diff --git a/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java b/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java index ee8993f9c..300db923e 100644 --- a/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java +++ b/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java @@ -46,11 +46,16 @@ public class TokenController String token = SecurityUtils.getToken(request); if (StringUtils.isNotEmpty(token)) { - String username = JwtUtils.getUserName(token); - // 删除用户缓存记录 - AuthUtil.logoutByToken(token); - // 记录用户退出日志 - sysLoginService.logout(username); + try{ + String username = JwtUtils.getUserName(token); + // 删除用户缓存记录 + AuthUtil.logoutByToken(token); + // 记录用户退出日志 + sysLoginService.logout(username); + }catch (Exception e){ + System.out.println(e.getMessage()); + return R.ok(); + } } return R.ok(); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SyncGoUser.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SyncGoUser.java index d7c406e17..0e9b1d678 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SyncGoUser.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SyncGoUser.java @@ -12,4 +12,6 @@ public class SyncGoUser { private String remark; private String avatar; private Integer status; + private String openId; + private String unionId; } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java index 673a056ae..54d3a88b2 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java @@ -7,6 +7,7 @@ import java.util.stream.Collectors; import javax.validation.Validator; import cn.hutool.system.UserInfo; +import com.alibaba.fastjson.JSON; import com.github.pagehelper.Page; import com.ruoyi.system.api.domain.KSysUserAccount; import com.ruoyi.system.domain.SyncGoUser; @@ -411,7 +412,11 @@ public class SysUserServiceImpl implements ISysUserService syncGoUser.setLastIp(user.getLoginIp()); syncGoUser.setRemark(user.getRemark()); syncGoUser.setAvatar(user.getAvatar()); - syncGoUser.setStatus(Objects.equals(user.getStatus(), "正常") ?0:1); + syncGoUser.setStatus(Objects.equals(user.getStatus(), "1") ?1:0); + if (user.getSysUserAccount() != null) { + syncGoUser.setUnionId(user.getSysUserAccount().getWxUnionId()); + syncGoUser.setOpenId(user.getSysUserAccount().getRoutineOpenid()); + } ResponseEntity response = restTemplate.postForEntity(url, syncGoUser, String.class); // 检查响应状态码 if (response.getStatusCode().is2xxSuccessful()) {