t

src/main/java/com/roma/romaapi/interceptor/JWTInterceptor.java

@@ -26,8 +26,6 @@ public class JWTInterceptor implements HandlerInterceptor {
     @Autowired
     private JWTUtil jwtUtil;
 
-//    @Autowired
-//    private RedisUtil redisUtil;
     @Autowired
     StringRedisTemplate stringRedisTemplate;
 

src/main/java/com/roma/romaapi/service/ApiService.java

@@ -32,12 +32,6 @@ public class ApiService {
         String captchaToken = maps.get("captchaToken")[0]; // 验证码token,获取验证码的值
         String captchaTokenValue = redisTemplate.opsForValue().get(captchaToken); // 缓存中验证码的值
         Map<String, Object> loginResult = new HashMap<>();
-        if(!Boolean.TRUE.equals(redisTemplate.hasKey(captchaToken)) || !Objects.equals(captchaTokenValue, captcha)){
-            loginResult.put("sysErrorCode", "500");
-            loginResult.put("sysErrorMessage", "验证码错误");
-
-            return loginResult;
-        }
 //        String aa = securityUtils.encodePassword(password); // 加密密码
         // 判断是否存在此用户,用户密码是否正确
         Map<String, Object> UserInfo = apiDao.adminInfoQueryForMap(userName);
@@ -57,6 +51,13 @@ public class ApiService {
 
             return loginResult;
         }
+        // 校验图形验证码
+        if(!Boolean.TRUE.equals(redisTemplate.hasKey(captchaToken)) || !Objects.equals(captchaTokenValue, captcha)){
+            loginResult.put("sysErrorCode", "500");
+            loginResult.put("sysErrorMessage", "验证码错误");
+
+            return loginResult;
+        }
 
         // 通过密码,验证码校验,发放token
         Map<String, Object> jwtInfo = new HashMap<>();
@@ -66,7 +67,6 @@ public class ApiService {
         jwtInfo.put("loginTime", System.currentTimeMillis()/1000+"");
         jwtInfo.put("name", userName);
         String jwtToken = jwtUtil.getToken(jwtInfo);
-        System.out.println("jwt---token==="+jwtToken);
         Map<String, Object> map = new HashMap<>();
         map.put("loginToken", jwtToken);
 

src/main/java/com/roma/romaapi/utils/JWTUtil.java

@@ -83,9 +83,4 @@ public class JWTUtil {
 
         return build.verify(token);
     }
-
-   /* public static void main(String[] args) {
-        DecodedJWT verify = verify("eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJleHAiOjE2MTcxMDg1MDAsInVzZXJuYW1lIjoiYWRtaW4ifQ.geBEtpluViRUg66_P7ZisN3I_d4e32Wms8mFoBYM5f0");
-        System.out.println(verify.getClaim("password").asString());
-    }*/
 }