diff --git a/lidee-admin/src/main/resources/application.yaml b/lidee-admin/src/main/resources/application.yaml index 50ca7c0..c8edbf6 100644 --- a/lidee-admin/src/main/resources/application.yaml +++ b/lidee-admin/src/main/resources/application.yaml @@ -2,8 +2,8 @@ spring: application: name: lideeyunji-server profiles: - active: local # 读取配置 -# active: prod # 读取配置 +# active: local # 读取配置 + active: prod # 读取配置 main: allow-circular-references: true # 允许循环依赖,因为项目是三层架构,无法避免这个情况。 diff --git a/lidee-service/lidee-service-system-biz/src/main/java/com/lideeyunji/service/system/controller/AuthController.java b/lidee-service/lidee-service-system-biz/src/main/java/com/lideeyunji/service/system/controller/AuthController.java index f6ea6d2..847af0f 100644 --- a/lidee-service/lidee-service-system-biz/src/main/java/com/lideeyunji/service/system/controller/AuthController.java +++ b/lidee-service/lidee-service-system-biz/src/main/java/com/lideeyunji/service/system/controller/AuthController.java @@ -85,6 +85,15 @@ public class AuthController { return success(true); } + @PostMapping("/logout-client") + @PermitAll + @Operation(tags = "授权管理",summary = "登出系统") + @OperateLog(enable = false) // 避免 Post 请求被记录操作日志 + public CommonResult logoutClient(@RequestParam("refreshToken") String refreshToken) { + logoutService(refreshToken); + return success(true); + } + @PostMapping("/switch-login") @Operation(tags = "授权管理",summary = "切换部门登录") @OperateLog(enable = false) // 避免 Post 请求被记录操作日志 @@ -164,7 +173,9 @@ public class AuthController { @Parameter(name = "refreshToken", description = "根据token获取用户信息", required = true) @OperateLog(enable = false) // 避免 Post 请求被记录操作日志 public CommonResult getUerInfo(@RequestParam("refreshToken") String refreshToken) { - return success(authService.getTokenTouserInfo(refreshToken)); + + CommonResult result = CommonResult.success(authService.getTokenTouserInfo(refreshToken)); + return result; } @GetMapping("/get-permission-info") @@ -291,7 +302,23 @@ public class AuthController { authService.logout(token, LoginLogTypeEnum.LOGOUT_SELF.getType()); } //清空个人信息 - String userRedisKey="JEE_LOW_CODE:USER:"+loginUserId+":*"; + String userRedisKey="LIDEE_LOW_CODE:USER:"+loginUserId+":*"; + Set keys = stringRedisTemplate.keys(userRedisKey); + if(keys!=null && keys.size()>0){ + keys.forEach(key->{ + stringRedisTemplate.delete(key); + }); + } + } + private void logoutService(String token){ + AdminUserDO user = authService.getTokenTouserInfo(token); + Long loginUserId = user.getId(); + + if (StrUtil.isNotBlank(token)) { + authService.logout(token, LoginLogTypeEnum.LOGOUT_SELF.getType()); + } + //清空个人信息 + String userRedisKey="LIDEE_LOW_CODE:USER:"+loginUserId+":*"; Set keys = stringRedisTemplate.keys(userRedisKey); if(keys!=null && keys.size()>0){ keys.forEach(key->{ diff --git a/lidee-service/lidee-service-system-biz/src/main/java/com/lideeyunji/service/system/service/impl/LideeYunJiPermissionServiceImpl.java b/lidee-service/lidee-service-system-biz/src/main/java/com/lideeyunji/service/system/service/impl/LideeYunJiPermissionServiceImpl.java index c848f6d..7d4f1d7 100644 --- a/lidee-service/lidee-service-system-biz/src/main/java/com/lideeyunji/service/system/service/impl/LideeYunJiPermissionServiceImpl.java +++ b/lidee-service/lidee-service-system-biz/src/main/java/com/lideeyunji/service/system/service/impl/LideeYunJiPermissionServiceImpl.java @@ -100,7 +100,7 @@ public class LideeYunJiPermissionServiceImpl implements ILideeYunJiPermissionSer } //根据角色id来判断我是否是开发者,如果有开发者,则说明直接可以访问 boolean devUserFlag=false; - String isDevUserRedisKey="JEE_LOW_CODE:USER:"+userId+":DEVUSER"; + String isDevUserRedisKey="LIDEE_LOW_CODE:USER:"+userId+":DEVUSER"; if(!stringRedisTemplate.hasKey(isDevUserRedisKey)){//没有数据,则查询获取 TODO 优化 //所有菜单列表 Set menuIdList = permissionService.getRoleMenuListByRoleId(roleIds); diff --git a/lidee-service/lidee-service-system-biz/src/main/java/com/lideeyunji/service/system/service/impl/OAuth2TokenServiceImpl.java b/lidee-service/lidee-service-system-biz/src/main/java/com/lideeyunji/service/system/service/impl/OAuth2TokenServiceImpl.java index e9c4fcc..ffff3c4 100644 --- a/lidee-service/lidee-service-system-biz/src/main/java/com/lideeyunji/service/system/service/impl/OAuth2TokenServiceImpl.java +++ b/lidee-service/lidee-service-system-biz/src/main/java/com/lideeyunji/service/system/service/impl/OAuth2TokenServiceImpl.java @@ -85,6 +85,8 @@ public class OAuth2TokenServiceImpl implements IOAuth2TokenService { // 获得用户基本信息 OAuth2AccessTokenDO accessTokenDO= oauth2AccessTokenMapper.selectByAccessToken(refreshToken); AdminUserDO user = adminUserService.getUser(accessTokenDO.getUserId()); + user.setPassword(""); + user.setEmail(""); return user; } diff --git a/lidee-tool/tool-spring-boot-starter-yunji/src/main/java/com/lideeyunji/tool/framework/yunji/constant/lideeRedisConstants.java b/lidee-tool/tool-spring-boot-starter-yunji/src/main/java/com/lideeyunji/tool/framework/yunji/constant/lideeRedisConstants.java index c765a92..e294f34 100644 --- a/lidee-tool/tool-spring-boot-starter-yunji/src/main/java/com/lideeyunji/tool/framework/yunji/constant/lideeRedisConstants.java +++ b/lidee-tool/tool-spring-boot-starter-yunji/src/main/java/com/lideeyunji/tool/framework/yunji/constant/lideeRedisConstants.java @@ -9,7 +9,7 @@ package com.lideeyunji.tool.framework.yunji.constant; public interface lideeRedisConstants { //低代码 - String lideeyunji_PREFIX = "JEE_LOW_CODE:"; + String lideeyunji_PREFIX = "LIDEE_LOW_CODE:"; //js增强加锁 String ENHANCE_JS_LOCK = "LOCK_JS:%s";