From a54447507a3af4347e6b5981eb9da21d5ca03898 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期二, 03 十一月 2026 13:27:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_tide_wrzs' into dev_tide_wrzs
---
src/main/java/com/ruoyi/tide/controller/TideController.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/tide/controller/TideController.java b/src/main/java/com/ruoyi/tide/controller/TideController.java
index 0128b59..33cac85 100644
--- a/src/main/java/com/ruoyi/tide/controller/TideController.java
+++ b/src/main/java/com/ruoyi/tide/controller/TideController.java
@@ -105,12 +105,16 @@
if (ObjectUtils.isEmpty(password)) {
password = firstText(userInfo, "tenantPassword", "password", "pwd");
}
- if (ObjectUtils.isEmpty(account) || ObjectUtils.isEmpty(password)) {
- log.error("[娴疆SSO] 鏈彇鍒扮鎴疯处鍙�/瀵嗙爜, userInfo={}", userInfo);
+ // 鍏嶅瘑鐧诲綍鍙渶璐﹀彿锛沺assword 浠呬綔鏃ュ織鍙傝�冿紝娴疆渚т笉杩斿洖涔熶笉褰卞搷鐧诲綍
+ if (ObjectUtils.isEmpty(account)) {
+ log.error("[娴疆SSO] 鏈彇鍒扮鎴疯处鍙�, userInfo={}", userInfo);
return AjaxResult.error("娴疆鏈繑鍥炰紒涓氱鎴疯处鍙蜂俊鎭紝璇疯仈绯诲钩鍙扮鐞嗗憳妫�鏌ヨ璐﹀彿鐨勪紒涓氱粦瀹�");
}
try {
- String generateToken = loginService.login(account, password, null, IdWorker.get32UUID());
+ // 娴疆渚у凡瀹屾垚韬唤璁よ瘉锛坈ode 鎹� token 鈫� 鍙� userInfo锛夛紝鏈湴涓嶅啀鐢� tenantPassword 浜屾鏍￠獙銆�
+ // 鍘熷疄鐜� login(account, password, ...) 鍦ㄦ氮娼厤缃殑瀵嗙爜涓庢湰鍦� sys_user.password 涓嶄竴鑷存椂
+ // 浼氭姏 UserPasswordNotMatchException锛岃〃鐜颁负銆岀鎴疯处鍙穂xxx]鍦ㄧ郴缁熶腑鐧诲綍澶辫触(鐢ㄦ埛涓嶅瓨鍦�/瀵嗙爜閿欒)銆嶃��
+ String generateToken = loginService.ssoLogin(account);
AjaxResult ajax = AjaxResult.success();
ajax.put(Constants.TOKEN, generateToken);
return ajax;
--
Gitblit v1.9.3