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);