From 5910a5d4b42fcafe8adead0b1387cd1c130a833d Mon Sep 17 00:00:00 2001 From: chenshaohua <635616957@qq.com> Date: Thu, 9 Jul 2026 22:57:07 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=B7=BB=E5=8A=A0=E4=BF=AE=E6=94=B9=E6=B1=82?= =?UTF-8?q?=E8=81=8C=E8=80=85=E5=AF=86=E7=A0=81=202.=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=AE=A1=E7=90=86=E5=91=98=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E5=92=8C=E4=BC=81=E4=B8=9A=E5=AF=86=E7=A0=81?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=203.=E6=B7=BB=E5=8A=A0=E5=90=AF=E7=94=A8?= =?UTF-8?q?=E5=92=8C=E7=A6=81=E7=94=A8=E4=BC=81=E4=B8=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-dev.yml | 2 +- .../src/main/resources/application-local.yml | 2 +- .../cms/controller/app/AppUserController.java | 1 + .../controller/cms/CmsAppUserController.java | 62 ++++++++++++++++++- .../ruoyi/cms/service/IAppUserService.java | 4 ++ .../cms/service/impl/AppUserServiceImpl.java | 62 +++++++++++++++---- .../com/ruoyi/cms/util/http/JsonUtil.java | 49 +++++++++++++++ .../common/core/domain/entity/AppUser.java | 2 +- .../common/core/domain/entity/SysUser.java | 14 +++++ .../com/ruoyi/common/utils/SecurityUtils.java | 31 +++++++++- .../ruoyi/common/utils/SiteSecurityUtils.java | 16 +++++ .../framework/web/service/SsoService.java | 16 +++-- .../resources/mapper/system/SysUserMapper.xml | 6 +- 13 files changed, 244 insertions(+), 23 deletions(-) create mode 100644 ruoyi-bussiness/src/main/java/com/ruoyi/cms/util/http/JsonUtil.java diff --git a/ruoyi-admin/src/main/resources/application-dev.yml b/ruoyi-admin/src/main/resources/application-dev.yml index 5fd01b5..f1bb066 100644 --- a/ruoyi-admin/src/main/resources/application-dev.yml +++ b/ruoyi-admin/src/main/resources/application-dev.yml @@ -135,7 +135,7 @@ lc_web_auth: appSecret: x14lueHbtLQL7Pz2G7gE4wcGCV6TDblO5xfeu9V2wGk= getTokenUrl: http://100.128.128.6:9081/prod-psout-api/auth/token getUserInfoUrl: http://100.128.128.6:9081/prod-psout-api/system/app/authorize/user/info - editUserInfoUrl: http://100.128.128.6:9081/prod-psout-api/system/auth/user/edit + editUserInfoUrl: http://100.128.128.6:9081/prod-psout-api/auth/user/edit lc_cms_auth: appId: cloud-9793ee8a8c3d47b8871007ffc4128502 diff --git a/ruoyi-admin/src/main/resources/application-local.yml b/ruoyi-admin/src/main/resources/application-local.yml index a2b5bcb..8456e59 100644 --- a/ruoyi-admin/src/main/resources/application-local.yml +++ b/ruoyi-admin/src/main/resources/application-local.yml @@ -141,7 +141,7 @@ lc_web_auth: appSecret: x14lueHbtLQL7Pz2G7gE4wcGCV6TDblO5xfeu9V2wGk= getTokenUrl: http://218.31.252.15:9081/prod-psout-api/auth/token getUserInfoUrl: http://218.31.252.15:9081/prod-psout-api/system/app/authorize/user/info - editUserInfoUrl: http://218.31.252.15:9081/prod-psout-api/system/auth/user/edit + editUserInfoUrl: http://218.31.252.15:9081/prod-psout-api/auth/user/edit #监管端： lc_cms_auth: appId: cloud-9793ee8a8c3d47b8871007ffc4128502 diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/AppUserController.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/AppUserController.java index e8e6634..52923b2 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/AppUserController.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/AppUserController.java @@ -188,6 +188,7 @@ public class AppUserController extends BaseController public AjaxResult editUserSafety(@RequestBody AppUser appUser) { appUser.setUserId(SiteSecurityUtils.getUserId()); + appUser.setLcUserid(SiteSecurityUtils.getlcUserid()); return AjaxResult.success(appUserService.editUserSafety(appUser)); } } diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CmsAppUserController.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CmsAppUserController.java index 2f6943b..8ab995a 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CmsAppUserController.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CmsAppUserController.java @@ -16,7 +16,6 @@ import com.ruoyi.common.core.domain.entity.AppUserShow; import com.ruoyi.common.core.domain.model.RegisterBody; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.common.utils.SiteSecurityUtils; import com.ruoyi.common.utils.StringUtils; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; @@ -275,4 +274,65 @@ public class CmsAppUserController extends BaseController } return toAjax(appReviewJobService.insertAppReviewJob(appReviewJob)); } + + @ApiOperation("求职者求职安全保障") + @PreAuthorize("@ss.hasPermi('cms:appUser:editUserSafety')") + @PostMapping("/editUserSafety") + public AjaxResult editUserSafety(@RequestBody AppUser appUser) + { + if(!SecurityUtils.isLogin()){ + return error("未登录"); + } + appUser.setUserId(SecurityUtils.getAppuserId()); + appUser.setLcUserid(SecurityUtils.getlcUserid()); + return AjaxResult.success(appUserService.editUserSafety(appUser)); + } + + @ApiOperation("浪潮修改密码") + @PreAuthorize("@ss.hasPermi('cms:appUser:resetLcPsw')") + @PostMapping("/resetLcPsw") + public AjaxResult resetLcPsw(@RequestBody AppUser appUser){ + if (appUser == null) { + return AjaxResult.error("请求参数不能为空"); + } + if(!SecurityUtils.isLogin()){ + return error("未登录"); + } + if(SecurityUtils.getlcUserid()==null){ + return error("门户会话失效，请重新在门户登录"); + } + if(appUser.getUserId()==null){ + return error("用户id为空!"); + } + if(StringUtils.isBlank(appUser.getPassword())){ + return error("密码为空!"); + } + appUser.setLcUserid(SecurityUtils.getlcUserid()); + appUserService.resetLcPsw(appUser); + return success("密码重置成功"); + } + + @ApiOperation("浪潮启用和停用企业") + @PreAuthorize("@ss.hasPermi('cms:appUser:changeLcCompanyStatus')") + @PostMapping("/changeLcCompanyStatus") + public AjaxResult changeLcCompanyStatus(@RequestBody AppUser appUser){ + if (appUser == null) { + return AjaxResult.error("请求参数不能为空"); + } + if(!SecurityUtils.isLogin()){ + return error("未登录"); + } + if(SecurityUtils.getlcUserid()==null){ + return error("门户会话失效，请重新在门户登录"); + } + if(appUser.getUserId()==null){ + return error("用户id为空!"); + } + if(StringUtils.isBlank(appUser.getStatus())){ + return error("状态为空!"); + } + appUser.setLcUserid(SecurityUtils.getlcUserid()); + appUserService.changeLcCompanyStatus(appUser); + return success("密码重置成功"); + } } diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/IAppUserService.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/IAppUserService.java index 0b5d324..59347a9 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/IAppUserService.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/IAppUserService.java @@ -85,4 +85,8 @@ public interface IAppUserService public List selectUserApplyList(AppUser appUser); int editUserSafety(AppUser appUser); + + void resetLcPsw(AppUser appUser); + + void changeLcCompanyStatus(AppUser appUser); } diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/AppUserServiceImpl.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/AppUserServiceImpl.java index e728a87..6539239 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/AppUserServiceImpl.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/AppUserServiceImpl.java @@ -3,11 +3,12 @@ package com.ruoyi.cms.service.impl; import java.util.*; import java.util.stream.Collectors; -import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.ruoyi.cms.util.http.HttpClientUtils; +import com.ruoyi.cms.util.http.JsonUtil; import com.ruoyi.common.constant.CacheConstants; import com.ruoyi.common.core.domain.entity.MyChart; import com.ruoyi.common.core.domain.entity.File; @@ -58,6 +59,12 @@ public class AppUserServiceImpl extends ServiceImpl imple //互联网修改个人信息 @Value("${lc_web_auth.editUserInfoUrl}") String WEB_UPDATE_USER_INFO; + //修改密码接口 + @Value("${lc_cms_auth.resrtPwdUrl}") + String JG_RESET_PASSWORD_URL; + //启用和停用企业 + @Value("${lc_cms_auth.changeStatusUrl}") + String JG_UPDATE_COMPANY_URL; @Autowired private RedisCache redisCache; @@ -539,7 +546,7 @@ public class AppUserServiceImpl extends ServiceImpl imple public AppUser getUserInfo() { //查询用户信息 LoginUser loginUser=SecurityUtils.getLoginUser(); - System.out.println("loginUser========================"+JSON.toJSONString(loginUser)); + System.out.println("loginUser========================"+ JSON.toJSONString(loginUser)); SysUser sysUser=loginUser.getUser(); System.out.println("sysUser========================"+JSON.toJSONString(sysUser)); AppUser appUser=selectAppuserByIdcard(sysUser.getIdCard()); @@ -648,28 +655,59 @@ public class AppUserServiceImpl extends ServiceImpl imple @Override public int editUserSafety(AppUser appUser) { - appUserMapper.updateById(appUser); - String lcUserToken=redisCache.getCacheObject(CacheConstants.LC_HLW_TOKEN+appUser.getUserId()); + int i=appUserMapper.updateById(appUser); + String lcUserToken=redisCache.getCacheObject(CacheConstants.LC_HLW_TOKEN+appUser.getLcUserid()); if(StringUtils.isBlank(lcUserToken)){ throw new RuntimeException("token已失效"); } //修改门户个人信息 JSONObject pJson = new JSONObject(); if (StringUtils.isNotBlank(appUser.getEmail())) { - pJson.put("personEmail", appUser.getEmail()); + pJson.put("email", appUser.getEmail()); } if (StringUtils.isNotBlank(appUser.getPhone())) { - pJson.put("personPhone", appUser.getPhone()); + pJson.put("phonenumber", appUser.getPhone()); } if (StringUtils.isNotBlank(appUser.getPassword())) { pJson.put("password", appUser.getPassword()); } String result=httpClientUtils.sendHttpPost(WEB_UPDATE_USER_INFO,lcUserToken,pJson.toJSONString()); - if (StringUtils.isBlank(result)) { - throw new RuntimeException("调用门户修改用户信息接口响应为空"); - } - JSONObject json = JSONObject.parseObject(result); - System.out.println("门户修改个人信息返回："+json); - return 0; + JSONObject respJson = JsonUtil.parsePortalResponse(result, "调用修改个人信息接口"); + JSONObject data = respJson.getJSONObject("data"); + System.out.println(data); + return i; } + + @Override + public void resetLcPsw(AppUser appUser) { + String lcUserToken=redisCache.getCacheObject(CacheConstants.LC_HLW_TOKEN+appUser.getLcUserid()); + if(StringUtils.isBlank(lcUserToken)){ + throw new RuntimeException("token已失效"); + } + //修改密码 + JSONObject pJson = new JSONObject(); + pJson.put("userId", appUser.getUserId()); + pJson.put("password", appUser.getPassword()); + String result=httpClientUtils.sendHttpPost(JG_RESET_PASSWORD_URL,lcUserToken,pJson.toJSONString()); + JSONObject respJson = JsonUtil.parsePortalResponse(result, "调用重置密码接口"); + JSONObject data = respJson.getJSONObject("data"); + System.out.println(data); + } + + @Override + public void changeLcCompanyStatus(AppUser appUser) { + String lcUserToken=redisCache.getCacheObject(CacheConstants.LC_HLW_TOKEN+appUser.getLcUserid()); + if(StringUtils.isBlank(lcUserToken)){ + throw new RuntimeException("token已失效"); + } + //启用禁用 + JSONObject pJson = new JSONObject(); + pJson.put("userId", appUser.getUserId()); + pJson.put("status", appUser.getStatus()); + String result=httpClientUtils.sendHttpPost(JG_UPDATE_COMPANY_URL,lcUserToken,pJson.toJSONString()); + JSONObject respJson = JsonUtil.parsePortalResponse(result, "调用停用和启用企业接口"); + JSONObject data = respJson.getJSONObject("data"); + System.out.println(data); + } + } diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/util/http/JsonUtil.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/util/http/JsonUtil.java new file mode 100644 index 0000000..536d448 --- /dev/null +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/util/http/JsonUtil.java @@ -0,0 +1,49 @@ +package com.ruoyi.cms.util.http; + +import cn.hutool.core.util.StrUtil; +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONObject; + +public class JsonUtil { + + /** + * 解析门户接口返回并统一校验 + * @param result 接口原始响应字符串 + * @param apiDesc 接口业务描述（如：修改用户邮箱、查询用户信息） + * @return 解析后的JSONObject + */ + public static JSONObject parsePortalResponse(String result, String apiDesc) { + // 空响应校验 + if (StrUtil.isBlank(result)) { + throw new RuntimeException(apiDesc + "接口调用无返回数据，请检查服务连通性"); + } + + // 2. JSON解析 + JSONObject respJson; + try { + respJson = JSON.parseObject(result); + System.out.println(apiDesc + "返回：" + respJson); + } catch (Exception e) { + throw new RuntimeException(apiDesc + "接口返回数据格式异常，原始返回：" + result, e); + } + + //拦截404/500等SpringBoot错误体 + if (respJson.containsKey("status") && respJson.containsKey("error")) { + Integer httpStatus = respJson.getInteger("status"); + String errorMsg = respJson.getString("error"); + String path = respJson.getString("path"); + String errTemplate = "%s接口访问失败，HTTP状态码：%s，错误：%s，请求路径：%s，请核对接口地址是否正确"; + throw new RuntimeException(String.format(errTemplate, apiDesc, httpStatus, errorMsg, path)); + } + + //校验业务code=200 + Integer code = respJson.getInteger("code"); + if (!Integer.valueOf(200).equals(code)) { + String msg = respJson.getString("msg"); + String tip = StrUtil.isNotBlank(msg) ? msg : "未知业务异常"; + throw new RuntimeException(apiDesc + "失败：" + tip); + } + + return respJson; + } +} diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/AppUser.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/AppUser.java index 5d75704..0027f62 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/AppUser.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/AppUser.java @@ -170,7 +170,7 @@ public class AppUser extends BaseEntity private String domicileAddress; @ApiModelProperty("浪潮userid") - private String lcUserid; + private Long lcUserid; /** 1-大龄人员;2-低保人员;3-残疾人员;4-失地农名或联队职工;5-防止返贫;6-未就业大中专毕业生;7-退役军人;8-长期失业人员;9-城镇零就业家庭成员；10.刑满释放人员 **/ @ApiModelProperty("用户类型，以逗号分隔") diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java index 47fc573..5152e0d 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java @@ -76,6 +76,11 @@ public class SysUser extends BaseEntity //appUserId private Long appUserId; + /** + * 浪潮用户lc_Userid + */ + private Long lcUserid; + //岗位名称组 private List jobTitles; @@ -341,6 +346,14 @@ public class SysUser extends BaseEntity this.experience = experience; } + public Long getLcUserid() { + return lcUserid; + } + + public void setLcUserid(Long lcUserid) { + this.lcUserid = lcUserid; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) @@ -367,6 +380,7 @@ public class SysUser extends BaseEntity .append("appUserId", getAppUserId()) .append("jobTitles", getJobTitles()) .append("experience", getExperience()) + .append("lcUserid", getLcUserid()) .toString(); } } diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java index 243ce40..64a39a7 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java @@ -2,8 +2,8 @@ package com.ruoyi.common.utils; import java.util.Collection; import java.util.List; -import java.util.Objects; import java.util.stream.Collectors; + import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; @@ -189,4 +189,33 @@ public class SecurityUtils .anyMatch(x -> Constants.SUPER_ADMIN.equals(x) || PatternMatchUtils.simpleMatch(x, role)); } + /** + * 获取浪潮用户ID + **/ + public static Long getlcUserid() + { + try + { + return getLoginUser().getUser().getLcUserid(); + } + catch (Exception e) + { + throw new ServiceException("获取用户ID异常", HttpStatus.UNAUTHORIZED); + } + } + + /** + * @return + */ + public static Long getAppuserId() + { + try + { + return getLoginUser().getUser().getAppUserId(); + } + catch (Exception e) + { + throw new ServiceException("获取用户ID异常", HttpStatus.UNAUTHORIZED); + } + } } diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/SiteSecurityUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/SiteSecurityUtils.java index 5ba0ce6..a9e5e72 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/SiteSecurityUtils.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/SiteSecurityUtils.java @@ -119,4 +119,20 @@ public class SiteSecurityUtils throw new ServiceException("获取用户信息异常", HttpStatus.UNAUTHORIZED); } } + + /** + * 获取lc_userid + * @return + */ + public static Long getlcUserid() + { + try + { + return getLoginSiteUser().getUser().getLcUserid(); + } + catch (Exception e) + { + throw new ServiceException("获取用户ID异常", HttpStatus.UNAUTHORIZED); + } + } } 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 12e88f3..e4b93ab 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 @@ -235,6 +235,7 @@ public class SsoService { if (ObjectUtils.isEmpty(userJson)) { throw new RuntimeException("获取用户信息失败"); } + Long lcUserid=userJson.getLong("userId"); //用身份证号查询用户 用户类型（01：个人，02：企业） // 转换成本地：app角色：0企业，1求职者，2网格员 3内部政府人员 4其他（浪潮用） //userType对应appuser的isCompanyUser @@ -274,7 +275,7 @@ public class SsoService { //用户存在，生成本系统用户的token String token = loginSysUser(sysUser, userJson.getString("userName")); //缓存浪潮互联网token - redisCache.setCacheObject(CacheConstants.LC_HLW_TOKEN+appUser.getUserId(),lcToken, 6, TimeUnit.HOURS); + redisCache.setCacheObject(CacheConstants.LC_HLW_TOKEN+lcUserid,lcToken, 6, TimeUnit.HOURS); JSONObject backJson = new JSONObject(); backJson.put("token", token); backJson.put("lcToken", lcToken); @@ -326,6 +327,7 @@ public class SsoService { throw new RuntimeException("获取用户信息失败"); } + Long lcUserid=userJson.getLong("userId"); //用身份证号查询用户 用户类型（01：个人，02：企业） // 转换成本地：app角色：0企业，1求职者，2网格员 3内部政府人员 4其他（浪潮用） //取角色判断是网格员2，还是内部工作者3 @@ -359,7 +361,7 @@ public class SsoService { //用户存在，生成本系统用户的token String token = loginSysUser(sysUser, userJson.getString("userName")); - redisCache.setCacheObject(CacheConstants.LC_HLW_TOKEN+appUserId,lcToken, 6, TimeUnit.HOURS); + redisCache.setCacheObject(CacheConstants.LC_HLW_TOKEN+lcUserid,lcToken, 6, TimeUnit.HOURS); JSONObject backJson = new JSONObject(); backJson.put("token", token); backJson.put("lcToken", lcToken); @@ -438,7 +440,8 @@ public class SsoService { //保存appuser用户 private AppUser saveAppUser(JSONObject userJson, String isCompanyUser, String appId, String appSecret) { JSONObject info = userJson.containsKey("info") ? userJson.getJSONObject("info") : null; - System.out.println("userId===========" + userJson.getLong("userId")); + Long lcUserid=userJson.getLong("userId"); + System.out.println("userId===========" + lcUserid); System.out.println("userJson===========" + JSONObject.toJSONString(userJson)); AppUser appUser = new AppUser(); //app角色：0企业，1求职者，2网格员 3内部政府人员 4其他（浪潮用） @@ -451,6 +454,7 @@ public class SsoService { appUser.setLoginDate(new Date()); appUser.setCreateBy("system"); appUser.setLoginIp(IpUtils.getIpAddr()); + appUser.setLcUserid(lcUserid); //获取身份证，再获取年龄 String personCardNo = null; @@ -511,11 +515,12 @@ public class SsoService { */ private SysUser saveSysUser(JSONObject userJson, Long appUserId, String isCompanyUser, String appId, String appSecret) { JSONObject info = userJson.containsKey("info") ? userJson.getJSONObject("info") : null; - System.out.println("sysuserId==========" + userJson.getLong("userId")); + Long lcUserid=userJson.getLong("userId"); + System.out.println("sysuserId==========" + lcUserid); System.out.println("userJson==========" + JSONObject.toJSONString(userJson)); SysUser sysUser = new SysUser(); sysUser.setAppUserId(appUserId); - sysUser.setUserId(userJson.getLong("userId")); + sysUser.setUserId(lcUserid); sysUser.setUserName(userJson.getString("userName")); sysUser.setNickName(userJson.getString("nickName")); sysUser.setEmail(userJson.getString("email")); @@ -528,6 +533,7 @@ public class SsoService { sysUser.setLoginDate(new Date()); sysUser.setCreateBy("system"); sysUser.setLoginIp(IpUtils.getIpAddr()); + sysUser.setLcUserid(lcUserid); //获取身份证 String personCardNo=""; diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml index e6b969b..0399b1d 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -25,6 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -51,7 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status, - r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status,u.id_card,u.app_user_id + r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status,u.id_card,u.app_user_id,u.lc_userid from sys_user u left join sys_dept d on u.dept_id = d.dept_id left join sys_user_role ur on u.user_id = ur.user_id @@ -172,6 +173,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" remark, id_card, app_user_id, + lc_userid, create_time )values( #{userId}, @@ -188,6 +190,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{remark}, #{idCard}, #{appUserId}, + #{lcUserid}, sysdate() ) @@ -209,6 +212,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_by = #{updateBy}, remark = #{remark}, id_card = #{idCard}, + lc_userid = #{lcUserid}, update_time = sysdate() where user_id = #{userId}