拆分 model 包

backend/java/sk-matrix-service/.idea/compiler.xml

@@ -24,8 +24,8 @@
         <module name="starter" />
         <module name="auth" />
         <module name="model" />
-        <module name="api" />
         <module name="orm" />
+        <module name="api" />
         <module name="services" />
         <module name="casbin" />
       </profile>

backend/java/sk-matrix-service/api/pom.xml

@@ -24,6 +24,12 @@
             <version>${project.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>cn.skcks.matrix.v2</groupId>
+            <artifactId>model</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
         <dependency>
             <groupId>cn.skcks.matrix.v2</groupId>
             <artifactId>auth</artifactId>

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;

backend/java/sk-matrix-service/casbin/pom.xml

@@ -38,7 +38,6 @@
             <version>1.31.4</version>
         </dependency>
 
-
         <dependency>
             <groupId>org.casbin</groupId>
             <artifactId>jdbc-adapter</artifactId>

backend/java/sk-matrix-service/model/pom.xml

@@ -51,6 +51,11 @@
             <artifactId>spring-boot-starter-validation</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.springdoc</groupId>
+            <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>

backend/java/sk-matrix-service/model/src/main/java/cn/skcks/matrix/v2/Main.java

@@ -1,7 +0,0 @@
-package cn.skcks.matrix.v2;
-
-public class Main {
-    public static void main(String[] args) {
-        System.out.println("Hello world!");
-    }
-}

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;
+}

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;

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;
 }

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;
 }
 

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;
 }

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;
 }

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;
 

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;

backend/java/sk-matrix-service/services/pom.xml

@@ -30,6 +30,12 @@
             <version>${project.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>cn.skcks.matrix.v2</groupId>
+            <artifactId>model</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
         <dependency>
             <groupId>cn.skcks.matrix.v2</groupId>
             <artifactId>auth</artifactId>

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);
 

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;

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;