Procházet zdrojové kódy

解决 使用公共Redis项目启动异常问题

v_HuilingDeng před 4 roky
rodič
revize
0df9f64cf6

+ 0 - 5
abi-cloud-qr-platform-server/pom.xml

@@ -126,11 +126,6 @@
             <groupId>com.xuxueli</groupId>
             <artifactId>xxl-job-core</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.abi.base</groupId>
-            <artifactId>abi-base-foundation</artifactId>
-            <version>1.0-SNAPSHOT</version>
-        </dependency>
     </dependencies>
     <build>
         <plugins>

+ 3 - 2
abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/controller/console/LoginController.java

@@ -3,6 +3,7 @@ package com.abi.qms.platform.controller.console;
 import com.abi.qms.platform.dto.req.LoginReq;
 import com.abi.qms.platform.dto.req.ResetPasswordReq;
 import com.abi.qms.platform.dto.req.UpdatePasswordReq;
+import com.abi.qms.platform.dto.res.LoginRes;
 import com.abi.qms.platform.service.LoginService;
 import com.abi.task.common.annotation.IgnoreToken;
 import com.abi.task.common.api.base.BaseResponse;
@@ -40,8 +41,8 @@ public class LoginController {
     @ApiOperation("登录")
     @IgnoreToken
     public BaseResponse loginQms(@Validated @RequestBody LoginReq req) {
-        loginService.login(req);
-        return BaseResponse.create();
+        LoginRes login = loginService.login(req);
+        return BaseResponse.create(login);
     }
 
 

+ 19 - 19
abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/service/impl/LoginServiceImpl.java

@@ -1,7 +1,6 @@
 package com.abi.qms.platform.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
-import com.abi.base.foundation.util.RedisClient;
 import com.abi.qms.platform.dao.entity.UserInfo;
 import com.abi.qms.platform.dao.entity.UserRole;
 import com.abi.qms.platform.dao.mapper.UserInfoMapper;
@@ -13,6 +12,7 @@ import com.abi.qms.platform.dto.req.UpdatePasswordReq;
 import com.abi.qms.platform.dto.res.LoginRes;
 import com.abi.qms.platform.infrastructure.constant.BaseFinal;
 import com.abi.qms.platform.infrastructure.constant.RedisKey;
+import com.abi.qms.platform.infrastructure.util.RedisUtils;
 import com.abi.qms.platform.infrastructure.util.UUIDutils;
 import com.abi.qms.platform.infrastructure.util.UserUtil;
 import com.abi.qms.platform.service.LoginService;
@@ -46,7 +46,7 @@ public class LoginServiceImpl extends ServiceImpl<UserInfoMapper, UserInfo> impl
     private UserRoleMapper userRoleMapper;
 
     @Autowired
-    private RedisClient redisClient;
+    private RedisUtils redisUtils;
 
 
     @Override
@@ -65,20 +65,20 @@ public class LoginServiceImpl extends ServiceImpl<UserInfoMapper, UserInfo> impl
             UserUtil.setUser(userInfo);
             String uuid = UUIDutils.getUUID();
             //token为key,id为value。过期时间30天
-            redisClient.set(RedisKey.USER_TOKEN_ID + ":" + uuid, one.getId(), BaseFinal.REDIS_USER_EXPIRE_TIME, TimeUnit.SECONDS);
+            redisUtils.set(RedisKey.USER_TOKEN_ID + ":" + uuid, one.getId(), BaseFinal.REDIS_USER_EXPIRE_TIME, TimeUnit.SECONDS);
             //异地登录状态
-            if (redisClient.hasKey(RedisKey.USER_ID_TOKEN + ":" + one.getId())) {
+            if (redisUtils.exists(RedisKey.USER_ID_TOKEN + ":" + one.getId())) {
                 //有key,value为null的情况;就把key删掉
-                Object loginkey = redisClient.get(RedisKey.USER_ID_TOKEN + ":" + one.getId());
+                Object loginkey = redisUtils.get(RedisKey.USER_ID_TOKEN + ":" + one.getId());
                 if (Objects.nonNull(loginkey)) {
-                    redisClient.delete(RedisKey.USER_TOKEN_ID + ":" + loginkey.toString());
+                    redisUtils.del(RedisKey.USER_TOKEN_ID + ":" + loginkey.toString());
                 } else {
-                    redisClient.delete(RedisKey.USER_ID_TOKEN + ":" + one.getId());
+                    redisUtils.del(RedisKey.USER_ID_TOKEN + ":" + one.getId());
                 }
             }
             ;
             //登录状态
-            redisClient.set(RedisKey.USER_ID_TOKEN + ":" + one.getId(), uuid, BaseFinal.REDIS_USER_EXPIRE_TIME, TimeUnit.SECONDS);
+            redisUtils.set(RedisKey.USER_ID_TOKEN + ":" + one.getId(), uuid, BaseFinal.REDIS_USER_EXPIRE_TIME, TimeUnit.SECONDS);
             LoginRes build = LoginRes.builder()
                     .token(uuid)
                     .id(one.getId())
@@ -99,13 +99,13 @@ public class LoginServiceImpl extends ServiceImpl<UserInfoMapper, UserInfo> impl
             userInfoMapper.updateById(userInfo);
             UserUtil.releaseUser();
             //删除redis用户token信息
-            if (redisClient.hasKey(RedisKey.USER_ID_TOKEN + ":" + req.getId())) {
+            if (redisUtils.exists(RedisKey.USER_ID_TOKEN + ":" + req.getId())) {
                 //有key,value为null的情况;就把key删掉
-                Object loginkey = redisClient.get(RedisKey.USER_ID_TOKEN + ":" + req.getId());
+                Object loginkey = redisUtils.get(RedisKey.USER_ID_TOKEN + ":" + req.getId());
                 if (Objects.nonNull(loginkey)) {
-                    redisClient.delete(RedisKey.USER_TOKEN_ID + ":" + loginkey.toString());
+                    redisUtils.del(RedisKey.USER_TOKEN_ID + ":" + loginkey.toString());
                 }
-                redisClient.delete(RedisKey.USER_ID_TOKEN + ":" + req.getId());
+                redisUtils.del(RedisKey.USER_ID_TOKEN + ":" + req.getId());
             }
         }
     }
@@ -119,13 +119,13 @@ public class LoginServiceImpl extends ServiceImpl<UserInfoMapper, UserInfo> impl
             userInfo.setPassword(req.getNewPassword());
             userInfoMapper.updateById(userInfo);
             //删除redis用户token信息
-            if (redisClient.hasKey(RedisKey.USER_ID_TOKEN + ":" + req.getId())) {
+            if (redisUtils.exists(RedisKey.USER_ID_TOKEN + ":" + req.getId())) {
                 //有key,value为null的情况;就把key删掉
-                Object loginkey = redisClient.get(RedisKey.USER_ID_TOKEN + ":" + req.getId());
+                Object loginkey = redisUtils.get(RedisKey.USER_ID_TOKEN + ":" + req.getId());
                 if (Objects.nonNull(loginkey)) {
-                    redisClient.delete(RedisKey.USER_TOKEN_ID + ":" + loginkey.toString());
+                    redisUtils.del(RedisKey.USER_TOKEN_ID + ":" + loginkey.toString());
                 }
-                redisClient.delete(RedisKey.USER_ID_TOKEN + ":" + req.getId());
+                redisUtils.del(RedisKey.USER_ID_TOKEN + ":" + req.getId());
             }
         } else {
             throw new BusinessException("请输入正确的密码");
@@ -134,13 +134,13 @@ public class LoginServiceImpl extends ServiceImpl<UserInfoMapper, UserInfo> impl
 
     @Override
     public UserInfo validateToken(TokenReq req) {
-        Object uid = redisClient.get(RedisKey.USER_TOKEN_ID + ":" + req.getToken());
+        Object uid = redisUtils.get(RedisKey.USER_TOKEN_ID + ":" + req.getToken());
         if (Objects.nonNull(uid)) {
             UserInfo userInfo = getById(uid.toString());
             if (userInfo != null) {
                 //刷新token
-                redisClient.set(RedisKey.USER_TOKEN_ID + ":" + req.getToken(), userInfo.getId(), BaseFinal.REDIS_USER_EXPIRE_TIME, TimeUnit.SECONDS);
-                redisClient.set(RedisKey.USER_ID_TOKEN + ":" + userInfo.getId(), req.getToken(), BaseFinal.REDIS_USER_EXPIRE_TIME, TimeUnit.SECONDS);
+                redisUtils.set(RedisKey.USER_TOKEN_ID + ":" + req.getToken(), userInfo.getId(), BaseFinal.REDIS_USER_EXPIRE_TIME, TimeUnit.SECONDS);
+                redisUtils.set(RedisKey.USER_ID_TOKEN + ":" + userInfo.getId(), req.getToken(), BaseFinal.REDIS_USER_EXPIRE_TIME, TimeUnit.SECONDS);
             }
             return userInfo;
         }

+ 4 - 4
abi-cloud-qr-platform-server/src/main/resources/application.yml

@@ -27,10 +27,10 @@ spring:
     username: qmsqrdev
     url: jdbc:mysql://rm-uf6t3m8yo40d5b905go.mysql.rds.aliyuncs.com:3306/qms_qr_platform_dev?characterEncoding=utf8&serverTimezone=Asia/Shanghai
     password: qmsqrdev@2021
-#  redis:
-#    database: 0
-#    password: Abi@12345
-#    host: r-uf6kxuqc1iw6f8rwrjpd.redis.rds.aliyuncs.com
+  redis:
+    database: 0
+    password: Abi@12345
+    host: r-uf6kxuqc1iw6f8rwrjpd.redis.rds.aliyuncs.com
 
 management:
   endpoint: