diff --git a/backend/java/sk-matrix-service/.idea/compiler.xml b/backend/java/sk-matrix-service/.idea/compiler.xml index 509a652..4fbcc19 100644 --- a/backend/java/sk-matrix-service/.idea/compiler.xml +++ b/backend/java/sk-matrix-service/.idea/compiler.xml @@ -24,8 +24,8 @@ - + diff --git a/backend/java/sk-matrix-service/api/pom.xml b/backend/java/sk-matrix-service/api/pom.xml index 5d3f9bd..971150b 100644 --- a/backend/java/sk-matrix-service/api/pom.xml +++ b/backend/java/sk-matrix-service/api/pom.xml @@ -24,6 +24,12 @@ ${project.version} + + cn.skcks.matrix.v2 + model + ${project.version} + + cn.skcks.matrix.v2 auth diff --git a/backend/java/sk-matrix-service/api/src/main/java/cn/skcks/matrix/v2/api/role/RoleController.java b/backend/java/sk-matrix-service/api/src/main/java/cn/skcks/matrix/v2/api/role/RoleController.java index 0dc15ca..680adc4 100644 --- a/backend/java/sk-matrix-service/api/src/main/java/cn/skcks/matrix/v2/api/role/RoleController.java +++ b/backend/java/sk-matrix-service/api/src/main/java/cn/skcks/matrix/v2/api/role/RoleController.java @@ -10,7 +10,7 @@ import cn.skcks.matrix.v2.config.swagger.SwaggerConfig; import cn.skcks.matrix.v2.model.role.convert.RoleConvertor; import cn.skcks.matrix.v2.model.role.dto.*; import cn.skcks.matrix.v2.model.role.vo.RoleVo; -import cn.skcks.matrix.v2.model.service.ServiceResult; +import cn.skcks.matrix.v2.model.services.ServiceResult; import cn.skcks.matrix.v2.model.user.convert.UserConvertor; import cn.skcks.matrix.v2.model.user.vo.UserVo; import cn.skcks.matrix.v2.orm.mybatis.dynamic.model.Role; diff --git a/backend/java/sk-matrix-service/casbin/pom.xml b/backend/java/sk-matrix-service/casbin/pom.xml index 0027e9e..492e039 100644 --- a/backend/java/sk-matrix-service/casbin/pom.xml +++ b/backend/java/sk-matrix-service/casbin/pom.xml @@ -38,7 +38,6 @@ 1.31.4 - org.casbin jdbc-adapter diff --git a/backend/java/sk-matrix-service/model/pom.xml b/backend/java/sk-matrix-service/model/pom.xml index 8725555..569438c 100644 --- a/backend/java/sk-matrix-service/model/pom.xml +++ b/backend/java/sk-matrix-service/model/pom.xml @@ -51,6 +51,11 @@ spring-boot-starter-validation + + org.springdoc + springdoc-openapi-starter-webmvc-ui + + org.springframework.boot spring-boot-starter-test diff --git a/backend/java/sk-matrix-service/model/src/main/java/cn/skcks/matrix/v2/Main.java b/backend/java/sk-matrix-service/model/src/main/java/cn/skcks/matrix/v2/Main.java deleted file mode 100644 index 28c017b..0000000 --- a/backend/java/sk-matrix-service/model/src/main/java/cn/skcks/matrix/v2/Main.java +++ /dev/null @@ -1,7 +0,0 @@ -package cn.skcks.matrix.v2; - -public class Main { - public static void main(String[] args) { - System.out.println("Hello world!"); - } -} diff --git a/backend/java/sk-matrix-service/services/src/main/java/cn/skcks/matrix/v2/model/auth/dto/UserLoginDto.java b/backend/java/sk-matrix-service/model/src/main/java/cn/skcks/matrix/v2/model/auth/dto/UserLoginDto.java similarity index 100% rename from backend/java/sk-matrix-service/services/src/main/java/cn/skcks/matrix/v2/model/auth/dto/UserLoginDto.java rename to backend/java/sk-matrix-service/model/src/main/java/cn/skcks/matrix/v2/model/auth/dto/UserLoginDto.java diff --git a/backend/java/sk-matrix-service/services/src/main/java/cn/skcks/matrix/v2/model/auth/dto/UserRegisterDto.java b/backend/java/sk-matrix-service/model/src/main/java/cn/skcks/matrix/v2/model/auth/dto/UserRegisterDto.java similarity index 100% rename from backend/java/sk-matrix-service/services/src/main/java/cn/skcks/matrix/v2/model/auth/dto/UserRegisterDto.java rename to backend/java/sk-matrix-service/model/src/main/java/cn/skcks/matrix/v2/model/auth/dto/UserRegisterDto.java diff --git a/backend/java/sk-matrix-service/services/src/main/java/cn/skcks/matrix/v2/model/auth/vo/UserLoginVo.java b/backend/java/sk-matrix-service/model/src/main/java/cn/skcks/matrix/v2/model/auth/vo/UserLoginVo.java similarity index 100% rename from backend/java/sk-matrix-service/services/src/main/java/cn/skcks/matrix/v2/model/auth/vo/UserLoginVo.java rename to backend/java/sk-matrix-service/model/src/main/java/cn/skcks/matrix/v2/model/auth/vo/UserLoginVo.java diff --git a/backend/java/sk-matrix-service/services/src/main/java/cn/skcks/matrix/v2/model/auth/vo/UserRegisterVo.java b/backend/java/sk-matrix-service/model/src/main/java/cn/skcks/matrix/v2/model/auth/vo/UserRegisterVo.java similarity index 100% rename from backend/java/sk-matrix-service/services/src/main/java/cn/skcks/matrix/v2/model/auth/vo/UserRegisterVo.java rename to backend/java/sk-matrix-service/model/src/main/java/cn/skcks/matrix/v2/model/auth/vo/UserRegisterVo.java diff --git a/backend/java/sk-matrix-service/model/src/main/java/cn/skcks/matrix/v2/model/casbin/CasbinConstant.java b/backend/java/sk-matrix-service/model/src/main/java/cn/skcks/matrix/v2/model/casbin/CasbinConstant.java new file mode 100644 index 0000000..2b7fef9 --- /dev/null +++ b/backend/java/sk-matrix-service/model/src/main/java/cn/skcks/matrix/v2/model/casbin/CasbinConstant.java @@ -0,0 +1,17 @@ +package cn.skcks.matrix.v2.model.casbin; + +import lombok.experimental.UtilityClass; + +public class CasbinConstant { + + public static final String SEPARATOR = "::"; + public static final String USER = "USER"; + public static final String USER_PREFIX = USER + SEPARATOR; + public static final String ROLE = "ROLE"; + public static final String ROLE_PREFIX = ROLE + SEPARATOR; + public static final String DEFAULT_SYSTEM = "WEB"; + + public static final String SUPER_PERMISSION = "root"; + public static final String SUPER_PERMISSION_NAME = "超级管理员"; + public static final String SUPER_ROLE = ROLE_PREFIX + SUPER_PERMISSION; +} diff --git a/backend/java/sk-matrix-service/services/src/main/java/cn/skcks/matrix/v2/model/jwt/convert/ClaimConvertor.java b/backend/java/sk-matrix-service/model/src/main/java/cn/skcks/matrix/v2/model/jwt/convert/ClaimConvertor.java similarity index 100% rename from backend/java/sk-matrix-service/services/src/main/java/cn/skcks/matrix/v2/model/jwt/convert/ClaimConvertor.java rename to backend/java/sk-matrix-service/model/src/main/java/cn/skcks/matrix/v2/model/jwt/convert/ClaimConvertor.java diff --git a/backend/java/sk-matrix-service/services/src/main/java/cn/skcks/matrix/v2/model/jwt/dto/Claims.java b/backend/java/sk-matrix-service/model/src/main/java/cn/skcks/matrix/v2/model/jwt/dto/Claims.java similarity index 100% rename from backend/java/sk-matrix-service/services/src/main/java/cn/skcks/matrix/v2/model/jwt/dto/Claims.java rename to backend/java/sk-matrix-service/model/src/main/java/cn/skcks/matrix/v2/model/jwt/dto/Claims.java diff --git a/backend/java/sk-matrix-service/api/src/main/java/cn/skcks/matrix/v2/model/role/convert/RoleConvertor.java b/backend/java/sk-matrix-service/model/src/main/java/cn/skcks/matrix/v2/model/role/convert/RoleConvertor.java similarity index 100% rename from backend/java/sk-matrix-service/api/src/main/java/cn/skcks/matrix/v2/model/role/convert/RoleConvertor.java rename to backend/java/sk-matrix-service/model/src/main/java/cn/skcks/matrix/v2/model/role/convert/RoleConvertor.java diff --git a/backend/java/sk-matrix-service/api/src/main/java/cn/skcks/matrix/v2/model/role/dto/AddRoleParams.java b/backend/java/sk-matrix-service/model/src/main/java/cn/skcks/matrix/v2/model/role/dto/AddRoleParams.java similarity index 80% rename from backend/java/sk-matrix-service/api/src/main/java/cn/skcks/matrix/v2/model/role/dto/AddRoleParams.java rename to backend/java/sk-matrix-service/model/src/main/java/cn/skcks/matrix/v2/model/role/dto/AddRoleParams.java index 0dd564a..1b841dc 100644 --- a/backend/java/sk-matrix-service/api/src/main/java/cn/skcks/matrix/v2/model/role/dto/AddRoleParams.java +++ b/backend/java/sk-matrix-service/model/src/main/java/cn/skcks/matrix/v2/model/role/dto/AddRoleParams.java @@ -1,6 +1,5 @@ package cn.skcks.matrix.v2.model.role.dto; -import cn.skcks.matrix.v2.services.role.RoleRoutePermission; import lombok.Data; import java.util.List; diff --git a/backend/java/sk-matrix-service/api/src/main/java/cn/skcks/matrix/v2/model/role/dto/DelRoleParams.java b/backend/java/sk-matrix-service/model/src/main/java/cn/skcks/matrix/v2/model/role/dto/DelRoleParams.java similarity index 100% rename from backend/java/sk-matrix-service/api/src/main/java/cn/skcks/matrix/v2/model/role/dto/DelRoleParams.java rename to backend/java/sk-matrix-service/model/src/main/java/cn/skcks/matrix/v2/model/role/dto/DelRoleParams.java diff --git a/backend/java/sk-matrix-service/api/src/main/java/cn/skcks/matrix/v2/model/role/dto/GetRoleParams.java b/backend/java/sk-matrix-service/model/src/main/java/cn/skcks/matrix/v2/model/role/dto/GetRoleParams.java similarity index 100% rename from backend/java/sk-matrix-service/api/src/main/java/cn/skcks/matrix/v2/model/role/dto/GetRoleParams.java rename to backend/java/sk-matrix-service/model/src/main/java/cn/skcks/matrix/v2/model/role/dto/GetRoleParams.java diff --git a/backend/java/sk-matrix-service/api/src/main/java/cn/skcks/matrix/v2/model/role/dto/GetRoleUsers.java b/backend/java/sk-matrix-service/model/src/main/java/cn/skcks/matrix/v2/model/role/dto/GetRoleUsers.java similarity index 75% rename from backend/java/sk-matrix-service/api/src/main/java/cn/skcks/matrix/v2/model/role/dto/GetRoleUsers.java rename to backend/java/sk-matrix-service/model/src/main/java/cn/skcks/matrix/v2/model/role/dto/GetRoleUsers.java index ec3f956..00f9044 100644 --- a/backend/java/sk-matrix-service/api/src/main/java/cn/skcks/matrix/v2/model/role/dto/GetRoleUsers.java +++ b/backend/java/sk-matrix-service/model/src/main/java/cn/skcks/matrix/v2/model/role/dto/GetRoleUsers.java @@ -1,6 +1,6 @@ package cn.skcks.matrix.v2.model.role.dto; -import cn.skcks.matrix.v2.services.casbin.CasbinService; +import cn.skcks.matrix.v2.model.casbin.CasbinConstant; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; import lombok.Data; @@ -13,6 +13,6 @@ public class GetRoleUsers { private String role; @NotBlank(message = "系统 不能为空") - @Schema(description = "系统", defaultValue = CasbinService.DEFAULT_SYSTEM) + @Schema(description = "系统", defaultValue = CasbinConstant.DEFAULT_SYSTEM) private String system; } diff --git a/backend/java/sk-matrix-service/api/src/main/java/cn/skcks/matrix/v2/model/role/dto/GetUserPermissions.java b/backend/java/sk-matrix-service/model/src/main/java/cn/skcks/matrix/v2/model/role/dto/GetUserPermissions.java similarity index 80% rename from backend/java/sk-matrix-service/api/src/main/java/cn/skcks/matrix/v2/model/role/dto/GetUserPermissions.java rename to backend/java/sk-matrix-service/model/src/main/java/cn/skcks/matrix/v2/model/role/dto/GetUserPermissions.java index fcd6654..70ed324 100644 --- a/backend/java/sk-matrix-service/api/src/main/java/cn/skcks/matrix/v2/model/role/dto/GetUserPermissions.java +++ b/backend/java/sk-matrix-service/model/src/main/java/cn/skcks/matrix/v2/model/role/dto/GetUserPermissions.java @@ -1,6 +1,6 @@ package cn.skcks.matrix.v2.model.role.dto; -import cn.skcks.matrix.v2.services.casbin.CasbinService; +import cn.skcks.matrix.v2.model.casbin.CasbinConstant; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.Pattern; @@ -15,7 +15,7 @@ public class GetUserPermissions { private String userId; @NotBlank(message = "系统 不能为空") - @Schema(description = "系统", defaultValue = CasbinService.DEFAULT_SYSTEM) + @Schema(description = "系统", defaultValue = CasbinConstant.DEFAULT_SYSTEM) private String system; } diff --git a/backend/java/sk-matrix-service/api/src/main/java/cn/skcks/matrix/v2/model/role/dto/GetUserRoles.java b/backend/java/sk-matrix-service/model/src/main/java/cn/skcks/matrix/v2/model/role/dto/GetUserRoles.java similarity index 79% rename from backend/java/sk-matrix-service/api/src/main/java/cn/skcks/matrix/v2/model/role/dto/GetUserRoles.java rename to backend/java/sk-matrix-service/model/src/main/java/cn/skcks/matrix/v2/model/role/dto/GetUserRoles.java index c76c868..1babc0b 100644 --- a/backend/java/sk-matrix-service/api/src/main/java/cn/skcks/matrix/v2/model/role/dto/GetUserRoles.java +++ b/backend/java/sk-matrix-service/model/src/main/java/cn/skcks/matrix/v2/model/role/dto/GetUserRoles.java @@ -1,6 +1,6 @@ package cn.skcks.matrix.v2.model.role.dto; -import cn.skcks.matrix.v2.services.casbin.CasbinService; +import cn.skcks.matrix.v2.model.casbin.CasbinConstant; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.Pattern; @@ -15,6 +15,6 @@ public class GetUserRoles { private String userId; @NotBlank(message = "系统 不能为空") - @Schema(description = "系统", defaultValue = CasbinService.DEFAULT_SYSTEM) + @Schema(description = "系统", defaultValue = CasbinConstant.DEFAULT_SYSTEM) private String system; } diff --git a/backend/java/sk-matrix-service/api/src/main/java/cn/skcks/matrix/v2/model/role/dto/GrantAndRevokeRoleForUserDto.java b/backend/java/sk-matrix-service/model/src/main/java/cn/skcks/matrix/v2/model/role/dto/GrantAndRevokeRoleForUserDto.java similarity index 82% rename from backend/java/sk-matrix-service/api/src/main/java/cn/skcks/matrix/v2/model/role/dto/GrantAndRevokeRoleForUserDto.java rename to backend/java/sk-matrix-service/model/src/main/java/cn/skcks/matrix/v2/model/role/dto/GrantAndRevokeRoleForUserDto.java index 73fa908..4fed4ca 100644 --- a/backend/java/sk-matrix-service/api/src/main/java/cn/skcks/matrix/v2/model/role/dto/GrantAndRevokeRoleForUserDto.java +++ b/backend/java/sk-matrix-service/model/src/main/java/cn/skcks/matrix/v2/model/role/dto/GrantAndRevokeRoleForUserDto.java @@ -1,6 +1,6 @@ package cn.skcks.matrix.v2.model.role.dto; -import cn.skcks.matrix.v2.services.casbin.CasbinService; +import cn.skcks.matrix.v2.model.casbin.CasbinConstant; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.Pattern; @@ -19,6 +19,6 @@ public class GrantAndRevokeRoleForUserDto { private String role; @NotBlank(message = "系统 不能为空") - @Schema(description = "系统", defaultValue = CasbinService.DEFAULT_SYSTEM) + @Schema(description = "系统", defaultValue = CasbinConstant.DEFAULT_SYSTEM) private String system; } diff --git a/backend/java/sk-matrix-service/services/src/main/java/cn/skcks/matrix/v2/services/role/RoleRoutePermission.java b/backend/java/sk-matrix-service/model/src/main/java/cn/skcks/matrix/v2/model/role/dto/RoleRoutePermission.java similarity index 72% rename from backend/java/sk-matrix-service/services/src/main/java/cn/skcks/matrix/v2/services/role/RoleRoutePermission.java rename to backend/java/sk-matrix-service/model/src/main/java/cn/skcks/matrix/v2/model/role/dto/RoleRoutePermission.java index 0388cff..8a5dbee 100644 --- a/backend/java/sk-matrix-service/services/src/main/java/cn/skcks/matrix/v2/services/role/RoleRoutePermission.java +++ b/backend/java/sk-matrix-service/model/src/main/java/cn/skcks/matrix/v2/model/role/dto/RoleRoutePermission.java @@ -1,4 +1,4 @@ -package cn.skcks.matrix.v2.services.role; +package cn.skcks.matrix.v2.model.role.dto; import lombok.Data; diff --git a/backend/java/sk-matrix-service/api/src/main/java/cn/skcks/matrix/v2/model/role/vo/RoleVo.java b/backend/java/sk-matrix-service/model/src/main/java/cn/skcks/matrix/v2/model/role/vo/RoleVo.java similarity index 100% rename from backend/java/sk-matrix-service/api/src/main/java/cn/skcks/matrix/v2/model/role/vo/RoleVo.java rename to backend/java/sk-matrix-service/model/src/main/java/cn/skcks/matrix/v2/model/role/vo/RoleVo.java diff --git a/backend/java/sk-matrix-service/services/src/main/java/cn/skcks/matrix/v2/model/route/dto/RouteInfo.java b/backend/java/sk-matrix-service/model/src/main/java/cn/skcks/matrix/v2/model/route/dto/RouteInfo.java similarity index 100% rename from backend/java/sk-matrix-service/services/src/main/java/cn/skcks/matrix/v2/model/route/dto/RouteInfo.java rename to backend/java/sk-matrix-service/model/src/main/java/cn/skcks/matrix/v2/model/route/dto/RouteInfo.java diff --git a/backend/java/sk-matrix-service/services/src/main/java/cn/skcks/matrix/v2/model/service/ServiceResult.java b/backend/java/sk-matrix-service/model/src/main/java/cn/skcks/matrix/v2/model/services/ServiceResult.java similarity index 95% rename from backend/java/sk-matrix-service/services/src/main/java/cn/skcks/matrix/v2/model/service/ServiceResult.java rename to backend/java/sk-matrix-service/model/src/main/java/cn/skcks/matrix/v2/model/services/ServiceResult.java index a4e07b8..38b67f2 100644 --- a/backend/java/sk-matrix-service/services/src/main/java/cn/skcks/matrix/v2/model/service/ServiceResult.java +++ b/backend/java/sk-matrix-service/model/src/main/java/cn/skcks/matrix/v2/model/services/ServiceResult.java @@ -1,4 +1,4 @@ -package cn.skcks.matrix.v2.model.service; +package cn.skcks.matrix.v2.model.services; import cn.skcks.matrix.v2.utils.json.JsonResponse; import lombok.AllArgsConstructor; diff --git a/backend/java/sk-matrix-service/api/src/main/java/cn/skcks/matrix/v2/model/user/convert/UserConvertor.java b/backend/java/sk-matrix-service/model/src/main/java/cn/skcks/matrix/v2/model/user/convert/UserConvertor.java similarity index 100% rename from backend/java/sk-matrix-service/api/src/main/java/cn/skcks/matrix/v2/model/user/convert/UserConvertor.java rename to backend/java/sk-matrix-service/model/src/main/java/cn/skcks/matrix/v2/model/user/convert/UserConvertor.java diff --git a/backend/java/sk-matrix-service/api/src/main/java/cn/skcks/matrix/v2/model/user/vo/UserVo.java b/backend/java/sk-matrix-service/model/src/main/java/cn/skcks/matrix/v2/model/user/vo/UserVo.java similarity index 100% rename from backend/java/sk-matrix-service/api/src/main/java/cn/skcks/matrix/v2/model/user/vo/UserVo.java rename to backend/java/sk-matrix-service/model/src/main/java/cn/skcks/matrix/v2/model/user/vo/UserVo.java diff --git a/backend/java/sk-matrix-service/services/pom.xml b/backend/java/sk-matrix-service/services/pom.xml index 5d4e99b..8a25057 100644 --- a/backend/java/sk-matrix-service/services/pom.xml +++ b/backend/java/sk-matrix-service/services/pom.xml @@ -30,6 +30,12 @@ ${project.version} + + cn.skcks.matrix.v2 + model + ${project.version} + + cn.skcks.matrix.v2 auth diff --git a/backend/java/sk-matrix-service/services/src/main/java/cn/skcks/matrix/v2/services/casbin/CasbinService.java b/backend/java/sk-matrix-service/services/src/main/java/cn/skcks/matrix/v2/services/casbin/CasbinService.java index a5eb95a..9b096bb 100644 --- a/backend/java/sk-matrix-service/services/src/main/java/cn/skcks/matrix/v2/services/casbin/CasbinService.java +++ b/backend/java/sk-matrix-service/services/src/main/java/cn/skcks/matrix/v2/services/casbin/CasbinService.java @@ -1,21 +1,22 @@ package cn.skcks.matrix.v2.services.casbin; +import cn.skcks.matrix.v2.model.casbin.CasbinConstant; import org.springframework.stereotype.Service; import java.util.List; @Service public interface CasbinService { - String SEPARATOR = "::"; - String USER = "USER"; - String USER_PREFIX = USER + SEPARATOR; - String ROLE = "ROLE"; - String ROLE_PREFIX = ROLE + SEPARATOR; - String DEFAULT_SYSTEM = "WEB"; + String SEPARATOR = CasbinConstant.SEPARATOR; + String USER = CasbinConstant.USER; + String USER_PREFIX = CasbinConstant.USER_PREFIX; + String ROLE = CasbinConstant.ROLE; + String ROLE_PREFIX = CasbinConstant.ROLE_PREFIX; + String DEFAULT_SYSTEM = CasbinConstant.DEFAULT_SYSTEM; - String SUPER_PERMISSION = "root"; - String SUPER_PERMISSION_NAME = "超级管理员"; - String SUPER_ROLE = ROLE_PREFIX + SUPER_PERMISSION; + String SUPER_PERMISSION = CasbinConstant.SUPER_PERMISSION; + String SUPER_PERMISSION_NAME = CasbinConstant.SUPER_PERMISSION_NAME; + String SUPER_ROLE = CasbinConstant.SUPER_ROLE; boolean addRole(String role, String system, String url, String method); diff --git a/backend/java/sk-matrix-service/services/src/main/java/cn/skcks/matrix/v2/services/role/RoleService.java b/backend/java/sk-matrix-service/services/src/main/java/cn/skcks/matrix/v2/services/role/RoleService.java index 9687643..8562075 100644 --- a/backend/java/sk-matrix-service/services/src/main/java/cn/skcks/matrix/v2/services/role/RoleService.java +++ b/backend/java/sk-matrix-service/services/src/main/java/cn/skcks/matrix/v2/services/role/RoleService.java @@ -1,6 +1,7 @@ package cn.skcks.matrix.v2.services.role; -import cn.skcks.matrix.v2.model.service.ServiceResult; +import cn.skcks.matrix.v2.model.role.dto.RoleRoutePermission; +import cn.skcks.matrix.v2.model.services.ServiceResult; import cn.skcks.matrix.v2.orm.mybatis.dynamic.model.Role; import cn.skcks.matrix.v2.orm.mybatis.dynamic.model.User; import com.github.pagehelper.PageInfo; diff --git a/backend/java/sk-matrix-service/services/src/main/java/cn/skcks/matrix/v2/services/role/RoleServiceImpl.java b/backend/java/sk-matrix-service/services/src/main/java/cn/skcks/matrix/v2/services/role/RoleServiceImpl.java index a18a037..c90b86f 100644 --- a/backend/java/sk-matrix-service/services/src/main/java/cn/skcks/matrix/v2/services/role/RoleServiceImpl.java +++ b/backend/java/sk-matrix-service/services/src/main/java/cn/skcks/matrix/v2/services/role/RoleServiceImpl.java @@ -1,7 +1,8 @@ package cn.skcks.matrix.v2.services.role; import cn.hutool.core.util.IdUtil; -import cn.skcks.matrix.v2.model.service.ServiceResult; +import cn.skcks.matrix.v2.model.role.dto.RoleRoutePermission; +import cn.skcks.matrix.v2.model.services.ServiceResult; import cn.skcks.matrix.v2.orm.mybatis.dynamic.mapper.RoleDynamicSqlSupport; import cn.skcks.matrix.v2.orm.mybatis.dynamic.mapper.RoleMapper; import cn.skcks.matrix.v2.orm.mybatis.dynamic.mapper.UserDynamicSqlSupport;