v1.0.3
CI / build-deploy (pull_request) Failing after 2m52s
CI / notify-on-failure (pull_request) Successful in 0s

This commit is contained in:
Timi
2026-08-01 01:13:08 +08:00
parent ce22661a9b
commit 15bf9bd688
31 changed files with 131 additions and 145 deletions
@@ -53,7 +53,7 @@ public class PermissionCheckerImplement implements PermissionChecker {
public void checkAll(ModuleCode moduleCode, String... permissionCodeList) {
if (!hasAll(moduleCode, permissionCodeList)) {
String codeList = buildPermissionKeys(moduleCode, permissionCodeList).toString();
throw new TimiException(TimiCode.PERMISSION_ERROR).msgKey("权限不足:%s".formatted(codeList));
throw new TimiException(TimiCode.PERMISSION_ERROR, "权限不足:%s".formatted(codeList));
}
}
@@ -61,7 +61,7 @@ public class PermissionCheckerImplement implements PermissionChecker {
public void checkAny(ModuleCode moduleCode, String... permissionCodeList) {
if (!hasAny(moduleCode, permissionCodeList)) {
String codeList = buildPermissionKeys(moduleCode, permissionCodeList).toString();
throw new TimiException(TimiCode.PERMISSION_ERROR).msgKey("权限不足:%s".formatted(codeList));
throw new TimiException(TimiCode.PERMISSION_ERROR, "权限不足:%s".formatted(codeList));
}
}
@@ -8,8 +8,8 @@ import com.imyeyu.api.modules.user.mapper.PermissionMapper;
import com.imyeyu.api.modules.user.mapper.RolePermissionMapper;
import com.imyeyu.api.modules.user.service.PermissionService;
import com.imyeyu.api.modules.user.vo.permission.BatchCreateReq;
import com.imyeyu.api.util.RedisMultilingual;
import com.imyeyu.java.TimiJava;
import com.imyeyu.lang.message.MessageResolver;
import com.imyeyu.spring.TimiSpring;
import com.imyeyu.spring.mapper.BaseMapper;
import com.imyeyu.spring.service.AbstractEntityService;
@@ -35,7 +35,7 @@ public class PermissionServiceImplement extends AbstractEntityService<Permission
private final MultilingualMapper multilingualMapper;
private final MultilingualService multilingualService;
private final RedisMultilingual multilingual;
private final MessageResolver messageResolver;
@Override
protected BaseMapper<Permission, String> mapper() {
@@ -61,7 +61,7 @@ public class PermissionServiceImplement extends AbstractEntityService<Permission
permission.setId(UUID.randomUUID().toString());
permission.setModuleCode(req.getModuleCode());
permission.setCode(req.getPrefixCode() + "_" + type.name());
permission.setName(req.getPrefixName() + multilingual.map(TimiSpring.getLanguage()).text(type.name().toLowerCase()));
permission.setName(req.getPrefixName() + messageResolver.resolve(type.name().toLowerCase(), null, TimiSpring.getLanguage()));
permission.setCreatedAt(Time.now());
permissionList.add(permission);
}
@@ -47,14 +47,14 @@ public class RoleCheckerImplement implements RoleChecker {
@Override
public void checkAll(ModuleCode moduleCode, String... roleCodeList) {
if (!hasAll(moduleCode, roleCodeList)) {
throw new TimiException(TimiCode.PERMISSION_ERROR).msgKey("require role: %s".formatted(buildRoleKeys(moduleCode, roleCodeList)));
throw new TimiException(TimiCode.PERMISSION_ERROR, "require role: %s".formatted(buildRoleKeys(moduleCode, roleCodeList)));
}
}
@Override
public void checkAny(ModuleCode moduleCode, String... roleCodeList) {
if (!hasAny(moduleCode, roleCodeList)) {
throw new TimiException(TimiCode.PERMISSION_ERROR).msgKey("require role: %s".formatted(buildRoleKeys(moduleCode, roleCodeList)));
throw new TimiException(TimiCode.PERMISSION_ERROR, "require role: %s".formatted(buildRoleKeys(moduleCode, roleCodeList)));
}
}
@@ -159,7 +159,7 @@ public class RoleServiceImplement extends AbstractEntityService<Role, String> im
TimiException.required(req, "not found req");
TimiException.required(req.getUserId(), "not found req.userId");
if (req.getModuleCode() == null) {
throw new TimiException(TimiCode.ARG_MISS).msgKey("moduleCode");
throw new TimiException(TimiCode.ARG_MISS, "moduleCode");
}
List<UserRole> bindingList = userRoleService.listByUserId(req.getUserId());
List<String> bindingRoleIdList = bindingList.stream().map(UserRole::getRoleId).toList();