From 51cc5466be25d9fe928fae24516d52eeeb25ee17 Mon Sep 17 00:00:00 2001
From: lsy <18332763730@163.com>
Date: Mon, 8 Jan 2018 22:35:43 +0800
Subject: [PATCH] =?UTF-8?q?upms=E7=94=A8=E6=88=B7=E6=B3=A8=E5=86=8C,?=
 =?UTF-8?q?=E5=BC=82=E5=B8=B8=E5=A4=84=E7=90=86=E5=8A=9F=E8=83=BD=E7=BC=96?=
 =?UTF-8?q?=E5=86=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../response/Const.ServerResponseCode.html    |   2 +-
 .../com/micro/fast/common/response/Const.html |   2 +-
 .../class-use/Const.ServerResponseCode.html   |   6 +-
 .../fast/common/response/class-use/Const.html |   4 +-
 .../browser/config/BrowserSecurityConfig.java |   4 +-
 .../common/exception/SystemException.java     |  12 ++
 .../fast/common/exception/UserException.java  |  11 ++
 .../micro/fast/common/response/BaseConst.java | 103 +++++++++++
 .../com/micro/fast/common/response/Const.java |  35 ----
 .../fast/common/response/ServerResponse.java  | 175 ++++++++++--------
 .../common/util/ExceptionHandlerUtil.java     |  12 ++
 .../com/micro/fast/util/ExceptionUtil.java    |  31 ++++
 .../java/com/micro/fast/util/XmlUtil.java     |   2 +-
 ms-web/config/index.js                        |   2 +-
 ms-web/src/components/Register.vue            |   3 +-
 .../upms/controller/UpmsUserController.java   |  50 +++++
 .../handler/ExceptionHandlerController.java   |  47 +++++
 .../micro/fast/upms/dao/UpmsUserMapper.java   |  26 ++-
 .../com/micro/fast/upms/pojo/UpmsUser.java    |   7 +
 .../fast/upms/service/UpmsUserService.java    |  34 ++++
 .../UpmsUserAuthenticationServiceImpl.java    |  31 ++++
 .../service/impl/UpmsUserServiceImpl.java     |  87 ++++++---
 .../main/resources/mappers/UpmsUserMapper.xml |   6 +
 .../service/impl/UpmsUserServiceImplTest.java |  25 +++
 24 files changed, 566 insertions(+), 151 deletions(-)
 create mode 100644 boot-starter/boot-starter-ssm/src/main/java/com/micro/fast/common/exception/SystemException.java
 create mode 100644 boot-starter/boot-starter-ssm/src/main/java/com/micro/fast/common/exception/UserException.java
 create mode 100644 boot-starter/boot-starter-ssm/src/main/java/com/micro/fast/common/response/BaseConst.java
 delete mode 100644 boot-starter/boot-starter-ssm/src/main/java/com/micro/fast/common/response/Const.java
 create mode 100644 boot-starter/boot-starter-ssm/src/main/java/com/micro/fast/common/util/ExceptionHandlerUtil.java
 create mode 100644 boot-starter/boot-starter-util/src/main/java/com/micro/fast/util/ExceptionUtil.java
 create mode 100644 ms/upms/src/main/java/com/micro/fast/upms/controller/UpmsUserController.java
 create mode 100644 ms/upms/src/main/java/com/micro/fast/upms/controller/handler/ExceptionHandlerController.java
 create mode 100644 ms/upms/src/main/java/com/micro/fast/upms/service/UpmsUserService.java
 create mode 100644 ms/upms/src/main/java/com/micro/fast/upms/service/impl/UpmsUserAuthenticationServiceImpl.java
 create mode 100644 ms/upms/src/test/java/com/micro/fast/upms/service/impl/UpmsUserServiceImplTest.java

diff --git a/all/javaDoc/com/micro/fast/common/response/Const.ServerResponseCode.html b/all/javaDoc/com/micro/fast/common/response/Const.ServerResponseCode.html
index 278eb8c..e50001c 100644
--- a/all/javaDoc/com/micro/fast/common/response/Const.ServerResponseCode.html
+++ b/all/javaDoc/com/micro/fast/common/response/Const.ServerResponseCode.html
@@ -104,7 +104,7 @@ var activeTableTab = "activeTableTab";
 <li>java.lang.Enum&lt;<a href="../../../../../com/micro/fast/common/response/Const.ServerResponseCode.html" title="com.micro.fast.common.response中的枚举">Const.ServerResponseCode</a>&gt;</li>
 <li>
 <ul class="inheritance">
-<li>com.micro.fast.common.response.Const.ServerResponseCode</li>
+<li>com.micro.fast.common.response.BaseConst.ServerResponseCode</li>
 </ul>
 </li>
 </ul>
diff --git a/all/javaDoc/com/micro/fast/common/response/Const.html b/all/javaDoc/com/micro/fast/common/response/Const.html
index c209a78..5b56309 100644
--- a/all/javaDoc/com/micro/fast/common/response/Const.html
+++ b/all/javaDoc/com/micro/fast/common/response/Const.html
@@ -95,7 +95,7 @@
 <li>java.lang.Object</li>
 <li>
 <ul class="inheritance">
