refactor: 重命名项目目录，system -> base

diff --git a/base/api/.gitignore b/base/api/.gitignore
new file mode 100644 (file)
index 0000000..b83d222
--- /dev/null
+++ b/base/api/.gitignore
@@ -0,0 +1 @@
+/target/

diff --git a/system/api/pom.xml b/base/api/pom.xml
similarity index 92%
rename from system/api/pom.xml
rename to base/api/pom.xml
index 07e9732..1935e28 100644 (file)
--- a/system/api/pom.xml
+++ b/base/api/pom.xml
@@ -11,12 +11,12 @@
   </parent>
 
   <groupId>com.supwisdom.institute</groupId>
-  <artifactId>sw-backend-system-api</artifactId>
+  <artifactId>sw-backend-base-api</artifactId>
   <version>0.0.1-SNAPSHOT</version>
   <packaging>jar</packaging>
 
-  <name>Supwisdom Backend Framework System API</name>
-  <description>Supwisdom Backend Framework System API project</description>
+  <name>Supwisdom Backend Framework Base API</name>
+  <description>Supwisdom Backend Framework Base API project</description>
 
   <dependencies>
 
@@ -62,7 +62,7 @@
 
     <dependency>
       <groupId>com.supwisdom.institute</groupId>
-      <artifactId>sw-backend-system-domain</artifactId>
+      <artifactId>sw-backend-base-domain</artifactId>
     </dependency>
 
 

diff --git a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/v1/admin/AdminAccountController.java b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/v1/admin/AdminAccountController.java
similarity index 89%
rename from system/api/src/main/java/com/supwisdom/institute/backend/system/api/v1/admin/AdminAccountController.java
rename to base/api/src/main/java/com/supwisdom/institute/backend/base/api/v1/admin/AdminAccountController.java
index dbb8dda..646445d 100644 (file)
--- a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/v1/admin/AdminAccountController.java
+++ b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/v1/admin/AdminAccountController.java
@@ -1,4 +1,4 @@
-package com.supwisdom.institute.backend.system.api.v1.admin;
+package com.supwisdom.institute.backend.base.api.v1.admin;
 
 import java.util.HashMap;
 import java.util.List;
@@ -22,32 +22,32 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.bind.annotation.RestController;
 
+import com.supwisdom.institute.backend.base.api.vo.request.AccountCreateRequest;
+import com.supwisdom.institute.backend.base.api.vo.request.AccountDeleteBatchRequest;
+import com.supwisdom.institute.backend.base.api.vo.request.AccountQueryRequest;
+import com.supwisdom.institute.backend.base.api.vo.request.AccountRelateGroupsRequest;
+import com.supwisdom.institute.backend.base.api.vo.request.AccountRelateRolesRequest;
+import com.supwisdom.institute.backend.base.api.vo.request.AccountRelatedGroupsRequest;
+import com.supwisdom.institute.backend.base.api.vo.request.AccountRelatedRolesRequest;
+import com.supwisdom.institute.backend.base.api.vo.request.AccountUpdateRequest;
+import com.supwisdom.institute.backend.base.api.vo.response.AccountCreateResponseData;
+import com.supwisdom.institute.backend.base.api.vo.response.AccountDeleteBatchResponseData;
+import com.supwisdom.institute.backend.base.api.vo.response.AccountLoadResponseData;
+import com.supwisdom.institute.backend.base.api.vo.response.AccountQueryResponseData;
+import com.supwisdom.institute.backend.base.api.vo.response.AccountRelateGroupsResponseData;
+import com.supwisdom.institute.backend.base.api.vo.response.AccountRelateRolesResponseData;
+import com.supwisdom.institute.backend.base.api.vo.response.AccountRelatedGroupsResponseData;
+import com.supwisdom.institute.backend.base.api.vo.response.AccountRelatedRolesResponseData;
+import com.supwisdom.institute.backend.base.api.vo.response.AccountRemoveResponseData;
+import com.supwisdom.institute.backend.base.api.vo.response.AccountUpdateResponseData;
+import com.supwisdom.institute.backend.base.domain.entity.Account;
+import com.supwisdom.institute.backend.base.domain.entity.AccountGroup;
+import com.supwisdom.institute.backend.base.domain.entity.AccountRole;
+import com.supwisdom.institute.backend.base.domain.service.AccountService;
 import com.supwisdom.institute.backend.common.framework.entity.EntityUtils;
 import com.supwisdom.institute.backend.common.framework.vo.response.DefaultApiResponse;
-import com.supwisdom.institute.backend.system.api.vo.request.AccountCreateRequest;
-import com.supwisdom.institute.backend.system.api.vo.request.AccountDeleteBatchRequest;
-import com.supwisdom.institute.backend.system.api.vo.request.AccountQueryRequest;
-import com.supwisdom.institute.backend.system.api.vo.request.AccountRelateGroupsRequest;
-import com.supwisdom.institute.backend.system.api.vo.request.AccountRelateRolesRequest;
-import com.supwisdom.institute.backend.system.api.vo.request.AccountRelatedGroupsRequest;
-import com.supwisdom.institute.backend.system.api.vo.request.AccountRelatedRolesRequest;
-import com.supwisdom.institute.backend.system.api.vo.request.AccountUpdateRequest;
-import com.supwisdom.institute.backend.system.api.vo.response.AccountCreateResponseData;
-import com.supwisdom.institute.backend.system.api.vo.response.AccountDeleteBatchResponseData;
-import com.supwisdom.institute.backend.system.api.vo.response.AccountLoadResponseData;
-import com.supwisdom.institute.backend.system.api.vo.response.AccountQueryResponseData;
-import com.supwisdom.institute.backend.system.api.vo.response.AccountRelateGroupsResponseData;
-import com.supwisdom.institute.backend.system.api.vo.response.AccountRelateRolesResponseData;
-import com.supwisdom.institute.backend.system.api.vo.response.AccountRelatedGroupsResponseData;
-import com.supwisdom.institute.backend.system.api.vo.response.AccountRelatedRolesResponseData;
-import com.supwisdom.institute.backend.system.api.vo.response.AccountRemoveResponseData;
-import com.supwisdom.institute.backend.system.api.vo.response.AccountUpdateResponseData;
-import com.supwisdom.institute.backend.system.domain.entity.Account;
-import com.supwisdom.institute.backend.system.domain.entity.AccountGroup;
-import com.supwisdom.institute.backend.system.domain.entity.AccountRole;
-import com.supwisdom.institute.backend.system.domain.service.AccountService;
-
-@Api(value = "SystemAdminAccount", tags = { "SystemAdminAccount" }, description = "帐号的操作接口")
+
+@Api(value = "BaseAdminAccount", tags = { "BaseAdminAccount" }, description = "帐号的操作接口")
 @Slf4j
 @RestController
 @RequestMapping("/v1/admin/accounts")
