Просмотр исходного кода

fix: 登录,注册相关功能

liaoyitao месяцев назад: 9
Родитель
Сommit
fc91f64aef

+ 2 - 2
src/main/java/com/lqkj/link/config/LimitRequest/LimitRequestAspect.java

@@ -38,8 +38,8 @@ public class LimitRequestAspect {
38
         HttpServletRequest request = sra.getRequest();
38
         HttpServletRequest request = sra.getRequest();
39
 
39
 
40
         // 从header获取RSA加密后的AES KEY
40
         // 从header获取RSA加密后的AES KEY
41
-        String aesKey = request.getHeader("KEY");
42
-        aesKey = RSAUtils.decryptBase64(aesKey);
41
+//        String aesKey = request.getHeader("KEY");
42
+//        aesKey = RSAUtils.decryptBase64(aesKey);
43
 
43
 
44
         ExpiringMap<String, Integer> uc = book.getOrDefault(request.getRequestURI(), ExpiringMap.builder().variableExpiration().build());
44
         ExpiringMap<String, Integer> uc = book.getOrDefault(request.getRequestURI(), ExpiringMap.builder().variableExpiration().build());
45
 
45
 

+ 1 - 1
src/main/java/com/lqkj/link/module/authority/controller/UserInfoController.java

@@ -123,7 +123,7 @@ public class UserInfoController {
123
         if (StringUtils.isNotBlank(userInfo.getPassword()) && userInfo.getPassword().length() == 172) {
123
         if (StringUtils.isNotBlank(userInfo.getPassword()) && userInfo.getPassword().length() == 172) {
124
             userInfo.setPassword(RSAUtils.decryptBase64(userInfo.getPassword()));
124
             userInfo.setPassword(RSAUtils.decryptBase64(userInfo.getPassword()));
125
         }
125
         }
126
-        userInfo.setAuthorizationCode(RSAUtils.decryptBase64(userInfo.getAuthorizationCode()));
126
+//        userInfo.setAuthorizationCode(RSAUtils.decryptBase64(userInfo.getAuthorizationCode()));
127
         String message = userInfoService.save(userInfo);
127
         String message = userInfoService.save(userInfo);
128
         if (message == null) return MessageBean.ok(null, "保存用户接口");
128
         if (message == null) return MessageBean.ok(null, "保存用户接口");
129
         return MessageBean.error(message);
129
         return MessageBean.error(message);

+ 9 - 10
src/main/java/com/lqkj/link/module/authority/service/UserInfoService.java

@@ -226,22 +226,21 @@ public class UserInfoService {
226
      * @param userCode
226
      * @param userCode
227
      */
227
      */
228
     private void assemblyParameter(UserInfo userInfo, String userCode) {
228
     private void assemblyParameter(UserInfo userInfo, String userCode) {
229
-        if (Objects.nonNull(userCode)){
230
-            UserInfo guestUser = userInfoRepository.findByUserCode(userCode);
229
+        UserInfo guestUser = userInfoRepository.findByUserCode(userCode);
230
+        if (Objects.nonNull(userCode) && "游客".equals(guestUser.getDisplayName())){
231
             userInfo.setUserId(guestUser.getUserId());
231
             userInfo.setUserId(guestUser.getUserId());
232
-            userInfo.setDisplayName(userInfo.getUserCode());
233
             userInfo.setPassword(passwordEncoder.encode(userInfo.getPassword()));
232
             userInfo.setPassword(passwordEncoder.encode(userInfo.getPassword()));
233
+            userInfo.setDisplayName(userInfo.getUserCode());
234
         }else {
234
         }else {
235
-            userInfo.setLocking(false);
236
             userInfo.setPassword(passwordEncoder.encode(userInfo.getPassword()));
235
             userInfo.setPassword(passwordEncoder.encode(userInfo.getPassword()));
237
-            userInfo.setUpdateTime(new Date());
238
-            userInfo.setRefreshResource(false);
239
-            userInfo.setHasAuth(false);
240
             userInfo.setDisplayName(userInfo.getUserCode());
236
             userInfo.setDisplayName(userInfo.getUserCode());
241
-            userInfo.setHasManage(false);
242
-            userInfo.setUpdateTime(new Date());
243
-            userInfo.setLocking(false);
237
+
244
         }
238
         }
239
+        userInfo.setHasAuth(false);
240
+        userInfo.setHasManage(false);
241
+        userInfo.setUpdateTime(new Date());
242
+        userInfo.setLocking(false);
243
+        userInfo.setRefreshResource(false);
245
     }
244
     }
246
     /**
245
     /**
247
      * 验证参数
246
      * 验证参数

+ 9 - 6
src/main/java/com/lqkj/link/module/jwt/controller/JwtController.java

@@ -1,5 +1,6 @@
1
 package com.lqkj.link.module.jwt.controller;
1
 package com.lqkj.link.module.jwt.controller;
2
 
2
 
3
+import com.lqkj.link.config.LimitRequest.LimitRequest;
3
 import com.lqkj.link.message.MessageBean;
4
 import com.lqkj.link.message.MessageBean;
4
 import com.lqkj.link.module.authority.service.UserInfoService;
5
 import com.lqkj.link.module.authority.service.UserInfoService;
5
 import com.lqkj.link.module.jwt.service.JwtService;
6
 import com.lqkj.link.module.jwt.service.JwtService;
@@ -23,6 +24,7 @@ import java.util.Objects;
23
 @RestController
24
 @RestController
24
 @RequestMapping("/jwt")
25
 @RequestMapping("/jwt")
25
 @Tag(name = "授权服务", description = "授权服务")
26
 @Tag(name = "授权服务", description = "授权服务")
27
+@LimitRequest
26
 public class JwtController {
28
 public class JwtController {
27
 
29
 
28
     private final DatabaseUserDetailService userDetailService;
30
     private final DatabaseUserDetailService userDetailService;
@@ -54,13 +56,13 @@ public class JwtController {
54
     public MessageBean<String> getToken(@RequestBody LoginBody loginBody){
56
     public MessageBean<String> getToken(@RequestBody LoginBody loginBody){
55
         String userCode = loginBody.getUsername();
57
         String userCode = loginBody.getUsername();
56
         String password = loginBody.getPassword();
58
         String password = loginBody.getPassword();
57
-        String authCode = loginBody.getAuthCode();
59
+//        String authCode = loginBody.getAuthCode();
58
         if (userCode.length() != 172 || password.length() != 172) {
60
         if (userCode.length() != 172 || password.length() != 172) {
59
             return MessageBean.error("用户名或密码或授权码错误!");
61
             return MessageBean.error("用户名或密码或授权码错误!");
60
         }
62
         }
61
         userCode = RSAUtils.decryptBase64(userCode);
63
         userCode = RSAUtils.decryptBase64(userCode);
62
         password = RSAUtils.decryptBase64(password);
64
         password = RSAUtils.decryptBase64(password);
63
-        if (Objects.nonNull(authCode)) authCode = RSAUtils.decryptBase64(authCode);
65
+//        if (Objects.nonNull(authCode)) authCode = RSAUtils.decryptBase64(authCode);
64
         UserInfo userInfo = userDetailService.findByUserCode(userCode);
66
         UserInfo userInfo = userDetailService.findByUserCode(userCode);
65
         if (userInfo == null) {
67
         if (userInfo == null) {
66
             return MessageBean.error("账号不存在!");
68
             return MessageBean.error("账号不存在!");
@@ -71,10 +73,10 @@ public class JwtController {
71
         if (!passwordEncoder.matches(password, userInfo.getPassword())) {
73
         if (!passwordEncoder.matches(password, userInfo.getPassword())) {
72
             return MessageBean.error(userDetailService.lockedUser(userInfo.getUserCode()));
74
             return MessageBean.error(userDetailService.lockedUser(userInfo.getUserCode()));
73
         }
75
         }
74
-        if (loginBody.getLoginType() == 0) return MessageBean.error("参数错误请重试!");
75
-        if (loginBody.getLoginType() == 1 && !authCode.equals(userInfo.getAuthorizationCode())) {
76
-            return MessageBean.error("授权码错误!");
77
-        }
76
+//        if (loginBody.getLoginType() == 0) return MessageBean.error("参数错误请重试!");
77
+//        if (loginBody.getLoginType() == 1 && !authCode.equals(userInfo.getAuthorizationCode())) {
78
+//            return MessageBean.error("授权码错误!");
79
+//        }
78
         userDetailService.unlockedUser(userInfo.getUserCode());
80
         userDetailService.unlockedUser(userInfo.getUserCode());
79
 
81
 
80
         return MessageBean.ok(jwtService.generateToken(userCode), "登录");
82
         return MessageBean.ok(jwtService.generateToken(userCode), "登录");
@@ -106,6 +108,7 @@ public class JwtController {
106
             summary = "游客登录",
108
             summary = "游客登录",
107
             description = "游客登录"
109
             description = "游客登录"
108
     )
110
     )
111
+    @LimitRequest
109
     @GetMapping("/getGuestToken")
112
     @GetMapping("/getGuestToken")
110
     public MessageBean<String> getGuestToken() {
113
     public MessageBean<String> getGuestToken() {
111
         String userCode = userInfoService.getGuestToken();
114
         String userCode = userInfoService.getGuestToken();