-<li>com.micro.fast.common.response.Const</li>
+<li>com.micro.fast.common.response.BaseConst</li>
 </ul>
 </li>
 </ul>
diff --git a/all/javaDoc/com/micro/fast/common/response/class-use/Const.ServerResponseCode.html b/all/javaDoc/com/micro/fast/common/response/class-use/Const.ServerResponseCode.html
index 1d51e79..333098d 100644
--- a/all/javaDoc/com/micro/fast/common/response/class-use/Const.ServerResponseCode.html
+++ b/all/javaDoc/com/micro/fast/common/response/class-use/Const.ServerResponseCode.html
@@ -4,7 +4,7 @@
 <head>
 <!-- Generated by javadoc (1.8.0_144) on Mon Oct 02 18:41:08 CST 2017 -->
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>类 com.micro.fast.common.response.Const.ServerResponseCode的使用</title>
+<title>类 com.micro.fast.common.response.BaseConst.ServerResponseCode的使用</title>
 <meta name="date" content="2017-10-02">
 <link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../../script.js"></script>
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="\u7C7B com.micro.fast.common.response.Const.ServerResponseCode\u7684\u4F7F\u7528";
+            parent.document.title="\u7C7B com.micro.fast.common.response.BaseConst.ServerResponseCode\u7684\u4F7F\u7528";
         }
     }
     catch(err) {
@@ -71,7 +71,7 @@
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
 <div class="header">
-<h2 title="类的使用 com.micro.fast.common.response.Const.ServerResponseCode" class="title">类的使用<br>com.micro.fast.common.response.Const.ServerResponseCode</h2>
+<h2 title="类的使用 com.micro.fast.common.response.BaseConst.ServerResponseCode" class="title">类的使用<br>com.micro.fast.common.response.BaseConst.ServerResponseCode</h2>
 </div>
 <div class="classUseContainer">
 <ul class="blockList">
diff --git a/all/javaDoc/com/micro/fast/common/response/class-use/Const.html b/all/javaDoc/com/micro/fast/common/response/class-use/Const.html
index aee4f1b..22cb560 100644
--- a/all/javaDoc/com/micro/fast/common/response/class-use/Const.html
+++ b/all/javaDoc/com/micro/fast/common/response/class-use/Const.html
@@ -13,7 +13,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="\u7C7B com.micro.fast.common.response.Const\u7684\u4F7F\u7528";
+            parent.document.title="\u7C7B com.micro.fast.common.response.BaseConst\u7684\u4F7F\u7528";
         }
     }
     catch(err) {
@@ -71,7 +71,7 @@
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
 <div class="header">
-<h2 title="类的使用 com.micro.fast.common.response.Const" class="title">类的使用<br>com.micro.fast.common.response.Const</h2>
+<h2 title="类的使用 com.micro.fast.common.response.BaseConst" class="title">类的使用<br>com.micro.fast.common.response.BaseConst</h2>
 </div>
 <div class="classUseContainer">没有com.micro.fast.common.response.Const的用法</div>
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
diff --git a/boot-starter/boot-starter-security/boot-starter-security-browser/src/main/java/com/micro/fast/security/browser/config/BrowserSecurityConfig.java b/boot-starter/boot-starter-security/boot-starter-security-browser/src/main/java/com/micro/fast/security/browser/config/BrowserSecurityConfig.java
index d965961..04388ba 100644
--- a/boot-starter/boot-starter-security/boot-starter-security-browser/src/main/java/com/micro/fast/security/browser/config/BrowserSecurityConfig.java
+++ b/boot-starter/boot-starter-security/boot-starter-security-browser/src/main/java/com/micro/fast/security/browser/config/BrowserSecurityConfig.java
@@ -121,7 +121,9 @@ public class BrowserSecurityConfig extends WebSecurityConfigurerAdapter {
             , SecurityConstants.GET_VALIDATE_CODE_URI
             , SecurityConstants.LOGIN_PAGE
             , DRUID
-            , securityProperties.getBrowser().getHtml())
+            , securityProperties.getBrowser().getHtml()
+            //upms系统用户注册
+            , "/upms/user")
         .permitAll()
         //任何请求
         .anyRequest()
