From 75f68f7e1eca85b7db9619a72a8760093c0bc7e9 Mon Sep 17 00:00:00 2001
From: "rui.zhang" <zhangrui@lymsh.com>
Date: Mon, 28 Mar 2016 10:37:43 +0800
Subject: [PATCH] platform permission login model move login center

---
 .../lyms/platform/permission/dao/UsersMapper.java  |  14 +-
 .../com/lyms/platform/permission/model/Users.java  |  79 ++++++-----
 .../lyms/platform/permission/model/UsersQuery.java |  13 +-
 .../platform/permission/service/UsersService.java  |  15 ++-
 .../permission/service/impl/UsersServiceImpl.java  |   6 +
 .../src/main/resources/mainOrm/Users.xml           |  20 ++-
 .../com/lyms/platform/common/base/LoginState.java  |  49 +++++++
 .../com/lyms/platform/common/utils/LoginUtil.java  | 138 ++++++++++++++++++-
 .../lyms/platform/common/utils/MessageUtil.java    |  13 ++
 .../lyms/platform/common/utils/ResultUtils.java    |  12 ++
 .../web/controller/DepartmentsController.java      |  10 +-
 .../web/controller/OrganizationController.java     |   8 +-
 .../operate/web/controller/RolesController.java    |   8 +-
 .../operate/web/controller/UsersController.java    | 148 ++++++++-------------
 .../web/inteceptor/TokenValidateInteceptor.java    |  33 ++---
 .../src/main/resources/database.properties         |   4 +
 16 files changed, 409 insertions(+), 161 deletions(-)
 create mode 100644 platform-common/src/main/java/com/lyms/platform/common/base/LoginState.java

diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/UsersMapper.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/UsersMapper.java
index 1f9c957..8634121 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/UsersMapper.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/UsersMapper.java
@@ -5,6 +5,18 @@ import com.lyms.platform.permission.model.UsersQuery;
 
 import java.util.List;
 
