From 3b0ba39406740749fded2d6ff078721aaa3cf88a Mon Sep 17 00:00:00 2001
From: chenyanchang <30190327@qq.com>
Date: Wed, 20 May 2026 17:45:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8D=95=E7=82=B9=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E7=9B=B8=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../framework/config/SecurityConfig.java      |  2 +-
 .../framework/web/service/SsoService.java     | 29 +++++++++----------
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
index 53313f5..6e0da95 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
@@ -111,7 +111,7 @@ public class SecurityConfig
             .authorizeHttpRequests((requests) -> {
                 permitAllUrl.getUrls().forEach(url -> requests.antMatchers(url).permitAll());
                 // 对于登录login 注册register 验证码captchaImage 允许匿名访问
-                requests.antMatchers("/sso/login","/login","/loginoss", "/register", "/captchaImage","/app/login","/websocket/**","/ws/**","/speech-recognition","/speech-synthesis",
+                requests.antMatchers("/sso/token/login","/sso/code/login","/login","/loginoss", "/register", "/captchaImage","/app/login","/websocket/**","/ws/**","/speech-recognition","/speech-synthesis",
                                 "/cms/company/listPage","/cms/appUser/noTmlist","/getTjmhToken","/getWwTjmhToken","/getWwTjmHlwToken",
                                 "/cms/notice/noticTotal","/cms/jobApply/zphApply","/cms/jobApply/zphApplyAgree").permitAll()
                     // 静态资源，可匿名访问
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SsoService.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SsoService.java
index 308af1c..0208dc5 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SsoService.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SsoService.java
@@ -112,25 +112,12 @@ public class SsoService {
         return backJson;
     }
 
-    //模拟登录
-    public String loginApp(AppUser appUser, String userName){
-        LoginSiteUser loginSiteUser = new LoginSiteUser();
-        loginSiteUser.setUserId(appUser.getUserId());
-        loginSiteUser.setUser(appUser);
-//        recordLoginInfo(appUser);
-        AsyncManager.me().execute(AsyncFactory.recordLogininfor(userName, Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success")));
-//        recordLoginInfo(appUser);
-        // 生成token
-        return tokenSiteService.createToken(loginSiteUser);
-    }
-
-
     public JSONObject ssoTokenLogin(JSONObject param) {
         if (ObjectUtils.isEmpty(param)) {
             throw new RuntimeException("请求参数不能为空");
         }
         //浪潮token
-        String lcToken = param.getString("token");
+        String lcToken = param.getString("lcToken");
         //获取用户信息
         JSONObject pJson = new JSONObject();
         pJson.put("appId", webAppId);
@@ -191,7 +178,19 @@ public class SsoService {
         }
     }
 
-    //2.获取用户信息
+    //模拟登录
+    public String loginApp(AppUser appUser, String userName){
+        LoginSiteUser loginSiteUser = new LoginSiteUser();
+        loginSiteUser.setUserId(appUser.getUserId());
+        loginSiteUser.setUser(appUser);
+//        recordLoginInfo(appUser);
+        AsyncManager.me().execute(AsyncFactory.recordLogininfor(userName, Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success")));
+//        recordLoginInfo(appUser);
+        // 生成token
+        return tokenSiteService.createTokenHourTwo(loginSiteUser);
+    }
+
+    //获取用户信息
     private JSONObject getUserInfo(String url, String token, String params) {
         try {
             String result = sendHttpPost(url, token, params);