diff --git a/order/order-application/pom.xml b/order/order-application/pom.xml index d6421ee3e..1eb9932af 100644 --- a/order/order-application/pom.xml +++ b/order/order-application/pom.xml @@ -24,7 +24,7 @@ cn.iocoder.mall - admin-sdk + system-sdk 1.0-SNAPSHOT diff --git a/order/order-service-impl/pom.xml b/order/order-service-impl/pom.xml index 70ce33e08..a89dac8bb 100644 --- a/order/order-service-impl/pom.xml +++ b/order/order-service-impl/pom.xml @@ -19,7 +19,7 @@ cn.iocoder.mall - admin-service-api + system-service-api 1.0-SNAPSHOT compile diff --git a/pay/pay-application/pom.xml b/pay/pay-application/pom.xml index b7e736b9d..9e0734fe5 100644 --- a/pay/pay-application/pom.xml +++ b/pay/pay-application/pom.xml @@ -24,7 +24,7 @@ cn.iocoder.mall - admin-sdk + system-sdk 1.0-SNAPSHOT diff --git a/pay/pay-service-impl/pom.xml b/pay/pay-service-impl/pom.xml index e15df21fd..337fe9eff 100644 --- a/pay/pay-service-impl/pom.xml +++ b/pay/pay-service-impl/pom.xml @@ -18,7 +18,7 @@ cn.iocoder.mall - admin-service-api + system-service-api 1.0-SNAPSHOT diff --git a/product/product-application/pom.xml b/product/product-application/pom.xml index fc84fb7b1..341895fe3 100644 --- a/product/product-application/pom.xml +++ b/product/product-application/pom.xml @@ -40,7 +40,7 @@ cn.iocoder.mall - admin-sdk + system-sdk 1.0-SNAPSHOT diff --git a/promotion/promotion-application/pom.xml b/promotion/promotion-application/pom.xml index 94b643b53..cd4e4d06c 100644 --- a/promotion/promotion-application/pom.xml +++ b/promotion/promotion-application/pom.xml @@ -42,7 +42,7 @@ cn.iocoder.mall - admin-sdk + system-sdk 1.0-SNAPSHOT diff --git a/promotion/promotion-service-impl/pom.xml b/promotion/promotion-service-impl/pom.xml index ea0ca6110..b0c6d477a 100644 --- a/promotion/promotion-service-impl/pom.xml +++ b/promotion/promotion-service-impl/pom.xml @@ -19,7 +19,7 @@ cn.iocoder.mall - admin-service-api + system-service-api 1.0-SNAPSHOT diff --git a/admin/pom.xml b/system/pom.xml similarity index 69% rename from admin/pom.xml rename to system/pom.xml index ea03dd1cf..cba0e5974 100644 --- a/admin/pom.xml +++ b/system/pom.xml @@ -9,13 +9,14 @@ 4.0.0 - admin + system + system pom - admin-application - admin-sdk - admin-service-api - admin-service-impl + system-application + system-sdk + system-service-api + system-service-impl diff --git a/admin/admin-application/pom.xml b/system/system-application/pom.xml similarity index 95% rename from admin/admin-application/pom.xml rename to system/system-application/pom.xml index 061cc411d..63ba9b76f 100644 --- a/admin/admin-application/pom.xml +++ b/system/system-application/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - admin + system cn.iocoder.mall 1.0-SNAPSHOT @@ -14,12 +14,12 @@ cn.iocoder.mall - admin-service-impl + system-service-impl 1.0-SNAPSHOT cn.iocoder.mall - admin-sdk + system-sdk 1.0-SNAPSHOT diff --git a/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/AdminApplication.java b/system/system-application/src/main/java/cn/iocoder/mall/admin/application/AdminApplication.java similarity index 100% rename from admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/AdminApplication.java rename to system/system-application/src/main/java/cn/iocoder/mall/admin/application/AdminApplication.java diff --git a/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/config/MVCConfiguration.java b/system/system-application/src/main/java/cn/iocoder/mall/admin/application/config/MVCConfiguration.java similarity index 100% rename from admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/config/MVCConfiguration.java rename to system/system-application/src/main/java/cn/iocoder/mall/admin/application/config/MVCConfiguration.java diff --git a/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/config/QiniuConfiguration.java b/system/system-application/src/main/java/cn/iocoder/mall/admin/application/config/QiniuConfiguration.java similarity index 100% rename from admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/config/QiniuConfiguration.java rename to system/system-application/src/main/java/cn/iocoder/mall/admin/application/config/QiniuConfiguration.java diff --git a/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/config/SwaggerConfiguration.java b/system/system-application/src/main/java/cn/iocoder/mall/admin/application/config/SwaggerConfiguration.java similarity index 100% rename from admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/config/SwaggerConfiguration.java rename to system/system-application/src/main/java/cn/iocoder/mall/admin/application/config/SwaggerConfiguration.java diff --git a/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/controller/admins/AdminController.java b/system/system-application/src/main/java/cn/iocoder/mall/admin/application/controller/admins/AdminController.java similarity index 100% rename from admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/controller/admins/AdminController.java rename to system/system-application/src/main/java/cn/iocoder/mall/admin/application/controller/admins/AdminController.java diff --git a/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/controller/admins/DataDictController.java b/system/system-application/src/main/java/cn/iocoder/mall/admin/application/controller/admins/DataDictController.java similarity index 100% rename from admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/controller/admins/DataDictController.java rename to system/system-application/src/main/java/cn/iocoder/mall/admin/application/controller/admins/DataDictController.java diff --git a/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/controller/admins/FileController.java b/system/system-application/src/main/java/cn/iocoder/mall/admin/application/controller/admins/FileController.java similarity index 100% rename from admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/controller/admins/FileController.java rename to system/system-application/src/main/java/cn/iocoder/mall/admin/application/controller/admins/FileController.java diff --git a/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/controller/admins/PassportController.java b/system/system-application/src/main/java/cn/iocoder/mall/admin/application/controller/admins/PassportController.java similarity index 100% rename from admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/controller/admins/PassportController.java rename to system/system-application/src/main/java/cn/iocoder/mall/admin/application/controller/admins/PassportController.java diff --git a/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/controller/admins/ResourceController.java b/system/system-application/src/main/java/cn/iocoder/mall/admin/application/controller/admins/ResourceController.java similarity index 100% rename from admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/controller/admins/ResourceController.java rename to system/system-application/src/main/java/cn/iocoder/mall/admin/application/controller/admins/ResourceController.java diff --git a/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/controller/admins/RoleController.java b/system/system-application/src/main/java/cn/iocoder/mall/admin/application/controller/admins/RoleController.java similarity index 100% rename from admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/controller/admins/RoleController.java rename to system/system-application/src/main/java/cn/iocoder/mall/admin/application/controller/admins/RoleController.java diff --git a/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/convert/AdminConvert.java b/system/system-application/src/main/java/cn/iocoder/mall/admin/application/convert/AdminConvert.java similarity index 100% rename from admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/convert/AdminConvert.java rename to system/system-application/src/main/java/cn/iocoder/mall/admin/application/convert/AdminConvert.java diff --git a/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/convert/DataDictConvert.java b/system/system-application/src/main/java/cn/iocoder/mall/admin/application/convert/DataDictConvert.java similarity index 100% rename from admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/convert/DataDictConvert.java rename to system/system-application/src/main/java/cn/iocoder/mall/admin/application/convert/DataDictConvert.java diff --git a/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/convert/PassportConvert.java b/system/system-application/src/main/java/cn/iocoder/mall/admin/application/convert/PassportConvert.java similarity index 100% rename from admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/convert/PassportConvert.java rename to system/system-application/src/main/java/cn/iocoder/mall/admin/application/convert/PassportConvert.java diff --git a/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/convert/ResourceConvert.java b/system/system-application/src/main/java/cn/iocoder/mall/admin/application/convert/ResourceConvert.java similarity index 100% rename from admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/convert/ResourceConvert.java rename to system/system-application/src/main/java/cn/iocoder/mall/admin/application/convert/ResourceConvert.java diff --git a/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/convert/RoleConvert.java b/system/system-application/src/main/java/cn/iocoder/mall/admin/application/convert/RoleConvert.java similarity index 100% rename from admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/convert/RoleConvert.java rename to system/system-application/src/main/java/cn/iocoder/mall/admin/application/convert/RoleConvert.java diff --git a/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/AdminInfoVO.java b/system/system-application/src/main/java/cn/iocoder/mall/admin/application/vo/AdminInfoVO.java similarity index 100% rename from admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/AdminInfoVO.java rename to system/system-application/src/main/java/cn/iocoder/mall/admin/application/vo/AdminInfoVO.java diff --git a/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/AdminMenuTreeNodeVO.java b/system/system-application/src/main/java/cn/iocoder/mall/admin/application/vo/AdminMenuTreeNodeVO.java similarity index 100% rename from admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/AdminMenuTreeNodeVO.java rename to system/system-application/src/main/java/cn/iocoder/mall/admin/application/vo/AdminMenuTreeNodeVO.java diff --git a/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/AdminPageVO.java b/system/system-application/src/main/java/cn/iocoder/mall/admin/application/vo/AdminPageVO.java similarity index 100% rename from admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/AdminPageVO.java rename to system/system-application/src/main/java/cn/iocoder/mall/admin/application/vo/AdminPageVO.java diff --git a/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/AdminRoleVO.java b/system/system-application/src/main/java/cn/iocoder/mall/admin/application/vo/AdminRoleVO.java similarity index 100% rename from admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/AdminRoleVO.java rename to system/system-application/src/main/java/cn/iocoder/mall/admin/application/vo/AdminRoleVO.java diff --git a/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/AdminVO.java b/system/system-application/src/main/java/cn/iocoder/mall/admin/application/vo/AdminVO.java similarity index 100% rename from admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/AdminVO.java rename to system/system-application/src/main/java/cn/iocoder/mall/admin/application/vo/AdminVO.java diff --git a/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/DataDictEnumVO.java b/system/system-application/src/main/java/cn/iocoder/mall/admin/application/vo/DataDictEnumVO.java similarity index 100% rename from admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/DataDictEnumVO.java rename to system/system-application/src/main/java/cn/iocoder/mall/admin/application/vo/DataDictEnumVO.java diff --git a/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/DataDictVO.java b/system/system-application/src/main/java/cn/iocoder/mall/admin/application/vo/DataDictVO.java similarity index 100% rename from admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/DataDictVO.java rename to system/system-application/src/main/java/cn/iocoder/mall/admin/application/vo/DataDictVO.java diff --git a/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/DataDictValueVO.java b/system/system-application/src/main/java/cn/iocoder/mall/admin/application/vo/DataDictValueVO.java similarity index 100% rename from admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/DataDictValueVO.java rename to system/system-application/src/main/java/cn/iocoder/mall/admin/application/vo/DataDictValueVO.java diff --git a/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/PassportLoginVO.java b/system/system-application/src/main/java/cn/iocoder/mall/admin/application/vo/PassportLoginVO.java similarity index 100% rename from admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/PassportLoginVO.java rename to system/system-application/src/main/java/cn/iocoder/mall/admin/application/vo/PassportLoginVO.java diff --git a/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/ResourceTreeNodeVO.java b/system/system-application/src/main/java/cn/iocoder/mall/admin/application/vo/ResourceTreeNodeVO.java similarity index 100% rename from admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/ResourceTreeNodeVO.java rename to system/system-application/src/main/java/cn/iocoder/mall/admin/application/vo/ResourceTreeNodeVO.java diff --git a/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/ResourceVO.java b/system/system-application/src/main/java/cn/iocoder/mall/admin/application/vo/ResourceVO.java similarity index 100% rename from admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/ResourceVO.java rename to system/system-application/src/main/java/cn/iocoder/mall/admin/application/vo/ResourceVO.java diff --git a/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/RolePageVO.java b/system/system-application/src/main/java/cn/iocoder/mall/admin/application/vo/RolePageVO.java similarity index 100% rename from admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/RolePageVO.java rename to system/system-application/src/main/java/cn/iocoder/mall/admin/application/vo/RolePageVO.java diff --git a/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/RoleResourceTreeNodeVO.java b/system/system-application/src/main/java/cn/iocoder/mall/admin/application/vo/RoleResourceTreeNodeVO.java similarity index 100% rename from admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/RoleResourceTreeNodeVO.java rename to system/system-application/src/main/java/cn/iocoder/mall/admin/application/vo/RoleResourceTreeNodeVO.java diff --git a/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/RoleVO.java b/system/system-application/src/main/java/cn/iocoder/mall/admin/application/vo/RoleVO.java similarity index 100% rename from admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/RoleVO.java rename to system/system-application/src/main/java/cn/iocoder/mall/admin/application/vo/RoleVO.java diff --git a/admin/admin-application/src/main/resources/application-test.yaml b/system/system-application/src/main/resources/application-test.yaml similarity index 100% rename from admin/admin-application/src/main/resources/application-test.yaml rename to system/system-application/src/main/resources/application-test.yaml diff --git a/admin/admin-application/src/main/resources/application.yaml b/system/system-application/src/main/resources/application.yaml similarity index 100% rename from admin/admin-application/src/main/resources/application.yaml rename to system/system-application/src/main/resources/application.yaml diff --git a/admin/admin-sdk/pom.xml b/system/system-sdk/pom.xml similarity index 91% rename from admin/admin-sdk/pom.xml rename to system/system-sdk/pom.xml index 80f49a798..eea6c2677 100644 --- a/admin/admin-sdk/pom.xml +++ b/system/system-sdk/pom.xml @@ -3,14 +3,14 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - admin + system cn.iocoder.mall 1.0-SNAPSHOT 4.0.0 jar - admin-sdk + system-sdk @@ -43,7 +43,7 @@ cn.iocoder.mall - admin-service-api + system-service-api 1.0-SNAPSHOT diff --git a/admin/admin-sdk/src/main/java/cn/iocoder/mall/admin/sdk/context/AdminSecurityContext.java b/system/system-sdk/src/main/java/cn/iocoder/mall/admin/sdk/context/AdminSecurityContext.java similarity index 100% rename from admin/admin-sdk/src/main/java/cn/iocoder/mall/admin/sdk/context/AdminSecurityContext.java rename to system/system-sdk/src/main/java/cn/iocoder/mall/admin/sdk/context/AdminSecurityContext.java diff --git a/admin/admin-sdk/src/main/java/cn/iocoder/mall/admin/sdk/context/AdminSecurityContextHolder.java b/system/system-sdk/src/main/java/cn/iocoder/mall/admin/sdk/context/AdminSecurityContextHolder.java similarity index 100% rename from admin/admin-sdk/src/main/java/cn/iocoder/mall/admin/sdk/context/AdminSecurityContextHolder.java rename to system/system-sdk/src/main/java/cn/iocoder/mall/admin/sdk/context/AdminSecurityContextHolder.java diff --git a/admin/admin-sdk/src/main/java/cn/iocoder/mall/admin/sdk/dict/Bean.java b/system/system-sdk/src/main/java/cn/iocoder/mall/admin/sdk/dict/Bean.java similarity index 100% rename from admin/admin-sdk/src/main/java/cn/iocoder/mall/admin/sdk/dict/Bean.java rename to system/system-sdk/src/main/java/cn/iocoder/mall/admin/sdk/dict/Bean.java diff --git a/admin/admin-sdk/src/main/java/cn/iocoder/mall/admin/sdk/dict/DictVal.java b/system/system-sdk/src/main/java/cn/iocoder/mall/admin/sdk/dict/DictVal.java similarity index 100% rename from admin/admin-sdk/src/main/java/cn/iocoder/mall/admin/sdk/dict/DictVal.java rename to system/system-sdk/src/main/java/cn/iocoder/mall/admin/sdk/dict/DictVal.java diff --git a/admin/admin-sdk/src/main/java/cn/iocoder/mall/admin/sdk/dict/DictValProcessor.java b/system/system-sdk/src/main/java/cn/iocoder/mall/admin/sdk/dict/DictValProcessor.java similarity index 100% rename from admin/admin-sdk/src/main/java/cn/iocoder/mall/admin/sdk/dict/DictValProcessor.java rename to system/system-sdk/src/main/java/cn/iocoder/mall/admin/sdk/dict/DictValProcessor.java diff --git a/admin/admin-sdk/src/main/java/cn/iocoder/mall/admin/sdk/interceptor/AdminAccessLogInterceptor.java b/system/system-sdk/src/main/java/cn/iocoder/mall/admin/sdk/interceptor/AdminAccessLogInterceptor.java similarity index 100% rename from admin/admin-sdk/src/main/java/cn/iocoder/mall/admin/sdk/interceptor/AdminAccessLogInterceptor.java rename to system/system-sdk/src/main/java/cn/iocoder/mall/admin/sdk/interceptor/AdminAccessLogInterceptor.java diff --git a/admin/admin-sdk/src/main/java/cn/iocoder/mall/admin/sdk/interceptor/AdminSecurityInterceptor.java b/system/system-sdk/src/main/java/cn/iocoder/mall/admin/sdk/interceptor/AdminSecurityInterceptor.java similarity index 100% rename from admin/admin-sdk/src/main/java/cn/iocoder/mall/admin/sdk/interceptor/AdminSecurityInterceptor.java rename to system/system-sdk/src/main/java/cn/iocoder/mall/admin/sdk/interceptor/AdminSecurityInterceptor.java diff --git a/admin/admin-sdk/src/main/java/cn/iocoder/mall/admin/sdk/package-info.java b/system/system-sdk/src/main/java/cn/iocoder/mall/admin/sdk/package-info.java similarity index 100% rename from admin/admin-sdk/src/main/java/cn/iocoder/mall/admin/sdk/package-info.java rename to system/system-sdk/src/main/java/cn/iocoder/mall/admin/sdk/package-info.java diff --git a/admin/admin-service-api/pom.xml b/system/system-service-api/pom.xml similarity index 93% rename from admin/admin-service-api/pom.xml rename to system/system-service-api/pom.xml index fc2d3d383..79a8b8649 100644 --- a/admin/admin-service-api/pom.xml +++ b/system/system-service-api/pom.xml @@ -3,14 +3,14 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - admin + system cn.iocoder.mall 1.0-SNAPSHOT 4.0.0 jar - admin-service-api + system-service-api cn.iocoder.mall diff --git a/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/AdminAccessLogService.java b/system/system-service-api/src/main/java/cn/iocoder/mall/admin/api/AdminAccessLogService.java similarity index 100% rename from admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/AdminAccessLogService.java rename to system/system-service-api/src/main/java/cn/iocoder/mall/admin/api/AdminAccessLogService.java diff --git a/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/AdminService.java b/system/system-service-api/src/main/java/cn/iocoder/mall/admin/api/AdminService.java similarity index 100% rename from admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/AdminService.java rename to system/system-service-api/src/main/java/cn/iocoder/mall/admin/api/AdminService.java diff --git a/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/DataDictService.java b/system/system-service-api/src/main/java/cn/iocoder/mall/admin/api/DataDictService.java similarity index 100% rename from admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/DataDictService.java rename to system/system-service-api/src/main/java/cn/iocoder/mall/admin/api/DataDictService.java diff --git a/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/OAuth2Service.java b/system/system-service-api/src/main/java/cn/iocoder/mall/admin/api/OAuth2Service.java similarity index 100% rename from admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/OAuth2Service.java rename to system/system-service-api/src/main/java/cn/iocoder/mall/admin/api/OAuth2Service.java diff --git a/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/ResourceService.java b/system/system-service-api/src/main/java/cn/iocoder/mall/admin/api/ResourceService.java similarity index 100% rename from admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/ResourceService.java rename to system/system-service-api/src/main/java/cn/iocoder/mall/admin/api/ResourceService.java diff --git a/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/RoleService.java b/system/system-service-api/src/main/java/cn/iocoder/mall/admin/api/RoleService.java similarity index 100% rename from admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/RoleService.java rename to system/system-service-api/src/main/java/cn/iocoder/mall/admin/api/RoleService.java diff --git a/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/AdminBO.java b/system/system-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/AdminBO.java similarity index 100% rename from admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/AdminBO.java rename to system/system-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/AdminBO.java diff --git a/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/AdminPageBO.java b/system/system-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/AdminPageBO.java similarity index 100% rename from admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/AdminPageBO.java rename to system/system-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/AdminPageBO.java diff --git a/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/DataDictBO.java b/system/system-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/DataDictBO.java similarity index 100% rename from admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/DataDictBO.java rename to system/system-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/DataDictBO.java diff --git a/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/OAuth2AccessTokenBO.java b/system/system-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/OAuth2AccessTokenBO.java similarity index 100% rename from admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/OAuth2AccessTokenBO.java rename to system/system-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/OAuth2AccessTokenBO.java diff --git a/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/OAuth2AuthenticationBO.java b/system/system-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/OAuth2AuthenticationBO.java similarity index 100% rename from admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/OAuth2AuthenticationBO.java rename to system/system-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/OAuth2AuthenticationBO.java diff --git a/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/ResourceBO.java b/system/system-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/ResourceBO.java similarity index 100% rename from admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/ResourceBO.java rename to system/system-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/ResourceBO.java diff --git a/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/RoleBO.java b/system/system-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/RoleBO.java similarity index 100% rename from admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/RoleBO.java rename to system/system-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/RoleBO.java diff --git a/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/RolePageBO.java b/system/system-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/RolePageBO.java similarity index 100% rename from admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/RolePageBO.java rename to system/system-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/RolePageBO.java diff --git a/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/constant/AdminConstants.java b/system/system-service-api/src/main/java/cn/iocoder/mall/admin/api/constant/AdminConstants.java similarity index 100% rename from admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/constant/AdminConstants.java rename to system/system-service-api/src/main/java/cn/iocoder/mall/admin/api/constant/AdminConstants.java diff --git a/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/constant/AdminErrorCodeEnum.java b/system/system-service-api/src/main/java/cn/iocoder/mall/admin/api/constant/AdminErrorCodeEnum.java similarity index 100% rename from admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/constant/AdminErrorCodeEnum.java rename to system/system-service-api/src/main/java/cn/iocoder/mall/admin/api/constant/AdminErrorCodeEnum.java diff --git a/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/constant/ResourceConstants.java b/system/system-service-api/src/main/java/cn/iocoder/mall/admin/api/constant/ResourceConstants.java similarity index 100% rename from admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/constant/ResourceConstants.java rename to system/system-service-api/src/main/java/cn/iocoder/mall/admin/api/constant/ResourceConstants.java diff --git a/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/AdminAccessLogAddDTO.java b/system/system-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/AdminAccessLogAddDTO.java similarity index 100% rename from admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/AdminAccessLogAddDTO.java rename to system/system-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/AdminAccessLogAddDTO.java diff --git a/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/AdminAddDTO.java b/system/system-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/AdminAddDTO.java similarity index 100% rename from admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/AdminAddDTO.java rename to system/system-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/AdminAddDTO.java diff --git a/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/AdminPageDTO.java b/system/system-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/AdminPageDTO.java similarity index 100% rename from admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/AdminPageDTO.java rename to system/system-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/AdminPageDTO.java diff --git a/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/AdminUpdateDTO.java b/system/system-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/AdminUpdateDTO.java similarity index 100% rename from admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/AdminUpdateDTO.java rename to system/system-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/AdminUpdateDTO.java diff --git a/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/DataDictAddDTO.java b/system/system-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/DataDictAddDTO.java similarity index 100% rename from admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/DataDictAddDTO.java rename to system/system-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/DataDictAddDTO.java diff --git a/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/DataDictUpdateDTO.java b/system/system-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/DataDictUpdateDTO.java similarity index 100% rename from admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/DataDictUpdateDTO.java rename to system/system-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/DataDictUpdateDTO.java diff --git a/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/ResourceAddDTO.java b/system/system-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/ResourceAddDTO.java similarity index 100% rename from admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/ResourceAddDTO.java rename to system/system-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/ResourceAddDTO.java diff --git a/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/ResourceUpdateDTO.java b/system/system-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/ResourceUpdateDTO.java similarity index 100% rename from admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/ResourceUpdateDTO.java rename to system/system-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/ResourceUpdateDTO.java diff --git a/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/RoleAddDTO.java b/system/system-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/RoleAddDTO.java similarity index 100% rename from admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/RoleAddDTO.java rename to system/system-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/RoleAddDTO.java diff --git a/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/RolePageDTO.java b/system/system-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/RolePageDTO.java similarity index 100% rename from admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/RolePageDTO.java rename to system/system-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/RolePageDTO.java diff --git a/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/RoleUpdateDTO.java b/system/system-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/RoleUpdateDTO.java similarity index 100% rename from admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/RoleUpdateDTO.java rename to system/system-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/RoleUpdateDTO.java diff --git a/admin/admin-service-impl/pom.xml b/system/system-service-impl/pom.xml similarity index 93% rename from admin/admin-service-impl/pom.xml rename to system/system-service-impl/pom.xml index 67c28849f..ab75ffb7e 100644 --- a/admin/admin-service-impl/pom.xml +++ b/system/system-service-impl/pom.xml @@ -3,19 +3,17 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - admin + system cn.iocoder.mall 1.0-SNAPSHOT 4.0.0 - - admin-service-impl - + system-service-impl cn.iocoder.mall - admin-service-api + system-service-api 1.0-SNAPSHOT diff --git a/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/config/DatabaseConfiguration.java b/system/system-service-impl/src/main/java/cn/iocoder/mall/admin/config/DatabaseConfiguration.java similarity index 100% rename from admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/config/DatabaseConfiguration.java rename to system/system-service-impl/src/main/java/cn/iocoder/mall/admin/config/DatabaseConfiguration.java diff --git a/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/config/ServiceExceptionConfiguration.java b/system/system-service-impl/src/main/java/cn/iocoder/mall/admin/config/ServiceExceptionConfiguration.java similarity index 100% rename from admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/config/ServiceExceptionConfiguration.java rename to system/system-service-impl/src/main/java/cn/iocoder/mall/admin/config/ServiceExceptionConfiguration.java diff --git a/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/convert/AdminAccessLogConvert.java b/system/system-service-impl/src/main/java/cn/iocoder/mall/admin/convert/AdminAccessLogConvert.java similarity index 100% rename from admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/convert/AdminAccessLogConvert.java rename to system/system-service-impl/src/main/java/cn/iocoder/mall/admin/convert/AdminAccessLogConvert.java diff --git a/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/convert/AdminConvert.java b/system/system-service-impl/src/main/java/cn/iocoder/mall/admin/convert/AdminConvert.java similarity index 100% rename from admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/convert/AdminConvert.java rename to system/system-service-impl/src/main/java/cn/iocoder/mall/admin/convert/AdminConvert.java diff --git a/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/convert/DataDictConvert.java b/system/system-service-impl/src/main/java/cn/iocoder/mall/admin/convert/DataDictConvert.java similarity index 100% rename from admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/convert/DataDictConvert.java rename to system/system-service-impl/src/main/java/cn/iocoder/mall/admin/convert/DataDictConvert.java diff --git a/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/convert/OAuth2Convert.java b/system/system-service-impl/src/main/java/cn/iocoder/mall/admin/convert/OAuth2Convert.java similarity index 100% rename from admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/convert/OAuth2Convert.java rename to system/system-service-impl/src/main/java/cn/iocoder/mall/admin/convert/OAuth2Convert.java diff --git a/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/convert/ResourceConvert.java b/system/system-service-impl/src/main/java/cn/iocoder/mall/admin/convert/ResourceConvert.java similarity index 100% rename from admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/convert/ResourceConvert.java rename to system/system-service-impl/src/main/java/cn/iocoder/mall/admin/convert/ResourceConvert.java diff --git a/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/convert/RoleConvert.java b/system/system-service-impl/src/main/java/cn/iocoder/mall/admin/convert/RoleConvert.java similarity index 100% rename from admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/convert/RoleConvert.java rename to system/system-service-impl/src/main/java/cn/iocoder/mall/admin/convert/RoleConvert.java diff --git a/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/dao/AdminAccessLogMapper.java b/system/system-service-impl/src/main/java/cn/iocoder/mall/admin/dao/AdminAccessLogMapper.java similarity index 100% rename from admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/dao/AdminAccessLogMapper.java rename to system/system-service-impl/src/main/java/cn/iocoder/mall/admin/dao/AdminAccessLogMapper.java diff --git a/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/dao/AdminMapper.java b/system/system-service-impl/src/main/java/cn/iocoder/mall/admin/dao/AdminMapper.java similarity index 100% rename from admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/dao/AdminMapper.java rename to system/system-service-impl/src/main/java/cn/iocoder/mall/admin/dao/AdminMapper.java diff --git a/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/dao/AdminRoleMapper.java b/system/system-service-impl/src/main/java/cn/iocoder/mall/admin/dao/AdminRoleMapper.java similarity index 100% rename from admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/dao/AdminRoleMapper.java rename to system/system-service-impl/src/main/java/cn/iocoder/mall/admin/dao/AdminRoleMapper.java diff --git a/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/dao/DataDictMapper.java b/system/system-service-impl/src/main/java/cn/iocoder/mall/admin/dao/DataDictMapper.java similarity index 100% rename from admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/dao/DataDictMapper.java rename to system/system-service-impl/src/main/java/cn/iocoder/mall/admin/dao/DataDictMapper.java diff --git a/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/dao/OAuth2AccessTokenMapper.java b/system/system-service-impl/src/main/java/cn/iocoder/mall/admin/dao/OAuth2AccessTokenMapper.java similarity index 100% rename from admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/dao/OAuth2AccessTokenMapper.java rename to system/system-service-impl/src/main/java/cn/iocoder/mall/admin/dao/OAuth2AccessTokenMapper.java diff --git a/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/dao/OAuth2RefreshTokenMapper.java b/system/system-service-impl/src/main/java/cn/iocoder/mall/admin/dao/OAuth2RefreshTokenMapper.java similarity index 100% rename from admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/dao/OAuth2RefreshTokenMapper.java rename to system/system-service-impl/src/main/java/cn/iocoder/mall/admin/dao/OAuth2RefreshTokenMapper.java diff --git a/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/dao/ResourceMapper.java b/system/system-service-impl/src/main/java/cn/iocoder/mall/admin/dao/ResourceMapper.java similarity index 100% rename from admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/dao/ResourceMapper.java rename to system/system-service-impl/src/main/java/cn/iocoder/mall/admin/dao/ResourceMapper.java diff --git a/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/dao/RoleMapper.java b/system/system-service-impl/src/main/java/cn/iocoder/mall/admin/dao/RoleMapper.java similarity index 100% rename from admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/dao/RoleMapper.java rename to system/system-service-impl/src/main/java/cn/iocoder/mall/admin/dao/RoleMapper.java diff --git a/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/dao/RoleResourceMapper.java b/system/system-service-impl/src/main/java/cn/iocoder/mall/admin/dao/RoleResourceMapper.java similarity index 100% rename from admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/dao/RoleResourceMapper.java rename to system/system-service-impl/src/main/java/cn/iocoder/mall/admin/dao/RoleResourceMapper.java diff --git a/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/AdminAccessLogDO.java b/system/system-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/AdminAccessLogDO.java similarity index 100% rename from admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/AdminAccessLogDO.java rename to system/system-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/AdminAccessLogDO.java diff --git a/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/AdminDO.java b/system/system-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/AdminDO.java similarity index 100% rename from admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/AdminDO.java rename to system/system-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/AdminDO.java diff --git a/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/AdminRoleDO.java b/system/system-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/AdminRoleDO.java similarity index 100% rename from admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/AdminRoleDO.java rename to system/system-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/AdminRoleDO.java diff --git a/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/DataDictDO.java b/system/system-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/DataDictDO.java similarity index 100% rename from admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/DataDictDO.java rename to system/system-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/DataDictDO.java diff --git a/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/OAuth2AccessTokenDO.java b/system/system-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/OAuth2AccessTokenDO.java similarity index 100% rename from admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/OAuth2AccessTokenDO.java rename to system/system-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/OAuth2AccessTokenDO.java diff --git a/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/OAuth2RefreshTokenDO.java b/system/system-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/OAuth2RefreshTokenDO.java similarity index 100% rename from admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/OAuth2RefreshTokenDO.java rename to system/system-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/OAuth2RefreshTokenDO.java diff --git a/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/ResourceDO.java b/system/system-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/ResourceDO.java similarity index 100% rename from admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/ResourceDO.java rename to system/system-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/ResourceDO.java diff --git a/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/RoleDO.java b/system/system-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/RoleDO.java similarity index 100% rename from admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/RoleDO.java rename to system/system-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/RoleDO.java diff --git a/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/RoleResourceDO.java b/system/system-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/RoleResourceDO.java similarity index 100% rename from admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/RoleResourceDO.java rename to system/system-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/RoleResourceDO.java diff --git a/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/service/AdminAccessLogServiceImpl.java b/system/system-service-impl/src/main/java/cn/iocoder/mall/admin/service/AdminAccessLogServiceImpl.java similarity index 100% rename from admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/service/AdminAccessLogServiceImpl.java rename to system/system-service-impl/src/main/java/cn/iocoder/mall/admin/service/AdminAccessLogServiceImpl.java diff --git a/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/service/AdminServiceImpl.java b/system/system-service-impl/src/main/java/cn/iocoder/mall/admin/service/AdminServiceImpl.java similarity index 100% rename from admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/service/AdminServiceImpl.java rename to system/system-service-impl/src/main/java/cn/iocoder/mall/admin/service/AdminServiceImpl.java diff --git a/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/service/DataDictServiceImpl.java b/system/system-service-impl/src/main/java/cn/iocoder/mall/admin/service/DataDictServiceImpl.java similarity index 100% rename from admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/service/DataDictServiceImpl.java rename to system/system-service-impl/src/main/java/cn/iocoder/mall/admin/service/DataDictServiceImpl.java diff --git a/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/service/OAuth2ServiceImpl.java b/system/system-service-impl/src/main/java/cn/iocoder/mall/admin/service/OAuth2ServiceImpl.java similarity index 100% rename from admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/service/OAuth2ServiceImpl.java rename to system/system-service-impl/src/main/java/cn/iocoder/mall/admin/service/OAuth2ServiceImpl.java diff --git a/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/service/ResourceServiceImpl.java b/system/system-service-impl/src/main/java/cn/iocoder/mall/admin/service/ResourceServiceImpl.java similarity index 100% rename from admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/service/ResourceServiceImpl.java rename to system/system-service-impl/src/main/java/cn/iocoder/mall/admin/service/ResourceServiceImpl.java diff --git a/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/service/RoleServiceImpl.java b/system/system-service-impl/src/main/java/cn/iocoder/mall/admin/service/RoleServiceImpl.java similarity index 100% rename from admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/service/RoleServiceImpl.java rename to system/system-service-impl/src/main/java/cn/iocoder/mall/admin/service/RoleServiceImpl.java diff --git a/admin/admin-service-impl/src/main/resources/config/application.properties b/system/system-service-impl/src/main/resources/config/application.properties similarity index 100% rename from admin/admin-service-impl/src/main/resources/config/application.properties rename to system/system-service-impl/src/main/resources/config/application.properties diff --git a/admin/admin-service-impl/src/main/resources/config/application.yaml b/system/system-service-impl/src/main/resources/config/application.yaml similarity index 100% rename from admin/admin-service-impl/src/main/resources/config/application.yaml rename to system/system-service-impl/src/main/resources/config/application.yaml diff --git a/admin/admin-service-impl/src/main/resources/mapper/AdminAccessLogMapper.xml b/system/system-service-impl/src/main/resources/mapper/AdminAccessLogMapper.xml similarity index 100% rename from admin/admin-service-impl/src/main/resources/mapper/AdminAccessLogMapper.xml rename to system/system-service-impl/src/main/resources/mapper/AdminAccessLogMapper.xml diff --git a/admin/admin-service-impl/src/main/resources/mapper/AdminMapper.xml b/system/system-service-impl/src/main/resources/mapper/AdminMapper.xml similarity index 100% rename from admin/admin-service-impl/src/main/resources/mapper/AdminMapper.xml rename to system/system-service-impl/src/main/resources/mapper/AdminMapper.xml diff --git a/admin/admin-service-impl/src/main/resources/mapper/AdminRoleMapper.xml b/system/system-service-impl/src/main/resources/mapper/AdminRoleMapper.xml similarity index 100% rename from admin/admin-service-impl/src/main/resources/mapper/AdminRoleMapper.xml rename to system/system-service-impl/src/main/resources/mapper/AdminRoleMapper.xml diff --git a/admin/admin-service-impl/src/main/resources/mapper/DataDictMapper.xml b/system/system-service-impl/src/main/resources/mapper/DataDictMapper.xml similarity index 100% rename from admin/admin-service-impl/src/main/resources/mapper/DataDictMapper.xml rename to system/system-service-impl/src/main/resources/mapper/DataDictMapper.xml diff --git a/admin/admin-service-impl/src/main/resources/mapper/OAuth2AccessTokenMapper.xml b/system/system-service-impl/src/main/resources/mapper/OAuth2AccessTokenMapper.xml similarity index 100% rename from admin/admin-service-impl/src/main/resources/mapper/OAuth2AccessTokenMapper.xml rename to system/system-service-impl/src/main/resources/mapper/OAuth2AccessTokenMapper.xml diff --git a/admin/admin-service-impl/src/main/resources/mapper/OAuth2RefreshTokenMapper.xml b/system/system-service-impl/src/main/resources/mapper/OAuth2RefreshTokenMapper.xml similarity index 100% rename from admin/admin-service-impl/src/main/resources/mapper/OAuth2RefreshTokenMapper.xml rename to system/system-service-impl/src/main/resources/mapper/OAuth2RefreshTokenMapper.xml diff --git a/admin/admin-service-impl/src/main/resources/mapper/ResourceMapper.xml b/system/system-service-impl/src/main/resources/mapper/ResourceMapper.xml similarity index 100% rename from admin/admin-service-impl/src/main/resources/mapper/ResourceMapper.xml rename to system/system-service-impl/src/main/resources/mapper/ResourceMapper.xml diff --git a/admin/admin-service-impl/src/main/resources/mapper/RoleMapper.xml b/system/system-service-impl/src/main/resources/mapper/RoleMapper.xml similarity index 100% rename from admin/admin-service-impl/src/main/resources/mapper/RoleMapper.xml rename to system/system-service-impl/src/main/resources/mapper/RoleMapper.xml diff --git a/admin/admin-service-impl/src/main/resources/mapper/RoleResourceMapper.xml b/system/system-service-impl/src/main/resources/mapper/RoleResourceMapper.xml similarity index 100% rename from admin/admin-service-impl/src/main/resources/mapper/RoleResourceMapper.xml rename to system/system-service-impl/src/main/resources/mapper/RoleResourceMapper.xml diff --git a/admin/admin-service-impl/src/main/resources/mybatis-config.xml b/system/system-service-impl/src/main/resources/mybatis-config.xml similarity index 100% rename from admin/admin-service-impl/src/main/resources/mybatis-config.xml rename to system/system-service-impl/src/main/resources/mybatis-config.xml diff --git a/user/user-application/pom.xml b/user/user-application/pom.xml index 2667b748d..39cd6b886 100644 --- a/user/user-application/pom.xml +++ b/user/user-application/pom.xml @@ -38,7 +38,7 @@ cn.iocoder.mall - admin-sdk + system-sdk 1.0-SNAPSHOT