pay/dax-pay
1
0
Fork 0
mirror of https://gitee.com/dromara/dax-pay synced 2026-08-09 22:45:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(i18n): IAM 角色分配错误码改为 camelCase messageKey

Browse Source 
统一 assignOutOfScope/notExist 等 key，跨终端分配改为可参数化 i18n 消息。
This commit is contained in:
DaxPay Dev
2026-07-14 12:52:13 +08:00
parent db58674ab7
commit af33bee339
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
daxpay-platform/daxpay-platform-service/service-iam/src/main/java/cn/daxpay/open/platform/iam/service/upms/UserRoleService.java
View File

@@ -47,7 +47,7 @@ public class UserRoleService {
List<Long> roleIdsByUser = this.findRoleIdsByUser();
if (!roleIdsByUser.contains(roleId)){
// 权限: 角色分配超出了可分配的范围
throw new ValidationFailedException("error.iam.role.assign_out_of_scope");
throw new ValidationFailedException("error.iam.role.assignOutOfScope");
}
}
@@ -86,7 +86,7 @@ public class UserRoleService {
public List<RoleResult> findAssignableRolesByUser(Long userId) {
UserInfo userInfo = userInfoManager.findById(userId)
// 权限: 用户不存在
.orElseThrow(() -> new DataNotExistException("error.iam.user.not_exist"));
.orElseThrow(() -> new DataNotExistException("error.iam.user.notExist"));
return MpUtil.toListResult(roleManager.findAllByClientCode(userInfo.getClientCode()));
}
@@ -94,14 +94,15 @@ public class UserRoleService {
private void validateUserRoleTerminalConsistency(Long userId, Long roleId) {
UserInfo userInfo = userInfoManager.findById(userId)
// 权限: 用户不存在
.orElseThrow(() -> new DataNotExistException("error.iam.user.not_exist"));
.orElseThrow(() -> new DataNotExistException("error.iam.user.notExist"));
String userClientCode = userInfo.getClientCode();
Role role = roleManager.findById(roleId)
// 权限: 角色不存在
.orElseThrow(() -> new DataNotExistException("error.iam.role.not_exist"));
.orElseThrow(() -> new DataNotExistException("error.iam.role.notExist"));
if (!Objects.equals(userClientCode, role.getClientCode())) {
// 权限: 禁止跨终端分配角色
throw new ValidationFailedException(
"禁止为用户分配跨终端角色：用户归属终端[" + userClientCode + "]，角色归属终端[" + role.getClientCode() + "]");
"error.iam.role.assignCrossClient", userClientCode, role.getClientCode());
}
}