From 940c701f3c39914ae70734d68c39b622648467c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com>
Date: Thu, 25 Jul 2024 10:32:53 +0800
Subject: [PATCH] 'commit'

---
 .../Sso/Controller/WebLoginController.java    | 38 +++++++++++--------
 .../java/com/dsideal/Sso/Model/BaseModel.java |  2 +-
 2 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/src/main/java/com/dsideal/Sso/Controller/WebLoginController.java b/src/main/java/com/dsideal/Sso/Controller/WebLoginController.java
index 0585efb..61c2e25 100644
--- a/src/main/java/com/dsideal/Sso/Controller/WebLoginController.java
+++ b/src/main/java/com/dsideal/Sso/Controller/WebLoginController.java
@@ -26,25 +26,30 @@ public class WebLoginController extends Controller {
         redirect("/html/login.html");
     }
 
+    /**
+     * http://10.10.21.21:9001/dsssoserver/login?redirect_url=https://www.ccsjy.cn/QingLong/loginPerson/getCaptcha
+       测试账号：stu81
+       测试密码：632342
+     * @param redirect_url
+     */
     @Before({GET.class})
     @EmptyInterface({"redirect_url"})
     public void login(String redirect_url) {
-        Set<String> _set = RedisKit.SMembers(PropKit.get("SYS_JRXT"));
-        boolean found = false;
-        for (String s : _set) {
-            if (redirect_url.contains(s)) {
-                found = true;
-                break;
-            }
-        }
-        if (!found) {
-            JSONObject resultJson = new JSONObject();
-            resultJson.put("success", false);
-            resultJson.put("msg", "回调地址不在指定的IP或域名范围内！");
-            renderJson(resultJson);
-            return;
-        }
-
+//        Set<String> _set = RedisKit.SMembers(PropKit.get("SYS_JRXT"));
+//        boolean found = false;
+//        for (String s : _set) {
+//            if (redirect_url.contains(s)) {
+//                found = true;
+//                break;
+//            }
+//        }
+//        if (!found) {
+//            JSONObject resultJson = new JSONObject();
+//            resultJson.put("success", false);
+//            resultJson.put("msg", "回调地址不在指定的IP或域名范围内！");
+//            renderJson(resultJson);
+//            return;
+//        }
         Kv kv = SsoLoginHelper.loginCheck(getRequest());
         if (kv.getBoolean("success")) {
             String ssoSessionId = PropKit.get("sso.sessionid");
@@ -193,6 +198,7 @@ public class WebLoginController extends Controller {
 
     /**
      * WEB登出
+     * http://10.10.21.21:9001/dsssoserver/logout?redirect_url=http://10.10.21.21:9001/dsssoserver
      */
     @Before({GET.class})
     @EmptyInterface({"redirect_url"})
diff --git a/src/main/java/com/dsideal/Sso/Model/BaseModel.java b/src/main/java/com/dsideal/Sso/Model/BaseModel.java
index e7a48ec..cb2a53f 100644
--- a/src/main/java/com/dsideal/Sso/Model/BaseModel.java
+++ b/src/main/java/com/dsideal/Sso/Model/BaseModel.java
@@ -42,7 +42,7 @@ public class BaseModel {
             }
             return record;
         }
-        String sql = "select login_name,pwd,identity_id,person_id from t_sys_loginperson where login_name=? and b_use=1";
+        String sql = "select login_name,pwd,identity_id,person_id from t_sys_loginperson where login_name=? and b_use=1 and identity_id in (5,6)";
         Record record = Db.findFirst(sql, username);
         RedisKit.HSet(redisKey, "login_name", record.getStr("login_name"));
         RedisKit.HSet(redisKey, "pwd", record.getStr("pwd"));