From ebb7242b718e5af304503ec7ab6dc4736ce9688f Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期三, 03 七月 2024 11:43:59 +0800
Subject: [PATCH] update 更新 redis 密码策略

---
 ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java |   55 +++++++++++++++++++++++++++++++++++--------------------
 1 files changed, 35 insertions(+), 20 deletions(-)

diff --git a/ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java b/ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java
index 8b83e29..1db68f1 100644
--- a/ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java
+++ b/ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java
@@ -1,6 +1,8 @@
 package org.dromara.web.controller;
 
 import cn.dev33.satoken.annotation.SaIgnore;
+import cn.dev33.satoken.exception.NotLoginException;
+import cn.hutool.core.codec.Base64;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjectUtil;
 import jakarta.servlet.http.HttpServletRequest;
@@ -42,7 +44,10 @@
 import org.springframework.web.bind.annotation.*;
 
 import java.net.URL;
+import java.nio.charset.StandardCharsets;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 
@@ -91,7 +96,7 @@
             return R.fail(MessageUtils.message("auth.grant.type.blocked"));
         }
         // 鏍￠獙绉熸埛
-        SysTenantVo tenant = loginService.checkTenant(loginBody.getTenantId());
+        loginService.checkTenant(loginBody.getTenantId());
         // 鐧诲綍
         LoginVo loginVo = IAuthStrategy.login(body, client, grantType);
 
@@ -102,10 +107,6 @@
             dto.setSessionKeys(List.of(userId));
             WebSocketUtils.publishMessage(dto);
         }, 3, TimeUnit.SECONDS);
-
-        if (StringUtils.isNotBlank(tenant.getTenantId())) {
-            loginVo.setDomain(tenant.getDomain());
-        }
         return R.ok(loginVo);
     }
 
@@ -116,13 +117,18 @@
      * @return 缁撴灉
      */
     @GetMapping("/binding/{source}")
-    public R<String> authBinding(@PathVariable("source") String source) {
+    public R<String> authBinding(@PathVariable("source") String source,
+                                 @RequestParam String tenantId, @RequestParam String domain) {
         SocialLoginConfigProperties obj = socialProperties.getType().get(source);
         if (ObjectUtil.isNull(obj)) {
             return R.fail(source + "骞冲彴璐﹀彿鏆備笉鏀寔");
         }
         AuthRequest authRequest = SocialUtils.getAuthRequest(source, socialProperties);
-        String authorizeUrl = authRequest.authorize(AuthStateUtils.createState());
+        Map<String, String> map = new HashMap<>();
+        map.put("tenantId", tenantId);
+        map.put("domain", domain);
+        map.put("state", AuthStateUtils.createState());
+        String authorizeUrl = authRequest.authorize(Base64.encode(JsonUtils.toJsonString(map), StandardCharsets.UTF_8));
         return R.ok("鎿嶄綔鎴愬姛", authorizeUrl);
     }
 
@@ -133,7 +139,7 @@
      * @return 缁撴灉
      */
     @PostMapping("/social/callback")
-    public R<LoginVo> socialCallback(@RequestBody SocialLoginBody loginBody) {
+    public R<Void> socialCallback(@RequestBody SocialLoginBody loginBody) {
         // 鑾峰彇绗笁鏂圭櫥褰曚俊鎭�
         AuthResponse<AuthUser> response = SocialUtils.loginAuth(
                 loginBody.getSource(), loginBody.getSocialCode(),
@@ -144,13 +150,7 @@
             return R.fail(response.getMsg());
         }
         loginService.socialRegister(authUserData);
-
-        LoginVo loginVo = new LoginVo();
-        SysTenantVo tenant = tenantService.queryByTenantId(LoginHelper.getTenantId());
-        if (StringUtils.isNotBlank(tenant.getTenantId())) {
-            loginVo.setDomain(tenant.getDomain());
-        }
-        return R.ok(loginVo);
+        return R.ok();
     }
 
 
@@ -195,8 +195,26 @@
      */
     @GetMapping("/tenant/list")
     public R<LoginTenantVo> tenantList(HttpServletRequest request) throws Exception {
+        // 杩斿洖瀵硅薄
+        LoginTenantVo result = new LoginTenantVo();
+        boolean enable = TenantHelper.isEnable();
+        result.setTenantEnabled(enable);
+        // 濡傛灉鏈紑鍚鎴疯繖鐩存帴杩斿洖
+        if (!enable) {
+            return R.ok(result);
+        }
+
         List<SysTenantVo> tenantList = tenantService.queryList(new SysTenantBo());
         List<TenantListVo> voList = MapstructUtils.convert(tenantList, TenantListVo.class);
+        try {
+            // 濡傛灉鍙秴绠¤繑鍥炴墍鏈夌鎴�
+            if (LoginHelper.isSuperAdmin()) {
+                result.setVoList(voList);
+                return R.ok(result);
+            }
+        } catch (NotLoginException ignored) {
+        }
+
         // 鑾峰彇鍩熷悕
         String host;
         String referer = request.getHeader("referer");
@@ -209,11 +227,8 @@
         // 鏍规嵁鍩熷悕杩涜绛涢��
         List<TenantListVo> list = StreamUtils.filter(voList, vo ->
                 StringUtils.equals(vo.getDomain(), host));
-        // 杩斿洖瀵硅薄
-        LoginTenantVo vo = new LoginTenantVo();
-        vo.setVoList(CollUtil.isNotEmpty(list) ? list : voList);
-        vo.setTenantEnabled(TenantHelper.isEnable());
-        return R.ok(vo);
+        result.setVoList(CollUtil.isNotEmpty(list) ? list : voList);
+        return R.ok(result);
     }
 
 }

--
Gitblit v1.9.3