-public interface UsersMapper {public void addUsers(Users obj);public void updateUsers(Users obj);public void deleteUsers(Integer id);public Users getUsers(Integer id);public int queryUsersCount(UsersQuery query);public List<Users> queryUsers(UsersQuery query);
+public interface UsersMapper {
+    public void addUsers(Users obj);
 
+    public void updateUsers(Users obj);
+
+    public void deleteUsers(Integer id);
+
+    public Users getUsers(Integer id);
+
+    public int queryUsersCount(UsersQuery query);
+
+    public List<Users> queryUsers(UsersQuery query);
+
+    public Users getUsersByLoginCenterId(Integer id);
 }
\ No newline at end of file
diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/Users.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/Users.java
index f7a995d..7bb5a7b 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/Users.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/Users.java
@@ -2,179 +2,190 @@ package com.lyms.platform.permission.model;
 
 import java.util.Date;
 
-public class Users {
-    private Integer id;
-    private Integer type;
-    private Integer orgId;
-    private Integer deptId;
-    private String name;
-    private String account;
-    private String pwd;
-    private String phone;
-    private Integer publishId;
-    private String publishName;
-    private Integer yn;
-    private Integer enable;
-    private Date modified;
-    private Date created;
-    private String remarks;
-    private Date lastLoginTime;
-
-    public Integer getId() {
+public class Users {private Integer id;private Integer logincenterId;private Integer type;private Integer orgId;private Integer deptId;private String name;private String account;private String pwd;private String phone;private Integer publishId;private String publishName;private Integer yn;private Integer enable;private Date modified;private Date created;private String remarks;private Date lastLoginTime;
+
+public Integer getId() {
         return id;
     }
 
 
+
     public void setId(Integer id) {
         this.id = id;
 
     }
 
-    public Integer getType() {
+public Integer getLogincenterId() {
+        return logincenterId;
+    }
+
+
+
+    public void setLogincenterId(Integer logincenterId) {
+        this.logincenterId = logincenterId;
+
+    }
+
+public Integer getType() {
         return type;
     }
 
 
+
     public void setType(Integer type) {
         this.type = type;
 
     }
 
-    public Integer getOrgId() {
+public Integer getOrgId() {
         return orgId;
     }
 
 
+
     public void setOrgId(Integer orgId) {
         this.orgId = orgId;
 
     }
 
-    public Integer getDeptId() {
+public Integer getDeptId() {
         return deptId;
     }
 
 
+
     public void setDeptId(Integer deptId) {
         this.deptId = deptId;
 
     }
 
-    public String getName() {
+public String getName() {
         return name;
     }
 
 
+
     public void setName(String name) {
         this.name = name;
 
     }
 
-    public String getAccount() {
+public String getAccount() {
         return account;
     }
 
 
+
     public void setAccount(String account) {
         this.account = account;
 
     }
 
-    public String getPwd() {
+public String getPwd() {
         return pwd;
     }
 
 
+
     public void setPwd(String pwd) {
         this.pwd = pwd;
 
     }
 
-    public String getPhone() {
+public String getPhone() {
         return phone;
     }
 
 
+
     public void setPhone(String phone) {
         this.phone = phone;
 
     }
 
-    public Integer getPublishId() {
+public Integer getPublishId() {
         return publishId;
     }
 
 
+
     public void setPublishId(Integer publishId) {
         this.publishId = publishId;
 
     }
 
-    public String getPublishName() {
+public String getPublishName() {
         return publishName;
     }
 
 
+
     public void setPublishName(String publishName) {
         this.publishName = publishName;
 
     }
 
-    public Integer getYn() {
+public Integer getYn() {
         return yn;
     }
 
 
+
     public void setYn(Integer yn) {
         this.yn = yn;
 
     }
 
-    public Integer getEnable() {
+public Integer getEnable() {
         return enable;
     }
 
 
+
     public void setEnable(Integer enable) {
         this.enable = enable;
 
     }
 
-    public Date getModified() {
+public Date getModified() {
         return modified;
     }
 
 
+
     public void setModified(Date modified) {
         this.modified = modified;
 
     }
 
-    public Date getCreated() {
+public Date getCreated() {
         return created;
     }
 
 
+
     public void setCreated(Date created) {
         this.created = created;
 
     }
 
-    public String getRemarks() {
+public String getRemarks() {
         return remarks;
     }
 
 
+
     public void setRemarks(String remarks) {
         this.remarks = remarks;
 
     }
 
-    public Date getLastLoginTime() {
+public Date getLastLoginTime() {
         return lastLoginTime;
     }
 
 
+
     public void setLastLoginTime(Date lastLoginTime) {
         this.lastLoginTime = lastLoginTime;
 
diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/UsersQuery.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/UsersQuery.java
index 5ae346f..a2866e4 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/UsersQuery.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/UsersQuery.java
@@ -8,7 +8,7 @@ import java.util.Date;
 
 
 
-public class UsersQuery extends BaseQuery {private Integer id;private Integer type;private Integer orgId;private Integer deptId;private String name;private String account;private String pwd;private String phone;private Integer publishId;private String publishName;private Integer yn;private Integer enable;private Date modified;private Date created;private String remarks;private Date lastLoginTime;
+public class UsersQuery extends BaseQuery {private Integer id;private Integer logincenterId;private Integer type;private Integer orgId;private Integer deptId;private String name;private String account;private String pwd;private String phone;private Integer publishId;private String publishName;private Integer yn;private Integer enable;private Date modified;private Date created;private String remarks;private Date lastLoginTime;
 
 public Integer getId() {
         return id;
@@ -21,6 +21,17 @@ public Integer getId() {
 
     }
 
+public Integer getLogincenterId() {
+        return logincenterId;
+    }
+
+
+
+    public void setLogincenterId(Integer logincenterId) {
+        this.logincenterId = logincenterId;
+
+    }
+
 public Integer getType() {
         return type;
     }
diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/UsersService.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/UsersService.java
index c758a02..42186cb 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/UsersService.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/UsersService.java
@@ -5,6 +5,19 @@ import com.lyms.platform.permission.model.UsersQuery;
 
 import java.util.List;
 
-public interface UsersService {public void addUsers(Users obj);public void updateUsers(Users obj);public void deleteUsers(Integer id);public Users getUsers(Integer id);public int queryUsersCount(UsersQuery query);public List<Users> queryUsers(UsersQuery query);
+public interface UsersService {
+    public void addUsers(Users obj);
+
+    public void updateUsers(Users obj);
+
+    public void deleteUsers(Integer id);
+
+    public Users getUsers(Integer id);
+
+    public int queryUsersCount(UsersQuery query);
+
+    public List<Users> queryUsers(UsersQuery query);
+
+    public Users getUsersByLoginCenterId(Integer id);
 
 }
\ No newline at end of file
diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/UsersServiceImpl.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/UsersServiceImpl.java
index b7d7321..3178d36 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/UsersServiceImpl.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/UsersServiceImpl.java
@@ -29,4 +29,10 @@ public int queryUsersCount (UsersQuery query){return usersMapper.queryUsersCount
 @Override
 public List<Users> queryUsers (UsersQuery query){if (query.getNeed() != null) {query.mysqlBuild(usersMapper.queryUsersCount(query));}return usersMapper.queryUsers(query);}
 
+    @Override
+    public Users getUsersByLoginCenterId(Integer id) {
+        return usersMapper.getUsersByLoginCenterId(id);
+    }
+
+
 }
\ No newline at end of file
diff --git a/platform-biz-service/src/main/resources/mainOrm/Users.xml b/platform-biz-service/src/main/resources/mainOrm/Users.xml
index d3a4e3b..d70ed06 100644
--- a/platform-biz-service/src/main/resources/mainOrm/Users.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/Users.xml
@@ -4,6 +4,7 @@
 
 <resultMap id="UsersResultMap" type="com.lyms.platform.permission.model.Users">
 <id column="id" property="id" jdbcType="INTEGER" />
+<result column="logincenter_id" property="logincenterId" jdbcType="INTEGER" />
 <result column="type" property="type" jdbcType="INTEGER" />
 <result column="org_id" property="orgId" jdbcType="INTEGER" />
 <result column="dept_id" property="deptId" jdbcType="INTEGER" />
@@ -24,13 +25,16 @@
 
 
 <insert id="addUsers" parameterType="com.lyms.platform.permission.model.Users">
-insert into users (type,org_id,dept_id,name,account,pwd,phone,publish_id,publish_name,yn,enable,modified,created,remarks,last_login_time) values (#{type},#{orgId},#{deptId},#{name},#{account},#{pwd},#{phone},#{publishId},#{publishName},#{yn},#{enable},#{modified},#{created},#{remarks},#{lastLoginTime})
+insert into users (logincenter_id,type,org_id,dept_id,name,account,pwd,phone,publish_id,publish_name,yn,enable,modified,created,remarks,last_login_time) values (#{logincenterId},#{type},#{orgId},#{deptId},#{name},#{account},#{pwd},#{phone},#{publishId},#{publishName},#{yn},#{enable},#{modified},#{created},#{remarks},#{lastLoginTime})
 </insert>
 
 
 
 <update id="updateUsers" parameterType="com.lyms.platform.permission.model.Users">
-update users <set><if test="type != null and type >= 0">
+update users <set><if test="logincenterId != null and logincenterId >= 0">
+logincenter_id = #{logincenterId,jdbcType=INTEGER},
+</if>
+<if test="type != null and type >= 0">
 type = #{type,jdbcType=INTEGER},
 </if>
 <if test="orgId != null and orgId >= 0">
@@ -87,10 +91,15 @@ delete from users where id = #{id,jdbcType=INTEGER}
 
 
 <select id="getUsers" resultMap="UsersResultMap" parameterType="java.lang.Integer">
-select id,type,org_id,dept_id,name,account,pwd,phone,publish_id,publish_name,yn,enable,modified,created,remarks,last_login_time
+select id,logincenter_id,type,org_id,dept_id,name,account,pwd,phone,publish_id,publish_name,yn,enable,modified,created,remarks,last_login_time
  from users where id = #{id,jdbcType=INTEGER}
 </select>
 
+ <select id="getUsersByLoginCenterId" resultMap="UsersResultMap" parameterType="java.lang.Integer">
+  select id,logincenter_id,type,org_id,dept_id,name,account,pwd,phone,publish_id,publish_name,yn,enable,modified,created,remarks,last_login_time
+  from users where logincenter_id = #{id,jdbcType=INTEGER}
+ </select>
+
 
 <sql id="orderAndLimit">
 <if test="sort != null and sort != '' ">
@@ -109,6 +118,9 @@ limit #{offset, jdbcType=INTEGER} , #{limit, jdbcType=INTEGER}
 <if test="id != null and id >= 0">
 and id = #{id,jdbcType=INTEGER} 
 </if>
+<if test="logincenterId != null and logincenterId >= 0">
+and logincenter_id = #{logincenterId,jdbcType=INTEGER} 
+</if>
 <if test="type != null and type >= 0">
 and type = #{type,jdbcType=INTEGER} 
 </if>
@@ -160,7 +172,7 @@ and last_login_time = #{lastLoginTime,jdbcType=TIMESTAMP}
 
 
 <select id="queryUsers" resultMap="UsersResultMap" parameterType="com.lyms.platform.permission.model.UsersQuery">
-select id,type,org_id,dept_id,name,account,pwd,phone,publish_id,publish_name,yn,enable,modified,created,remarks,last_login_time
+select id,logincenter_id,type,org_id,dept_id,name,account,pwd,phone,publish_id,publish_name,yn,enable,modified,created,remarks,last_login_time
  from users 
 <include refid="UsersCondition" />
 <include refid="orderAndLimit" />
diff --git a/platform-common/src/main/java/com/lyms/platform/common/base/LoginState.java b/platform-common/src/main/java/com/lyms/platform/common/base/LoginState.java
new file mode 100644
index 0000000..cf90a2c
--- /dev/null
+++ b/platform-common/src/main/java/com/lyms/platform/common/base/LoginState.java
@@ -0,0 +1,49 @@
+package com.lyms.platform.common.base;
+
+/**
+ * Created by Zhang.Rui on 2016/3/28.
+ */
+public class LoginState {
+    private String token;
+    private Integer id;
+    private Integer errorcode;
+    private String errormsg;
+
+    public String getToken() {
+        return token;
+    }
+
+    public void setToken(String token) {
+        this.token = token;
+    }
+
+    public Integer getErrorcode() {
+        return errorcode;
+    }
+
+    public void setErrorcode(Integer errorcode) {
+        this.errorcode = errorcode;
+    }
+
+    public String getErrormsg() {
+        return errormsg;
+    }
+
+    public void setErrormsg(String errormsg) {
+        this.errormsg = errormsg;
+    }
+
+
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public boolean isLogin() {
+         return  0 == this.errorcode ? true : false;
+    }
+}
diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/LoginUtil.java b/platform-common/src/main/java/com/lyms/platform/common/utils/LoginUtil.java
index dafb1d3..a9ff494 100644
--- a/platform-common/src/main/java/com/lyms/platform/common/utils/LoginUtil.java
+++ b/platform-common/src/main/java/com/lyms/platform/common/utils/LoginUtil.java
@@ -1,10 +1,127 @@
 package com.lyms.platform.common.utils;
 
+import com.lyms.platform.common.base.LoginState;
+import jdk.nashorn.internal.runtime.regexp.joni.Regex;
+import org.apache.commons.digester.RegexMatcher;
+import org.apache.commons.httpclient.HttpClient;
+import org.apache.commons.httpclient.NameValuePair;
+import org.apache.commons.httpclient.methods.GetMethod;
+import org.apache.commons.httpclient.methods.PostMethod;
+import org.apache.commons.httpclient.params.HttpMethodParams;
+import org.springframework.beans.factory.annotation.Value;
+
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 public class LoginUtil {
 
+    public static Integer register(String phone, String token, String typeId) {
+        HttpClient client = new HttpClient();
+        PostMethod post = new MessageUtil.UTF8PostMethod("http://passport.healthbaby.com.cn/v1/register.action");
+        NameValuePair[] data = {
+                new NameValuePair("phone", phone),
+                new NameValuePair("typeId", typeId),
+        };
+        post.setRequestBody(data);
+        post.setRequestHeader("Authorization", token);
+        try {
+            client.executeMethod(post);
+            int statusCode = post.getStatusCode();
+            String result = new String(post.getResponseBodyAsString());
+            post.releaseConnection();
+            if(200 == statusCode) {
+                LoginState loginState = JsonUtil.str2Obj(result, LoginState.class);
+                return loginState.getId();
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+
+    public static String login(String phone, String varCode, String typeId, String token) {
+        HttpClient client = new HttpClient();
+        PostMethod post = new MessageUtil.UTF8PostMethod("http://passport.healthbaby.com.cn/v1/login.action");
+        NameValuePair[] data = {
+                new NameValuePair("phone", phone),
+                new NameValuePair("typeId", typeId),
+                new NameValuePair("code", varCode)
+        };
+        post.setRequestBody(data);
+        post.setRequestHeader("Authorization", token);
+        try {
+            client.executeMethod(post);
+            int statusCode = post.getStatusCode();
+            String result = new String(post.getResponseBodyAsString());
+
+            post.releaseConnection();
+            if(200 == statusCode) {
+                LoginState loginState = JsonUtil.str2Obj(result, LoginState.class);
+                if(0 == loginState.getErrorcode()) {
+                    return loginState.getToken();
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    public static boolean sendVerCode(String phone, String typeId, String token) {
+        HttpClient client = new HttpClient();
+        String query = "?phone=" + phone + "&typeId=" + typeId + "&token=" + token + "&userType=2";
+        GetMethod get = new MessageUtil.UTF8GetMethod("http://passport.healthbaby.com.cn/v1/vercode.action" + query);
+
+        get.setRequestHeader("Authorization", token);
+        try {
+            client.executeMethod(get);
+            int statusCode = get.getStatusCode();
+            String result = new String(get.getResponseBodyAsString());
+            get.releaseConnection();
+            if(200 == statusCode) {
+                LoginState loginState = JsonUtil.str2Obj(result, LoginState.class);
+                if(0 == loginState.getErrorcode()) {
+                    return true;
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return false;
+    }
+
+
+    public static LoginState checkLoginState(String token) {
+        LoginState loginState = new LoginState();
+        HttpClient client = new HttpClient();
+        String query = "?token=" + token ;
+        GetMethod get = new MessageUtil.UTF8GetMethod("http://passport.healthbaby.com.cn/v1/check.action" + query);
+        get.setRequestHeader("Authorization", token);
+        try {
+            client.executeMethod(get);
+            int statusCode = get.getStatusCode();
+            String result = new String(get.getResponseBodyAsString());
+            get.releaseConnection();
+            if(200 == statusCode) {
+                loginState = JsonUtil.str2Obj(result, LoginState.class);
+                return loginState;
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return loginState;
+    }
+
+
+
+
     public static String md5(String plainText) {
         try {
             if(plainText==null){
@@ -29,10 +146,21 @@ public class LoginUtil {
             return null;
         }
     }
-
-    public static void main(String[] args) {
-        System.out.println(md5("123789456"));
-        //3949ba59abbe56e057f20f88
-    }
+//
+//    public static void main(String[] args) {
+//        System.out.println(md5("123789456"));
+//        String a = "{\"id\":20,\"token\":\"ucefac93386a4c70a8a570da5bbfc24ad0\",\"errormsg\":\"成功\",\"errorcode\":3}";
+//
+//
+//        System.out.println(a.matches(".*errorcode\":0.*"));
+//
+//        Pattern pattern = Pattern.compile("token\":\"(.*?)\"");
+//        Matcher matcher = pattern.matcher(a);
+//        while(matcher.find()) {
+//            System.out.println(matcher.group(1));
+//        }
+//
+//        //3949ba59abbe56e057f20f88
+//    }
 
 }
diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/MessageUtil.java b/platform-common/src/main/java/com/lyms/platform/common/utils/MessageUtil.java
index 78bc419..aaf758c 100644
--- a/platform-common/src/main/java/com/lyms/platform/common/utils/MessageUtil.java
+++ b/platform-common/src/main/java/com/lyms/platform/common/utils/MessageUtil.java
@@ -4,6 +4,7 @@ package com.lyms.platform.common.utils;
 import com.lyms.platform.common.cache.redis.RedisUtils;
 import org.apache.commons.httpclient.HttpClient;
 import org.apache.commons.httpclient.NameValuePair;
+import org.apache.commons.httpclient.methods.GetMethod;
 import org.apache.commons.httpclient.methods.PostMethod;
 import org.apache.commons.httpclient.methods.PutMethod;
 
@@ -110,6 +111,18 @@ public class MessageUtil {
         }
     }
 
+
+    public static class UTF8GetMethod extends GetMethod {
+        public UTF8GetMethod(String url){
+            super(url);
+        }
+        @Override
+        public String getRequestCharSet() {
+            //return super.getRequestCharSet();
+            return "UTF-8";
+        }
+    }
+
     public static void main(String[] arsg) {
         send("18048563317", "妊娠是一件既幸福又痛苦的事：幸福是将为人母的一种执着和感觉，而来自内心的痛苦却是一种实实在在的体会。http://t.cn/RGQeGtf");
     }
diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/ResultUtils.java b/platform-common/src/main/java/com/lyms/platform/common/utils/ResultUtils.java
index 5057f6b..820f1a6 100644
--- a/platform-common/src/main/java/com/lyms/platform/common/utils/ResultUtils.java
+++ b/platform-common/src/main/java/com/lyms/platform/common/utils/ResultUtils.java
@@ -19,6 +19,18 @@ public final class ResultUtils {
 	/**
 	 * 返回成功数据
 	 */
+	public static void buildSuccessResultAndWrite(HttpServletResponse httpServletResponse,Map data){
+		Map<String,Object> result=  new HashMap<String, Object>();
+		result.put(ERROR_CODE, ErrorCodeConstants.SUCCESS);
+		result.put(ERROR_MSG,"成功");
+		result.putAll(data);
+		writeJson(httpServletResponse, JsonUtil.obj2JsonString(result));
+	}
+
+
+	/**
+	 * 返回成功数据
+	 */
 	public static void buildSuccessResultAndWrite(HttpServletResponse httpServletResponse, Object data){
 		Map<String,Object> result=  new HashMap<String, Object>();
 		result.put(ERROR_CODE, ErrorCodeConstants.SUCCESS);
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DepartmentsController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DepartmentsController.java
index 956d701..9440604 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DepartmentsController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DepartmentsController.java
@@ -4,6 +4,7 @@ package com.lyms.platform.operate.web.controller;
 import com.lyms.platform.common.annotation.TokenRequired;
 import com.lyms.platform.common.base.BaseController;
 import com.lyms.platform.common.base.ContextHolder;
+import com.lyms.platform.common.base.LoginState;
 import com.lyms.platform.common.base.PlatformContext;
 import com.lyms.platform.common.constants.ErrorCodeConstants;
 import com.lyms.platform.common.enums.YnEnums;
@@ -15,6 +16,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.Date;
 import java.util.List;
@@ -112,16 +114,18 @@ public class DepartmentsController extends BaseController {
     @RequestMapping(value = "/departments", method = RequestMethod.POST)
     @TokenRequired
     public void addDepartments(HttpServletResponse response,
+                               HttpServletRequest request,
                                @RequestParam(value = "pid") Integer pid,
                                @RequestParam(value = "name") String name,
                                @RequestParam(value = "orgId") Integer orgId,
                                @RequestParam(value = "description") String description,
                                @RequestParam(value = "shortCode") String shortCode) {
 
+
+
         //获取登录用户
-        PlatformContext mommyBobyContext = ContextHolder.getContext();
-        String token = mommyBobyContext.getToken();
-        Users users = usersService.getUsers(tokenService.getUserId(token));
+        LoginState loginState = (LoginState) request.getAttribute("loginState");
+        Users users = usersService.getUsersByLoginCenterId(loginState.getId());
 
         if (null == name  || null == orgId || null == users) {
             ResultUtils.buildParameterErrorResultAndWrite(response);
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java
index 92ec18e..57cfd4a 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java
@@ -4,6 +4,7 @@ package com.lyms.platform.operate.web.controller;
 import com.lyms.platform.common.annotation.TokenRequired;
 import com.lyms.platform.common.base.BaseController;
 import com.lyms.platform.common.base.ContextHolder;
+import com.lyms.platform.common.base.LoginState;
 import com.lyms.platform.common.base.PlatformContext;
 import com.lyms.platform.common.constants.ErrorCodeConstants;
 import com.lyms.platform.common.enums.YnEnums;
@@ -19,6 +20,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.Date;
 import java.util.List;
@@ -118,6 +120,7 @@ public class OrganizationController extends BaseController {
     @RequestMapping(value = "/organization", method = RequestMethod.POST)
     @TokenRequired
     public void addOrganization(HttpServletResponse response,
+                                HttpServletRequest request,
                                 @RequestParam(value = "name") String name,
                                 @RequestParam(value = "type") Integer type,
                                 @RequestParam(value = "level") Integer level,
@@ -130,9 +133,8 @@ public class OrganizationController extends BaseController {
                                 @RequestParam(value = "shortCode") String shortCode) {
 
         //获取登录用户
-        PlatformContext mommyBobyContext = ContextHolder.getContext();
-        String token = mommyBobyContext.getToken();
-        Users users = usersService.getUsers(tokenService.getUserId(token));
+        LoginState loginState = (LoginState) request.getAttribute("loginState");
+        Users users = usersService.getUsersByLoginCenterId(loginState.getId());
 
         if (type == null || StringUtils.isBlank(name) || null == users) {
             ResultUtils.buildParameterErrorResultAndWrite(response);
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RolesController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RolesController.java
index 313c925..85b70a4 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RolesController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RolesController.java
@@ -4,6 +4,7 @@ package com.lyms.platform.operate.web.controller;
 import com.lyms.platform.common.annotation.TokenRequired;
 import com.lyms.platform.common.base.BaseController;
 import com.lyms.platform.common.base.ContextHolder;
+import com.lyms.platform.common.base.LoginState;
 import com.lyms.platform.common.base.PlatformContext;
 import com.lyms.platform.common.constants.ConstantInterface;
 import com.lyms.platform.common.enums.YnEnums;
@@ -18,6 +19,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.*;
 
@@ -101,6 +103,7 @@ public class RolesController extends BaseController {
     @RequestMapping(value = "/roles",method = RequestMethod.POST)
     @TokenRequired
     public void addRoles(HttpServletResponse response,
+                         HttpServletRequest request,
                          @RequestParam(value = "type")Integer type,
                          @RequestParam(value = "name")String name,
                          @RequestParam(value = "enable")Integer enable,
@@ -108,9 +111,8 @@ public class RolesController extends BaseController {
                          @RequestParam(value = "shortCode")String shortCode) {
 
         //获取登录用户
-        PlatformContext mommyBobyContext = ContextHolder.getContext();
-        String token = mommyBobyContext.getToken();
-        Users users = usersService.getUsers(tokenService.getUserId(token));
+        LoginState loginState = (LoginState) request.getAttribute("loginState");
+        Users users = usersService.getUsersByLoginCenterId(loginState.getId());
 
         if (type == null || StringUtils.isBlank(name) || null == users) {
             ResultUtils.buildParameterErrorResultAndWrite(response);
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java
index 1e99de1..be6aa2c 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java
@@ -4,9 +4,11 @@ package com.lyms.platform.operate.web.controller;
 import com.lyms.platform.common.annotation.TokenRequired;
 import com.lyms.platform.common.base.BaseController;
 import com.lyms.platform.common.base.ContextHolder;
+import com.lyms.platform.common.base.LoginState;
 import com.lyms.platform.common.base.PlatformContext;
 import com.lyms.platform.common.cache.redis.RedisUtils;
 import com.lyms.platform.common.constants.ConstantInterface;
+import com.lyms.platform.common.constants.ErrorCodeConstants;
 import com.lyms.platform.common.constants.TimeConstants;
 import com.lyms.platform.common.enums.YnEnums;
 import com.lyms.platform.common.utils.*;
@@ -15,10 +17,12 @@ import com.lyms.platform.permission.service.*;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.MediaType;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.text.MessageFormat;
 import java.util.*;
@@ -41,7 +45,10 @@ public class UsersController extends BaseController {
     UserOrganizationMapsService userOrganizationMapsService;
     @Autowired
     OrganizationService organizationService;
-
+    @Value("#{configProperties['login.token']}")
+    private String token;
+    @Value("#{configProperties['login.typeId']}")
+    private String typeId;
 
 
     private static final String LYMS = "龙源美生";
@@ -103,44 +110,22 @@ public class UsersController extends BaseController {
             writeJson(response, JsonUtil.obj2JsonString(resultMsgMap));
             return;
         }
+
         UsersQuery usersQuery = new UsersQuery();
         usersQuery.setPhone(account);
-        usersQuery.setYn(YnEnums.YES.getId());
-        List<Users> usersList = usersService.queryUsers(usersQuery);
+        List<Users> users = usersService.queryUsers(usersQuery);
+        if(0 == users.size()) {
+            ResultUtils.buildParameterErrorResultAndWrite(response, "该账户不存在");
+            return;
+        }
 
-        //判断这个查询出来的集合不为空
-        if (CollectionUtils.isNotEmpty(usersList)) {
-            Users users = usersList.get(0);
-            //从redis里面获取验证码
-            Object verCodeObj = (Object) RedisUtils.getObj("c_" + account);
-            if (null == verCodeObj) {
-                //参数错误
-                resultMsgMap.put(ResultUtils.ERROR_CODE, ConstantInterface.VER_CODE_EXPIRE);
-                resultMsgMap.put(ResultUtils.ERROR_MSG, "验证码已过期,请重新获取.");
-                writeJson(response, JsonUtil.obj2JsonString(resultMsgMap));//把这个map转成一个json字符串输出到前台
-                return;
-            }
-            if (code.equals(verCodeObj)) {
-                resultMsgMap.put(ResultUtils.ERROR_CODE, ConstantInterface.SUCCESS);
-                resultMsgMap.put(ResultUtils.ERROR_MSG, "成功");
-                //修改最后一次登录时间
-                users.setLastLoginTime(new Date());
-                usersService.updateUsers(users);
-
-                //创建token
-                resultMsgMap.put("token", tokenService.createToken(users.getId(), 3600));
-                //id
-                resultMsgMap.put("id", users.getId());
-                writeJson(response, JsonUtil.obj2JsonString(resultMsgMap));
-            } else {
-                resultMsgMap.put(ResultUtils.ERROR_CODE, ConstantInterface.USER_PASSWORD_ERROR);
-                resultMsgMap.put(ResultUtils.ERROR_MSG, "验证码错误,请重新输入");
-                writeJson(response, JsonUtil.obj2JsonString(resultMsgMap));
-            }
-        } else {
-            resultMsgMap.put(ResultUtils.ERROR_CODE, ConstantInterface.USER_NOT_EXISTS);
-            resultMsgMap.put(ResultUtils.ERROR_MSG, "登录失败,用户信息不存在");
-            writeJson(response, JsonUtil.obj2JsonString(resultMsgMap));
+        String key =LoginUtil.login(account,code, typeId, token);
+        if(null != key) {
+            Map<String, Object> result = new HashMap<>();
+            result.put("token", key);
+            ResultUtils.buildSuccessResultAndWrite(response, result);
+        }else {
+            ResultUtils.buildResultAndWrite(response, ErrorCodeConstants.PARAMETER_ERROR, "登录失败,手机或验证码错误");
         }
     }
 
@@ -158,48 +143,19 @@ public class UsersController extends BaseController {
             return;
         }
 
-        try {
-            UsersQuery usersQuery = new UsersQuery();
-            usersQuery.setPhone(phone);
-            usersQuery.setYn(YnEnums.YES.getId());
-            String countKey = "c_" + phone;
-            Object obj = RedisUtils.getObj(phone);
-
-            if (usersService.queryUsersCount(usersQuery) > 0 && (null == obj || (Integer) obj <= 9)) {
-                String code = NumberUtils.getRandomString(6);
-                //设置缓存10分钟验证码
-                RedisUtils.setObj(countKey, code, TimeConstants.TEN_MINUTE);
+        UsersQuery usersQuery = new UsersQuery();
+        usersQuery.setPhone(phone);
+        int count = usersService.queryUsersCount(usersQuery);
+        if(0 == count) {
+            ResultUtils.buildParameterErrorResultAndWrite(httpServletResponse, "该账户不存在");
+            return;
+        }
 
-                System.out.println(phone + "----" + code);
-                //发送短信
-                MessageUtil.send(phone, ConstantInterface.SHORT_MESSAGE_PRE + MessageFormat.format("验证码{0}，您正在登录区域平台，若非本人操作，请勿泄露。", code));
 
-                ResultUtils.buildSuccessResultAndWrite(httpServletResponse);
-                int count = 0;
-                if (null != obj) {
-                    count = (Integer) obj;
-                }
-                count += 1;
-                RedisUtils.setObj(phone, count, DateUtil.getDaySeconds());
-            } else if (obj != null) {
-                Map<String, Object> resultMsgMap = new HashMap<>();
-                //参数错误
-                resultMsgMap.put(ResultUtils.ERROR_CODE, ConstantInterface.PARAMETER_ERROR);
-                resultMsgMap.put(ResultUtils.ERROR_MSG, "您已超过限制.");
-                writeJson(httpServletResponse, JsonUtil.obj2JsonString(resultMsgMap));
-            } else {
-                Map<String, Object> resultMsgMap = new HashMap<>();
-                //参数错误
-                resultMsgMap.put(ResultUtils.ERROR_CODE, ConstantInterface.PARAMETER_ERROR);
-                resultMsgMap.put(ResultUtils.ERROR_MSG, "您的手机号没注册.");
-                writeJson(httpServletResponse, JsonUtil.obj2JsonString(resultMsgMap));
-            }
-        } catch (Exception e) {
-            Map<String, Object> resultMsgMap = new HashMap<>();
-            //参数错误
-            resultMsgMap.put(ResultUtils.ERROR_CODE, ConstantInterface.PARAMETER_ERROR);
-            resultMsgMap.put(ResultUtils.ERROR_MSG, "请重试.");
-            writeJson(httpServletResponse, JsonUtil.obj2JsonString(resultMsgMap));
+        if(LoginUtil.sendVerCode(phone, typeId, token) ) {
+            ResultUtils.buildResultAndWrite(httpServletResponse, ErrorCodeConstants.SUCCESS, "发送成功");
+        } else {
+            ResultUtils.buildResultAndWrite(httpServletResponse, ErrorCodeConstants.SUCCESS, "发送失败");
         }
     }
 
@@ -223,8 +179,6 @@ public class UsersController extends BaseController {
     @RequestMapping(value = "/adminPermissions", method = RequestMethod.POST)
     @TokenRequired
     public void adminPermissions(HttpServletResponse response,@RequestParam(value = "userId") Integer userId, @RequestParam(value = "ids") String ids){
-        PlatformContext mommyBobyContext = ContextHolder.getContext();
-        String token = mommyBobyContext.getToken();
 
         if (ids == null) {
             ResultUtils.buildParameterErrorResultAndWrite(response);
@@ -292,6 +246,7 @@ public class UsersController extends BaseController {
     @RequestMapping(value = "/users", method = RequestMethod.POST)
     @TokenRequired
     public void addUsers(HttpServletResponse response,
+                         HttpServletRequest request,
                          @RequestParam(value = "type") Integer type,
                          @RequestParam(value = "deptId") Integer deptId,
                          @RequestParam(value = "orgId") Integer orgId,
@@ -302,10 +257,11 @@ public class UsersController extends BaseController {
                          @RequestParam(value = "remarks") String remarks,
                          @RequestParam(value = "roleIds") String roleIds) {
 
-        PlatformContext mommyBobyContext = ContextHolder.getContext();
-        String token = mommyBobyContext.getToken();
-        //获取登录用户ID
-        Users user = usersService.getUsers(Integer.valueOf(tokenService.getUserId(token)));
+
+        //获取登录用户
+        LoginState loginState = (LoginState) request.getAttribute("loginState");
+        Users user = usersService.getUsersByLoginCenterId(loginState.getId());
+
 
         if (type == null || StringUtils.isBlank(roleIds) || deptId == null ||
                 StringUtils.isBlank(name) /*|| StringUtils.isBlank(account) ||
@@ -328,6 +284,7 @@ public class UsersController extends BaseController {
                 return;
             }
 
+            //准备添加数据
             Users users = new Users();
             users.setType(type);
             users.setDeptId(deptId);
@@ -344,6 +301,15 @@ public class UsersController extends BaseController {
             users.setCreated(new Date());
             users.setLastLoginTime(new Date());
 //            users.setPwd(LoginUtil.md5(NumberUtils.getRandomString(6)));
+
+            //关联登录中心ID
+            Integer loginCenterId = LoginUtil.register(phone, token, typeId);
+            if(null == loginCenterId) {
+                ResultUtils.buildResultAndWrite(response, ErrorCodeConstants.SYSTEM_ERROR, "服务器内部错误");
+                return;
+            }
+            users.setLogincenterId(loginCenterId);
+
             usersService.addUsers(users);
 
 
@@ -385,8 +351,7 @@ public class UsersController extends BaseController {
                             @RequestParam(value = "remarks",required = false) String remarks,
                             @RequestParam(value = "roleIds",required = false) String roleIds) {
 
-        PlatformContext mommyBobyContext = ContextHolder.getContext();
-        String token = mommyBobyContext.getToken();
+
 
 
         //获取登录用户ID
@@ -463,8 +428,7 @@ public class UsersController extends BaseController {
     @RequestMapping(value = "/users/enable", method = RequestMethod.POST)
     @TokenRequired
     public void enableUsers(HttpServletResponse response,@RequestParam Integer id, @RequestParam Integer flag) {
-        PlatformContext mommyBobyContext = ContextHolder.getContext();
-        String token = mommyBobyContext.getToken();
+
 
         //检查账户是否存在
         UsersQuery usersQuery = new UsersQuery();
@@ -543,6 +507,7 @@ public class UsersController extends BaseController {
     @RequestMapping(value = "/passwords", method = RequestMethod.PUT)
     @TokenRequired
     public void updateUserPwd(HttpServletResponse httpServletResponse,
+                              HttpServletRequest request,
                               @RequestParam(value = "oldPwd") String oldPwd,
                               @RequestParam(value = "newPwd") String newPwd) {
         Map<String, Object> resultMsgMap = new HashMap<String, Object>();
@@ -550,19 +515,20 @@ public class UsersController extends BaseController {
             ResultUtils.buildParameterErrorResultAndWrite(httpServletResponse);
             return;
         }
-        PlatformContext mommyBobyContext = ContextHolder.getContext();
-        Integer userId = tokenService.getUserId(mommyBobyContext.getToken());
+        //获取登录用户
+        LoginState loginState = (LoginState) request.getAttribute("loginState");
+        Users users = usersService.getUsersByLoginCenterId(loginState.getId());
 
-        if (null != userId) {
+        if (null != users) {
             //修改前的密码
-            Users users = usersService.getUsers(userId);
+
             //验证之前的密码和数据库中的密码是否一致
             if (null != users && LoginUtil.md5(oldPwd).equals(users.getPwd()) && !LoginUtil.md5(newPwd).equals(users.getPwd())) {
 
                 Users newUsers = new Users();
                 newUsers.setPwd(LoginUtil.md5(newPwd));
                 newUsers.setModified(new Date());
-                newUsers.setId(userId);
+                newUsers.setId(users.getId());
 
                 //修改数据库的值
                 usersService.updateUsers(newUsers);
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/inteceptor/TokenValidateInteceptor.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/inteceptor/TokenValidateInteceptor.java
index 10305b8..18ffea1 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/inteceptor/TokenValidateInteceptor.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/inteceptor/TokenValidateInteceptor.java
@@ -4,12 +4,17 @@ package com.lyms.platform.operate.web.inteceptor;
 import com.lyms.platform.common.annotation.TokenRequired;
 import com.lyms.platform.common.base.BaseController;
 import com.lyms.platform.common.base.ContextHolder;
+import com.lyms.platform.common.base.LoginState;
 import com.lyms.platform.common.base.PlatformContext;
 import com.lyms.platform.common.exception.ParameterException;
 import com.lyms.platform.common.exception.TokenException;
 import com.lyms.platform.common.utils.LogUtil;
+import com.lyms.platform.common.utils.LoginUtil;
 import com.lyms.platform.common.utils.TokenUtils;
+import com.lyms.platform.permission.model.Users;
+import com.lyms.platform.permission.model.UsersQuery;
 import com.lyms.platform.permission.service.TokenService;
+import com.lyms.platform.permission.service.UsersService;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.method.HandlerMethod;
@@ -18,6 +23,7 @@ import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.lang.annotation.Annotation;
+import java.util.List;
 
 /**
  * 验证token拦截器
@@ -33,6 +39,8 @@ import java.lang.annotation.Annotation;
 public class TokenValidateInteceptor extends HandlerInterceptorAdapter {
     @Autowired
     private TokenService tokenService;
+    @Autowired
+    private UsersService usersService;
 
     public static boolean isSiteController(Object handler) {
         return handler instanceof HandlerMethod && (((HandlerMethod) handler).getBean() instanceof BaseController);
@@ -64,23 +72,18 @@ public class TokenValidateInteceptor extends HandlerInterceptorAdapter {
         if (StringUtils.isEmpty(token)) {
             throw new ParameterException();
         }
-        Object object = null;
-        try {
-            object=  tokenService.getUserId(token);
-            if(null==object){
-                throw new TokenException();
-            }
-            PlatformContext mommyBabyContext = new PlatformContext();
-            mommyBabyContext.setToken(token);
-            mommyBabyContext.setUserId( object.toString());
-            mommyBabyContext.setIpAddr(TokenUtils.getIpAddr(httpServletRequest));
-            ContextHolder.setContext(mommyBabyContext);
-            LogUtil.tokenInfo("from:" + mommyBabyContext.getIpAddr() + ", userId:" + mommyBabyContext.getUserId() + ", token:" + mommyBabyContext.getToken() + ",url:" + httpServletRequest.getRequestURI() + ",method:" + httpServletRequest.getMethod());
-        } catch (Exception e) {
-            LogUtil.tokenError("", e);
+        LoginState loginState = LoginUtil.checkLoginState(token);
+        if(!loginState.isLogin()) {
+            throw new TokenException();
+        }
+        Users users = usersService.getUsersByLoginCenterId(loginState.getId());
+        if(null == users) {
             throw new TokenException();
         }
-        return null != object;
+        httpServletRequest.setAttribute("loginState", loginState);
+        LogUtil.tokenInfo( " userId:" + users.getId() + ", ,url:" + httpServletRequest.getRequestURI() + ",method:" + httpServletRequest.getMethod());
+
+        return loginState.isLogin();
     }
     /**
      * This implementation is empty.
diff --git a/platform-operate-api/src/main/resources/database.properties b/platform-operate-api/src/main/resources/database.properties
index 579c910..907beea 100644
--- a/platform-operate-api/src/main/resources/database.properties
+++ b/platform-operate-api/src/main/resources/database.properties
@@ -39,3 +39,7 @@ redis.servers=192.168.5.250:6379:mommybaby123
 
 token.prefix=member
 
+
+
+login.typeId=2
+login.token=265a841b-9bb5-434a-8c2b-e78df86fc45d
\ No newline at end of file
-- 
1.8.3.1