wyc

pom.xml

@@ -43,7 +43,7 @@
         <dependency>
             <groupId>org.redisson</groupId>
             <artifactId>redisson</artifactId>
-            <version>3.16.4</version>
+            <version>3.12.1</version>
         </dependency>
         <dependency>
             <groupId>cn.hutool</groupId>
@@ -91,6 +91,10 @@
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
+<<<<<<< HEAD
+=======
+            <version>8.0.28</version>
+>>>>>>> 3633d0e (wyc)
         </dependency>
 
         <!-- Spring Data JPA -->

src/main/java/com/zhentao/user/service/impl/UserLoginServiceImpl.java

@@ -159,8 +159,7 @@ public class UserLoginServiceImpl extends ServiceImpl<UserLoginMapper, UserLogin
                     UserLogin one = this.getOne(queryWrapper);
                     // 生成JWT token
                     String token = TokenUtils.generateToken(one.getId() + "");
-                    stringRedisTemplate.opsForValue().set(one.getId()+"",token);
-                    // 返回登录成功结果，包含tokens
+                    // 返回登录成功结果，包含token
                     return Result.OK(token, "登录成功");
                 } catch (NullPointerException e) {
                     // 用户不存在时返回错误结果

src/main/java/com/zhentao/vo/Result.java

@@ -26,10 +26,10 @@ public class Result {
         return result;
     }
 
-    public static Result error(Integer code,String msg){
+    public static Result error(Integer code,Object data){
         Result result=new Result();
         result.setCode(code);
-        result.setMsg(msg);
+        result.setData(data);
         return result;
     }