diff --git a/boot-starter/boot-starter-ssm/src/main/java/com/micro/fast/common/exception/SystemException.java b/boot-starter/boot-starter-ssm/src/main/java/com/micro/fast/common/exception/SystemException.java
new file mode 100644
index 0000000..5d41c21
--- /dev/null
+++ b/boot-starter/boot-starter-ssm/src/main/java/com/micro/fast/common/exception/SystemException.java
@@ -0,0 +1,12 @@
+package com.micro.fast.common.exception;
+
+
+/**
+ * 系统级别的异常,比如数据哭插入失败
+ * @author lsy
+ */
+public class SystemException extends RuntimeException {
+  public SystemException(String message) {
+    super(message);
+  }
+}
diff --git a/boot-starter/boot-starter-ssm/src/main/java/com/micro/fast/common/exception/UserException.java b/boot-starter/boot-starter-ssm/src/main/java/com/micro/fast/common/exception/UserException.java
new file mode 100644
index 0000000..ef1b6e6
--- /dev/null
+++ b/boot-starter/boot-starter-ssm/src/main/java/com/micro/fast/common/exception/UserException.java
@@ -0,0 +1,11 @@
+package com.micro.fast.common.exception;
+
+/**
+ * 用户异常类
+ * @author lsy
+ */
+public class UserException extends RuntimeException{
+  public UserException(String message) {
+    super(message);
+  }
+}
diff --git a/boot-starter/boot-starter-ssm/src/main/java/com/micro/fast/common/response/BaseConst.java b/boot-starter/boot-starter-ssm/src/main/java/com/micro/fast/common/response/BaseConst.java
new file mode 100644
index 0000000..98a4299
--- /dev/null
+++ b/boot-starter/boot-starter-ssm/src/main/java/com/micro/fast/common/response/BaseConst.java
@@ -0,0 +1,103 @@
+package com.micro.fast.common.response;
+
+/**
+ * 数据字典
+ *
+ * @author lishouyu 18332763730@163.com 2017/10/02
+ * @version 1.0
+ * @since 1.0
+ */
+public class BaseConst {
+
+  public static final String DEFAULT_VALIDATE_CODE = "888888";
+  /**
+   * 服务器响应数据字典
+   */
+  public enum ServerResponseCode {
+    /**
+     * 获取数据成功
+     */
+    SUCCESS(0, "SUCCESS"),
+    /**
+     * 获取数据失败
+     */
+    ERROR(1, "ERROR");
+    private Integer code;
+    private String msg;
+
+    ServerResponseCode(Integer code, String msg) {
+      this.code = code;
+      this.msg = msg;
+    }
+
+    public Integer getCode() {
+      return code;
+    }
+
+    public String getMsg() {
+      return msg;
+    }
+  }
+
+  /**
+   * 系统响应码
+   */
+  public enum SystemResponse {
+    DATABASE_INSERT_FAILURE(00000, "系统错误,请稍后重试");
+    private Integer code;
+    private String msg;
+
+    SystemResponse(Integer code, String msg) {
+      this.code = code;
+      this.msg = msg;
+    }
+
+    public Integer getCode() {
+      return code;
+    }
+
+    public void setCode(Integer code) {
+      this.code = code;
+    }
+
+    public String getMsg() {
+      return msg;
+    }
+
+    public void setMsg(String msg) {
+      this.msg = msg;
+    }
+  }
+
+  /**
+   * 用户操作响应码
+   */
+  public enum UserResponse {
+    USERNAME_IS_HAVE(10000, "用户名被占用"),
+    EMAIL_IS_HAVE(10001, "邮箱被占用"),
+    TWO_PASSWORD_NOT_SAME(10002,"两次密码不一致");
+    public Integer code;
+    private String msg;
+
+    UserResponse(Integer code, String msg) {
+      this.code = code;
+      this.msg = msg;
+    }
+
+    public Integer getCode() {
+      return code;
+    }
+
+    public void setCode(Integer code) {
+      this.code = code;
+    }
+
+    public String getMsg() {
+      return msg;
+    }
+
+    public void setMsg(String msg) {
+      this.msg = msg;
+    }
+  }
+}
diff --git a/boot-starter/boot-starter-ssm/src/main/java/com/micro/fast/common/response/Const.java b/boot-starter/boot-starter-ssm/src/main/java/com/micro/fast/common/response/Const.java
deleted file mode 100644
index 0487478..0000000
--- a/boot-starter/boot-starter-ssm/src/main/java/com/micro/fast/common/response/Const.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.micro.fast.common.response;
-
-/**
- * 数据字典
- * @author lishouyu 18332763730@163.com 2017/10/02
- * @version 1.0
- * @since 1.0
- */
-public class Const {
-    /**
-     *  服务器响应数据字典
-     */
-    public enum ServerResponseCode{
-        /**
-         * 获取数据成功
-         */
-        SUCCESS(0,"SUCCESS"),
-        /**
-         * 获取数据失败
-         */
-        ERROR(1,"ERROR");
-        private Integer code;
-        private String  msg;
-        ServerResponseCode(Integer code, String msg) {
-            this.code = code;
-            this.msg = msg;
-        }
-        public Integer getCode() {
-            return code;
-        }
-        public String getMsg() {
-            return msg;
-        }
-    }
-}
diff --git a/boot-starter/boot-starter-ssm/src/main/java/com/micro/fast/common/response/ServerResponse.java b/boot-starter/boot-starter-ssm/src/main/java/com/micro/fast/common/response/ServerResponse.java
index ccec743..6bdc596 100644
--- a/boot-starter/boot-starter-ssm/src/main/java/com/micro/fast/common/response/ServerResponse.java
+++ b/boot-starter/boot-starter-ssm/src/main/java/com/micro/fast/common/response/ServerResponse.java
@@ -5,7 +5,8 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 
 /**
- * 统一服务响应类
+ * 统一服务响应类,方法返回值
+ *
  * @author lishouyu 18332763730@163.com 2017/10/02
  * @version 1.0
  * @since 1.0
@@ -13,109 +14,119 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)//序列化中不包含为空的字段
 public class ServerResponse<T> {
-    private Integer code;//获取数据返回的提示数据字典码
-    private String msg; //获取数据成功或者失败的时候提示的消息
-    T data;
+  /**
+   * 获取数据返回的提示数据字典码
+   */
+  private Integer code;
+  /**
+   * 获取数据成功或者失败的时候提示的消息
+   */
+  private String msg;
+  /**
+   * 返回的数据
+   */
+  T data;
 
