bugfix/修复部分错误

Author: freestylefly

pmhub-auth/src/main/java/com/laigeoffer/pmhub/auth/config/SecurityConfig.java

@@ -1,6 +1,7 @@
 package com.laigeoffer.pmhub.auth.controller;
 
 import com.laigeoffer.pmhub.auth.service.SysLoginService;
+import com.laigeoffer.pmhub.base.core.config.redis.RedisService;
 import com.laigeoffer.pmhub.base.core.constant.Constants;
 import com.laigeoffer.pmhub.base.core.core.domain.AjaxResult;
 import com.laigeoffer.pmhub.base.core.core.domain.R;
@@ -37,6 +38,9 @@ public class LoginController {
     @Autowired
     private SysLoginService sysLoginService;
 
+    @Autowired
+    private RedisService redisService;
+
     @PostMapping("login")
     public AjaxResult login(@RequestBody LoginBody form) {
         AjaxResult ajax = success();
@@ -80,4 +84,14 @@ public R<?> register(@RequestBody RegisterBody registerBody) {
     }
 
 
+    /**
+     * 刷新 redis
+     * @return
+     */
+    @PostMapping("refreshRedis")
+    public R<?> refreshRedis() {
+        redisService.flushAll();
+        return R.ok();
+    }
+
 }

pmhub-auth/src/main/java/com/laigeoffer/pmhub/auth/controller/LoginController.java

@@ -2,10 +2,7 @@
 
 import cn.hutool.core.util.ObjectUtil;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.BoundSetOperations;
-import org.springframework.data.redis.core.HashOperations;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.data.redis.core.ValueOperations;
+import org.springframework.data.redis.core.*;
 import org.springframework.stereotype.Component;
 
 import java.util.*;
@@ -261,4 +258,14 @@ public Map<String,Object> getCacheKv(String pattern){
         }
         return kv;
     }
+
+    /**
+     * 删除所有缓存数据（慎用）
+     */
+    public void flushAll() {
+        redisTemplate.execute((RedisCallback<Object>) connection -> {
+            connection.flushDb();
+            return "OK";
+        });
+    }
 }

pmhub-base/pmhub-base-core/src/main/java/com/laigeoffer/pmhub/base/core/config/redis/RedisService.java

@@ -62,12 +62,6 @@ public static LoginUser getLoginUser() {
         }
     }
 
-    /**
-     * 获取Authentication
-     */
-//    public static Authentication getAuthentication() {
-//        return SecurityContextHolder.getContext().getAuthentication();
-//    }
 
     /**
      * 生成BCryptPasswordEncoder密码

pmhub-base/pmhub-base-security/src/main/java/com/laigeoffer/pmhub/base/security/utils/SecurityUtils.java

@@ -303,6 +303,8 @@ public R<LoginUser> info(@PathVariable("username") String username) {
         loginUser.setUser(sysUser);
         loginUser.setRoles(roles);
         loginUser.setPermissions(permissions);
+        loginUser.setUserId(sysUser.getUserId());
+        loginUser.setDeptId(sysUser.getDeptId());
 
 
         return R.ok(loginUser);