@@ -424,7 +424,6 @@ public class AdminAccountController {
   public DefaultApiResponse<AccountDeleteBatchResponseData> deleteBatch(
       @RequestBody AccountDeleteBatchRequest deleteBatchRequest) {
     
-    System.out.println(deleteBatchRequest.getIds());
     List<String> ids = deleteBatchRequest.getIds();
     
     accountService.deleteBatch(ids);

diff --git a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/v1/admin/AdminConfigController.java b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/v1/admin/AdminConfigController.java
similarity index 89%
rename from system/api/src/main/java/com/supwisdom/institute/backend/system/api/v1/admin/AdminConfigController.java
rename to base/api/src/main/java/com/supwisdom/institute/backend/base/api/v1/admin/AdminConfigController.java
index 10a5c64..15b3bda 100644 (file)
--- a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/v1/admin/AdminConfigController.java
+++ b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/v1/admin/AdminConfigController.java
@@ -1,4 +1,4 @@
-package com.supwisdom.institute.backend.system.api.v1.admin;
+package com.supwisdom.institute.backend.base.api.v1.admin;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -19,20 +19,20 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.bind.annotation.RestController;
 
+import com.supwisdom.institute.backend.base.api.vo.request.ConfigCreateRequest;
+import com.supwisdom.institute.backend.base.api.vo.request.ConfigQueryRequest;
+import com.supwisdom.institute.backend.base.api.vo.request.ConfigUpdateRequest;
+import com.supwisdom.institute.backend.base.api.vo.response.ConfigCreateResponseData;
+import com.supwisdom.institute.backend.base.api.vo.response.ConfigLoadResponseData;
+import com.supwisdom.institute.backend.base.api.vo.response.ConfigQueryResponseData;
+import com.supwisdom.institute.backend.base.api.vo.response.ConfigUpdateResponseData;
+import com.supwisdom.institute.backend.base.domain.entity.Config;
+import com.supwisdom.institute.backend.base.domain.exception.ConfigException;
+import com.supwisdom.institute.backend.base.domain.service.ConfigService;
 import com.supwisdom.institute.backend.common.framework.entity.EntityUtils;
 import com.supwisdom.institute.backend.common.framework.vo.response.DefaultApiResponse;
-import com.supwisdom.institute.backend.system.api.vo.request.ConfigCreateRequest;
-import com.supwisdom.institute.backend.system.api.vo.request.ConfigQueryRequest;
-import com.supwisdom.institute.backend.system.api.vo.request.ConfigUpdateRequest;
-import com.supwisdom.institute.backend.system.api.vo.response.ConfigCreateResponseData;
-import com.supwisdom.institute.backend.system.api.vo.response.ConfigLoadResponseData;
-import com.supwisdom.institute.backend.system.api.vo.response.ConfigQueryResponseData;
-import com.supwisdom.institute.backend.system.api.vo.response.ConfigUpdateResponseData;
-import com.supwisdom.institute.backend.system.domain.entity.Config;
-import com.supwisdom.institute.backend.system.domain.exception.ConfigException;
-import com.supwisdom.institute.backend.system.domain.service.ConfigService;
-
-@Api(value = "SystemAdminConfig", tags = { "SystemAdminConfig" }, description = "配置项的操作接口")
+
+@Api(value = "BaseAdminConfig", tags = { "BaseAdminConfig" }, description = "配置项的操作接口")
 @Slf4j
 @RestController
 @RequestMapping("/v1/admin/configs")

diff --git a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/v1/admin/AdminGroupController.java b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/v1/admin/AdminGroupController.java
similarity index 82%
rename from system/api/src/main/java/com/supwisdom/institute/backend/system/api/v1/admin/AdminGroupController.java
rename to base/api/src/main/java/com/supwisdom/institute/backend/base/api/v1/admin/AdminGroupController.java
index 9de8744..3dc572d 100644 (file)
--- a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/v1/admin/AdminGroupController.java
+++ b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/v1/admin/AdminGroupController.java
@@ -1,4 +1,4 @@
-package com.supwisdom.institute.backend.system.api.v1.admin;
+package com.supwisdom.institute.backend.base.api.v1.admin;
 
 import java.util.HashMap;
 
@@ -21,30 +21,30 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.bind.annotation.RestController;
 
+import com.supwisdom.institute.backend.base.api.vo.request.GroupCreateRequest;
+import com.supwisdom.institute.backend.base.api.vo.request.GroupQueryRequest;
+import com.supwisdom.institute.backend.base.api.vo.request.GroupRelateAccountsRequest;
+import com.supwisdom.institute.backend.base.api.vo.request.GroupRelateRolesRequest;
+import com.supwisdom.institute.backend.base.api.vo.request.GroupRelatedAccountsRequest;
+import com.supwisdom.institute.backend.base.api.vo.request.GroupRelatedRolesRequest;
+import com.supwisdom.institute.backend.base.api.vo.request.GroupUpdateRequest;
+import com.supwisdom.institute.backend.base.api.vo.response.GroupCreateResponseData;
+import com.supwisdom.institute.backend.base.api.vo.response.GroupLoadResponseData;
+import com.supwisdom.institute.backend.base.api.vo.response.GroupQueryResponseData;
+import com.supwisdom.institute.backend.base.api.vo.response.GroupRelateAccountsResponseData;
+import com.supwisdom.institute.backend.base.api.vo.response.GroupRelateRolesResponseData;
+import com.supwisdom.institute.backend.base.api.vo.response.GroupRelatedAccountsResponseData;
+import com.supwisdom.institute.backend.base.api.vo.response.GroupRelatedRolesResponseData;
+import com.supwisdom.institute.backend.base.api.vo.response.GroupRemoveResponseData;
+import com.supwisdom.institute.backend.base.api.vo.response.GroupUpdateResponseData;
+import com.supwisdom.institute.backend.base.domain.entity.AccountGroup;
+import com.supwisdom.institute.backend.base.domain.entity.Group;
+import com.supwisdom.institute.backend.base.domain.entity.GroupRole;
+import com.supwisdom.institute.backend.base.domain.service.GroupService;
 import com.supwisdom.institute.backend.common.framework.entity.EntityUtils;
 import com.supwisdom.institute.backend.common.framework.vo.response.DefaultApiResponse;
-import com.supwisdom.institute.backend.system.api.vo.request.GroupCreateRequest;
-import com.supwisdom.institute.backend.system.api.vo.request.GroupQueryRequest;
-import com.supwisdom.institute.backend.system.api.vo.request.GroupRelateAccountsRequest;
-import com.supwisdom.institute.backend.system.api.vo.request.GroupRelateRolesRequest;
-import com.supwisdom.institute.backend.system.api.vo.request.GroupRelatedAccountsRequest;
-import com.supwisdom.institute.backend.system.api.vo.request.GroupRelatedRolesRequest;
-import com.supwisdom.institute.backend.system.api.vo.request.GroupUpdateRequest;
-import com.supwisdom.institute.backend.system.api.vo.response.GroupCreateResponseData;
-import com.supwisdom.institute.backend.system.api.vo.response.GroupLoadResponseData;
-import com.supwisdom.institute.backend.system.api.vo.response.GroupQueryResponseData;
-import com.supwisdom.institute.backend.system.api.vo.response.GroupRelateAccountsResponseData;
-import com.supwisdom.institute.backend.system.api.vo.response.GroupRelateRolesResponseData;
-import com.supwisdom.institute.backend.system.api.vo.response.GroupRelatedAccountsResponseData;
-import com.supwisdom.institute.backend.system.api.vo.response.GroupRelatedRolesResponseData;
-import com.supwisdom.institute.backend.system.api.vo.response.GroupRemoveResponseData;
-import com.supwisdom.institute.backend.system.api.vo.response.GroupUpdateResponseData;
-import com.supwisdom.institute.backend.system.domain.entity.AccountGroup;
-import com.supwisdom.institute.backend.system.domain.entity.Group;
-import com.supwisdom.institute.backend.system.domain.entity.GroupRole;
-import com.supwisdom.institute.backend.system.domain.service.GroupService;
-
-@Api(value = "SystemAdminGroup", tags = { "SystemAdminGroup" }, description = "用户组的操作接口")
+
+@Api(value = "BaseAdminGroup", tags = { "BaseAdminGroup" }, description = "用户组的操作接口")
 @Slf4j
 @RestController
 @RequestMapping("/v1/admin/groups")

diff --git a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/v1/admin/AdminMenuController.java b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/v1/admin/AdminMenuController.java
similarity index 82%
rename from system/api/src/main/java/com/supwisdom/institute/backend/system/api/v1/admin/AdminMenuController.java
rename to base/api/src/main/java/com/supwisdom/institute/backend/base/api/v1/admin/AdminMenuController.java
index 3c3a832..9526d94 100644 (file)
--- a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/v1/admin/AdminMenuController.java
+++ b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/v1/admin/AdminMenuController.java
@@ -1,4 +1,4 @@
-package com.supwisdom.institute.backend.system.api.v1.admin;
+package com.supwisdom.institute.backend.base.api.v1.admin;
 
 import java.util.HashMap;
 import java.util.List;
@@ -22,24 +22,24 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.bind.annotation.RestController;
 
+import com.supwisdom.institute.backend.base.api.vo.request.PermissionCreateRequest;
+import com.supwisdom.institute.backend.base.api.vo.request.PermissionDeleteBatchRequest;
+import com.supwisdom.institute.backend.base.api.vo.request.PermissionQueryRequest;
+import com.supwisdom.institute.backend.base.api.vo.request.PermissionUpdateRequest;
+import com.supwisdom.institute.backend.base.api.vo.response.PermissionCreateResponseData;
+import com.supwisdom.institute.backend.base.api.vo.response.PermissionDeleteBatchResponseData;
+import com.supwisdom.institute.backend.base.api.vo.response.PermissionLoadResponseData;
+import com.supwisdom.institute.backend.base.api.vo.response.PermissionQueryResponseData;
+import com.supwisdom.institute.backend.base.api.vo.response.PermissionRemoveResponseData;
+import com.supwisdom.institute.backend.base.api.vo.response.PermissionTreeResponseData;
+import com.supwisdom.institute.backend.base.api.vo.response.PermissionUpdateResponseData;
+import com.supwisdom.institute.backend.base.domain.entity.Permission;
+import com.supwisdom.institute.backend.base.domain.model.PermissionTreeNode;
+import com.supwisdom.institute.backend.base.domain.service.PermissionService;
 import com.supwisdom.institute.backend.common.framework.entity.EntityUtils;
 import com.supwisdom.institute.backend.common.framework.vo.response.DefaultApiResponse;
-import com.supwisdom.institute.backend.system.api.vo.request.PermissionCreateRequest;
-import com.supwisdom.institute.backend.system.api.vo.request.PermissionDeleteBatchRequest;
-import com.supwisdom.institute.backend.system.api.vo.request.PermissionQueryRequest;
-import com.supwisdom.institute.backend.system.api.vo.request.PermissionUpdateRequest;
-import com.supwisdom.institute.backend.system.api.vo.response.PermissionCreateResponseData;
-import com.supwisdom.institute.backend.system.api.vo.response.PermissionDeleteBatchResponseData;
-import com.supwisdom.institute.backend.system.api.vo.response.PermissionLoadResponseData;
-import com.supwisdom.institute.backend.system.api.vo.response.PermissionQueryResponseData;
-import com.supwisdom.institute.backend.system.api.vo.response.PermissionRemoveResponseData;
-import com.supwisdom.institute.backend.system.api.vo.response.PermissionTreeResponseData;
-import com.supwisdom.institute.backend.system.api.vo.response.PermissionUpdateResponseData;
-import com.supwisdom.institute.backend.system.domain.entity.Permission;
-import com.supwisdom.institute.backend.system.domain.model.PermissionTreeNode;
-import com.supwisdom.institute.backend.system.domain.service.PermissionService;
-
-@Api(value = "SystemAdminMenu", tags = { "SystemAdminMenu" }, description = "菜单的操作接口")
+
+@Api(value = "BaseAdminMenu", tags = { "BaseAdminMenu" }, description = "菜单的操作接口")
 @Slf4j
 @RestController
 @RequestMapping("/v1/admin/menus")
@@ -173,7 +173,6 @@ public class AdminMenuController {
   public DefaultApiResponse<PermissionDeleteBatchResponseData> deleteBatch(
       @RequestBody PermissionDeleteBatchRequest deleteBatchRequest) {
     
-    System.out.println(deleteBatchRequest.getIds());
     List<String> ids = deleteBatchRequest.getIds();
     
     permissionService.deleteBatch(ids);

diff --git a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/v1/admin/AdminOperationController.java b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/v1/admin/AdminOperationController.java
similarity index 84%
rename from system/api/src/main/java/com/supwisdom/institute/backend/system/api/v1/admin/AdminOperationController.java
rename to base/api/src/main/java/com/supwisdom/institute/backend/base/api/v1/admin/AdminOperationController.java
index d4e60f5..69c57d3 100644 (file)
--- a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/v1/admin/AdminOperationController.java
+++ b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/v1/admin/AdminOperationController.java
@@ -1,4 +1,4 @@
-package com.supwisdom.institute.backend.system.api.v1.admin;
+package com.supwisdom.institute.backend.base.api.v1.admin;
 
 import io.swagger.annotations.Api;
 
@@ -21,20 +21,20 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.bind.annotation.RestController;
 
+import com.supwisdom.institute.backend.base.api.vo.request.PermissionCreateRequest;
+import com.supwisdom.institute.backend.base.api.vo.request.PermissionQueryRequest;
+import com.supwisdom.institute.backend.base.api.vo.request.PermissionUpdateRequest;
+import com.supwisdom.institute.backend.base.api.vo.response.PermissionCreateResponseData;
+import com.supwisdom.institute.backend.base.api.vo.response.PermissionLoadResponseData;
+import com.supwisdom.institute.backend.base.api.vo.response.PermissionQueryResponseData;
+import com.supwisdom.institute.backend.base.api.vo.response.PermissionRemoveResponseData;
+import com.supwisdom.institute.backend.base.api.vo.response.PermissionUpdateResponseData;
+import com.supwisdom.institute.backend.base.domain.entity.Permission;
+import com.supwisdom.institute.backend.base.domain.service.PermissionService;
 import com.supwisdom.institute.backend.common.framework.entity.EntityUtils;
 import com.supwisdom.institute.backend.common.framework.vo.response.DefaultApiResponse;
-import com.supwisdom.institute.backend.system.api.vo.request.PermissionCreateRequest;
-import com.supwisdom.institute.backend.system.api.vo.request.PermissionQueryRequest;
-import com.supwisdom.institute.backend.system.api.vo.request.PermissionUpdateRequest;
-import com.supwisdom.institute.backend.system.api.vo.response.PermissionCreateResponseData;
-import com.supwisdom.institute.backend.system.api.vo.response.PermissionLoadResponseData;
-import com.supwisdom.institute.backend.system.api.vo.response.PermissionQueryResponseData;
-import com.supwisdom.institute.backend.system.api.vo.response.PermissionRemoveResponseData;
-import com.supwisdom.institute.backend.system.api.vo.response.PermissionUpdateResponseData;
-import com.supwisdom.institute.backend.system.domain.entity.Permission;
-import com.supwisdom.institute.backend.system.domain.service.PermissionService;
-
-@Api(value = "SystemAdminOperation", tags = { "SystemAdminOperation" }, description = "操作的操作接口")
+
+@Api(value = "BaseAdminOperation", tags = { "BaseAdminOperation" }, description = "操作的操作接口")
 @Slf4j
 @RestController
 @RequestMapping("/v1/admin/operations")

diff --git a/base/api/src/main/java/com/supwisdom/institute/backend/base/api/v1/admin/AdminPermissionController.java b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/v1/admin/AdminPermissionController.java
new file mode 100644 (file)
index 0000000..7859731
--- /dev/null
+++ b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/v1/admin/AdminPermissionController.java
@@ -0,0 +1,5 @@
+package com.supwisdom.institute.backend.base.api.v1.admin;
+
+public class AdminPermissionController {
+
+}

diff --git a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/v1/admin/AdminResourceController.java b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/v1/admin/AdminResourceController.java
similarity index 82%
rename from system/api/src/main/java/com/supwisdom/institute/backend/system/api/v1/admin/AdminResourceController.java
rename to base/api/src/main/java/com/supwisdom/institute/backend/base/api/v1/admin/AdminResourceController.java
index a16bd63..67686d6 100644 (file)
--- a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/v1/admin/AdminResourceController.java
+++ b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/v1/admin/AdminResourceController.java
@@ -1,4 +1,4 @@
-package com.supwisdom.institute.backend.system.api.v1.admin;
+package com.supwisdom.institute.backend.base.api.v1.admin;
 
 import io.swagger.annotations.Api;
 import lombok.extern.slf4j.Slf4j;
@@ -18,20 +18,20 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.bind.annotation.RestController;
 
+import com.supwisdom.institute.backend.base.api.vo.request.ResourceCreateRequest;
+import com.supwisdom.institute.backend.base.api.vo.request.ResourceQueryRequest;
+import com.supwisdom.institute.backend.base.api.vo.request.ResourceUpdateRequest;
+import com.supwisdom.institute.backend.base.api.vo.response.ResourceCreateResponseData;
+import com.supwisdom.institute.backend.base.api.vo.response.ResourceLoadResponseData;
+import com.supwisdom.institute.backend.base.api.vo.response.ResourceQueryResponseData;
+import com.supwisdom.institute.backend.base.api.vo.response.ResourceRemoveResponseData;
+import com.supwisdom.institute.backend.base.api.vo.response.ResourceUpdateResponseData;
+import com.supwisdom.institute.backend.base.domain.entity.Resource;
+import com.supwisdom.institute.backend.base.domain.service.ResourceService;
 import com.supwisdom.institute.backend.common.framework.entity.EntityUtils;
 import com.supwisdom.institute.backend.common.framework.vo.response.DefaultApiResponse;
-import com.supwisdom.institute.backend.system.api.vo.request.ResourceCreateRequest;
-import com.supwisdom.institute.backend.system.api.vo.request.ResourceQueryRequest;
-import com.supwisdom.institute.backend.system.api.vo.request.ResourceUpdateRequest;
-import com.supwisdom.institute.backend.system.api.vo.response.ResourceCreateResponseData;
-import com.supwisdom.institute.backend.system.api.vo.response.ResourceLoadResponseData;
-import com.supwisdom.institute.backend.system.api.vo.response.ResourceQueryResponseData;
-import com.supwisdom.institute.backend.system.api.vo.response.ResourceRemoveResponseData;
-import com.supwisdom.institute.backend.system.api.vo.response.ResourceUpdateResponseData;
-import com.supwisdom.institute.backend.system.domain.entity.Resource;
-import com.supwisdom.institute.backend.system.domain.service.ResourceService;
-
-@Api(value = "SystemAdminResource", tags = { "SystemAdminResource" }, description = "资源（API）的操作接口")
+
+@Api(value = "BaseAdminResource", tags = { "BaseAdminResource" }, description = "资源（API）的操作接口")
 @Slf4j
 @RestController
 @RequestMapping("/v1/admin/resources")

diff --git a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/v1/admin/AdminRoleController.java b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/v1/admin/AdminRoleController.java
similarity index 81%
rename from system/api/src/main/java/com/supwisdom/institute/backend/system/api/v1/admin/AdminRoleController.java
rename to base/api/src/main/java/com/supwisdom/institute/backend/base/api/v1/admin/AdminRoleController.java
index a198eeb..448384b 100644 (file)
--- a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/v1/admin/AdminRoleController.java
+++ b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/v1/admin/AdminRoleController.java
@@ -1,4 +1,4 @@
-package com.supwisdom.institute.backend.system.api.v1.admin;
+package com.supwisdom.institute.backend.base.api.v1.admin;
 
 import java.util.HashMap;
 import java.util.List;
@@ -22,37 +22,37 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.bind.annotation.RestController;
 
+import com.supwisdom.institute.backend.base.api.vo.request.RoleCreateRequest;
+import com.supwisdom.institute.backend.base.api.vo.request.RoleDeleteBatchRequest;
+import com.supwisdom.institute.backend.base.api.vo.request.RoleQueryRequest;
+import com.supwisdom.institute.backend.base.api.vo.request.RoleRelateAccountsRequest;
+import com.supwisdom.institute.backend.base.api.vo.request.RoleRelateGroupsRequest;
+import com.supwisdom.institute.backend.base.api.vo.request.RoleRelatePermissionsRequest;
+import com.supwisdom.institute.backend.base.api.vo.request.RoleRelatedAccountsRequest;
+import com.supwisdom.institute.backend.base.api.vo.request.RoleRelatedGroupsRequest;
+import com.supwisdom.institute.backend.base.api.vo.request.RoleRelatedPermissionsRequest;
+import com.supwisdom.institute.backend.base.api.vo.request.RoleUpdateRequest;
+import com.supwisdom.institute.backend.base.api.vo.response.RoleCreateResponseData;
+import com.supwisdom.institute.backend.base.api.vo.response.RoleDeleteBatchResponseData;
+import com.supwisdom.institute.backend.base.api.vo.response.RoleLoadResponseData;
+import com.supwisdom.institute.backend.base.api.vo.response.RoleQueryResponseData;
+import com.supwisdom.institute.backend.base.api.vo.response.RoleRelateAccountsResponseData;
+import com.supwisdom.institute.backend.base.api.vo.response.RoleRelateGroupsResponseData;
+import com.supwisdom.institute.backend.base.api.vo.response.RoleRelatePermissionsResponseData;
+import com.supwisdom.institute.backend.base.api.vo.response.RoleRelatedAccountsResponseData;
+import com.supwisdom.institute.backend.base.api.vo.response.RoleRelatedGroupsResponseData;
+import com.supwisdom.institute.backend.base.api.vo.response.RoleRelatedPermissionsResponseData;
+import com.supwisdom.institute.backend.base.api.vo.response.RoleRemoveResponseData;
+import com.supwisdom.institute.backend.base.api.vo.response.RoleUpdateResponseData;
+import com.supwisdom.institute.backend.base.domain.entity.AccountRole;
+import com.supwisdom.institute.backend.base.domain.entity.GroupRole;
+import com.supwisdom.institute.backend.base.domain.entity.Role;
+import com.supwisdom.institute.backend.base.domain.entity.RolePermission;
+import com.supwisdom.institute.backend.base.domain.service.RoleService;
 import com.supwisdom.institute.backend.common.framework.entity.EntityUtils;
 import com.supwisdom.institute.backend.common.framework.vo.response.DefaultApiResponse;
-import com.supwisdom.institute.backend.system.api.vo.request.RoleCreateRequest;
-import com.supwisdom.institute.backend.system.api.vo.request.RoleDeleteBatchRequest;
-import com.supwisdom.institute.backend.system.api.vo.request.RoleRelateAccountsRequest;
-import com.supwisdom.institute.backend.system.api.vo.request.RoleRelateGroupsRequest;
-import com.supwisdom.institute.backend.system.api.vo.request.RoleRelatePermissionsRequest;
-import com.supwisdom.institute.backend.system.api.vo.request.RoleRelatedAccountsRequest;
-import com.supwisdom.institute.backend.system.api.vo.request.RoleRelatedGroupsRequest;
-import com.supwisdom.institute.backend.system.api.vo.request.RoleRelatedPermissionsRequest;
-import com.supwisdom.institute.backend.system.api.vo.request.RoleUpdateRequest;
-import com.supwisdom.institute.backend.system.api.vo.request.RoleQueryRequest;
-import com.supwisdom.institute.backend.system.api.vo.response.RoleCreateResponseData;
-import com.supwisdom.institute.backend.system.api.vo.response.RoleDeleteBatchResponseData;
-import com.supwisdom.institute.backend.system.api.vo.response.RoleLoadResponseData;
-import com.supwisdom.institute.backend.system.api.vo.response.RoleRelateAccountsResponseData;
-import com.supwisdom.institute.backend.system.api.vo.response.RoleRelateGroupsResponseData;
-import com.supwisdom.institute.backend.system.api.vo.response.RoleRelatePermissionsResponseData;
-import com.supwisdom.institute.backend.system.api.vo.response.RoleRelatedAccountsResponseData;
-import com.supwisdom.institute.backend.system.api.vo.response.RoleRelatedGroupsResponseData;
-import com.supwisdom.institute.backend.system.api.vo.response.RoleRelatedPermissionsResponseData;
-import com.supwisdom.institute.backend.system.api.vo.response.RoleRemoveResponseData;
-import com.supwisdom.institute.backend.system.api.vo.response.RoleUpdateResponseData;
-import com.supwisdom.institute.backend.system.api.vo.response.RoleQueryResponseData;
-import com.supwisdom.institute.backend.system.domain.entity.AccountRole;
-import com.supwisdom.institute.backend.system.domain.entity.GroupRole;
-import com.supwisdom.institute.backend.system.domain.entity.Role;
-import com.supwisdom.institute.backend.system.domain.entity.RolePermission;
-import com.supwisdom.institute.backend.system.domain.service.RoleService;
-
-@Api(value = "SystemAdminRole", tags = { "SystemAdminRole" }, description = "角色的操作接口")
+
+@Api(value = "BaseAdminRole", tags = { "BaseAdminRole" }, description = "角色的操作接口")
 @Slf4j
 @RestController
 @RequestMapping("/v1/admin/roles")
@@ -170,7 +170,6 @@ public class AdminRoleController {
   public DefaultApiResponse<RoleDeleteBatchResponseData> deleteBatch(
       @RequestBody RoleDeleteBatchRequest deleteBatchRequest) {
     
-    System.out.println(deleteBatchRequest.getIds());
     List<String> ids = deleteBatchRequest.getIds();
     
     roleService.deleteBatch(ids);

diff --git a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/.gitkeep b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/.gitkeep
similarity index 100%
rename from system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/.gitkeep
rename to base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/.gitkeep

diff --git a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/request/AccountCreateRequest.java b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/request/AccountCreateRequest.java
similarity index 77%
rename from system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/request/AccountCreateRequest.java
rename to base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/request/AccountCreateRequest.java
index abdd2c1..ce6bf94 100644 (file)
--- a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/request/AccountCreateRequest.java
+++ b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/request/AccountCreateRequest.java
@@ -1,8 +1,8 @@
-package com.supwisdom.institute.backend.system.api.vo.request;
+package com.supwisdom.institute.backend.base.api.vo.request;
 
+import com.supwisdom.institute.backend.base.domain.entity.Account;
 import com.supwisdom.institute.backend.common.framework.entity.EntityUtils;
 import com.supwisdom.institute.backend.common.framework.vo.request.IApiCreateRequest;
-import com.supwisdom.institute.backend.system.domain.entity.Account;
 
 /**
  * @author loie

diff --git a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/request/AccountDeleteBatchRequest.java b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/request/AccountDeleteBatchRequest.java
similarity index 85%
rename from system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/request/AccountDeleteBatchRequest.java
rename to base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/request/AccountDeleteBatchRequest.java
index 5b5df24..27ff27a 100644 (file)
--- a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/request/AccountDeleteBatchRequest.java
+++ b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/request/AccountDeleteBatchRequest.java
@@ -1,4 +1,4 @@
-package com.supwisdom.institute.backend.system.api.vo.request;
+package com.supwisdom.institute.backend.base.api.vo.request;
 
 import java.util.List;
 

diff --git a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/request/AccountQueryRequest.java b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/request/AccountQueryRequest.java
similarity index 92%
rename from system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/request/AccountQueryRequest.java
rename to base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/request/AccountQueryRequest.java
index 21e0d5f..fdaf3a3 100644 (file)
--- a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/request/AccountQueryRequest.java
+++ b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/request/AccountQueryRequest.java
@@ -1,4 +1,4 @@
-package com.supwisdom.institute.backend.system.api.vo.request;
+package com.supwisdom.institute.backend.base.api.vo.request;
 
 import lombok.Getter;
 import lombok.Setter;

diff --git a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/request/AccountRelateGroupsRequest.java b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/request/AccountRelateGroupsRequest.java
similarity index 73%
rename from system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/request/AccountRelateGroupsRequest.java
rename to base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/request/AccountRelateGroupsRequest.java
index bc0e913..51f542a 100644 (file)
--- a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/request/AccountRelateGroupsRequest.java
+++ b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/request/AccountRelateGroupsRequest.java
@@ -1,12 +1,12 @@
-package com.supwisdom.institute.backend.system.api.vo.request;
+package com.supwisdom.institute.backend.base.api.vo.request;
 
 import java.util.List;
 
 import lombok.Getter;
 import lombok.Setter;
 
+import com.supwisdom.institute.backend.base.domain.entity.AccountGroup;
 import com.supwisdom.institute.backend.common.framework.vo.request.IApiRequest;
-import com.supwisdom.institute.backend.system.domain.entity.AccountGroup;
 
 public class AccountRelateGroupsRequest implements IApiRequest {
 

diff --git a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/request/AccountRelateRolesRequest.java b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/request/AccountRelateRolesRequest.java
similarity index 73%
rename from system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/request/AccountRelateRolesRequest.java
rename to base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/request/AccountRelateRolesRequest.java
index 7054a7f..235cf22 100644 (file)
--- a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/request/AccountRelateRolesRequest.java
+++ b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/request/AccountRelateRolesRequest.java
@@ -1,12 +1,12 @@
-package com.supwisdom.institute.backend.system.api.vo.request;
+package com.supwisdom.institute.backend.base.api.vo.request;
 
 import java.util.List;
 
 import lombok.Getter;
 import lombok.Setter;
 
+import com.supwisdom.institute.backend.base.domain.entity.AccountRole;
 import com.supwisdom.institute.backend.common.framework.vo.request.IApiRequest;
-import com.supwisdom.institute.backend.system.domain.entity.AccountRole;
 
 public class AccountRelateRolesRequest implements IApiRequest {
 

diff --git a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/request/AccountRelatedGroupsRequest.java b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/request/AccountRelatedGroupsRequest.java
similarity index 92%
rename from system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/request/AccountRelatedGroupsRequest.java
rename to base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/request/AccountRelatedGroupsRequest.java
index a6e17a8..362c5b6 100644 (file)
--- a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/request/AccountRelatedGroupsRequest.java
+++ b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/request/AccountRelatedGroupsRequest.java
@@ -1,4 +1,4 @@
-package com.supwisdom.institute.backend.system.api.vo.request;
+package com.supwisdom.institute.backend.base.api.vo.request;
 
 import lombok.Getter;
 import lombok.Setter;

diff --git a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/request/AccountRelatedRolesRequest.java b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/request/AccountRelatedRolesRequest.java
similarity index 92%
rename from system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/request/AccountRelatedRolesRequest.java
rename to base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/request/AccountRelatedRolesRequest.java
index 608c5ca..0fc9e07 100644 (file)
--- a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/request/AccountRelatedRolesRequest.java
+++ b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/request/AccountRelatedRolesRequest.java
@@ -1,4 +1,4 @@
-package com.supwisdom.institute.backend.system.api.vo.request;
+package com.supwisdom.institute.backend.base.api.vo.request;
 
 import lombok.Getter;
 import lombok.Setter;

diff --git a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/request/AccountUpdateRequest.java b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/request/AccountUpdateRequest.java
similarity index 80%
rename from system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/request/AccountUpdateRequest.java
rename to base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/request/AccountUpdateRequest.java
index 64d4e1b..bb7a089 100644 (file)
--- a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/request/AccountUpdateRequest.java
+++ b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/request/AccountUpdateRequest.java
@@ -1,8 +1,8 @@
-package com.supwisdom.institute.backend.system.api.vo.request;
+package com.supwisdom.institute.backend.base.api.vo.request;
 
+import com.supwisdom.institute.backend.base.domain.entity.Account;
 import com.supwisdom.institute.backend.common.framework.entity.EntityUtils;
 import com.supwisdom.institute.backend.common.framework.vo.request.IApiUpdateRequest;
-import com.supwisdom.institute.backend.system.domain.entity.Account;
 
 import lombok.Getter;
 import lombok.Setter;

diff --git a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/request/ConfigCreateRequest.java b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/request/ConfigCreateRequest.java
similarity index 77%
rename from system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/request/ConfigCreateRequest.java
rename to base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/request/ConfigCreateRequest.java
index 94d8578..f175704 100644 (file)
--- a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/request/ConfigCreateRequest.java
+++ b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/request/ConfigCreateRequest.java
@@ -1,8 +1,8 @@
-package com.supwisdom.institute.backend.system.api.vo.request;
+package com.supwisdom.institute.backend.base.api.vo.request;
 
+import com.supwisdom.institute.backend.base.domain.entity.Config;
 import com.supwisdom.institute.backend.common.framework.entity.EntityUtils;
 import com.supwisdom.institute.backend.common.framework.vo.request.IApiCreateRequest;
-import com.supwisdom.institute.backend.system.domain.entity.Config;
 
 /**
  * @author loie

diff --git a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/request/ConfigQueryRequest.java b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/request/ConfigQueryRequest.java
similarity index 92%
rename from system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/request/ConfigQueryRequest.java
rename to base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/request/ConfigQueryRequest.java
index d167604..0449b6d 100644 (file)
--- a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/request/ConfigQueryRequest.java
+++ b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/request/ConfigQueryRequest.java
@@ -1,4 +1,4 @@
-package com.supwisdom.institute.backend.system.api.vo.request;
+package com.supwisdom.institute.backend.base.api.vo.request;
 
 import lombok.Getter;
 import lombok.Setter;

diff --git a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/request/ConfigUpdateRequest.java b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/request/ConfigUpdateRequest.java
similarity index 80%
rename from system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/request/ConfigUpdateRequest.java
rename to base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/request/ConfigUpdateRequest.java
index 8ebf5f2..a69ebb4 100644 (file)
--- a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/request/ConfigUpdateRequest.java
+++ b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/request/ConfigUpdateRequest.java
@@ -1,8 +1,8 @@
-package com.supwisdom.institute.backend.system.api.vo.request;
+package com.supwisdom.institute.backend.base.api.vo.request;
 
+import com.supwisdom.institute.backend.base.domain.entity.Config;
 import com.supwisdom.institute.backend.common.framework.entity.EntityUtils;
 import com.supwisdom.institute.backend.common.framework.vo.request.IApiUpdateRequest;
-import com.supwisdom.institute.backend.system.domain.entity.Config;
 
 import lombok.Getter;
 import lombok.Setter;

diff --git a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/request/GroupCreateRequest.java b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/request/GroupCreateRequest.java
similarity index 77%
rename from system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/request/GroupCreateRequest.java
rename to base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/request/GroupCreateRequest.java
index cc54393..dd06d2e 100644 (file)
--- a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/request/GroupCreateRequest.java
+++ b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/request/GroupCreateRequest.java
@@ -1,8 +1,8 @@
-package com.supwisdom.institute.backend.system.api.vo.request;
+package com.supwisdom.institute.backend.base.api.vo.request;
 
+import com.supwisdom.institute.backend.base.domain.entity.Group;
 import com.supwisdom.institute.backend.common.framework.entity.EntityUtils;
 import com.supwisdom.institute.backend.common.framework.vo.request.IApiCreateRequest;
-import com.supwisdom.institute.backend.system.domain.entity.Group;
 
 /**
  * @author loie

diff --git a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/request/GroupQueryRequest.java b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/request/GroupQueryRequest.java
similarity index 91%
rename from system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/request/GroupQueryRequest.java
rename to base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/request/GroupQueryRequest.java
index ad06060..6cf4017 100644 (file)
--- a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/request/GroupQueryRequest.java
+++ b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/request/GroupQueryRequest.java
@@ -1,4 +1,4 @@
-package com.supwisdom.institute.backend.system.api.vo.request;
+package com.supwisdom.institute.backend.base.api.vo.request;
 
 import lombok.Getter;
 import lombok.Setter;

diff --git a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/request/GroupRelateAccountsRequest.java b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/request/GroupRelateAccountsRequest.java
similarity index 73%
rename from system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/request/GroupRelateAccountsRequest.java
rename to base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/request/GroupRelateAccountsRequest.java
index fd95dd0..3251273 100644 (file)
--- a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/request/GroupRelateAccountsRequest.java
+++ b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/request/GroupRelateAccountsRequest.java
@@ -1,12 +1,12 @@
-package com.supwisdom.institute.backend.system.api.vo.request;
+package com.supwisdom.institute.backend.base.api.vo.request;
 
 import java.util.List;
 
 import lombok.Getter;
 import lombok.Setter;
 
+import com.supwisdom.institute.backend.base.domain.entity.AccountGroup;
 import com.supwisdom.institute.backend.common.framework.vo.request.IApiRequest;
-import com.supwisdom.institute.backend.system.domain.entity.AccountGroup;
 
 public class GroupRelateAccountsRequest implements IApiRequest {
 

diff --git a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/request/GroupRelateRolesRequest.java b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/request/GroupRelateRolesRequest.java
similarity index 72%
rename from system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/request/GroupRelateRolesRequest.java
rename to base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/request/GroupRelateRolesRequest.java
index 5aa77fe..5323c0c 100644 (file)
--- a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/request/GroupRelateRolesRequest.java
+++ b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/request/GroupRelateRolesRequest.java
@@ -1,12 +1,12 @@
-package com.supwisdom.institute.backend.system.api.vo.request;
+package com.supwisdom.institute.backend.base.api.vo.request;
 
 import java.util.List;
 
 import lombok.Getter;
 import lombok.Setter;
 
+import com.supwisdom.institute.backend.base.domain.entity.GroupRole;
 import com.supwisdom.institute.backend.common.framework.vo.request.IApiRequest;
-import com.supwisdom.institute.backend.system.domain.entity.GroupRole;
 
 public class GroupRelateRolesRequest implements IApiRequest {
 

diff --git a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/request/GroupRelatedAccountsRequest.java b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/request/GroupRelatedAccountsRequest.java
similarity index 92%
rename from system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/request/GroupRelatedAccountsRequest.java
rename to base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/request/GroupRelatedAccountsRequest.java
index e2354d2..fd4b708 100644 (file)
--- a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/request/GroupRelatedAccountsRequest.java
+++ b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/request/GroupRelatedAccountsRequest.java
@@ -1,4 +1,4 @@
-package com.supwisdom.institute.backend.system.api.vo.request;
+package com.supwisdom.institute.backend.base.api.vo.request;
 
 import lombok.Getter;
 import lombok.Setter;

diff --git a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/request/GroupRelatedRolesRequest.java b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/request/GroupRelatedRolesRequest.java
similarity index 92%
rename from system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/request/GroupRelatedRolesRequest.java
rename to base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/request/GroupRelatedRolesRequest.java
index 64dd04d..2ec6d00 100644 (file)
--- a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/request/GroupRelatedRolesRequest.java
+++ b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/request/GroupRelatedRolesRequest.java
@@ -1,4 +1,4 @@
-package com.supwisdom.institute.backend.system.api.vo.request;
+package com.supwisdom.institute.backend.base.api.vo.request;
 
 import lombok.Getter;
 import lombok.Setter;

diff --git a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/request/GroupUpdateRequest.java b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/request/GroupUpdateRequest.java
similarity index 80%
rename from system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/request/GroupUpdateRequest.java
rename to base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/request/GroupUpdateRequest.java
index 348658d..da9322a 100644 (file)
--- a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/request/GroupUpdateRequest.java
+++ b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/request/GroupUpdateRequest.java
@@ -1,8 +1,8 @@
-package com.supwisdom.institute.backend.system.api.vo.request;
+package com.supwisdom.institute.backend.base.api.vo.request;
 
+import com.supwisdom.institute.backend.base.domain.entity.Group;
 import com.supwisdom.institute.backend.common.framework.entity.EntityUtils;
 import com.supwisdom.institute.backend.common.framework.vo.request.IApiUpdateRequest;
-import com.supwisdom.institute.backend.system.domain.entity.Group;
 
 import lombok.Getter;
 import lombok.Setter;

diff --git a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/request/PermissionCreateRequest.java b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/request/PermissionCreateRequest.java
similarity index 77%
rename from system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/request/PermissionCreateRequest.java
rename to base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/request/PermissionCreateRequest.java
index 24a6c19..0fc549d 100644 (file)
--- a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/request/PermissionCreateRequest.java
+++ b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/request/PermissionCreateRequest.java
@@ -1,8 +1,8 @@
-package com.supwisdom.institute.backend.system.api.vo.request;
+package com.supwisdom.institute.backend.base.api.vo.request;
 
+import com.supwisdom.institute.backend.base.domain.entity.Permission;
 import com.supwisdom.institute.backend.common.framework.entity.EntityUtils;
 import com.supwisdom.institute.backend.common.framework.vo.request.IApiCreateRequest;
-import com.supwisdom.institute.backend.system.domain.entity.Permission;
 
 /**
  * @author loie

diff --git a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/request/PermissionDeleteBatchRequest.java b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/request/PermissionDeleteBatchRequest.java
similarity index 85%
rename from system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/request/PermissionDeleteBatchRequest.java
rename to base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/request/PermissionDeleteBatchRequest.java
index d868006..99663ba 100644 (file)
--- a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/request/PermissionDeleteBatchRequest.java
+++ b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/request/PermissionDeleteBatchRequest.java
@@ -1,4 +1,4 @@
-package com.supwisdom.institute.backend.system.api.vo.request;
+package com.supwisdom.institute.backend.base.api.vo.request;
 
 import java.util.List;
 

diff --git a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/request/PermissionQueryRequest.java b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/request/PermissionQueryRequest.java
similarity index 92%
rename from system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/request/PermissionQueryRequest.java
rename to base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/request/PermissionQueryRequest.java
index 4b26b8c..ed66913 100644 (file)
--- a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/request/PermissionQueryRequest.java
+++ b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/request/PermissionQueryRequest.java
@@ -1,4 +1,4 @@
-package com.supwisdom.institute.backend.system.api.vo.request;
+package com.supwisdom.institute.backend.base.api.vo.request;
 
 import lombok.Getter;
 import lombok.Setter;

diff --git a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/request/PermissionUpdateRequest.java b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/request/PermissionUpdateRequest.java
similarity index 80%
rename from system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/request/PermissionUpdateRequest.java
rename to base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/request/PermissionUpdateRequest.java
index f128f35..896b901 100644 (file)
--- a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/request/PermissionUpdateRequest.java
+++ b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/request/PermissionUpdateRequest.java
@@ -1,8 +1,8 @@
-package com.supwisdom.institute.backend.system.api.vo.request;
+package com.supwisdom.institute.backend.base.api.vo.request;
 
+import com.supwisdom.institute.backend.base.domain.entity.Permission;
 import com.supwisdom.institute.backend.common.framework.entity.EntityUtils;
 import com.supwisdom.institute.backend.common.framework.vo.request.IApiUpdateRequest;
-import com.supwisdom.institute.backend.system.domain.entity.Permission;
 
 import lombok.Getter;
 import lombok.Setter;

diff --git a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/request/ResourceCreateRequest.java b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/request/ResourceCreateRequest.java
similarity index 77%
rename from system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/request/ResourceCreateRequest.java
rename to base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/request/ResourceCreateRequest.java
index edcc582..74ac0c5 100644 (file)
--- a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/request/ResourceCreateRequest.java
+++ b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/request/ResourceCreateRequest.java
@@ -1,8 +1,8 @@
-package com.supwisdom.institute.backend.system.api.vo.request;
+package com.supwisdom.institute.backend.base.api.vo.request;
 
+import com.supwisdom.institute.backend.base.domain.entity.Resource;
 import com.supwisdom.institute.backend.common.framework.entity.EntityUtils;
 import com.supwisdom.institute.backend.common.framework.vo.request.IApiCreateRequest;
-import com.supwisdom.institute.backend.system.domain.entity.Resource;
 
 /**
  * @author loie

diff --git a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/request/ResourceQueryRequest.java b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/request/ResourceQueryRequest.java
similarity index 92%
rename from system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/request/ResourceQueryRequest.java
rename to base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/request/ResourceQueryRequest.java
index 780f827..cc73efb 100644 (file)
--- a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/request/ResourceQueryRequest.java
+++ b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/request/ResourceQueryRequest.java
@@ -1,4 +1,4 @@
-package com.supwisdom.institute.backend.system.api.vo.request;
+package com.supwisdom.institute.backend.base.api.vo.request;
 
 import lombok.Getter;
 import lombok.Setter;

diff --git a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/request/ResourceUpdateRequest.java b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/request/ResourceUpdateRequest.java
similarity index 80%
rename from system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/request/ResourceUpdateRequest.java
rename to base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/request/ResourceUpdateRequest.java
index 7013336..13f7bf7 100644 (file)
--- a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/request/ResourceUpdateRequest.java
+++ b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/request/ResourceUpdateRequest.java
@@ -1,8 +1,8 @@
-package com.supwisdom.institute.backend.system.api.vo.request;
+package com.supwisdom.institute.backend.base.api.vo.request;
 
+import com.supwisdom.institute.backend.base.domain.entity.Resource;
 import com.supwisdom.institute.backend.common.framework.entity.EntityUtils;
 import com.supwisdom.institute.backend.common.framework.vo.request.IApiUpdateRequest;
-import com.supwisdom.institute.backend.system.domain.entity.Resource;
 
 import lombok.Getter;
 import lombok.Setter;

diff --git a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/request/RoleCreateRequest.java b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/request/RoleCreateRequest.java
similarity index 77%
rename from system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/request/RoleCreateRequest.java
rename to base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/request/RoleCreateRequest.java
index f8dfc33..467dcb1 100644 (file)
--- a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/request/RoleCreateRequest.java
+++ b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/request/RoleCreateRequest.java
@@ -1,8 +1,8 @@
-package com.supwisdom.institute.backend.system.api.vo.request;
+package com.supwisdom.institute.backend.base.api.vo.request;
 
+import com.supwisdom.institute.backend.base.domain.entity.Role;
 import com.supwisdom.institute.backend.common.framework.entity.EntityUtils;
 import com.supwisdom.institute.backend.common.framework.vo.request.IApiCreateRequest;
-import com.supwisdom.institute.backend.system.domain.entity.Role;
 
 /**
  * @author loie

diff --git a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/request/RoleDeleteBatchRequest.java b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/request/RoleDeleteBatchRequest.java
similarity index 84%
rename from system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/request/RoleDeleteBatchRequest.java
rename to base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/request/RoleDeleteBatchRequest.java
index 14f65d3..ae6edc8 100644 (file)
--- a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/request/RoleDeleteBatchRequest.java
+++ b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/request/RoleDeleteBatchRequest.java
@@ -1,4 +1,4 @@
-package com.supwisdom.institute.backend.system.api.vo.request;
+package com.supwisdom.institute.backend.base.api.vo.request;
 
 import java.util.List;
 

diff --git a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/request/RoleQueryRequest.java b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/request/RoleQueryRequest.java
similarity index 91%
rename from system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/request/RoleQueryRequest.java
rename to base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/request/RoleQueryRequest.java
index 76a3f9e..d247f24 100644 (file)
--- a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/request/RoleQueryRequest.java
+++ b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/request/RoleQueryRequest.java
@@ -1,4 +1,4 @@
-package com.supwisdom.institute.backend.system.api.vo.request;
+package com.supwisdom.institute.backend.base.api.vo.request;
 
 import lombok.Getter;
 import lombok.Setter;

diff --git a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/request/RoleRelateAccountsRequest.java b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/request/RoleRelateAccountsRequest.java
similarity index 73%
rename from system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/request/RoleRelateAccountsRequest.java
rename to base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/request/RoleRelateAccountsRequest.java
index 69a0b4d..214caea 100644 (file)
--- a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/request/RoleRelateAccountsRequest.java
+++ b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/request/RoleRelateAccountsRequest.java
@@ -1,12 +1,12 @@
-package com.supwisdom.institute.backend.system.api.vo.request;
+package com.supwisdom.institute.backend.base.api.vo.request;
 
 import java.util.List;
 
 import lombok.Getter;
 import lombok.Setter;
 
+import com.supwisdom.institute.backend.base.domain.entity.AccountRole;
 import com.supwisdom.institute.backend.common.framework.vo.request.IApiRequest;
-import com.supwisdom.institute.backend.system.domain.entity.AccountRole;
 
 public class RoleRelateAccountsRequest implements IApiRequest {
   

diff --git a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/request/RoleRelateGroupsRequest.java b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/request/RoleRelateGroupsRequest.java
similarity index 73%
rename from system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/request/RoleRelateGroupsRequest.java
rename to base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/request/RoleRelateGroupsRequest.java
index b31c4d2..0bdff1a 100644 (file)
--- a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/request/RoleRelateGroupsRequest.java
+++ b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/request/RoleRelateGroupsRequest.java
@@ -1,12 +1,12 @@
-package com.supwisdom.institute.backend.system.api.vo.request;
+package com.supwisdom.institute.backend.base.api.vo.request;
 
 import java.util.List;
 
 import lombok.Getter;
 import lombok.Setter;
 
+import com.supwisdom.institute.backend.base.domain.entity.GroupRole;
 import com.supwisdom.institute.backend.common.framework.vo.request.IApiRequest;
-import com.supwisdom.institute.backend.system.domain.entity.GroupRole;
 
 public class RoleRelateGroupsRequest implements IApiRequest {
 

diff --git a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/request/RoleRelatePermissionsRequest.java b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/request/RoleRelatePermissionsRequest.java
similarity index 73%
rename from system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/request/RoleRelatePermissionsRequest.java
rename to base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/request/RoleRelatePermissionsRequest.java
index e4ed807..f00d520 100644 (file)
--- a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/request/RoleRelatePermissionsRequest.java
+++ b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/request/RoleRelatePermissionsRequest.java
@@ -1,12 +1,12 @@
-package com.supwisdom.institute.backend.system.api.vo.request;
+package com.supwisdom.institute.backend.base.api.vo.request;
 
 import java.util.List;
 
 import lombok.Getter;
 import lombok.Setter;
 
+import com.supwisdom.institute.backend.base.domain.entity.RolePermission;
 import com.supwisdom.institute.backend.common.framework.vo.request.IApiRequest;
-import com.supwisdom.institute.backend.system.domain.entity.RolePermission;
 
 public class RoleRelatePermissionsRequest implements IApiRequest {
   

diff --git a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/request/RoleRelatedAccountsRequest.java b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/request/RoleRelatedAccountsRequest.java
similarity index 92%
rename from system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/request/RoleRelatedAccountsRequest.java
rename to base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/request/RoleRelatedAccountsRequest.java
index 0480258..cc1c505 100644 (file)
--- a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/request/RoleRelatedAccountsRequest.java
+++ b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/request/RoleRelatedAccountsRequest.java
@@ -1,4 +1,4 @@
-package com.supwisdom.institute.backend.system.api.vo.request;
+package com.supwisdom.institute.backend.base.api.vo.request;
 
 import lombok.Getter;
 import lombok.Setter;

diff --git a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/request/RoleRelatedGroupsRequest.java b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/request/RoleRelatedGroupsRequest.java
similarity index 92%
rename from system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/request/RoleRelatedGroupsRequest.java
rename to base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/request/RoleRelatedGroupsRequest.java
index 52126ab..88c0ac8 100644 (file)
--- a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/request/RoleRelatedGroupsRequest.java
+++ b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/request/RoleRelatedGroupsRequest.java
@@ -1,4 +1,4 @@
-package com.supwisdom.institute.backend.system.api.vo.request;
+package com.supwisdom.institute.backend.base.api.vo.request;
 
 import lombok.Getter;
 import lombok.Setter;

diff --git a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/request/RoleRelatedPermissionsRequest.java b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/request/RoleRelatedPermissionsRequest.java
similarity index 92%
rename from system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/request/RoleRelatedPermissionsRequest.java
rename to base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/request/RoleRelatedPermissionsRequest.java
index b31c761..12eaf23 100644 (file)
--- a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/request/RoleRelatedPermissionsRequest.java
+++ b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/request/RoleRelatedPermissionsRequest.java
@@ -1,4 +1,4 @@
-package com.supwisdom.institute.backend.system.api.vo.request;
+package com.supwisdom.institute.backend.base.api.vo.request;
 
 import lombok.Getter;
 import lombok.Setter;

diff --git a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/request/RoleUpdateRequest.java b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/request/RoleUpdateRequest.java
similarity index 80%
rename from system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/request/RoleUpdateRequest.java
rename to base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/request/RoleUpdateRequest.java
index b5adc41..c3cbe19 100644 (file)
--- a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/request/RoleUpdateRequest.java
+++ b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/request/RoleUpdateRequest.java
@@ -1,8 +1,8 @@
-package com.supwisdom.institute.backend.system.api.vo.request;
+package com.supwisdom.institute.backend.base.api.vo.request;
 
+import com.supwisdom.institute.backend.base.domain.entity.Role;
 import com.supwisdom.institute.backend.common.framework.entity.EntityUtils;
 import com.supwisdom.institute.backend.common.framework.vo.request.IApiUpdateRequest;
-import com.supwisdom.institute.backend.system.domain.entity.Role;
 
 import lombok.Getter;
 import lombok.Setter;

diff --git a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/AccountCreateResponseData.java b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/AccountCreateResponseData.java
similarity index 84%
rename from system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/AccountCreateResponseData.java
rename to base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/AccountCreateResponseData.java
index 49b5383..c5cabb4 100644 (file)
--- a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/AccountCreateResponseData.java
+++ b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/AccountCreateResponseData.java
@@ -1,8 +1,8 @@
-package com.supwisdom.institute.backend.system.api.vo.response;
+package com.supwisdom.institute.backend.base.api.vo.response;
 
+import com.supwisdom.institute.backend.base.domain.entity.Account;
 import com.supwisdom.institute.backend.common.framework.entity.EntityUtils;
 import com.supwisdom.institute.backend.common.framework.vo.response.data.IApiCreateResponseData;
-import com.supwisdom.institute.backend.system.domain.entity.Account;
 
 import lombok.Getter;
 import lombok.Setter;

diff --git a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/AccountDeleteBatchResponseData.java b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/AccountDeleteBatchResponseData.java
similarity index 91%
rename from system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/AccountDeleteBatchResponseData.java
rename to base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/AccountDeleteBatchResponseData.java
index f712942..6726752 100644 (file)
--- a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/AccountDeleteBatchResponseData.java
+++ b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/AccountDeleteBatchResponseData.java
@@ -1,4 +1,4 @@
-package com.supwisdom.institute.backend.system.api.vo.response;
+package com.supwisdom.institute.backend.base.api.vo.response;
 
 import java.util.List;
 

diff --git a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/AccountLoadResponseData.java b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/AccountLoadResponseData.java
similarity index 83%
rename from system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/AccountLoadResponseData.java
rename to base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/AccountLoadResponseData.java
index d8f2c43..184d935 100644 (file)
--- a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/AccountLoadResponseData.java
+++ b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/AccountLoadResponseData.java
@@ -1,8 +1,8 @@
-package com.supwisdom.institute.backend.system.api.vo.response;
+package com.supwisdom.institute.backend.base.api.vo.response;
 
+import com.supwisdom.institute.backend.base.domain.entity.Account;
 import com.supwisdom.institute.backend.common.framework.entity.EntityUtils;
 import com.supwisdom.institute.backend.common.framework.vo.response.data.IApiLoadResponseData;
-import com.supwisdom.institute.backend.system.domain.entity.Account;
 
 import lombok.Getter;
 import lombok.Setter;

diff --git a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/AccountQueryResponseData.java b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/AccountQueryResponseData.java
similarity index 93%
rename from system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/AccountQueryResponseData.java
rename to base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/AccountQueryResponseData.java
index 723dc26..cf4c59a 100644 (file)
--- a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/AccountQueryResponseData.java
+++ b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/AccountQueryResponseData.java
@@ -1,4 +1,4 @@
-package com.supwisdom.institute.backend.system.api.vo.response;
+package com.supwisdom.institute.backend.base.api.vo.response;
 
 import lombok.Getter;
 import lombok.Setter;
@@ -8,9 +8,9 @@ import java.util.Map;
 
 import org.springframework.data.domain.Page;
 
+import com.supwisdom.institute.backend.base.domain.entity.Account;
 import com.supwisdom.institute.backend.common.framework.vo.request.IApiQueryRequest;
 import com.supwisdom.institute.backend.common.framework.vo.response.data.IApiQueryResponseData;
-import com.supwisdom.institute.backend.system.domain.entity.Account;
 
 /**
  * @author loie

diff --git a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/AccountRelateGroupsResponseData.java b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/AccountRelateGroupsResponseData.java
similarity index 90%
rename from system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/AccountRelateGroupsResponseData.java
rename to base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/AccountRelateGroupsResponseData.java
index b1d8b43..2baafb9 100644 (file)
--- a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/AccountRelateGroupsResponseData.java
+++ b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/AccountRelateGroupsResponseData.java
@@ -1,4 +1,4 @@
-package com.supwisdom.institute.backend.system.api.vo.response;
+package com.supwisdom.institute.backend.base.api.vo.response;
 
 import lombok.Getter;
 import lombok.Setter;

diff --git a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/AccountRelateRolesResponseData.java b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/AccountRelateRolesResponseData.java
similarity index 90%
rename from system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/AccountRelateRolesResponseData.java
rename to base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/AccountRelateRolesResponseData.java
index 1d9c932..5c7a252 100644 (file)
--- a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/AccountRelateRolesResponseData.java
+++ b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/AccountRelateRolesResponseData.java
@@ -1,4 +1,4 @@
-package com.supwisdom.institute.backend.system.api.vo.response;
+package com.supwisdom.institute.backend.base.api.vo.response;
 
 import lombok.Getter;
 import lombok.Setter;

diff --git a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/AccountRelatedGroupsResponseData.java b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/AccountRelatedGroupsResponseData.java
similarity index 93%
rename from system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/AccountRelatedGroupsResponseData.java
rename to base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/AccountRelatedGroupsResponseData.java
index 01c9884..54db3e9 100644 (file)
--- a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/AccountRelatedGroupsResponseData.java
+++ b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/AccountRelatedGroupsResponseData.java
@@ -1,4 +1,4 @@
-package com.supwisdom.institute.backend.system.api.vo.response;
+package com.supwisdom.institute.backend.base.api.vo.response;
 
 import lombok.Getter;
 import lombok.Setter;
@@ -8,9 +8,9 @@ import java.util.Map;
 
 import org.springframework.data.domain.Page;
 
+import com.supwisdom.institute.backend.base.domain.entity.AccountGroup;
 import com.supwisdom.institute.backend.common.framework.vo.request.IApiQueryRequest;
 import com.supwisdom.institute.backend.common.framework.vo.response.data.IApiQueryResponseData;
-import com.supwisdom.institute.backend.system.domain.entity.AccountGroup;
 
 /**
  * @author loie

diff --git a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/AccountRelatedRolesResponseData.java b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/AccountRelatedRolesResponseData.java
similarity index 93%
rename from system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/AccountRelatedRolesResponseData.java
rename to base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/AccountRelatedRolesResponseData.java
index fc6c1c0..96fff82 100644 (file)
--- a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/AccountRelatedRolesResponseData.java
+++ b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/AccountRelatedRolesResponseData.java
@@ -1,4 +1,4 @@
-package com.supwisdom.institute.backend.system.api.vo.response;
+package com.supwisdom.institute.backend.base.api.vo.response;
 
 import lombok.Getter;
 import lombok.Setter;
@@ -8,9 +8,9 @@ import java.util.Map;
 
 import org.springframework.data.domain.Page;
 
+import com.supwisdom.institute.backend.base.domain.entity.AccountRole;
 import com.supwisdom.institute.backend.common.framework.vo.request.IApiQueryRequest;
 import com.supwisdom.institute.backend.common.framework.vo.response.data.IApiQueryResponseData;
-import com.supwisdom.institute.backend.system.domain.entity.AccountRole;
 
 /**
  * @author loie

diff --git a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/AccountRemoveResponseData.java b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/AccountRemoveResponseData.java
similarity index 83%
rename from system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/AccountRemoveResponseData.java
rename to base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/AccountRemoveResponseData.java
index 4d89768..718df5d 100644 (file)
--- a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/AccountRemoveResponseData.java
+++ b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/AccountRemoveResponseData.java
@@ -1,11 +1,11 @@
-package com.supwisdom.institute.backend.system.api.vo.response;
+package com.supwisdom.institute.backend.base.api.vo.response;
 
 import lombok.Getter;
 import lombok.Setter;
 
+import com.supwisdom.institute.backend.base.domain.entity.Account;
 import com.supwisdom.institute.backend.common.framework.entity.EntityUtils;
 import com.supwisdom.institute.backend.common.framework.vo.response.data.IApiRemoveResponseData;
-import com.supwisdom.institute.backend.system.domain.entity.Account;
 
 /**
  * @author loie

diff --git a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/AccountUpdateResponseData.java b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/AccountUpdateResponseData.java
similarity index 84%
rename from system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/AccountUpdateResponseData.java
rename to base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/AccountUpdateResponseData.java
index 4b637dc..43d9098 100644 (file)
--- a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/AccountUpdateResponseData.java
+++ b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/AccountUpdateResponseData.java
@@ -1,8 +1,8 @@
-package com.supwisdom.institute.backend.system.api.vo.response;
+package com.supwisdom.institute.backend.base.api.vo.response;
 
+import com.supwisdom.institute.backend.base.domain.entity.Account;
 import com.supwisdom.institute.backend.common.framework.entity.EntityUtils;
 import com.supwisdom.institute.backend.common.framework.vo.response.data.IApiUpdateResponseData;
-import com.supwisdom.institute.backend.system.domain.entity.Account;
 
 import lombok.Getter;
 import lombok.Setter;

diff --git a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/ConfigCreateResponseData.java b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/ConfigCreateResponseData.java
similarity index 84%
rename from system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/ConfigCreateResponseData.java
rename to base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/ConfigCreateResponseData.java
index 3d130d8..c29d112 100644 (file)
--- a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/ConfigCreateResponseData.java
+++ b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/ConfigCreateResponseData.java
@@ -1,8 +1,8 @@
-package com.supwisdom.institute.backend.system.api.vo.response;
+package com.supwisdom.institute.backend.base.api.vo.response;
 
+import com.supwisdom.institute.backend.base.domain.entity.Config;
 import com.supwisdom.institute.backend.common.framework.entity.EntityUtils;
 import com.supwisdom.institute.backend.common.framework.vo.response.data.IApiCreateResponseData;
-import com.supwisdom.institute.backend.system.domain.entity.Config;
 
 import lombok.Getter;
 import lombok.Setter;

diff --git a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/ConfigLoadResponseData.java b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/ConfigLoadResponseData.java
similarity index 84%
rename from system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/ConfigLoadResponseData.java
rename to base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/ConfigLoadResponseData.java
index c93fa8c..4753b1d 100644 (file)
--- a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/ConfigLoadResponseData.java
+++ b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/ConfigLoadResponseData.java
@@ -1,8 +1,8 @@
-package com.supwisdom.institute.backend.system.api.vo.response;
+package com.supwisdom.institute.backend.base.api.vo.response;
 
+import com.supwisdom.institute.backend.base.domain.entity.Config;
 import com.supwisdom.institute.backend.common.framework.entity.EntityUtils;
 import com.supwisdom.institute.backend.common.framework.vo.response.data.IApiLoadResponseData;
-import com.supwisdom.institute.backend.system.domain.entity.Config;
 
 import lombok.Getter;
 import lombok.Setter;

diff --git a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/ConfigQueryResponseData.java b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/ConfigQueryResponseData.java
similarity index 89%
rename from system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/ConfigQueryResponseData.java
rename to base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/ConfigQueryResponseData.java
index aea651a..f27c1cd 100644 (file)
--- a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/ConfigQueryResponseData.java
+++ b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/ConfigQueryResponseData.java
@@ -1,4 +1,4 @@
-package com.supwisdom.institute.backend.system.api.vo.response;
+package com.supwisdom.institute.backend.base.api.vo.response;
 
 import lombok.Getter;
 import lombok.Setter;
@@ -8,9 +8,9 @@ import java.util.Map;
 
 import org.springframework.data.domain.Page;
 
+import com.supwisdom.institute.backend.base.api.vo.request.ConfigQueryRequest;
+import com.supwisdom.institute.backend.base.domain.entity.Config;
 import com.supwisdom.institute.backend.common.framework.vo.response.data.IApiQueryResponseData;
-import com.supwisdom.institute.backend.system.api.vo.request.ConfigQueryRequest;
-import com.supwisdom.institute.backend.system.domain.entity.Config;
 
 /**
  * @author loie

diff --git a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/ConfigRemoveResponseData.java b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/ConfigRemoveResponseData.java
similarity index 84%
rename from system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/ConfigRemoveResponseData.java
rename to base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/ConfigRemoveResponseData.java
index 26f9a35..fc483de 100644 (file)
--- a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/ConfigRemoveResponseData.java
+++ b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/ConfigRemoveResponseData.java
@@ -1,11 +1,11 @@
-package com.supwisdom.institute.backend.system.api.vo.response;
+package com.supwisdom.institute.backend.base.api.vo.response;
 
 import lombok.Getter;
 import lombok.Setter;
 
+import com.supwisdom.institute.backend.base.domain.entity.Config;
 import com.supwisdom.institute.backend.common.framework.entity.EntityUtils;
 import com.supwisdom.institute.backend.common.framework.vo.response.data.IApiRemoveResponseData;
-import com.supwisdom.institute.backend.system.domain.entity.Config;
 
 /**
  * @author loie

diff --git a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/ConfigUpdateResponseData.java b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/ConfigUpdateResponseData.java
similarity index 84%
rename from system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/ConfigUpdateResponseData.java
rename to base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/ConfigUpdateResponseData.java
index 95a1d24..ae27d68 100644 (file)
--- a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/ConfigUpdateResponseData.java
+++ b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/ConfigUpdateResponseData.java
@@ -1,8 +1,8 @@
-package com.supwisdom.institute.backend.system.api.vo.response;
+package com.supwisdom.institute.backend.base.api.vo.response;
 
+import com.supwisdom.institute.backend.base.domain.entity.Config;
 import com.supwisdom.institute.backend.common.framework.entity.EntityUtils;
 import com.supwisdom.institute.backend.common.framework.vo.response.data.IApiUpdateResponseData;
-import com.supwisdom.institute.backend.system.domain.entity.Config;
 
 import lombok.Getter;
 import lombok.Setter;

diff --git a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/GroupCreateResponseData.java b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/GroupCreateResponseData.java
similarity index 83%
rename from system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/GroupCreateResponseData.java
rename to base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/GroupCreateResponseData.java
index b5b64bd..96c8149 100644 (file)
--- a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/GroupCreateResponseData.java
+++ b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/GroupCreateResponseData.java
@@ -1,8 +1,8 @@
-package com.supwisdom.institute.backend.system.api.vo.response;
+package com.supwisdom.institute.backend.base.api.vo.response;
 
+import com.supwisdom.institute.backend.base.domain.entity.Group;
 import com.supwisdom.institute.backend.common.framework.entity.EntityUtils;
 import com.supwisdom.institute.backend.common.framework.vo.response.data.IApiCreateResponseData;
-import com.supwisdom.institute.backend.system.domain.entity.Group;
 
 import lombok.Getter;
 import lombok.Setter;

diff --git a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/GroupLoadResponseData.java b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/GroupLoadResponseData.java
similarity index 83%
rename from system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/GroupLoadResponseData.java
rename to base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/GroupLoadResponseData.java
index 9462642..b1e6f47 100644 (file)
--- a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/GroupLoadResponseData.java
+++ b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/GroupLoadResponseData.java
@@ -1,8 +1,8 @@
-package com.supwisdom.institute.backend.system.api.vo.response;
+package com.supwisdom.institute.backend.base.api.vo.response;
 
+import com.supwisdom.institute.backend.base.domain.entity.Group;
 import com.supwisdom.institute.backend.common.framework.entity.EntityUtils;
 import com.supwisdom.institute.backend.common.framework.vo.response.data.IApiLoadResponseData;
-import com.supwisdom.institute.backend.system.domain.entity.Group;
 
 import lombok.Getter;
 import lombok.Setter;

diff --git a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/GroupQueryResponseData.java b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/GroupQueryResponseData.java
similarity index 93%
rename from system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/GroupQueryResponseData.java
rename to base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/GroupQueryResponseData.java
index 43ee6f8..fa702a3 100644 (file)
--- a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/GroupQueryResponseData.java
+++ b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/GroupQueryResponseData.java
@@ -1,4 +1,4 @@
-package com.supwisdom.institute.backend.system.api.vo.response;
+package com.supwisdom.institute.backend.base.api.vo.response;
 
 import lombok.Getter;
 import lombok.Setter;
@@ -8,9 +8,9 @@ import java.util.Map;
 
 import org.springframework.data.domain.Page;
 
+import com.supwisdom.institute.backend.base.domain.entity.Group;
 import com.supwisdom.institute.backend.common.framework.vo.request.IApiQueryRequest;
 import com.supwisdom.institute.backend.common.framework.vo.response.data.IApiQueryResponseData;
-import com.supwisdom.institute.backend.system.domain.entity.Group;
 
 /**
  * @author loie

diff --git a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/GroupRelateAccountsResponseData.java b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/GroupRelateAccountsResponseData.java
similarity index 90%
rename from system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/GroupRelateAccountsResponseData.java
rename to base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/GroupRelateAccountsResponseData.java
index 84794bc..61d95e8 100644 (file)
--- a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/GroupRelateAccountsResponseData.java
+++ b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/GroupRelateAccountsResponseData.java
@@ -1,4 +1,4 @@
-package com.supwisdom.institute.backend.system.api.vo.response;
+package com.supwisdom.institute.backend.base.api.vo.response;
 
 import lombok.Getter;
 import lombok.Setter;

diff --git a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/GroupRelateRolesResponseData.java b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/GroupRelateRolesResponseData.java
similarity index 90%
rename from system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/GroupRelateRolesResponseData.java
rename to base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/GroupRelateRolesResponseData.java
index b9ecbd7..17c65f7 100644 (file)
--- a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/GroupRelateRolesResponseData.java
+++ b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/GroupRelateRolesResponseData.java
@@ -1,4 +1,4 @@
-package com.supwisdom.institute.backend.system.api.vo.response;
+package com.supwisdom.institute.backend.base.api.vo.response;
 
 import lombok.Getter;
 import lombok.Setter;

diff --git a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/GroupRelatedAccountsResponseData.java b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/GroupRelatedAccountsResponseData.java
similarity index 93%
rename from system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/GroupRelatedAccountsResponseData.java
rename to base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/GroupRelatedAccountsResponseData.java
index efc5a28..0d37091 100644 (file)
--- a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/GroupRelatedAccountsResponseData.java
+++ b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/GroupRelatedAccountsResponseData.java
@@ -1,4 +1,4 @@
-package com.supwisdom.institute.backend.system.api.vo.response;
+package com.supwisdom.institute.backend.base.api.vo.response;
 
 import lombok.Getter;
 import lombok.Setter;
@@ -8,9 +8,9 @@ import java.util.Map;
 
 import org.springframework.data.domain.Page;
 
+import com.supwisdom.institute.backend.base.domain.entity.AccountGroup;
 import com.supwisdom.institute.backend.common.framework.vo.request.IApiQueryRequest;
 import com.supwisdom.institute.backend.common.framework.vo.response.data.IApiQueryResponseData;
-import com.supwisdom.institute.backend.system.domain.entity.AccountGroup;
 
 /**
  * @author loie

diff --git a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/GroupRelatedRolesResponseData.java b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/GroupRelatedRolesResponseData.java
similarity index 93%
rename from system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/GroupRelatedRolesResponseData.java
rename to base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/GroupRelatedRolesResponseData.java
index 747ca50..c5ee184 100644 (file)
--- a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/GroupRelatedRolesResponseData.java
+++ b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/GroupRelatedRolesResponseData.java
@@ -1,4 +1,4 @@
-package com.supwisdom.institute.backend.system.api.vo.response;
+package com.supwisdom.institute.backend.base.api.vo.response;
 
 import lombok.Getter;
 import lombok.Setter;
@@ -8,9 +8,9 @@ import java.util.Map;
 
 import org.springframework.data.domain.Page;
 
+import com.supwisdom.institute.backend.base.domain.entity.GroupRole;
 import com.supwisdom.institute.backend.common.framework.vo.request.IApiQueryRequest;
 import com.supwisdom.institute.backend.common.framework.vo.response.data.IApiQueryResponseData;
-import com.supwisdom.institute.backend.system.domain.entity.GroupRole;
 
 /**
  * @author loie

diff --git a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/GroupRemoveResponseData.java b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/GroupRemoveResponseData.java
similarity index 83%
rename from system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/GroupRemoveResponseData.java
rename to base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/GroupRemoveResponseData.java
index 4289989..0fb7409 100644 (file)
--- a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/GroupRemoveResponseData.java
+++ b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/GroupRemoveResponseData.java
@@ -1,11 +1,11 @@
-package com.supwisdom.institute.backend.system.api.vo.response;
+package com.supwisdom.institute.backend.base.api.vo.response;
 
 import lombok.Getter;
 import lombok.Setter;
 
+import com.supwisdom.institute.backend.base.domain.entity.Group;
 import com.supwisdom.institute.backend.common.framework.entity.EntityUtils;
 import com.supwisdom.institute.backend.common.framework.vo.response.data.IApiRemoveResponseData;
-import com.supwisdom.institute.backend.system.domain.entity.Group;
 
 /**
  * @author loie

diff --git a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/GroupUpdateResponseData.java b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/GroupUpdateResponseData.java
similarity index 83%
rename from system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/GroupUpdateResponseData.java
rename to base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/GroupUpdateResponseData.java
index a069602..bb9df8b 100644 (file)
--- a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/GroupUpdateResponseData.java
+++ b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/GroupUpdateResponseData.java
@@ -1,8 +1,8 @@
-package com.supwisdom.institute.backend.system.api.vo.response;
+package com.supwisdom.institute.backend.base.api.vo.response;
 
+import com.supwisdom.institute.backend.base.domain.entity.Group;
 import com.supwisdom.institute.backend.common.framework.entity.EntityUtils;
 import com.supwisdom.institute.backend.common.framework.vo.response.data.IApiUpdateResponseData;
-import com.supwisdom.institute.backend.system.domain.entity.Group;
 
 import lombok.Getter;
 import lombok.Setter;

diff --git a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/PermissionCreateResponseData.java b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/PermissionCreateResponseData.java
similarity index 84%
rename from system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/PermissionCreateResponseData.java
rename to base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/PermissionCreateResponseData.java
index ac89dd3..94cf9db 100644 (file)
--- a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/PermissionCreateResponseData.java
+++ b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/PermissionCreateResponseData.java
@@ -1,8 +1,8 @@
-package com.supwisdom.institute.backend.system.api.vo.response;
+package com.supwisdom.institute.backend.base.api.vo.response;
 
+import com.supwisdom.institute.backend.base.domain.entity.Permission;
 import com.supwisdom.institute.backend.common.framework.entity.EntityUtils;
 import com.supwisdom.institute.backend.common.framework.vo.response.data.IApiCreateResponseData;
-import com.supwisdom.institute.backend.system.domain.entity.Permission;
 
 import lombok.Getter;
 import lombok.Setter;

diff --git a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/PermissionDeleteBatchResponseData.java b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/PermissionDeleteBatchResponseData.java
similarity index 91%
rename from system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/PermissionDeleteBatchResponseData.java
rename to base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/PermissionDeleteBatchResponseData.java
index 2923725..141afb4 100644 (file)
--- a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/PermissionDeleteBatchResponseData.java
+++ b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/PermissionDeleteBatchResponseData.java
@@ -1,4 +1,4 @@
-package com.supwisdom.institute.backend.system.api.vo.response;
+package com.supwisdom.institute.backend.base.api.vo.response;
 
 import java.util.List;
 

diff --git a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/PermissionLoadResponseData.java b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/PermissionLoadResponseData.java
similarity index 83%
rename from system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/PermissionLoadResponseData.java
rename to base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/PermissionLoadResponseData.java
index 6114186..422b88e 100644 (file)
--- a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/PermissionLoadResponseData.java
+++ b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/PermissionLoadResponseData.java
@@ -1,8 +1,8 @@
-package com.supwisdom.institute.backend.system.api.vo.response;
+package com.supwisdom.institute.backend.base.api.vo.response;
 
+import com.supwisdom.institute.backend.base.domain.entity.Permission;
 import com.supwisdom.institute.backend.common.framework.entity.EntityUtils;
 import com.supwisdom.institute.backend.common.framework.vo.response.data.IApiLoadResponseData;
-import com.supwisdom.institute.backend.system.domain.entity.Permission;
 
 import lombok.Getter;
 import lombok.Setter;

diff --git a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/PermissionQueryResponseData.java b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/PermissionQueryResponseData.java
similarity index 93%
rename from system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/PermissionQueryResponseData.java
rename to base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/PermissionQueryResponseData.java
index 28f6bf6..bb2c6b3 100644 (file)
--- a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/PermissionQueryResponseData.java
+++ b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/PermissionQueryResponseData.java
@@ -1,4 +1,4 @@
-package com.supwisdom.institute.backend.system.api.vo.response;
+package com.supwisdom.institute.backend.base.api.vo.response;
 
 import lombok.Getter;
 import lombok.Setter;
@@ -8,9 +8,9 @@ import java.util.Map;
 
 import org.springframework.data.domain.Page;
 
+import com.supwisdom.institute.backend.base.domain.entity.Permission;
 import com.supwisdom.institute.backend.common.framework.vo.request.IApiQueryRequest;
 import com.supwisdom.institute.backend.common.framework.vo.response.data.IApiQueryResponseData;
-import com.supwisdom.institute.backend.system.domain.entity.Permission;
 
 /**
  * @author loie

diff --git a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/PermissionRemoveResponseData.java b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/PermissionRemoveResponseData.java
similarity index 83%
rename from system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/PermissionRemoveResponseData.java
rename to base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/PermissionRemoveResponseData.java
index c5fc2bc..b2179dd 100644 (file)
--- a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/PermissionRemoveResponseData.java
+++ b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/PermissionRemoveResponseData.java
@@ -1,11 +1,11 @@
-package com.supwisdom.institute.backend.system.api.vo.response;
+package com.supwisdom.institute.backend.base.api.vo.response;
 
 import lombok.Getter;
 import lombok.Setter;
 
+import com.supwisdom.institute.backend.base.domain.entity.Permission;
 import com.supwisdom.institute.backend.common.framework.entity.EntityUtils;
 import com.supwisdom.institute.backend.common.framework.vo.response.data.IApiRemoveResponseData;
-import com.supwisdom.institute.backend.system.domain.entity.Permission;
 
 /**
  * @author loie

diff --git a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/PermissionTreeResponseData.java b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/PermissionTreeResponseData.java
similarity index 81%
rename from system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/PermissionTreeResponseData.java
rename to base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/PermissionTreeResponseData.java
index f4724e1..5eeb263 100644 (file)
--- a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/PermissionTreeResponseData.java
+++ b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/PermissionTreeResponseData.java
@@ -1,11 +1,11 @@
-package com.supwisdom.institute.backend.system.api.vo.response;
+package com.supwisdom.institute.backend.base.api.vo.response;
 
 
 import lombok.Getter;
 import lombok.Setter;
 
+import com.supwisdom.institute.backend.base.domain.model.PermissionTreeNode;
 import com.supwisdom.institute.backend.common.framework.vo.response.data.IApiResponseData;
-import com.supwisdom.institute.backend.system.domain.model.PermissionTreeNode;
 
 public class PermissionTreeResponseData implements IApiResponseData {
 

diff --git a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/PermissionUpdateResponseData.java b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/PermissionUpdateResponseData.java
similarity index 84%
rename from system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/PermissionUpdateResponseData.java
rename to base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/PermissionUpdateResponseData.java
index e9aa597..28c3a70 100644 (file)
--- a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/PermissionUpdateResponseData.java
+++ b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/PermissionUpdateResponseData.java
@@ -1,8 +1,8 @@
-package com.supwisdom.institute.backend.system.api.vo.response;
+package com.supwisdom.institute.backend.base.api.vo.response;
 
+import com.supwisdom.institute.backend.base.domain.entity.Permission;
 import com.supwisdom.institute.backend.common.framework.entity.EntityUtils;
 import com.supwisdom.institute.backend.common.framework.vo.response.data.IApiUpdateResponseData;
-import com.supwisdom.institute.backend.system.domain.entity.Permission;
 
 import lombok.Getter;
 import lombok.Setter;

diff --git a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/ResourceCreateResponseData.java b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/ResourceCreateResponseData.java
similarity index 84%
rename from system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/ResourceCreateResponseData.java
rename to base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/ResourceCreateResponseData.java
index 79cfe20..ba61a45 100644 (file)
--- a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/ResourceCreateResponseData.java
+++ b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/ResourceCreateResponseData.java
@@ -1,8 +1,8 @@
-package com.supwisdom.institute.backend.system.api.vo.response;
+package com.supwisdom.institute.backend.base.api.vo.response;
 
+import com.supwisdom.institute.backend.base.domain.entity.Resource;
 import com.supwisdom.institute.backend.common.framework.entity.EntityUtils;
 import com.supwisdom.institute.backend.common.framework.vo.response.data.IApiCreateResponseData;
-import com.supwisdom.institute.backend.system.domain.entity.Resource;
 
 import lombok.Getter;
 import lombok.Setter;

diff --git a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/ResourceLoadResponseData.java b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/ResourceLoadResponseData.java
similarity index 83%
rename from system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/ResourceLoadResponseData.java
rename to base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/ResourceLoadResponseData.java
index 7a129e8..9db0971 100644 (file)
--- a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/ResourceLoadResponseData.java
+++ b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/ResourceLoadResponseData.java
@@ -1,8 +1,8 @@
-package com.supwisdom.institute.backend.system.api.vo.response;
+package com.supwisdom.institute.backend.base.api.vo.response;
 
+import com.supwisdom.institute.backend.base.domain.entity.Resource;
 import com.supwisdom.institute.backend.common.framework.entity.EntityUtils;
 import com.supwisdom.institute.backend.common.framework.vo.response.data.IApiLoadResponseData;
-import com.supwisdom.institute.backend.system.domain.entity.Resource;
 
 import lombok.Getter;
 import lombok.Setter;

diff --git a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/ResourceQueryResponseData.java b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/ResourceQueryResponseData.java
similarity index 93%
rename from system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/ResourceQueryResponseData.java
rename to base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/ResourceQueryResponseData.java
index fb85017..a87f048 100644 (file)
--- a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/ResourceQueryResponseData.java
+++ b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/ResourceQueryResponseData.java
@@ -1,4 +1,4 @@
-package com.supwisdom.institute.backend.system.api.vo.response;
+package com.supwisdom.institute.backend.base.api.vo.response;
 
 import lombok.Getter;
 import lombok.Setter;
@@ -8,9 +8,9 @@ import java.util.Map;
 
 import org.springframework.data.domain.Page;
 
+import com.supwisdom.institute.backend.base.domain.entity.Resource;
 import com.supwisdom.institute.backend.common.framework.vo.request.IApiQueryRequest;
 import com.supwisdom.institute.backend.common.framework.vo.response.data.IApiQueryResponseData;
-import com.supwisdom.institute.backend.system.domain.entity.Resource;
 
 /**
  * @author loie

diff --git a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/ResourceRemoveResponseData.java b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/ResourceRemoveResponseData.java
similarity index 83%
rename from system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/ResourceRemoveResponseData.java
rename to base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/ResourceRemoveResponseData.java
index b7f8ecb..9ff9637 100644 (file)
--- a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/ResourceRemoveResponseData.java
+++ b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/ResourceRemoveResponseData.java
@@ -1,11 +1,11 @@
-package com.supwisdom.institute.backend.system.api.vo.response;
+package com.supwisdom.institute.backend.base.api.vo.response;
 
 import lombok.Getter;
 import lombok.Setter;
 
+import com.supwisdom.institute.backend.base.domain.entity.Resource;
 import com.supwisdom.institute.backend.common.framework.entity.EntityUtils;
 import com.supwisdom.institute.backend.common.framework.vo.response.data.IApiRemoveResponseData;
-import com.supwisdom.institute.backend.system.domain.entity.Resource;
 
 /**
  * @author loie

diff --git a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/ResourceUpdateResponseData.java b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/ResourceUpdateResponseData.java
similarity index 84%
rename from system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/ResourceUpdateResponseData.java
rename to base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/ResourceUpdateResponseData.java
index c185a0a..95592b1 100644 (file)
--- a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/ResourceUpdateResponseData.java
+++ b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/ResourceUpdateResponseData.java
@@ -1,8 +1,8 @@
-package com.supwisdom.institute.backend.system.api.vo.response;
+package com.supwisdom.institute.backend.base.api.vo.response;
 
+import com.supwisdom.institute.backend.base.domain.entity.Resource;
 import com.supwisdom.institute.backend.common.framework.entity.EntityUtils;
 import com.supwisdom.institute.backend.common.framework.vo.response.data.IApiUpdateResponseData;
-import com.supwisdom.institute.backend.system.domain.entity.Resource;
 
 import lombok.Getter;
 import lombok.Setter;

diff --git a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/RoleCreateResponseData.java b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/RoleCreateResponseData.java
similarity index 83%
rename from system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/RoleCreateResponseData.java
rename to base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/RoleCreateResponseData.java
index 7d4ee1c..9bde1cf 100644 (file)
--- a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/RoleCreateResponseData.java
+++ b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/RoleCreateResponseData.java
@@ -1,8 +1,8 @@
-package com.supwisdom.institute.backend.system.api.vo.response;
+package com.supwisdom.institute.backend.base.api.vo.response;
 
+import com.supwisdom.institute.backend.base.domain.entity.Role;
 import com.supwisdom.institute.backend.common.framework.entity.EntityUtils;
 import com.supwisdom.institute.backend.common.framework.vo.response.data.IApiCreateResponseData;
-import com.supwisdom.institute.backend.system.domain.entity.Role;
 
 import lombok.Getter;
 import lombok.Setter;

diff --git a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/RoleDeleteBatchResponseData.java b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/RoleDeleteBatchResponseData.java
similarity index 90%
rename from system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/RoleDeleteBatchResponseData.java
rename to base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/RoleDeleteBatchResponseData.java
index c7a6ac0..ec520a4 100644 (file)
--- a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/RoleDeleteBatchResponseData.java
+++ b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/RoleDeleteBatchResponseData.java
@@ -1,4 +1,4 @@
-package com.supwisdom.institute.backend.system.api.vo.response;
+package com.supwisdom.institute.backend.base.api.vo.response;
 
 import java.util.List;
 

diff --git a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/RoleLoadResponseData.java b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/RoleLoadResponseData.java
similarity index 83%
rename from system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/RoleLoadResponseData.java
rename to base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/RoleLoadResponseData.java
index 628920a..c311285 100644 (file)
--- a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/RoleLoadResponseData.java
+++ b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/RoleLoadResponseData.java
@@ -1,8 +1,8 @@
-package com.supwisdom.institute.backend.system.api.vo.response;
+package com.supwisdom.institute.backend.base.api.vo.response;
 
+import com.supwisdom.institute.backend.base.domain.entity.Role;
 import com.supwisdom.institute.backend.common.framework.entity.EntityUtils;
 import com.supwisdom.institute.backend.common.framework.vo.response.data.IApiLoadResponseData;
-import com.supwisdom.institute.backend.system.domain.entity.Role;
 
 import lombok.Getter;
 import lombok.Setter;

diff --git a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/RoleQueryResponseData.java b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/RoleQueryResponseData.java
similarity index 93%
rename from system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/RoleQueryResponseData.java
rename to base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/RoleQueryResponseData.java
index 83bab25..18e9c22 100644 (file)
--- a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/RoleQueryResponseData.java
+++ b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/RoleQueryResponseData.java
@@ -1,4 +1,4 @@
-package com.supwisdom.institute.backend.system.api.vo.response;
+package com.supwisdom.institute.backend.base.api.vo.response;
 
 import lombok.Getter;
 import lombok.Setter;
@@ -8,9 +8,9 @@ import java.util.Map;
 
 import org.springframework.data.domain.Page;
 
+import com.supwisdom.institute.backend.base.domain.entity.Role;
 import com.supwisdom.institute.backend.common.framework.vo.request.IApiQueryRequest;
 import com.supwisdom.institute.backend.common.framework.vo.response.data.IApiQueryResponseData;
-import com.supwisdom.institute.backend.system.domain.entity.Role;
 
 /**
  * @author loie

diff --git a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/RoleRelateAccountsResponseData.java b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/RoleRelateAccountsResponseData.java
similarity index 90%
rename from system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/RoleRelateAccountsResponseData.java
rename to base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/RoleRelateAccountsResponseData.java
index 5bb6838..a91bad9 100644 (file)
--- a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/RoleRelateAccountsResponseData.java
+++ b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/RoleRelateAccountsResponseData.java
@@ -1,4 +1,4 @@
-package com.supwisdom.institute.backend.system.api.vo.response;
+package com.supwisdom.institute.backend.base.api.vo.response;
 
 import lombok.Getter;
 import lombok.Setter;

diff --git a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/RoleRelateGroupsResponseData.java b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/RoleRelateGroupsResponseData.java
similarity index 90%
rename from system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/RoleRelateGroupsResponseData.java
rename to base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/RoleRelateGroupsResponseData.java
index 3548655..995b48f 100644 (file)
--- a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/RoleRelateGroupsResponseData.java
+++ b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/RoleRelateGroupsResponseData.java
@@ -1,4 +1,4 @@
-package com.supwisdom.institute.backend.system.api.vo.response;
+package com.supwisdom.institute.backend.base.api.vo.response;
 
 import lombok.Getter;
 import lombok.Setter;

diff --git a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/RoleRelatePermissionsResponseData.java b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/RoleRelatePermissionsResponseData.java
similarity index 90%
rename from system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/RoleRelatePermissionsResponseData.java
rename to base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/RoleRelatePermissionsResponseData.java
index f5089b0..c9a34b0 100644 (file)
--- a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/RoleRelatePermissionsResponseData.java
+++ b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/RoleRelatePermissionsResponseData.java
@@ -1,4 +1,4 @@
-package com.supwisdom.institute.backend.system.api.vo.response;
+package com.supwisdom.institute.backend.base.api.vo.response;
 
 import lombok.Getter;
 import lombok.Setter;

diff --git a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/RoleRelatedAccountsResponseData.java b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/RoleRelatedAccountsResponseData.java
similarity index 93%
rename from system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/RoleRelatedAccountsResponseData.java
rename to base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/RoleRelatedAccountsResponseData.java
index eeb44d2..385ff3e 100644 (file)
--- a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/RoleRelatedAccountsResponseData.java
+++ b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/RoleRelatedAccountsResponseData.java
@@ -1,4 +1,4 @@
-package com.supwisdom.institute.backend.system.api.vo.response;
+package com.supwisdom.institute.backend.base.api.vo.response;
 
 import lombok.Getter;
 import lombok.Setter;
@@ -8,9 +8,9 @@ import java.util.Map;
 
 import org.springframework.data.domain.Page;
 
+import com.supwisdom.institute.backend.base.domain.entity.AccountRole;
 import com.supwisdom.institute.backend.common.framework.vo.request.IApiQueryRequest;
 import com.supwisdom.institute.backend.common.framework.vo.response.data.IApiQueryResponseData;
-import com.supwisdom.institute.backend.system.domain.entity.AccountRole;
 
 /**
  * @author loie

diff --git a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/RoleRelatedGroupsResponseData.java b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/RoleRelatedGroupsResponseData.java
similarity index 93%
rename from system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/RoleRelatedGroupsResponseData.java
rename to base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/RoleRelatedGroupsResponseData.java
index 7f4865e..f32a2f6 100644 (file)
--- a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/RoleRelatedGroupsResponseData.java
+++ b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/RoleRelatedGroupsResponseData.java
@@ -1,4 +1,4 @@
-package com.supwisdom.institute.backend.system.api.vo.response;
+package com.supwisdom.institute.backend.base.api.vo.response;
 
 import lombok.Getter;
 import lombok.Setter;
@@ -8,9 +8,9 @@ import java.util.Map;
 
 import org.springframework.data.domain.Page;
 
+import com.supwisdom.institute.backend.base.domain.entity.GroupRole;
 import com.supwisdom.institute.backend.common.framework.vo.request.IApiQueryRequest;
 import com.supwisdom.institute.backend.common.framework.vo.response.data.IApiQueryResponseData;
-import com.supwisdom.institute.backend.system.domain.entity.GroupRole;
 
 /**
  * @author loie

diff --git a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/RoleRelatedPermissionsResponseData.java b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/RoleRelatedPermissionsResponseData.java
similarity index 93%
rename from system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/RoleRelatedPermissionsResponseData.java
rename to base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/RoleRelatedPermissionsResponseData.java
index 31453e4..35bcb2b 100644 (file)
--- a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/RoleRelatedPermissionsResponseData.java
+++ b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/RoleRelatedPermissionsResponseData.java
@@ -1,4 +1,4 @@
-package com.supwisdom.institute.backend.system.api.vo.response;
+package com.supwisdom.institute.backend.base.api.vo.response;
 
 import lombok.Getter;
 import lombok.Setter;
@@ -8,9 +8,9 @@ import java.util.Map;
 
 import org.springframework.data.domain.Page;
 
+import com.supwisdom.institute.backend.base.domain.entity.RolePermission;
 import com.supwisdom.institute.backend.common.framework.vo.request.IApiQueryRequest;
 import com.supwisdom.institute.backend.common.framework.vo.response.data.IApiQueryResponseData;
-import com.supwisdom.institute.backend.system.domain.entity.RolePermission;
 
 /**
  * @author loie

diff --git a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/RoleRemoveResponseData.java b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/RoleRemoveResponseData.java
similarity index 83%
rename from system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/RoleRemoveResponseData.java
rename to base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/RoleRemoveResponseData.java
index cf7f3ba..5ef2057 100644 (file)
--- a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/RoleRemoveResponseData.java
+++ b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/RoleRemoveResponseData.java
@@ -1,11 +1,11 @@
-package com.supwisdom.institute.backend.system.api.vo.response;
+package com.supwisdom.institute.backend.base.api.vo.response;
 
 import lombok.Getter;
 import lombok.Setter;
 
+import com.supwisdom.institute.backend.base.domain.entity.Role;
 import com.supwisdom.institute.backend.common.framework.entity.EntityUtils;
 import com.supwisdom.institute.backend.common.framework.vo.response.data.IApiRemoveResponseData;
-import com.supwisdom.institute.backend.system.domain.entity.Role;
 
 /**
  * @author loie

diff --git a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/RoleUpdateResponseData.java b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/RoleUpdateResponseData.java
similarity index 83%
rename from system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/RoleUpdateResponseData.java
rename to base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/RoleUpdateResponseData.java
index ea2cd26..0c96f46 100644 (file)
--- a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/vo/response/RoleUpdateResponseData.java
+++ b/base/api/src/main/java/com/supwisdom/institute/backend/base/api/vo/response/RoleUpdateResponseData.java
@@ -1,8 +1,8 @@
-package com.supwisdom.institute.backend.system.api.vo.response;
+package com.supwisdom.institute.backend.base.api.vo.response;
 
+import com.supwisdom.institute.backend.base.domain.entity.Role;
 import com.supwisdom.institute.backend.common.framework.entity.EntityUtils;
 import com.supwisdom.institute.backend.common.framework.vo.response.data.IApiUpdateResponseData;
-import com.supwisdom.institute.backend.system.domain.entity.Role;
 
 import lombok.Getter;
 import lombok.Setter;

diff --git a/base/domain/.gitignore b/base/domain/.gitignore
new file mode 100644 (file)
index 0000000..b83d222
--- /dev/null
+++ b/base/domain/.gitignore
@@ -0,0 +1 @@
+/target/

diff --git a/system/domain/pom.xml b/base/domain/pom.xml
similarity index 93%
rename from system/domain/pom.xml
rename to base/domain/pom.xml
index 7464c71..26580ba 100644 (file)
--- a/system/domain/pom.xml
+++ b/base/domain/pom.xml
@@ -11,12 +11,12 @@
   </parent>
 
   <groupId>com.supwisdom.institute</groupId>
-  <artifactId>sw-backend-system-domain</artifactId>
+  <artifactId>sw-backend-base-domain</artifactId>
   <version>0.0.1-SNAPSHOT</version>
   <packaging>jar</packaging>
 
-  <name>Supwisdom Backend Framework System Domain</name>
-  <description>Supwisdom Backend Framework System Domain project</description>
+  <name>Supwisdom Backend Framework Base Domain</name>
+  <description>Supwisdom Backend Framework Base Domain project</description>
 
   <dependencies>
 

diff --git a/system/domain/src/main/java/com/supwisdom/institute/backend/system/domain/entity/.gitkeep b/base/domain/src/main/java/com/supwisdom/institute/backend/base/domain/entity/.gitkeep
similarity index 100%
rename from system/domain/src/main/java/com/supwisdom/institute/backend/system/domain/entity/.gitkeep
rename to base/domain/src/main/java/com/supwisdom/institute/backend/base/domain/entity/.gitkeep

diff --git a/system/domain/src/main/java/com/supwisdom/institute/backend/system/domain/entity/Account.java b/base/domain/src/main/java/com/supwisdom/institute/backend/base/domain/entity/Account.java
similarity index 98%
rename from system/domain/src/main/java/com/supwisdom/institute/backend/system/domain/entity/Account.java
rename to base/domain/src/main/java/com/supwisdom/institute/backend/base/domain/entity/Account.java
index d241d32..9e05174 100644 (file)
--- a/system/domain/src/main/java/com/supwisdom/institute/backend/system/domain/entity/Account.java
+++ b/base/domain/src/main/java/com/supwisdom/institute/backend/base/domain/entity/Account.java
@@ -1,4 +1,4 @@
-package com.supwisdom.institute.backend.system.domain.entity;
+package com.supwisdom.institute.backend.base.domain.entity;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;

diff --git a/system/domain/src/main/java/com/supwisdom/institute/backend/system/domain/entity/AccountGroup.java b/base/domain/src/main/java/com/supwisdom/institute/backend/base/domain/entity/AccountGroup.java
similarity index 92%
rename from system/domain/src/main/java/com/supwisdom/institute/backend/system/domain/entity/AccountGroup.java
rename to base/domain/src/main/java/com/supwisdom/institute/backend/base/domain/entity/AccountGroup.java
index f7ae973..318d373 100644 (file)
--- a/system/domain/src/main/java/com/supwisdom/institute/backend/system/domain/entity/AccountGroup.java
+++ b/base/domain/src/main/java/com/supwisdom/institute/backend/base/domain/entity/AccountGroup.java
@@ -1,4 +1,4 @@
-package com.supwisdom.institute.backend.system.domain.entity;
+package com.supwisdom.institute.backend.base.domain.entity;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;

diff --git a/system/domain/src/main/java/com/supwisdom/institute/backend/system/domain/entity/AccountRole.java b/base/domain/src/main/java/com/supwisdom/institute/backend/base/domain/entity/AccountRole.java
similarity index 92%
rename from system/domain/src/main/java/com/supwisdom/institute/backend/system/domain/entity/AccountRole.java
rename to base/domain/src/main/java/com/supwisdom/institute/backend/base/domain/entity/AccountRole.java
index a91b367..4a834b0 100644 (file)
--- a/system/domain/src/main/java/com/supwisdom/institute/backend/system/domain/entity/AccountRole.java
+++ b/base/domain/src/main/java/com/supwisdom/institute/backend/base/domain/entity/AccountRole.java
@@ -1,4 +1,4 @@
-package com.supwisdom.institute.backend.system.domain.entity;
+package com.supwisdom.institute.backend.base.domain.entity;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;

diff --git a/system/domain/src/main/java/com/supwisdom/institute/backend/system/domain/entity/Config.java b/base/domain/src/main/java/com/supwisdom/institute/backend/base/domain/entity/Config.java
similarity index 95%
rename from system/domain/src/main/java/com/supwisdom/institute/backend/system/domain/entity/Config.java
rename to base/domain/src/main/java/com/supwisdom/institute/backend/base/domain/entity/Config.java
index 16300ef..ee78348 100644 (file)
--- a/system/domain/src/main/java/com/supwisdom/institute/backend/system/domain/entity/Config.java
+++ b/base/domain/src/main/java/com/supwisdom/institute/backend/base/domain/entity/Config.java
@@ -1,4 +1,4 @@
-package com.supwisdom.institute.backend.system.domain.entity;
+package com.supwisdom.institute.backend.base.domain.entity;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;

diff --git a/system/domain/src/main/java/com/supwisdom/institute/backend/system/domain/entity/Group.java b/base/domain/src/main/java/com/supwisdom/institute/backend/base/domain/entity/Group.java
similarity index 94%
rename from system/domain/src/main/java/com/supwisdom/institute/backend/system/domain/entity/Group.java
rename to base/domain/src/main/java/com/supwisdom/institute/backend/base/domain/entity/Group.java
index d1de8a2..87eaf2e 100644 (file)
--- a/system/domain/src/main/java/com/supwisdom/institute/backend/system/domain/entity/Group.java
+++ b/base/domain/src/main/java/com/supwisdom/institute/backend/base/domain/entity/Group.java
@@ -1,4 +1,4 @@
-package com.supwisdom.institute.backend.system.domain.entity;
+package com.supwisdom.institute.backend.base.domain.entity;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;

diff --git a/system/domain/src/main/java/com/supwisdom/institute/backend/system/domain/entity/GroupRole.java b/base/domain/src/main/java/com/supwisdom/institute/backend/base/domain/entity/GroupRole.java
similarity index 92%
rename from system/domain/src/main/java/com/supwisdom/institute/backend/system/domain/entity/GroupRole.java
rename to base/domain/src/main/java/com/supwisdom/institute/backend/base/domain/entity/GroupRole.java
index 1addd93..be96211 100644 (file)
--- a/system/domain/src/main/java/com/supwisdom/institute/backend/system/domain/entity/GroupRole.java
+++ b/base/domain/src/main/java/com/supwisdom/institute/backend/base/domain/entity/GroupRole.java
@@ -1,4 +1,4 @@
-package com.supwisdom.institute.backend.system.domain.entity;
+package com.supwisdom.institute.backend.base.domain.entity;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;

diff --git a/system/domain/src/main/java/com/supwisdom/institute/backend/system/domain/entity/Permission.java b/base/domain/src/main/java/com/supwisdom/institute/backend/base/domain/entity/Permission.java
similarity index 97%
rename from system/domain/src/main/java/com/supwisdom/institute/backend/system/domain/entity/Permission.java
rename to base/domain/src/main/java/com/supwisdom/institute/backend/base/domain/entity/Permission.java
index 449123b..0d7dbd0 100644 (file)
--- a/system/domain/src/main/java/com/supwisdom/institute/backend/system/domain/entity/Permission.java
+++ b/base/domain/src/main/java/com/supwisdom/institute/backend/base/domain/entity/Permission.java
@@ -1,4 +1,4 @@
-package com.supwisdom.institute.backend.system.domain.entity;
+package com.supwisdom.institute.backend.base.domain.entity;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;

diff --git a/system/domain/src/main/java/com/supwisdom/institute/backend/system/domain/entity/Resource.java b/base/domain/src/main/java/com/supwisdom/institute/backend/base/domain/entity/Resource.java
similarity index 93%
rename from system/domain/src/main/java/com/supwisdom/institute/backend/system/domain/entity/Resource.java
rename to base/domain/src/main/java/com/supwisdom/institute/backend/base/domain/entity/Resource.java
index b34016e..7b3a08c 100644 (file)
--- a/system/domain/src/main/java/com/supwisdom/institute/backend/system/domain/entity/Resource.java
+++ b/base/domain/src/main/java/com/supwisdom/institute/backend/base/domain/entity/Resource.java
@@ -1,4 +1,4 @@
-package com.supwisdom.institute.backend.system.domain.entity;
+package com.supwisdom.institute.backend.base.domain.entity;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;

diff --git a/system/domain/src/main/java/com/supwisdom/institute/backend/system/domain/entity/Role.java b/base/domain/src/main/java/com/supwisdom/institute/backend/base/domain/entity/Role.java
similarity index 94%
rename from system/domain/src/main/java/com/supwisdom/institute/backend/system/domain/entity/Role.java
rename to base/domain/src/main/java/com/supwisdom/institute/backend/base/domain/entity/Role.java
index d2f57e7..0714133 100644 (file)
--- a/system/domain/src/main/java/com/supwisdom/institute/backend/system/domain/entity/Role.java
+++ b/base/domain/src/main/java/com/supwisdom/institute/backend/base/domain/entity/Role.java
@@ -1,4 +1,4 @@
-package com.supwisdom.institute.backend.system.domain.entity;
+package com.supwisdom.institute.backend.base.domain.entity;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;

diff --git a/system/domain/src/main/java/com/supwisdom/institute/backend/system/domain/entity/RolePermission.java b/base/domain/src/main/java/com/supwisdom/institute/backend/base/domain/entity/RolePermission.java
similarity index 93%
rename from system/domain/src/main/java/com/supwisdom/institute/backend/system/domain/entity/RolePermission.java
rename to base/domain/src/main/java/com/supwisdom/institute/backend/base/domain/entity/RolePermission.java
index 252d32a..df8a031 100644 (file)
--- a/system/domain/src/main/java/com/supwisdom/institute/backend/system/domain/entity/RolePermission.java
+++ b/base/domain/src/main/java/com/supwisdom/institute/backend/base/domain/entity/RolePermission.java
@@ -1,4 +1,4 @@
-package com.supwisdom.institute.backend.system.domain.entity;
+package com.supwisdom.institute.backend.base.domain.entity;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;

diff --git a/system/domain/src/main/java/com/supwisdom/institute/backend/system/domain/exception/.gitkeep b/base/domain/src/main/java/com/supwisdom/institute/backend/base/domain/exception/.gitkeep
similarity index 100%
rename from system/domain/src/main/java/com/supwisdom/institute/backend/system/domain/exception/.gitkeep
rename to base/domain/src/main/java/com/supwisdom/institute/backend/base/domain/exception/.gitkeep

diff --git a/system/domain/src/main/java/com/supwisdom/institute/backend/system/domain/exception/ConfigException.java b/base/domain/src/main/java/com/supwisdom/institute/backend/base/domain/exception/ConfigException.java
similarity index 77%
rename from system/domain/src/main/java/com/supwisdom/institute/backend/system/domain/exception/ConfigException.java
rename to base/domain/src/main/java/com/supwisdom/institute/backend/base/domain/exception/ConfigException.java
index 2a9957e..77fee05 100644 (file)
--- a/system/domain/src/main/java/com/supwisdom/institute/backend/system/domain/exception/ConfigException.java
+++ b/base/domain/src/main/java/com/supwisdom/institute/backend/base/domain/exception/ConfigException.java
@@ -1,4 +1,4 @@
-package com.supwisdom.institute.backend.system.domain.exception;
+package com.supwisdom.institute.backend.base.domain.exception;
 
 import com.supwisdom.institute.backend.common.framework.exception.BaseException;
 

diff --git a/system/domain/src/main/java/com/supwisdom/institute/backend/system/domain/model/.gitkeep b/base/domain/src/main/java/com/supwisdom/institute/backend/base/domain/model/.gitkeep
similarity index 100%
rename from system/domain/src/main/java/com/supwisdom/institute/backend/system/domain/model/.gitkeep
rename to base/domain/src/main/java/com/supwisdom/institute/backend/base/domain/model/.gitkeep

diff --git a/system/domain/src/main/java/com/supwisdom/institute/backend/system/domain/model/PermissionTreeNode.java b/base/domain/src/main/java/com/supwisdom/institute/backend/base/domain/model/PermissionTreeNode.java
similarity index 74%
rename from system/domain/src/main/java/com/supwisdom/institute/backend/system/domain/model/PermissionTreeNode.java
rename to base/domain/src/main/java/com/supwisdom/institute/backend/base/domain/model/PermissionTreeNode.java
index 0f93a47..233de5f 100644 (file)
--- a/system/domain/src/main/java/com/supwisdom/institute/backend/system/domain/model/PermissionTreeNode.java
+++ b/base/domain/src/main/java/com/supwisdom/institute/backend/base/domain/model/PermissionTreeNode.java
@@ -1,4 +1,4 @@
-package com.supwisdom.institute.backend.system.domain.model;
+package com.supwisdom.institute.backend.base.domain.model;
 
 import java.util.List;
 
@@ -6,8 +6,8 @@ import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
 
+import com.supwisdom.institute.backend.base.domain.entity.Permission;
 import com.supwisdom.institute.backend.common.framework.model.IModel;
-import com.supwisdom.institute.backend.system.domain.entity.Permission;
 
 @ToString
 public class PermissionTreeNode extends Permission implements IModel {

diff --git a/system/domain/src/main/java/com/supwisdom/institute/backend/system/domain/repo/.gitkeep b/base/domain/src/main/java/com/supwisdom/institute/backend/base/domain/repo/.gitkeep
similarity index 100%
rename from system/domain/src/main/java/com/supwisdom/institute/backend/system/domain/repo/.gitkeep
rename to base/domain/src/main/java/com/supwisdom/institute/backend/base/domain/repo/.gitkeep

diff --git a/system/domain/src/main/java/com/supwisdom/institute/backend/system/domain/repo/AccountGroupRepository.java b/base/domain/src/main/java/com/supwisdom/institute/backend/base/domain/repo/AccountGroupRepository.java
similarity index 95%
rename from system/domain/src/main/java/com/supwisdom/institute/backend/system/domain/repo/AccountGroupRepository.java
rename to base/domain/src/main/java/com/supwisdom/institute/backend/base/domain/repo/AccountGroupRepository.java
index e4239ff..be61930 100644 (file)
--- a/system/domain/src/main/java/com/supwisdom/institute/backend/system/domain/repo/AccountGroupRepository.java
+++ b/base/domain/src/main/java/com/supwisdom/institute/backend/base/domain/repo/AccountGroupRepository.java
@@ -1,4 +1,4 @@
-package com.supwisdom.institute.backend.system.domain.repo;
+package com.supwisdom.institute.backend.base.domain.repo;
 
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -11,11 +11,11 @@ import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.stereotype.Repository;
 
+import com.supwisdom.institute.backend.base.domain.entity.Account;
+import com.supwisdom.institute.backend.base.domain.entity.AccountGroup;
+import com.supwisdom.institute.backend.base.domain.entity.Group;
 import com.supwisdom.institute.backend.common.framework.repo.BaseJpaRepository;
 import com.supwisdom.institute.backend.common.util.MapBeanUtils;
-import com.supwisdom.institute.backend.system.domain.entity.Group;
-import com.supwisdom.institute.backend.system.domain.entity.Account;
-import com.supwisdom.institute.backend.system.domain.entity.AccountGroup;
 
 @Repository
 public interface AccountGroupRepository extends BaseJpaRepository<AccountGroup> {

diff --git a/system/domain/src/main/java/com/supwisdom/institute/backend/system/domain/repo/AccountRepository.java b/base/domain/src/main/java/com/supwisdom/institute/backend/base/domain/repo/AccountRepository.java
similarity index 98%
rename from system/domain/src/main/java/com/supwisdom/institute/backend/system/domain/repo/AccountRepository.java
rename to base/domain/src/main/java/com/supwisdom/institute/backend/base/domain/repo/AccountRepository.java
index 1b44fa9..e4d9e07 100644 (file)
--- a/system/domain/src/main/java/com/supwisdom/institute/backend/system/domain/repo/AccountRepository.java
+++ b/base/domain/src/main/java/com/supwisdom/institute/backend/base/domain/repo/AccountRepository.java
@@ -1,4 +1,4 @@
-package com.supwisdom.institute.backend.system.domain.repo;
+package com.supwisdom.institute.backend.base.domain.repo;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -16,9 +16,9 @@ import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Repository;
 import org.springframework.util.StringUtils;
 
+import com.supwisdom.institute.backend.base.domain.entity.Account;
 import com.supwisdom.institute.backend.common.framework.repo.BaseJpaRepository;
 import com.supwisdom.institute.backend.common.util.MapBeanUtils;
-import com.supwisdom.institute.backend.system.domain.entity.Account;
 
 @Repository
 public interface AccountRepository extends BaseJpaRepository<Account> {

diff --git a/system/domain/src/main/java/com/supwisdom/institute/backend/system/domain/repo/AccountRoleRepository.java b/base/domain/src/main/java/com/supwisdom/institute/backend/base/domain/repo/AccountRoleRepository.java
similarity index 95%
rename from system/domain/src/main/java/com/supwisdom/institute/backend/system/domain/repo/AccountRoleRepository.java
rename to base/domain/src/main/java/com/supwisdom/institute/backend/base/domain/repo/AccountRoleRepository.java
index 822bd9f..503f3b5 100644 (file)
--- a/system/domain/src/main/java/com/supwisdom/institute/backend/system/domain/repo/AccountRoleRepository.java
+++ b/base/domain/src/main/java/com/supwisdom/institute/backend/base/domain/repo/AccountRoleRepository.java
@@ -1,4 +1,4 @@
-package com.supwisdom.institute.backend.system.domain.repo;
+package com.supwisdom.institute.backend.base.domain.repo;
 
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -11,11 +11,11 @@ import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.stereotype.Repository;
 
+import com.supwisdom.institute.backend.base.domain.entity.Account;
+import com.supwisdom.institute.backend.base.domain.entity.AccountRole;
+import com.supwisdom.institute.backend.base.domain.entity.Role;
 import com.supwisdom.institute.backend.common.framework.repo.BaseJpaRepository;
 import com.supwisdom.institute.backend.common.util.MapBeanUtils;
-import com.supwisdom.institute.backend.system.domain.entity.Role;
-import com.supwisdom.institute.backend.system.domain.entity.Account;
-import com.supwisdom.institute.backend.system.domain.entity.AccountRole;
 
 @Repository
 public interface AccountRoleRepository extends BaseJpaRepository<AccountRole> {

diff --git a/system/domain/src/main/java/com/supwisdom/institute/backend/system/domain/repo/ConfigRepository.java b/base/domain/src/main/java/com/supwisdom/institute/backend/base/domain/repo/ConfigRepository.java
similarity index 95%
rename from system/domain/src/main/java/com/supwisdom/institute/backend/system/domain/repo/ConfigRepository.java
rename to base/domain/src/main/java/com/supwisdom/institute/backend/base/domain/repo/ConfigRepository.java
index 3d6ce38..052115e 100644 (file)
--- a/system/domain/src/main/java/com/supwisdom/institute/backend/system/domain/repo/ConfigRepository.java
+++ b/base/domain/src/main/java/com/supwisdom/institute/backend/base/domain/repo/ConfigRepository.java
@@ -1,4 +1,4 @@
-package com.supwisdom.institute.backend.system.domain.repo;
+package com.supwisdom.institute.backend.base.domain.repo;
 
 import org.springframework.data.domain.Example;
 import org.springframework.data.domain.ExampleMatcher;
@@ -6,9 +6,9 @@ import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.stereotype.Repository;
 
+import com.supwisdom.institute.backend.base.domain.entity.Config;
 import com.supwisdom.institute.backend.common.framework.repo.BaseJpaRepository;
 import com.supwisdom.institute.backend.common.util.MapBeanUtils;
-import com.supwisdom.institute.backend.system.domain.entity.Config;
 
 import java.util.Map;
 import java.util.Optional;

diff --git a/system/domain/src/main/java/com/supwisdom/institute/backend/system/domain/repo/GroupRepository.java b/base/domain/src/main/java/com/supwisdom/institute/backend/base/domain/repo/GroupRepository.java
similarity index 93%
rename from system/domain/src/main/java/com/supwisdom/institute/backend/system/domain/repo/GroupRepository.java
rename to base/domain/src/main/java/com/supwisdom/institute/backend/base/domain/repo/GroupRepository.java
index 28a0b66..9db0e26 100644 (file)
--- a/system/domain/src/main/java/com/supwisdom/institute/backend/system/domain/repo/GroupRepository.java
+++ b/base/domain/src/main/java/com/supwisdom/institute/backend/base/domain/repo/GroupRepository.java
@@ -1,4 +1,4 @@
-package com.supwisdom.institute.backend.system.domain.repo;
+package com.supwisdom.institute.backend.base.domain.repo;
 
 import java.util.Map;
 
@@ -8,9 +8,9 @@ import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.stereotype.Repository;
 
+import com.supwisdom.institute.backend.base.domain.entity.Group;
 import com.supwisdom.institute.backend.common.framework.repo.BaseJpaRepository;
 import com.supwisdom.institute.backend.common.util.MapBeanUtils;
-import com.supwisdom.institute.backend.system.domain.entity.Group;
 
 @Repository
 public interface GroupRepository extends BaseJpaRepository<Group> {

diff --git a/system/domain/src/main/java/com/supwisdom/institute/backend/system/domain/repo/GroupRoleRepository.java b/base/domain/src/main/java/com/supwisdom/institute/backend/base/domain/repo/GroupRoleRepository.java
similarity index 95%
rename from system/domain/src/main/java/com/supwisdom/institute/backend/system/domain/repo/GroupRoleRepository.java
rename to base/domain/src/main/java/com/supwisdom/institute/backend/base/domain/repo/GroupRoleRepository.java
index 8f0386e..35bd4d5 100644 (file)
--- a/system/domain/src/main/java/com/supwisdom/institute/backend/system/domain/repo/GroupRoleRepository.java
+++ b/base/domain/src/main/java/com/supwisdom/institute/backend/base/domain/repo/GroupRoleRepository.java
@@ -1,4 +1,4 @@
-package com.supwisdom.institute.backend.system.domain.repo;
+package com.supwisdom.institute.backend.base.domain.repo;
 
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -11,11 +11,11 @@ import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.stereotype.Repository;
 
+import com.supwisdom.institute.backend.base.domain.entity.Group;
+import com.supwisdom.institute.backend.base.domain.entity.GroupRole;
+import com.supwisdom.institute.backend.base.domain.entity.Role;
 import com.supwisdom.institute.backend.common.framework.repo.BaseJpaRepository;
 import com.supwisdom.institute.backend.common.util.MapBeanUtils;
-import com.supwisdom.institute.backend.system.domain.entity.Group;
-import com.supwisdom.institute.backend.system.domain.entity.GroupRole;
-import com.supwisdom.institute.backend.system.domain.entity.Role;
 
 @Repository
 public interface GroupRoleRepository extends BaseJpaRepository<GroupRole> {

diff --git a/system/domain/src/main/java/com/supwisdom/institute/backend/system/domain/repo/PermissionRepository.java b/base/domain/src/main/java/com/supwisdom/institute/backend/base/domain/repo/PermissionRepository.java
similarity index 99%
rename from system/domain/src/main/java/com/supwisdom/institute/backend/system/domain/repo/PermissionRepository.java
rename to base/domain/src/main/java/com/supwisdom/institute/backend/base/domain/repo/PermissionRepository.java
index 0768adb..e7e7940 100644 (file)
--- a/system/domain/src/main/java/com/supwisdom/institute/backend/system/domain/repo/PermissionRepository.java
+++ b/base/domain/src/main/java/com/supwisdom/institute/backend/base/domain/repo/PermissionRepository.java
@@ -1,4 +1,4 @@
-package com.supwisdom.institute.backend.system.domain.repo;
+package com.supwisdom.institute.backend.base.domain.repo;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -23,9 +23,9 @@ import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 import org.springframework.util.StringUtils;
 
+import com.supwisdom.institute.backend.base.domain.entity.Permission;
 import com.supwisdom.institute.backend.common.framework.repo.BaseJpaRepository;
 import com.supwisdom.institute.backend.common.util.MapBeanUtils;
-import com.supwisdom.institute.backend.system.domain.entity.Permission;
 
 @Repository
 @Transactional

diff --git a/system/domain/src/main/java/com/supwisdom/institute/backend/system/domain/repo/ResourceRepository.java b/base/domain/src/main/java/com/supwisdom/institute/backend/base/domain/repo/ResourceRepository.java
similarity index 94%
rename from system/domain/src/main/java/com/supwisdom/institute/backend/system/domain/repo/ResourceRepository.java
rename to base/domain/src/main/java/com/supwisdom/institute/backend/base/domain/repo/ResourceRepository.java
index 693c10a..ae9055d 100644 (file)
--- a/system/domain/src/main/java/com/supwisdom/institute/backend/system/domain/repo/ResourceRepository.java
+++ b/base/domain/src/main/java/com/supwisdom/institute/backend/base/domain/repo/ResourceRepository.java
@@ -1,4 +1,4 @@
-package com.supwisdom.institute.backend.system.domain.repo;
+package com.supwisdom.institute.backend.base.domain.repo;
 
 import java.util.Map;
 import java.util.Optional;
@@ -9,9 +9,9 @@ import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.stereotype.Repository;
 
+import com.supwisdom.institute.backend.base.domain.entity.Resource;
 import com.supwisdom.institute.backend.common.framework.repo.BaseJpaRepository;
 import com.supwisdom.institute.backend.common.util.MapBeanUtils;
-import com.supwisdom.institute.backend.system.domain.entity.Resource;
 
 @Repository
 public interface ResourceRepository extends BaseJpaRepository<Resource> {

diff --git a/system/domain/src/main/java/com/supwisdom/institute/backend/system/domain/repo/RolePermissionRepository.java b/base/domain/src/main/java/com/supwisdom/institute/backend/base/domain/repo/RolePermissionRepository.java
similarity index 96%
rename from system/domain/src/main/java/com/supwisdom/institute/backend/system/domain/repo/RolePermissionRepository.java
rename to base/domain/src/main/java/com/supwisdom/institute/backend/base/domain/repo/RolePermissionRepository.java
index 97ff9e6..95f2814 100644 (file)
--- a/system/domain/src/main/java/com/supwisdom/institute/backend/system/domain/repo/RolePermissionRepository.java
+++ b/base/domain/src/main/java/com/supwisdom/institute/backend/base/domain/repo/RolePermissionRepository.java
@@ -1,4 +1,4 @@
-package com.supwisdom.institute.backend.system.domain.repo;
+package com.supwisdom.institute.backend.base.domain.repo;
 
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -11,11 +11,11 @@ import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.stereotype.Repository;
 
+import com.supwisdom.institute.backend.base.domain.entity.Permission;
+import com.supwisdom.institute.backend.base.domain.entity.Role;
+import com.supwisdom.institute.backend.base.domain.entity.RolePermission;
 import com.supwisdom.institute.backend.common.framework.repo.BaseJpaRepository;
 import com.supwisdom.institute.backend.common.util.MapBeanUtils;
-import com.supwisdom.institute.backend.system.domain.entity.Permission;
-import com.supwisdom.institute.backend.system.domain.entity.Role;
-import com.supwisdom.institute.backend.system.domain.entity.RolePermission;
 
 @Repository
 public interface RolePermissionRepository extends BaseJpaRepository<RolePermission> {

diff --git a/system/domain/src/main/java/com/supwisdom/institute/backend/system/domain/repo/RoleRepository.java b/base/domain/src/main/java/com/supwisdom/institute/backend/base/domain/repo/RoleRepository.java
similarity index 96%
rename from system/domain/src/main/java/com/supwisdom/institute/backend/system/domain/repo/RoleRepository.java
rename to base/domain/src/main/java/com/supwisdom/institute/backend/base/domain/repo/RoleRepository.java
index 9a8763d..b416a7e 100644 (file)
--- a/system/domain/src/main/java/com/supwisdom/institute/backend/system/domain/repo/RoleRepository.java
+++ b/base/domain/src/main/java/com/supwisdom/institute/backend/base/domain/repo/RoleRepository.java
@@ -1,4 +1,4 @@
-package com.supwisdom.institute.backend.system.domain.repo;
+package com.supwisdom.institute.backend.base.domain.repo;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -13,9 +13,9 @@ import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
+import com.supwisdom.institute.backend.base.domain.entity.Role;
 import com.supwisdom.institute.backend.common.framework.repo.BaseJpaRepository;
 import com.supwisdom.institute.backend.common.util.MapBeanUtils;
-import com.supwisdom.institute.backend.system.domain.entity.Role;
 
 @Repository
 public interface RoleRepository extends BaseJpaRepository<Role> {

diff --git a/system/domain/src/main/java/com/supwisdom/institute/backend/system/domain/service/.gitkeep b/base/domain/src/main/java/com/supwisdom/institute/backend/base/domain/service/.gitkeep
similarity index 100%
rename from system/domain/src/main/java/com/supwisdom/institute/backend/system/domain/service/.gitkeep
rename to base/domain/src/main/java/com/supwisdom/institute/backend/base/domain/service/.gitkeep

diff --git a/system/domain/src/main/java/com/supwisdom/institute/backend/system/domain/service/AccountService.java b/base/domain/src/main/java/com/supwisdom/institute/backend/base/domain/service/AccountService.java
similarity index 92%
rename from system/domain/src/main/java/com/supwisdom/institute/backend/system/domain/service/AccountService.java
rename to base/domain/src/main/java/com/supwisdom/institute/backend/base/domain/service/AccountService.java
index 9e29e31..ece1cda 100644 (file)
--- a/system/domain/src/main/java/com/supwisdom/institute/backend/system/domain/service/AccountService.java
+++ b/base/domain/src/main/java/com/supwisdom/institute/backend/base/domain/service/AccountService.java
@@ -1,4 +1,4 @@
-package com.supwisdom.institute.backend.system.domain.service;
+package com.supwisdom.institute.backend.base.domain.service;
 
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -11,14 +11,14 @@ import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.stereotype.Service;
 
+import com.supwisdom.institute.backend.base.domain.entity.Account;
+import com.supwisdom.institute.backend.base.domain.entity.AccountGroup;
+import com.supwisdom.institute.backend.base.domain.entity.AccountRole;
+import com.supwisdom.institute.backend.base.domain.repo.AccountGroupRepository;
+import com.supwisdom.institute.backend.base.domain.repo.AccountRepository;
+import com.supwisdom.institute.backend.base.domain.repo.AccountRoleRepository;
 import com.supwisdom.institute.backend.common.framework.service.ABaseService;
 import com.supwisdom.institute.backend.common.util.MapBeanUtils;
-import com.supwisdom.institute.backend.system.domain.entity.Account;
-import com.supwisdom.institute.backend.system.domain.entity.AccountGroup;
-import com.supwisdom.institute.backend.system.domain.entity.AccountRole;
-import com.supwisdom.institute.backend.system.domain.repo.AccountGroupRepository;
-import com.supwisdom.institute.backend.system.domain.repo.AccountRepository;
-import com.supwisdom.institute.backend.system.domain.repo.AccountRoleRepository;
 
 @Service
 public class AccountService extends ABaseService<Account, AccountRepository> {

diff --git a/system/domain/src/main/java/com/supwisdom/institute/backend/system/domain/service/ConfigService.java b/base/domain/src/main/java/com/supwisdom/institute/backend/base/domain/service/ConfigService.java
similarity index 73%
rename from system/domain/src/main/java/com/supwisdom/institute/backend/system/domain/service/ConfigService.java
rename to base/domain/src/main/java/com/supwisdom/institute/backend/base/domain/service/ConfigService.java
index 55ba8ed..d41e362 100644 (file)
--- a/system/domain/src/main/java/com/supwisdom/institute/backend/system/domain/service/ConfigService.java
+++ b/base/domain/src/main/java/com/supwisdom/institute/backend/base/domain/service/ConfigService.java
@@ -1,11 +1,11 @@
-package com.supwisdom.institute.backend.system.domain.service;
+package com.supwisdom.institute.backend.base.domain.service;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import com.supwisdom.institute.backend.base.domain.entity.Config;
+import com.supwisdom.institute.backend.base.domain.repo.ConfigRepository;
 import com.supwisdom.institute.backend.common.framework.service.ABaseService;
-import com.supwisdom.institute.backend.system.domain.entity.Config;
-import com.supwisdom.institute.backend.system.domain.repo.ConfigRepository;
 
 @Service
 public class ConfigService extends ABaseService<Config, ConfigRepository> {

diff --git a/system/domain/src/main/java/com/supwisdom/institute/backend/system/domain/service/GroupService.java b/base/domain/src/main/java/com/supwisdom/institute/backend/base/domain/service/GroupService.java
similarity index 91%
rename from system/domain/src/main/java/com/supwisdom/institute/backend/system/domain/service/GroupService.java
rename to base/domain/src/main/java/com/supwisdom/institute/backend/base/domain/service/GroupService.java
index 1e9eb6b..f8b4f11 100644 (file)
--- a/system/domain/src/main/java/com/supwisdom/institute/backend/system/domain/service/GroupService.java
+++ b/base/domain/src/main/java/com/supwisdom/institute/backend/base/domain/service/GroupService.java
@@ -1,4 +1,4 @@
-package com.supwisdom.institute.backend.system.domain.service;
+package com.supwisdom.institute.backend.base.domain.service;
 
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -11,14 +11,14 @@ import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.stereotype.Service;
 
+import com.supwisdom.institute.backend.base.domain.entity.AccountGroup;
+import com.supwisdom.institute.backend.base.domain.entity.Group;
+import com.supwisdom.institute.backend.base.domain.entity.GroupRole;
+import com.supwisdom.institute.backend.base.domain.repo.AccountGroupRepository;
+import com.supwisdom.institute.backend.base.domain.repo.GroupRepository;
+import com.supwisdom.institute.backend.base.domain.repo.GroupRoleRepository;
 import com.supwisdom.institute.backend.common.framework.service.ABaseService;
 import com.supwisdom.institute.backend.common.util.MapBeanUtils;
-import com.supwisdom.institute.backend.system.domain.entity.AccountGroup;
-import com.supwisdom.institute.backend.system.domain.entity.Group;
-import com.supwisdom.institute.backend.system.domain.entity.GroupRole;
-import com.supwisdom.institute.backend.system.domain.repo.AccountGroupRepository;
-import com.supwisdom.institute.backend.system.domain.repo.GroupRepository;
-import com.supwisdom.institute.backend.system.domain.repo.GroupRoleRepository;
 
 @Service
 public class GroupService extends ABaseService<Group, GroupRepository> {

diff --git a/system/domain/src/main/java/com/supwisdom/institute/backend/system/domain/service/PermissionService.java b/base/domain/src/main/java/com/supwisdom/institute/backend/base/domain/service/PermissionService.java
similarity index 87%
rename from system/domain/src/main/java/com/supwisdom/institute/backend/system/domain/service/PermissionService.java
rename to base/domain/src/main/java/com/supwisdom/institute/backend/base/domain/service/PermissionService.java
index ff2f7f2..f2cfe4b 100644 (file)
--- a/system/domain/src/main/java/com/supwisdom/institute/backend/system/domain/service/PermissionService.java
+++ b/base/domain/src/main/java/com/supwisdom/institute/backend/base/domain/service/PermissionService.java
@@ -1,4 +1,4 @@
-package com.supwisdom.institute.backend.system.domain.service;
+package com.supwisdom.institute.backend.base.domain.service;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -11,11 +11,11 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import com.supwisdom.institute.backend.base.domain.entity.Permission;
+import com.supwisdom.institute.backend.base.domain.model.PermissionTreeNode;
+import com.supwisdom.institute.backend.base.domain.repo.PermissionRepository;
 import com.supwisdom.institute.backend.common.framework.entity.EntityUtils;
 import com.supwisdom.institute.backend.common.framework.service.ABaseService;
-import com.supwisdom.institute.backend.system.domain.entity.Permission;
-import com.supwisdom.institute.backend.system.domain.model.PermissionTreeNode;
-import com.supwisdom.institute.backend.system.domain.repo.PermissionRepository;
 
 @Slf4j
 @Service

diff --git a/system/domain/src/main/java/com/supwisdom/institute/backend/system/domain/service/ResourceService.java b/base/domain/src/main/java/com/supwisdom/institute/backend/base/domain/service/ResourceService.java
similarity index 67%
rename from system/domain/src/main/java/com/supwisdom/institute/backend/system/domain/service/ResourceService.java
rename to base/domain/src/main/java/com/supwisdom/institute/backend/base/domain/service/ResourceService.java
index 65eab2d..075fa74 100644 (file)
--- a/system/domain/src/main/java/com/supwisdom/institute/backend/system/domain/service/ResourceService.java
+++ b/base/domain/src/main/java/com/supwisdom/institute/backend/base/domain/service/ResourceService.java
@@ -1,11 +1,11 @@
-package com.supwisdom.institute.backend.system.domain.service;
+package com.supwisdom.institute.backend.base.domain.service;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import com.supwisdom.institute.backend.base.domain.entity.Resource;
+import com.supwisdom.institute.backend.base.domain.repo.ResourceRepository;
 import com.supwisdom.institute.backend.common.framework.service.ABaseService;
-import com.supwisdom.institute.backend.system.domain.entity.Resource;
-import com.supwisdom.institute.backend.system.domain.repo.ResourceRepository;
 
 @Service
 public class ResourceService extends ABaseService<Resource, ResourceRepository> {

diff --git a/system/domain/src/main/java/com/supwisdom/institute/backend/system/domain/service/RoleService.java b/base/domain/src/main/java/com/supwisdom/institute/backend/base/domain/service/RoleService.java
similarity index 92%
rename from system/domain/src/main/java/com/supwisdom/institute/backend/system/domain/service/RoleService.java
rename to base/domain/src/main/java/com/supwisdom/institute/backend/base/domain/service/RoleService.java
index 5b533df..1239d2f 100644 (file)
--- a/system/domain/src/main/java/com/supwisdom/institute/backend/system/domain/service/RoleService.java
+++ b/base/domain/src/main/java/com/supwisdom/institute/backend/base/domain/service/RoleService.java
@@ -1,4 +1,4 @@
-package com.supwisdom.institute.backend.system.domain.service;
+package com.supwisdom.institute.backend.base.domain.service;
 
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -11,16 +11,16 @@ import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.stereotype.Service;
 
+import com.supwisdom.institute.backend.base.domain.entity.AccountRole;
+import com.supwisdom.institute.backend.base.domain.entity.GroupRole;
+import com.supwisdom.institute.backend.base.domain.entity.Role;
+import com.supwisdom.institute.backend.base.domain.entity.RolePermission;
+import com.supwisdom.institute.backend.base.domain.repo.AccountRoleRepository;
+import com.supwisdom.institute.backend.base.domain.repo.GroupRoleRepository;
+import com.supwisdom.institute.backend.base.domain.repo.RolePermissionRepository;
+import com.supwisdom.institute.backend.base.domain.repo.RoleRepository;
 import com.supwisdom.institute.backend.common.framework.service.ABaseService;
 import com.supwisdom.institute.backend.common.util.MapBeanUtils;
-import com.supwisdom.institute.backend.system.domain.entity.AccountRole;
-import com.supwisdom.institute.backend.system.domain.entity.GroupRole;
-import com.supwisdom.institute.backend.system.domain.entity.Role;
-import com.supwisdom.institute.backend.system.domain.entity.RolePermission;
-import com.supwisdom.institute.backend.system.domain.repo.AccountRoleRepository;
-import com.supwisdom.institute.backend.system.domain.repo.GroupRoleRepository;
-import com.supwisdom.institute.backend.system.domain.repo.RolePermissionRepository;
-import com.supwisdom.institute.backend.system.domain.repo.RoleRepository;
 
 @Service
 public class RoleService extends ABaseService<Role, RoleRepository> {

diff --git a/system/pom.xml b/base/pom.xml
similarity index 81%
rename from system/pom.xml
rename to base/pom.xml
index d80ee43..2d60e6f 100644 (file)
--- a/system/pom.xml
+++ b/base/pom.xml
@@ -10,12 +10,12 @@
   </parent>
   
   <groupId>com.supwisdom.institute</groupId>
-  <artifactId>sw-backend-system-aggregator</artifactId>
+  <artifactId>sw-backend-base-aggregator</artifactId>
   <version>0.0.1-SNAPSHOT</version>
   <packaging>pom</packaging>
 
-  <name>Supwisdom Backend Framework System Aggregator</name>
-  <description>Supwisdom Backend Framework System Aggregator project</description>
+  <name>Supwisdom Backend Framework Base Aggregator</name>
+  <description>Supwisdom Backend Framework Base Aggregator project</description>
 
   <modules>
     <module>domain</module>

diff --git a/bff/admin/src/main/resources/application.yml b/bff/admin/src/main/resources/application.yml
index 815040b..a77dc9a 100644 (file)
--- a/bff/admin/src/main/resources/application.yml
+++ b/bff/admin/src/main/resources/application.yml
@@ -25,12 +25,12 @@ spring:
       metrics:
         enabled: true
       routes:
-      - id: system-api
+      - id: base-api
         uri: http://localhost:8081
         predicates:
-        - Path=/api/system/**
+        - Path=/api/base/**
         filters:
-        - RewritePath=/api/system/(?<suffix>.*), /$\{suffix}
+        - RewritePath=/api/base/(?<suffix>.*), /$\{suffix}
       - id: biz-api
         uri: http://localhost:8081
         predicates:

diff --git a/pom.xml b/pom.xml
index 26ca59e..1166bb6 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
   <modules>
     <module>common</module>
     
-    <module>system</module>
+    <module>base</module>
     <module>biz</module>
 
     <module>sa</module>
@@ -114,12 +114,12 @@
 
       <dependency>
         <groupId>com.supwisdom.institute</groupId>
-        <artifactId>sw-backend-system-domain</artifactId>
+        <artifactId>sw-backend-base-domain</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>com.supwisdom.institute</groupId>
-        <artifactId>sw-backend-system-api</artifactId>
+        <artifactId>sw-backend-base-api</artifactId>
         <version>${project.version}</version>
       </dependency>
 

diff --git a/sa/admin/pom.xml b/sa/admin/pom.xml
index a03165a..23ac7b7 100644 (file)
--- a/sa/admin/pom.xml
+++ b/sa/admin/pom.xml
@@ -76,7 +76,7 @@
 
     <dependency>
       <groupId>com.supwisdom.institute</groupId>
-      <artifactId>sw-backend-system-api</artifactId>
+      <artifactId>sw-backend-base-api</artifactId>
     </dependency>
     <dependency>
       <groupId>com.supwisdom.institute</groupId>

diff --git a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/v1/admin/AdminPermissionController.java b/system/api/src/main/java/com/supwisdom/institute/backend/system/api/v1/admin/AdminPermissionController.java
deleted file mode 100644 (file)
index d72d034..0000000
--- a/system/api/src/main/java/com/supwisdom/institute/backend/system/api/v1/admin/AdminPermissionController.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.supwisdom.institute.backend.system.api.v1.admin;
-
-public class AdminPermissionController {
-
-}