b2894lxlx/tms-erp-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

🐛 修复小程序令牌严格校验 401，并开放调度端打卡接口

Browse Source 
Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
b2894lxlx
2026-10-12 14:47:17 +08:00
parent c3edca04a5
commit ea1829cd75
4 changed files with 41 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
blade-auth/src/main/java/org/springblade/auth/endpoint/OAuth2UserInfoResponseAdvice.java
+2 -13
View File
@@ -30,11 +30,11 @@ import lombok.extern.slf4j.Slf4j;
import org.springblade.core.oauth2.endpoint.OAuth2TokenEndPoint;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.support.Kv;
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.system.feign.ISysClient;
import org.springblade.system.pojo.enums.MpUserIdentity;
import org.springblade.system.utils.MpUserAuth;
import org.springframework.core.MethodParameter;
import org.springframework.http.MediaType;
import org.springframework.http.converter.HttpMessageConverter;
@@ -74,7 +74,7 @@ public class OAuth2UserInfoResponseAdvice implements ResponseBodyAdvice<Object>
if (userInfo == null) {
return body;
}
if (isMpUser(bladeUser)) {
if (MpUserAuth.isMpUser(bladeUser)) {
// 小程序用户：按身份直接生成权限，不走系统角色菜单
userInfo.setPermission(MpUserIdentity.toPermissions(bladeUser.getRoleName()));
} else {
@@ -83,17 +83,6 @@ public class OAuth2UserInfoResponseAdvice implements ResponseBodyAdvice<Object>
return userInfo;
}
private boolean isMpUser(BladeUser bladeUser) {
Kv detail = bladeUser.getDetail();
if (detail != null && MpUserIdentity.DETAIL_TYPE.equalsIgnoreCase(Func.toStr(detail.get("type")))) {
return true;
}
// 兼容：无系统角色且 roleName 为小程序身份
return Func.isBlank(bladeUser.getRoleId())
&& Func.isNotBlank(bladeUser.getRoleName())
&& !MpUserIdentity.split(bladeUser.getRoleName()).isEmpty();
}
private List<String> loadPermission(String roleId) {
if (Func.isBlank(roleId)) {
return Collections.emptyList();
blade-auth/src/main/java/org/springblade/auth/utils/TokenUtil.java
+8 -4
View File
@@ -36,6 +36,7 @@ import org.springblade.system.pojo.entity.MpUserInfo;
import org.springblade.system.pojo.entity.User;
import org.springblade.system.pojo.entity.UserInfo;
import org.springblade.system.pojo.enums.MpUserIdentity;
import org.springblade.system.utils.MpUserAuth;
/**
* 认证工具类
@@ -107,10 +108,13 @@ public class TokenUtil {
userDetail.setAccount(user.getAccount());
userDetail.setPassword(user.getPassword());
userDetail.setPhone(user.getPhone());
userDetail.setDeptId(user.getDeptId());
userDetail.setPostId(user.getPostId());
// 小程序用户不绑定系统角色，roleId 留空；身份放入 roleName/authorities
userDetail.setRoleId("");
// 严格令牌模式要求 deptId/roleId 非空且 >=0；小程序用户用占位值，身份写在 roleName/authorities
userDetail.setDeptId(Func.toStr(user.getDeptId(), MpUserAuth.PLACEHOLDER_ID));
if (Func.isBlank(userDetail.getDeptId()) || "-1".equals(userDetail.getDeptId())) {
userDetail.setDeptId(MpUserAuth.PLACEHOLDER_ID);
}
userDetail.setPostId(Func.toStr(user.getPostId(), MpUserAuth.PLACEHOLDER_ID));
userDetail.setRoleId(MpUserAuth.PLACEHOLDER_ID);
userDetail.setRoleName(Func.join(userInfo.getIdentities()));
userDetail.setAvatar(user.getAvatar());
userDetail.setAuthorities(userInfo.getIdentities());