-    /**
-     * 所有的构造方法均为私有，不允许外部直接调用构造方法
-     */
-    public ServerResponse() {
+  /**
+   * 所有的构造方法均为私有，不允许外部直接调用构造方法
+   */
+  public ServerResponse() {
 
-    }
+  }
 
-    private ServerResponse(Integer code) {
-        this(code, null, null);
-    }
+  private ServerResponse(Integer code) {
+    this(code, null, null);
+  }
 
-    private ServerResponse(Integer code, String msg) {
-        this(code, msg, null);
-    }
+  private ServerResponse(Integer code, String msg) {
+    this(code, msg, null);
+  }
 
-    /**
-     * 为了避免T 为string的时候调用的是 上面的构造方法，需要对构造方法进行包装。构造方法设置为私有，不允许外部调用
-     *
-     * @param code　响应代码
-     * @param data　相应数据
-     */
-    private ServerResponse(Integer code, T data) {
-        this(code, null, data);
-    }
+  /**
+   * 为了避免T 为string的时候调用的是 上面的构造方法，需要对构造方法进行包装。构造方法设置为私有，不允许外部调用
+   *
+   * @param code 　响应代码
+   * @param data 　相应数据
+   */
+  private ServerResponse(Integer code, T data) {
+    this(code, null, data);
+  }
 
-    private ServerResponse(Integer code, String msg, T data) {
-        this.code = code;
-        this.msg = msg;
-        this.data = data;
-    }
+  private ServerResponse(Integer code, String msg, T data) {
+    this.code = code;
+    this.msg = msg;
+    this.data = data;
+  }
 
-    public Integer getCode() {
-        return code;
-    }
+  public Integer getCode() {
+    return code;
+  }
 
-    public void setCode(Integer code) {
-        this.code = code;
-    }
+  public void setCode(Integer code) {
+    this.code = code;
+  }
 
-    public String getMsg() {
-        return msg;
-    }
+  public String getMsg() {
+    return msg;
+  }
 
-    public void setMsg(String msg) {
-        this.msg = msg;
-    }
+  public void setMsg(String msg) {
+    this.msg = msg;
+  }
 
-    public T getData() {
-        return data;
-    }
+  public T getData() {
+    return data;
+  }
 
-    public void setData(T data) {
-        this.data = data;
-    }
+  public void setData(T data) {
+    this.data = data;
+  }
 
-    /**
-     * 返回代码是小于等于0的时候表示请求数据失败，或者进行验证时失败
-     * @return　是否成功
-     */
-    @JsonIgnore //使其不再json序列化结果之中
-    public boolean isSuccess() {
-        return Const.ServerResponseCode.SUCCESS.getCode().intValue() == this.code;
-    }
+  /**
+   * 返回代码是小于等于0的时候表示请求数据失败，或者进行验证时失败
+   *
+   * @return　是否成功
+   */
+  @JsonIgnore //使其不再json序列化结果之中
+  public boolean isSuccess() {
+    return BaseConst.ServerResponseCode.SUCCESS.getCode().intValue() == this.code;
+  }
 
-    //请求成功
-    public static <T> ServerResponse<T> success() {
+  //请求成功
+  public static <T> ServerResponse<T> success() {
 
-        return new ServerResponse<T>(Const.ServerResponseCode.SUCCESS.getCode());
-    }
+    return new ServerResponse<T>(BaseConst.ServerResponseCode.SUCCESS.getCode());
+  }
 
-    public static <T> ServerResponse<T> successMsg(String msg) {
+  public static <T> ServerResponse<T> successMsg(String msg) {
 
-        return new ServerResponse<T>(
-                Const.ServerResponseCode.SUCCESS.getCode(),
-                msg);
-    }
+    return new ServerResponse<T>(
+        BaseConst.ServerResponseCode.SUCCESS.getCode(),
+        msg);
+  }
 
-    public static <T> ServerResponse<T> successData(T data) {
+  public static <T> ServerResponse<T> successData(T data) {
 
-        return new ServerResponse<T>(Const.ServerResponseCode.SUCCESS.getCode(),
-                data);
-    }
+    return new ServerResponse<T>(BaseConst.ServerResponseCode.SUCCESS.getCode(),
+        data);
+  }
 
-    public static <T> ServerResponse<T> successMsgData(String msg, T data) {
+  public static <T> ServerResponse<T> successMsgData(String msg, T data) {
 
-        return new ServerResponse<T>(Const.ServerResponseCode.SUCCESS.getCode(),
-                msg, data);
-    }
+    return new ServerResponse<T>(BaseConst.ServerResponseCode.SUCCESS.getCode(),
+        msg, data);
+  }
 
