修复微信扫码登录签发不一致

This commit is contained in:
zjf committed 2026-06-24 21:14:01 +08:00
1 parent 30bad82955
commit 2c5ef59859
4 files changed
+30 -19

No files matched your search

@@ -31,6 +31,7 @@ import com.bsd.pjcloud.admin.api.vo.TokenVO;
import com.bsd.pjcloud.common.core.constant.CacheConstants;
import com.bsd.pjcloud.common.core.constant.CommonConstants;
import com.bsd.pjcloud.common.core.constant.SecurityConstants;
import com.bsd.pjcloud.common.core.constant.enums.UserTypeEnum;
import com.bsd.pjcloud.common.core.util.KeyStrResolver;
import com.bsd.pjcloud.common.core.util.R;
import com.bsd.pjcloud.common.core.util.RetOps;
@@ -115,11 +116,13 @@ public class PjcloudTokenEndpoint {
.build();
SysUser sysUser = userTokenDTO.getSysUser();
// 构建用户信息 , 这里只拼接了 UserTokenDTO 中的 username 和 authorities ,其他字段写死,可以自行场地;
PjcloudUser pigUser = new PjcloudUser(sysUser.getUserId(),sysUser.getUsername(),sysUser.getDeptId(),sysUser.getPhone()
,sysUser.getAvatar(),sysUser.getNickname(),sysUser.getName(), sysUser.getEmail(), sysUser.getTenantId()
, sysUser.getPassword(), true, true,"1", true,false, userTokenDTO.getAuthorities()
.stream().map(SimpleGrantedAuthority::new).collect(Collectors.toList()));
PjcloudUser pigUser = new PjcloudUser(sysUser.getUserId(), sysUser.getUsername(), sysUser.getDeptId(), sysUser.getPhone(),
sysUser.getAvatar(), sysUser.getNickname(), sysUser.getName(), sysUser.getEmail(), sysUser.getTenantId(),
sysUser.getPassword(), true, true, UserTypeEnum.TOB.getStatus(),
!CommonConstants.STATUS_LOCK.equals(sysUser.getPasswordExpireFlag()),
!CommonConstants.STATUS_LOCK.equals(sysUser.getLockFlag()),
userTokenDTO.getAuthorities()
.stream().map(SimpleGrantedAuthority::new).collect(Collectors.toList()));
Authentication usernamePasswordAuthentication = new UsernamePasswordAuthenticationToken(pigUser, StrUtil.EMPTY);