Merge remote-tracking branch 'refs/remotes/origin/feature-v1.3.0' into release-sy-v1.0.0

shuili-admin/src/main/java/com/kms/web/controller/system/SysLoginController.java

@@ -142,7 +142,16 @@ public class SysLoginController extends BaseController {
     @PostMapping("/logout")
     @SaCheckLogin
     public AjaxResult logout() {
-
+        SysUser sysUser = UserUtils.getUser();
+        if (sysUser != null) {
+            String token = permissionService.getPortalToken(sysUser.getId());
+            if (StringUtils.isNotBlank(token)) {
+                try {
+                    waterRequestUtil.logout(token);
+                } catch (Exception ignore) {
+                }
+            }
+        }
         // 登录保存缓存
         StpUtil.logout();
         //删除缓存
@@ -287,6 +296,7 @@ public class SysLoginController extends BaseController {
             throw new BaseException("账号异常，登陆失败");
         }
         permissionService.setUserMenuFromPortal(simpleUser.getId(), menus);
+        permissionService.setPortalToken(simpleUser.getId(), token);
         StpUtil.login(simpleUser.getId());
         StpUtil.getSession().set("jianwei-user", simpleUser);
         String accessToken = StpUtil.getTokenValue();

shuili-admin/src/main/java/com/kms/web/utils/WaterRequestUtil.java

@@ -39,6 +39,8 @@ public class WaterRequestUtil {
     public String singOnAppsecret;
     @Value("${water.singOnUrl:}")
     public String singOnUrl;
+    @Value("${water.logoutUrl:}")
+    public String logoutUrl;
 
     //验证用户登录
     @Value("${water.userUrl:}")
@@ -194,6 +196,23 @@ public class WaterRequestUtil {
         return JSONObject.parseObject(body, WaterResult.class);
     }
 
+    public WaterResultV2<String> logout(String authorization) {
+        long startTime = System.currentTimeMillis();
+        log.info("--------请求统一门户用户注销登陆,请求地址为:{}", logoutUrl);
+        HttpRequest get = createGet(logoutUrl, authUserServiceId, authUserAppsecret);
+        String body;
+        try (HttpResponse response = get.header("Authorization", authorization)
+                .execute()) {
+            body = response.body();
+        }
+        long endTime = System.currentTimeMillis();
+        log.info("--------请求统一门户用户注销登陆，耗时{}毫秒,返回结果为:{}", endTime - startTime, body);
+        WaterResultV2<String> waterResult = JSON.parseObject(body, new TypeReference<WaterResultV2<String>>() {
+        });
+        isSuccess(waterResult);
+        return waterResult;
+    }
+
     /**
      * 验证用户登录
      *

shuili-system/src/main/java/com/kms/framework/web/service/SysPermissionService.java

@@ -100,6 +100,14 @@ public class SysPermissionService {
         }
     }
 
+    public String getPortalToken(String userId) {
+        Object cache = redisCache.getCacheObject(tokenKey(userId));
+        if (cache != null) {
+            return StringUtils.cast(cache);
+        } else {
+            return null;
+        }
+    }
 
     public void setUserPermissionFromPortal(String userId, List<String> perms) {
         if (CollectionUtils.isEmpty(perms)) {
@@ -115,6 +123,10 @@ public class SysPermissionService {
         redisCache.setCacheObject(menusKey(userId), menus, 7, TimeUnit.DAYS);
     }
 
+    public void setPortalToken(String userId, String token) {
+        redisCache.setCacheObject(tokenKey(userId), token, 7, TimeUnit.DAYS);
+    }
+
     @Data
     @AllArgsConstructor
     @NoArgsConstructor
@@ -127,6 +139,10 @@ public class SysPermissionService {
     }
 
 
+    private String tokenKey(String userId) {
+        return "portal_token:" + userId;
+    }
+
     private String permsKey(String userId) {
         return "user_perms:" + userId;
     }