-    //请求失败
-    public static <T> ServerResponse<T> error() {
-        return new ServerResponse<T>(Const.ServerResponseCode.ERROR.getCode());
-    }
+  //请求失败
+  public static <T> ServerResponse<T> error() {
+    return new ServerResponse<T>(BaseConst.ServerResponseCode.ERROR.getCode());
+  }
 
-    public static <T> ServerResponse<T> errorMsg(String msg) {
-        return new ServerResponse<T>(Const.ServerResponseCode.ERROR.getCode(), msg);
-    }
+  public static <T> ServerResponse<T> errorMsg(String msg) {
+    return new ServerResponse<T>(BaseConst.ServerResponseCode.ERROR.getCode(), msg);
+  }
 
-    public static <T> ServerResponse<T> errorCodeMsg(Integer code, String msg) {
-        return new ServerResponse<T>(code, msg);
-    }
+  public static <T> ServerResponse<T> errorCodeMsg(Integer code, String msg) {
+    return new ServerResponse<T>(code, msg);
+  }
 }
diff --git a/boot-starter/boot-starter-ssm/src/main/java/com/micro/fast/common/util/ExceptionHandlerUtil.java b/boot-starter/boot-starter-ssm/src/main/java/com/micro/fast/common/util/ExceptionHandlerUtil.java
new file mode 100644
index 0000000..8af95e5
--- /dev/null
+++ b/boot-starter/boot-starter-ssm/src/main/java/com/micro/fast/common/util/ExceptionHandlerUtil.java
@@ -0,0 +1,12 @@
+package com.micro.fast.common.util;
+
+import com.micro.fast.util.ExceptionUtil;
+
+/**
+ * 对于基础异常工具类进行封装
+ * @author lsy
+ */
+public class ExceptionHandlerUtil {
+
+
+}
diff --git a/boot-starter/boot-starter-util/src/main/java/com/micro/fast/util/ExceptionUtil.java b/boot-starter/boot-starter-util/src/main/java/com/micro/fast/util/ExceptionUtil.java
new file mode 100644
index 0000000..02e157e
--- /dev/null
+++ b/boot-starter/boot-starter-util/src/main/java/com/micro/fast/util/ExceptionUtil.java
@@ -0,0 +1,31 @@
+package com.micro.fast.util;
+
+/**
+ * 对异常处理的工具类
+ * @author lsy
+ */
+public class ExceptionUtil {
+  /**
+   * 分隔符
+   */
+  public static final String split = "::::";
+
+  /**
+   * 合并异常代码和描述
+   * @param code
+   * @param msg
+   * @return
+   */
+  public static String contactCodeMsg(Integer code,String msg){
+    return String.valueOf(code)+ExceptionUtil.split+msg;
+  }
+
+  /**
+   * 拆分异常描述
+   * @return
+   */
+  public static String[] splitCodeMsg(String codeMsg){
+    String[] split = codeMsg.split(ExceptionUtil.split);
+    return split;
+  }
+}
diff --git a/boot-starter/boot-starter-util/src/main/java/com/micro/fast/util/XmlUtil.java b/boot-starter/boot-starter-util/src/main/java/com/micro/fast/util/XmlUtil.java
index 38209c0..e9485a7 100644
--- a/boot-starter/boot-starter-util/src/main/java/com/micro/fast/util/XmlUtil.java
+++ b/boot-starter/boot-starter-util/src/main/java/com/micro/fast/util/XmlUtil.java
@@ -16,7 +16,7 @@ import java.io.File;
 import java.io.IOException;
 
 /**
- *
+ * 修改xml某一节点的值
  */
 public class XmlUtil {
 
diff --git a/ms-web/config/index.js b/ms-web/config/index.js
index 33bf3e4..fc768aa 100644
--- a/ms-web/config/index.js
+++ b/ms-web/config/index.js
@@ -13,7 +13,7 @@ module.exports = {
     proxyTable: {},
 
     // Various Dev Server settings
-    host: 'localhost', // can be overwritten by process.env.HOST
+    host: 'fthipw.natappfree.cc', // can be overwritten by process.env.HOST
     port: 80, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     autoOpenBrowser: false,
     errorOverlay: true,
diff --git a/ms-web/src/components/Register.vue b/ms-web/src/components/Register.vue
index 2291607..b9353ad 100644
--- a/ms-web/src/components/Register.vue
+++ b/ms-web/src/components/Register.vue
@@ -75,7 +75,8 @@
     },
     methods: {
       signUp () {
-        this.$http.post('', this.$querystring.stringify(signUp))
+        let that = this
+        this.$http.post(that.$msConfig.reqUpms + '/upms/user', signUp)
           .then(response => {
             console.log(response)
           }, error => {
diff --git a/ms/upms/src/main/java/com/micro/fast/upms/controller/UpmsUserController.java b/ms/upms/src/main/java/com/micro/fast/upms/controller/UpmsUserController.java
new file mode 100644
index 0000000..80ce50a
--- /dev/null
+++ b/ms/upms/src/main/java/com/micro/fast/upms/controller/UpmsUserController.java
@@ -0,0 +1,50 @@
+package com.micro.fast.upms.controller;
+
+import com.micro.fast.common.exception.UserException;
+import com.micro.fast.common.response.ServerResponse;
+import com.micro.fast.upms.pojo.UpmsUser;
+import com.micro.fast.upms.service.UpmsUserService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.validation.FieldError;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+
+/**
+ * 权限管理系统用户管理
+ *
+ * @author lsy
+ */
+@RestController
+@RequestMapping(value = "/upms/user")
+public class UpmsUserController {
+
+  /**
+   * 用户服务接口
+   */
+  @Autowired
+  private UpmsUserService upmsUserService;
+
+  /**
+   * 用户注册,使用Valid注解对upmsUser进行参数校验
+   * BindingResult一定要紧跟校验的对象
+   * @return
+   */
+  @PostMapping
+  public ServerResponse<UpmsUser> register(@Valid UpmsUser upmsUser,BindingResult errors
+      , @RequestParam(defaultValue = "") String repeatPassword) {
+    //对参数的校验抛出异常
+    if (errors.hasErrors()) {
+      errors.getAllErrors().stream().forEach(objectError -> {
+        FieldError fieldError = (FieldError) objectError;
+        throw new UserException(fieldError.getDefaultMessage());
+      });
+    }
+    ServerResponse<UpmsUser> register = upmsUserService.register(upmsUser, repeatPassword);
+    return register;
+  }
+}
diff --git a/ms/upms/src/main/java/com/micro/fast/upms/controller/handler/ExceptionHandlerController.java b/ms/upms/src/main/java/com/micro/fast/upms/controller/handler/ExceptionHandlerController.java
new file mode 100644
index 0000000..897ef6f
--- /dev/null
+++ b/ms/upms/src/main/java/com/micro/fast/upms/controller/handler/ExceptionHandlerController.java
@@ -0,0 +1,47 @@
+package com.micro.fast.upms.controller.handler;
+
+import com.micro.fast.common.exception.SystemException;
+import com.micro.fast.common.exception.UserException;
+import com.micro.fast.util.ExceptionUtil;
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.ResponseStatus;
+import org.springframework.web.bind.annotation.RestControllerAdvice;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 异常处理类
+ * @author lsy
+ */
+@RestControllerAdvice
+public class ExceptionHandlerController {
+  /**
+   * 处理系统异常
+   * @param se
+   * @return
+   */
+  @ExceptionHandler(SystemException.class)
+  @ResponseStatus(HttpStatus.INTERNAL_SERVER_ERROR)
+  public Map<String, String> handlerSystemException(SystemException se) {
+    String[] strings = ExceptionUtil.splitCodeMsg(se.getMessage());
+    Map<String,String> map = new HashMap<>();
+    map.put(strings[0],strings[1]);
+    return map;
+  }
+
+  /**
+   * 处理用户异常
+   * @param se
+   * @return
+   */
+  @ExceptionHandler(UserException.class)
+  @ResponseStatus(HttpStatus.BAD_REQUEST)
+  public Map<String, String> handlerUserException(UserException se) {
+    String[] strings = ExceptionUtil.splitCodeMsg(se.getMessage());
+    Map<String,String> map = new HashMap<>();
+    map.put(strings[0],strings[1]);
+    return map;
+  }
+}
diff --git a/ms/upms/src/main/java/com/micro/fast/upms/dao/UpmsUserMapper.java b/ms/upms/src/main/java/com/micro/fast/upms/dao/UpmsUserMapper.java
index 75b0aa1..ede245a 100644
--- a/ms/upms/src/main/java/com/micro/fast/upms/dao/UpmsUserMapper.java
+++ b/ms/upms/src/main/java/com/micro/fast/upms/dao/UpmsUserMapper.java
@@ -1,6 +1,7 @@
 package com.micro.fast.upms.dao;
 
 import com.micro.fast.upms.pojo.UpmsUser;
+import feign.Param;
 
 /**
  * @author lsy
@@ -10,13 +11,36 @@ public interface UpmsUserMapper {
 
     int insert(UpmsUser record);
 
-    UpmsUser selectByUsername(String username);
+
 
     int insertSelective(UpmsUser record);
 
     UpmsUser selectByPrimaryKey(Integer id);
 
+    /**
+     * 根据用户名查找用户
+     * @param username 用户名
+     * @return
+     */
+    UpmsUser selectByUsername(@Param("username") String username);
+
+    /**
+     * 检查用户名是否存在
+     * @param username
+     * @return
+     */
+    int countUsername(String username);
+
+    /**
+     * 检查邮箱是否被占用
+     * @param email
+     * @return
+     */
+    int countEmail(String email);
+
     int updateByPrimaryKeySelective(UpmsUser record);
 
     int updateByPrimaryKey(UpmsUser record);
+
+
 }
\ No newline at end of file
diff --git a/ms/upms/src/main/java/com/micro/fast/upms/pojo/UpmsUser.java b/ms/upms/src/main/java/com/micro/fast/upms/pojo/UpmsUser.java
index e2b17af..26e41bb 100644
--- a/ms/upms/src/main/java/com/micro/fast/upms/pojo/UpmsUser.java
+++ b/ms/upms/src/main/java/com/micro/fast/upms/pojo/UpmsUser.java
@@ -1,12 +1,18 @@
 package com.micro.fast.upms.pojo;
 
+import com.micro.fast.common.response.BaseConst;
+import com.micro.fast.util.ExceptionUtil;
+import org.hibernate.validator.constraints.NotBlank;
+
 import java.io.Serializable;
 
 public class UpmsUser implements Serializable {
     private Integer id;
 
+    @NotBlank(message = BaseConst.DEFAULT_VALIDATE_CODE+ExceptionUtil.split+"请按提示输入用户名")
     private String username;
 
+    @NotBlank(message = BaseConst.DEFAULT_VALIDATE_CODE+ExceptionUtil.split+"请按提示输入密码")
     private String password;
 
     private String salt;
@@ -17,6 +23,7 @@ public class UpmsUser implements Serializable {
 
     private String phone;
 
+    @NotBlank(message = BaseConst.DEFAULT_VALIDATE_CODE+ExceptionUtil.split+"请按照提示输入邮箱")
     private String email;
 
     private Byte sex;
diff --git a/ms/upms/src/main/java/com/micro/fast/upms/service/UpmsUserService.java b/ms/upms/src/main/java/com/micro/fast/upms/service/UpmsUserService.java
new file mode 100644
index 0000000..db1ad6e
--- /dev/null
+++ b/ms/upms/src/main/java/com/micro/fast/upms/service/UpmsUserService.java
@@ -0,0 +1,34 @@
+package com.micro.fast.upms.service;
+
+import com.micro.fast.common.response.ServerResponse;
+import com.micro.fast.upms.pojo.UpmsUser;
+
+/**
+ * 权限管理系统用户服务接口
+ * @author lsy
+ */
+public interface UpmsUserService {
+
+  /**
+   * 注册用户
+   * @param upmsUser 用户对象
+   * @param repeatPassword 确认密码
+   * @return
+   */
+  ServerResponse<UpmsUser> register(UpmsUser upmsUser,String repeatPassword);
+
+  /**
+   * 检查用户名是否被占用
+   * @param username 用户名
+   * @return
+   */
+  ServerResponse checkUsername(String username);
+
+  /**
+   * 检查邮箱是否被占用
+   * @param email
+   * @return
+   */
+  ServerResponse checkEmail(String email);
+
+}
diff --git a/ms/upms/src/main/java/com/micro/fast/upms/service/impl/UpmsUserAuthenticationServiceImpl.java b/ms/upms/src/main/java/com/micro/fast/upms/service/impl/UpmsUserAuthenticationServiceImpl.java
new file mode 100644
index 0000000..35b4f81
--- /dev/null
+++ b/ms/upms/src/main/java/com/micro/fast/upms/service/impl/UpmsUserAuthenticationServiceImpl.java
@@ -0,0 +1,31 @@
+package com.micro.fast.upms.service.impl;
+
+import com.micro.fast.security.browser.service.UserService;
+import com.micro.fast.upms.dao.UpmsUserMapper;
+import com.micro.fast.upms.pojo.UpmsUser;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.core.authority.AuthorityUtils;
+import org.springframework.security.core.userdetails.User;
+import org.springframework.stereotype.Service;
+
+/**
+ * 后台权限管理系统用户操作接口实现类
+ * @author lsy
+ */
+@Service("userServiceImpl")
+public class UpmsUserAuthenticationServiceImpl implements UserService{
+
+    @Autowired
+    private UpmsUserMapper upmsUserMapper;
+
+    @Override
+    public User getUserByUsername(String username) {
+        UpmsUser upmsUser = upmsUserMapper.selectByUsername(username);
+        //将根据用户名查询出来的用户信息填入springSecurity的User对象中，默认是admin权限 todo 需要进行完善
+        User user = new User(username,upmsUser.getPassword(), AuthorityUtils.commaSeparatedStringToAuthorityList("admin"));
+        return user;
+    }
+
+
+
+}
diff --git a/ms/upms/src/main/java/com/micro/fast/upms/service/impl/UpmsUserServiceImpl.java b/ms/upms/src/main/java/com/micro/fast/upms/service/impl/UpmsUserServiceImpl.java
index 564a0e1..8760cde 100644
--- a/ms/upms/src/main/java/com/micro/fast/upms/service/impl/UpmsUserServiceImpl.java
+++ b/ms/upms/src/main/java/com/micro/fast/upms/service/impl/UpmsUserServiceImpl.java
@@ -1,39 +1,82 @@
 package com.micro.fast.upms.service.impl;
 
-import com.micro.fast.security.browser.service.UserService;
+import com.micro.fast.common.exception.SystemException;
+import com.micro.fast.common.response.ServerResponse;
 import com.micro.fast.upms.dao.UpmsUserMapper;
+import com.micro.fast.common.exception.UserException;
 import com.micro.fast.upms.pojo.UpmsUser;
+import com.micro.fast.upms.service.UpmsUserService;
+import com.micro.fast.util.ExceptionUtil;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.core.authority.AuthorityUtils;
-import org.springframework.security.core.userdetails.User;
 import org.springframework.stereotype.Service;
+import com.micro.fast.common.response.BaseConst.*;
 
 /**
- * 后台权限管理系统用户操作接口实现类
  * @author lsy
  */
-@Service("userServiceImpl")
-public class UpmsUserServiceImpl implements UserService{
+@Service(value = "upmsUserServiceImpl")
+public class UpmsUserServiceImpl implements UpmsUserService {
 
-    @Autowired
-    private UpmsUserMapper upmsUserMapper;
+  @Autowired
+  private UpmsUserMapper upmsUserMapper;
 
-    @Override
-    public User getUserByUsername(String username) {
-        UpmsUser upmsUser = upmsUserMapper.selectByUsername(username);
-        //将根据用户名查询出来的用户信息填入springSecurity的User对象中，默认是admin权限 todo 需要进行完善
-        User user = new User(username,upmsUser.getPassword(), AuthorityUtils.commaSeparatedStringToAuthorityList("admin"));
-        return user;
+  @Override
+  public ServerResponse<UpmsUser> register(UpmsUser upmsUser, String repeatPassword){
+    ServerResponse checkUsername = checkUsername(upmsUser.getUsername());
+    ServerResponse checkEmail = checkEmail(upmsUser.getEmail());
+    //校验两次输入密码是否一致
+    if (upmsUser.getPassword().equals(repeatPassword)){
+      throw new UserException(ExceptionUtil.contactCodeMsg(
+          UserResponse.TWO_PASSWORD_NOT_SAME.getCode(),
+          UserResponse.TWO_PASSWORD_NOT_SAME.getMsg()
+      ));
     }
-
-    //todo 添加用户
-    public int addUser(String username,String password){
-        UpmsUser upmsUser = new UpmsUser();
-        upmsUser.setUsername(username);
-        upmsUser.setPassword(password);
-        int insert = upmsUserMapper.insert(upmsUser);
-        return insert;
+    //校验用户名,邮箱是否存在
+    boolean success = checkUsername.isSuccess();
+    boolean success1 = checkEmail.isSuccess();
+    if (!success){
+      throw new UserException(ExceptionUtil.contactCodeMsg(
+         UserResponse.USERNAME_IS_HAVE.getCode()
+          ,UserResponse.USERNAME_IS_HAVE.getMsg()));
     }
+    if (!success1){
+      throw new UserException(ExceptionUtil.contactCodeMsg(
+          UserResponse.EMAIL_IS_HAVE.getCode()
+          ,UserResponse.EMAIL_IS_HAVE.getMsg()));
+    }
+    upmsUser.setCtime(Long.valueOf(System.currentTimeMillis()));
+    int i = upmsUserMapper.insertSelective(upmsUser);
+    //是否插入成功
+    if (i<1){
+      throw new SystemException(ExceptionUtil.contactCodeMsg(
+          SystemResponse.DATABASE_INSERT_FAILURE.getCode()
+          ,SystemResponse.DATABASE_INSERT_FAILURE.getMsg()));
+    }
+    return ServerResponse.successData(upmsUser);
+  }
 
+  @Override
+  public ServerResponse checkUsername(String username) {
+    int i = upmsUserMapper.countUsername(username);
+    if (i>0){
+      //用户名被占用
+      return ServerResponse.error();
+    }else{
+      //用户名没被占用
+      return ServerResponse.success();
+    }
+  }
 
+  @Override
+  public ServerResponse checkEmail(String email) {
+    int i = upmsUserMapper.countEmail(email);
+    if (i>0){
+      //邮箱已被占用
+      return ServerResponse.error();
+    }else{
+      //邮箱没被占用
+      return ServerResponse.success();
+    }
+  }
+  
 }
diff --git a/ms/upms/src/main/resources/mappers/UpmsUserMapper.xml b/ms/upms/src/main/resources/mappers/UpmsUserMapper.xml
index 7a3c103..4246b0f 100644
--- a/ms/upms/src/main/resources/mappers/UpmsUserMapper.xml
+++ b/ms/upms/src/main/resources/mappers/UpmsUserMapper.xml
@@ -31,6 +31,12 @@
     FROM upms_user
     WHERE username = #{username}
   </select>
+  <select id="countUsername" resultType="java.lang.Integer">
+    SELECT COUNT(username) FROM upms_user WHERE username = #{username}
+  </select>
+  <select id="countEmail" resultType="java.lang.Integer">
+    SELECT COUNT(email) FROM upms_user WHERE email = #{email}
+  </select>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
     delete from upms_user
     where id = #{id,jdbcType=INTEGER}
diff --git a/ms/upms/src/test/java/com/micro/fast/upms/service/impl/UpmsUserServiceImplTest.java b/ms/upms/src/test/java/com/micro/fast/upms/service/impl/UpmsUserServiceImplTest.java
new file mode 100644
index 0000000..62489e7
--- /dev/null
+++ b/ms/upms/src/test/java/com/micro/fast/upms/service/impl/UpmsUserServiceImplTest.java
@@ -0,0 +1,25 @@
+package com.micro.fast.upms.service.impl;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import static org.junit.Assert.*;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest
+public class UpmsUserServiceImplTest {
+
+
+  @Test
+  public void checkUsername() throws Exception {
+
+  }
+
+  @Test
+  public void checkEmail() throws Exception {
+
+  }
+
+}
\ No newline at end of file