登录的token 用户做标记修改

nbjk-admin/src/main/resources/application.yml

@@ -86,7 +86,7 @@ token:
     # pc令牌有效期（默认30分钟）
     pcExpireTime: 30
     # 微信授权码登录令牌有效期（默认2880分钟,即2天）
-    wxExpireTime: 2160012
+    wxExpireTime: 43200
 
 # MyBatis配置
 # https://baomidou.com/config/

nbjk-common/src/main/java/com/miaxis/common/core/domain/model/LoginUser.java

@@ -94,11 +94,17 @@ public class LoginUser implements UserDetails
     @ApiModelProperty(value = "学员信息")
     private UserInfo student;
 
+    public LoginUser(UserInfo student,String loginType) {
+        this.student = student;
+        this.id= "student:"+student.getId()+"_"+loginType+"_"+System.currentTimeMillis();
+    }
+
     public LoginUser(UserInfo student) {
         this.student = student;
         this.id= "student:"+student.getId()+"_"+System.currentTimeMillis();
     }
 
+
     public String getToken()
     {
         return token;

nbjk-framework/src/main/java/com/miaxis/framework/web/service/UserDetailsServiceImpl.java

@@ -77,14 +77,14 @@ public class UserDetailsServiceImpl implements UserDetailsService
                     userInfo.setUnionId(identification);
                     userInfo.setIsVip(0);
                     userService.saveUserInfo(userInfo);
-                    return createLoginUser(userService.getStudentByUnionId(identification));
+                    return createLoginUser(userService.getStudentByUnionId(identification),"app");
                 }else {
                     UserInfo userInfo = userInfoGetByUnionId ;
                     userInfo.setHeadImage((String) ServletUtils.getRequest().getAttribute("headImage"));
                     userInfo.setNickName((String) ServletUtils.getRequest().getAttribute("nickName"));
                     userInfo.setAppOpenid(openid);
                     userService.updateStudent(userInfo);
-                    return createLoginUser(userService.getStudentByUnionId(identification));
+                    return createLoginUser(userService.getStudentByUnionId(identification),"app");
                 }
 
             }
@@ -101,14 +101,14 @@ public class UserDetailsServiceImpl implements UserDetailsService
                     userInfo.setUnionId(identification);
                     userInfo.setIsVip(0);
                     userService.saveUserInfo(userInfo);
-                    return createLoginUser(userService.getStudentByUnionId(identification));
+                    return createLoginUser(userService.getStudentByUnionId(identification),"GH5");
                 }else {
                     UserInfo userInfo = userInfoGetByUnionId ;
                     userInfo.setHeadImage((String) ServletUtils.getRequest().getAttribute("headImage"));
                     userInfo.setNickName((String) ServletUtils.getRequest().getAttribute("nickName"));
                     userInfo.setGzhOpenid(openid);
                     userService.updateStudent(userInfo);
-                    return createLoginUser(userService.getStudentByUnionId(identification));
+                    return createLoginUser(userService.getStudentByUnionId(identification),"GH5");
                 }
 
             }
@@ -126,12 +126,12 @@ public class UserDetailsServiceImpl implements UserDetailsService
                     userInfo.setUnionId(identification);
                     userInfo.setIsVip(0);
                     userService.saveUserInfo(userInfo);
-                    return createLoginUser(userService.getStudentByUnionId(identification));
+                    return createLoginUser(userService.getStudentByUnionId(identification),"XCX");
                 }else {
                     UserInfo userInfo = userInfoGetByUnionId ;
                     userInfo.setXcxOpenid(openid);
                     userService.updateStudent(userInfo);
-                    return createLoginUser(userService.getStudentByUnionId(identification));
+                    return createLoginUser(userService.getStudentByUnionId(identification),"XCX");
                 }
 
             }
@@ -145,7 +145,7 @@ public class UserDetailsServiceImpl implements UserDetailsService
                     userInfo.setAppOpenid(identification);
                     userService.saveUserInfo(userInfo);
                 }
-                return createLoginUser(userService.getStudentByOpenId(identification));
+                return createLoginUser(userService.getStudentByOpenId(identification),"XCX");
             }
         }
         else{
@@ -156,8 +156,8 @@ public class UserDetailsServiceImpl implements UserDetailsService
 
     }
 
-    private UserDetails createLoginUser(UserInfo student) {
-        return new LoginUser(student);
+    private UserDetails createLoginUser(UserInfo student,String loginType) {
+        return new LoginUser(student,loginType);
     }
 
     public UserDetails createLoginUser(SysUser user)