From 95c01301f65379e7634e4619bf4c49186aa5be41 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期五, 07 二月 2025 14:19:28 +0800
Subject: [PATCH] !644 同步修复一些问题 Merge pull request !644 from 疯狂的狮子Li/dev

---
 ruoyi-admin/src/main/java/org/dromara/web/service/IAuthStrategy.java |   17 +++++++++++++----
 1 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/ruoyi-admin/src/main/java/org/dromara/web/service/IAuthStrategy.java b/ruoyi-admin/src/main/java/org/dromara/web/service/IAuthStrategy.java
index 33c4a34..a75b913 100644
--- a/ruoyi-admin/src/main/java/org/dromara/web/service/IAuthStrategy.java
+++ b/ruoyi-admin/src/main/java/org/dromara/web/service/IAuthStrategy.java
@@ -4,6 +4,7 @@
 import org.dromara.common.core.exception.ServiceException;
 import org.dromara.common.core.utils.SpringUtils;
 import org.dromara.system.domain.SysClient;
+import org.dromara.system.domain.vo.SysClientVo;
 import org.dromara.web.domain.vo.LoginVo;
 
 /**
@@ -17,21 +18,29 @@
 
     /**
      * 鐧诲綍
+     *
+     * @param body      鐧诲綍瀵硅薄
+     * @param client    鎺堟潈绠$悊瑙嗗浘瀵硅薄
+     * @param grantType 鎺堟潈绫诲瀷
+     * @return 鐧诲綍楠岃瘉淇℃伅
      */
-    static LoginVo login(String body, SysClient client, String grantType) {
+    static LoginVo login(String body, SysClientVo client, String grantType) {
         // 鎺堟潈绫诲瀷鍜屽鎴风id
-        String clientId = client.getClientId();
         String beanName = grantType + BASE_NAME;
         if (!SpringUtils.containsBean(beanName)) {
             throw new ServiceException("鎺堟潈绫诲瀷涓嶆纭�!");
         }
         IAuthStrategy instance = SpringUtils.getBean(beanName);
-        return instance.login(clientId, body, client);
+        return instance.login(body, client);
     }
 
     /**
      * 鐧诲綍
+     *
+     * @param body   鐧诲綍瀵硅薄
+     * @param client 鎺堟潈绠$悊瑙嗗浘瀵硅薄
+     * @return 鐧诲綍楠岃瘉淇℃伅
      */
-    LoginVo login(String clientId, String body, SysClient client);
+    LoginVo login(String body, SysClientVo client);
 
 }

--
Gitblit v1.9.3