From b21c4dbcb8f664acb35ca7c066950261b0592a7b Mon Sep 17 00:00:00 2001 From: sh Date: Tue, 25 Nov 2025 18:45:38 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E4=BA=92=E8=81=94=E7=BD=91?= =?UTF-8?q?=E5=8D=95=E7=82=B9=E9=97=AE=E9=A2=98=202.=E6=94=BE=E5=BC=80?= =?UTF-8?q?=E7=9B=B8=E5=BA=94=E6=8B=9B=E8=81=98=E4=BC=9A=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ruoyi/framework/config/SecurityConfig.java | 3 ++- .../ruoyi/framework/web/service/OauthLoginHlwService.java | 6 +++++- 2 files changed, 7 insertions(+), 2 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 de0e720..6bb2312 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 @@ -112,7 +112,8 @@ public class SecurityConfig permitAllUrl.getUrls().forEach(url -> requests.antMatchers(url).permitAll()); // 对于登录login 注册register 验证码captchaImage 允许匿名访问 requests.antMatchers("/login", "/register", "/captchaImage","/app/login","/websocket/**","/speech-recognition","/speech-synthesis", - "/cms/company/listPage","/cms/appUser/noTmlist","/getTjmhToken","/getWwTjmhToken","/getWwTjmHlwToken","/cms/notice/noticTotal").permitAll() + "/cms/company/listPage","/cms/appUser/noTmlist","/getTjmhToken","/getWwTjmhToken","/getWwTjmHlwToken", + "/cms/notice/noticTotal","/cms/jobApply/zphApply","/cms/jobApply/zphApplyAgree").permitAll() // 静态资源，可匿名访问 .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll() // 移动端公用查询，可匿名访问 diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/OauthLoginHlwService.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/OauthLoginHlwService.java index 4c9a758..f913d2d 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/OauthLoginHlwService.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/OauthLoginHlwService.java @@ -113,7 +113,11 @@ public class OauthLoginHlwService { String cacheKey = REDIS_KEY_PORTAL_USER_MAPPING + idCard; String localUsername = redisCache.getCacheObject(cacheKey); if (StringUtils.isNotBlank(localUsername)) { + if ("hlw_".equals(localUsername)) { + localUsername = String.format("%s%s", localUsername, idCard); + } updateUserInfo(wwTyInfo); + return localUsername; } @@ -303,7 +307,7 @@ public class OauthLoginHlwService { sysUser.setUserId(parmUser.getUserId()); sysUserService.updateUser(sysUser); //插入app_user - AppUser appUser=appUserService.selectAppuserByIdcard(wwTyInfo.getIdno()); + AppUser appUser=appUserService.selectAppuserByIdcard(code); if(appUser!=null){ appUserParm.setUserId(appUser.getUserId()); appUserService.updateAppUser(appUserParm);