From fb960226769396d76aa3ba9462e8a3e84b339825 Mon Sep 17 00:00:00 2001 From: sin <2943460818@qq.com> Date: Fri, 3 May 2019 17:20:18 +0800 Subject: [PATCH] =?UTF-8?q?-=20admin=20=E6=A8=A1=E5=9D=97=E9=87=8D?= =?UTF-8?q?=E5=91=BD=E5=90=8D=20system=20=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- order/order-application/pom.xml | 2 +- order/order-service-impl/pom.xml | 2 +- pay/pay-application/pom.xml | 2 +- pay/pay-service-impl/pom.xml | 2 +- product/product-application/pom.xml | 2 +- promotion/promotion-application/pom.xml | 2 +- promotion/promotion-service-impl/pom.xml | 2 +- {admin => system}/pom.xml | 11 ++++++----- .../system-application}/pom.xml | 6 +++--- .../mall/admin/application/AdminApplication.java | 0 .../admin/application/config/MVCConfiguration.java | 0 .../admin/application/config/QiniuConfiguration.java | 0 .../application/config/SwaggerConfiguration.java | 0 .../controller/admins/AdminController.java | 0 .../controller/admins/DataDictController.java | 0 .../application/controller/admins/FileController.java | 0 .../controller/admins/PassportController.java | 0 .../controller/admins/ResourceController.java | 0 .../application/controller/admins/RoleController.java | 0 .../mall/admin/application/convert/AdminConvert.java | 0 .../admin/application/convert/DataDictConvert.java | 0 .../admin/application/convert/PassportConvert.java | 0 .../admin/application/convert/ResourceConvert.java | 0 .../mall/admin/application/convert/RoleConvert.java | 0 .../mall/admin/application/vo/AdminInfoVO.java | 0 .../admin/application/vo/AdminMenuTreeNodeVO.java | 0 .../mall/admin/application/vo/AdminPageVO.java | 0 .../mall/admin/application/vo/AdminRoleVO.java | 0 .../cn/iocoder/mall/admin/application/vo/AdminVO.java | 0 .../mall/admin/application/vo/DataDictEnumVO.java | 0 .../iocoder/mall/admin/application/vo/DataDictVO.java | 0 .../mall/admin/application/vo/DataDictValueVO.java | 0 .../mall/admin/application/vo/PassportLoginVO.java | 0 .../mall/admin/application/vo/ResourceTreeNodeVO.java | 0 .../iocoder/mall/admin/application/vo/ResourceVO.java | 0 .../iocoder/mall/admin/application/vo/RolePageVO.java | 0 .../admin/application/vo/RoleResourceTreeNodeVO.java | 0 .../cn/iocoder/mall/admin/application/vo/RoleVO.java | 0 .../src/main/resources/application-test.yaml | 0 .../src/main/resources/application.yaml | 0 {admin/admin-sdk => system/system-sdk}/pom.xml | 6 +++--- .../mall/admin/sdk/context/AdminSecurityContext.java | 0 .../admin/sdk/context/AdminSecurityContextHolder.java | 0 .../java/cn/iocoder/mall/admin/sdk/dict/Bean.java | 0 .../java/cn/iocoder/mall/admin/sdk/dict/DictVal.java | 0 .../iocoder/mall/admin/sdk/dict/DictValProcessor.java | 0 .../sdk/interceptor/AdminAccessLogInterceptor.java | 0 .../sdk/interceptor/AdminSecurityInterceptor.java | 0 .../java/cn/iocoder/mall/admin/sdk/package-info.java | 0 .../system-service-api}/pom.xml | 4 ++-- .../iocoder/mall/admin/api/AdminAccessLogService.java | 0 .../java/cn/iocoder/mall/admin/api/AdminService.java | 0 .../cn/iocoder/mall/admin/api/DataDictService.java | 0 .../java/cn/iocoder/mall/admin/api/OAuth2Service.java | 0 .../cn/iocoder/mall/admin/api/ResourceService.java | 0 .../java/cn/iocoder/mall/admin/api/RoleService.java | 0 .../java/cn/iocoder/mall/admin/api/bo/AdminBO.java | 0 .../cn/iocoder/mall/admin/api/bo/AdminPageBO.java | 0 .../java/cn/iocoder/mall/admin/api/bo/DataDictBO.java | 0 .../mall/admin/api/bo/OAuth2AccessTokenBO.java | 0 .../mall/admin/api/bo/OAuth2AuthenticationBO.java | 0 .../java/cn/iocoder/mall/admin/api/bo/ResourceBO.java | 0 .../java/cn/iocoder/mall/admin/api/bo/RoleBO.java | 0 .../java/cn/iocoder/mall/admin/api/bo/RolePageBO.java | 0 .../mall/admin/api/constant/AdminConstants.java | 0 .../mall/admin/api/constant/AdminErrorCodeEnum.java | 0 .../mall/admin/api/constant/ResourceConstants.java | 0 .../mall/admin/api/dto/AdminAccessLogAddDTO.java | 0 .../cn/iocoder/mall/admin/api/dto/AdminAddDTO.java | 0 .../cn/iocoder/mall/admin/api/dto/AdminPageDTO.java | 0 .../cn/iocoder/mall/admin/api/dto/AdminUpdateDTO.java | 0 .../cn/iocoder/mall/admin/api/dto/DataDictAddDTO.java | 0 .../iocoder/mall/admin/api/dto/DataDictUpdateDTO.java | 0 .../cn/iocoder/mall/admin/api/dto/ResourceAddDTO.java | 0 .../iocoder/mall/admin/api/dto/ResourceUpdateDTO.java | 0 .../cn/iocoder/mall/admin/api/dto/RoleAddDTO.java | 0 .../cn/iocoder/mall/admin/api/dto/RolePageDTO.java | 0 .../cn/iocoder/mall/admin/api/dto/RoleUpdateDTO.java | 0 .../system-service-impl}/pom.xml | 8 +++----- .../mall/admin/config/DatabaseConfiguration.java | 0 .../admin/config/ServiceExceptionConfiguration.java | 0 .../mall/admin/convert/AdminAccessLogConvert.java | 0 .../cn/iocoder/mall/admin/convert/AdminConvert.java | 0 .../iocoder/mall/admin/convert/DataDictConvert.java | 0 .../cn/iocoder/mall/admin/convert/OAuth2Convert.java | 0 .../iocoder/mall/admin/convert/ResourceConvert.java | 0 .../cn/iocoder/mall/admin/convert/RoleConvert.java | 0 .../iocoder/mall/admin/dao/AdminAccessLogMapper.java | 0 .../java/cn/iocoder/mall/admin/dao/AdminMapper.java | 0 .../cn/iocoder/mall/admin/dao/AdminRoleMapper.java | 0 .../cn/iocoder/mall/admin/dao/DataDictMapper.java | 0 .../mall/admin/dao/OAuth2AccessTokenMapper.java | 0 .../mall/admin/dao/OAuth2RefreshTokenMapper.java | 0 .../cn/iocoder/mall/admin/dao/ResourceMapper.java | 0 .../java/cn/iocoder/mall/admin/dao/RoleMapper.java | 0 .../cn/iocoder/mall/admin/dao/RoleResourceMapper.java | 0 .../mall/admin/dataobject/AdminAccessLogDO.java | 0 .../cn/iocoder/mall/admin/dataobject/AdminDO.java | 0 .../cn/iocoder/mall/admin/dataobject/AdminRoleDO.java | 0 .../cn/iocoder/mall/admin/dataobject/DataDictDO.java | 0 .../mall/admin/dataobject/OAuth2AccessTokenDO.java | 0 .../mall/admin/dataobject/OAuth2RefreshTokenDO.java | 0 .../cn/iocoder/mall/admin/dataobject/ResourceDO.java | 0 .../java/cn/iocoder/mall/admin/dataobject/RoleDO.java | 0 .../iocoder/mall/admin/dataobject/RoleResourceDO.java | 0 .../mall/admin/service/AdminAccessLogServiceImpl.java | 0 .../iocoder/mall/admin/service/AdminServiceImpl.java | 0 .../mall/admin/service/DataDictServiceImpl.java | 0 .../iocoder/mall/admin/service/OAuth2ServiceImpl.java | 0 .../mall/admin/service/ResourceServiceImpl.java | 0 .../iocoder/mall/admin/service/RoleServiceImpl.java | 0 .../src/main/resources/config/application.properties | 0 .../src/main/resources/config/application.yaml | 0 .../main/resources/mapper/AdminAccessLogMapper.xml | 0 .../src/main/resources/mapper/AdminMapper.xml | 0 .../src/main/resources/mapper/AdminRoleMapper.xml | 0 .../src/main/resources/mapper/DataDictMapper.xml | 0 .../main/resources/mapper/OAuth2AccessTokenMapper.xml | 0 .../resources/mapper/OAuth2RefreshTokenMapper.xml | 0 .../src/main/resources/mapper/ResourceMapper.xml | 0 .../src/main/resources/mapper/RoleMapper.xml | 0 .../src/main/resources/mapper/RoleResourceMapper.xml | 0 .../src/main/resources/mybatis-config.xml | 0 user/user-application/pom.xml | 2 +- 124 files changed, 25 insertions(+), 26 deletions(-) rename {admin => system}/pom.xml (68%) rename {admin/admin-application => system/system-application}/pom.xml (95%) rename {admin/admin-application => system/system-application}/src/main/java/cn/iocoder/mall/admin/application/AdminApplication.java (100%) rename {admin/admin-application => system/system-application}/src/main/java/cn/iocoder/mall/admin/application/config/MVCConfiguration.java (100%) rename {admin/admin-application => system/system-application}/src/main/java/cn/iocoder/mall/admin/application/config/QiniuConfiguration.java (100%) rename {admin/admin-application => system/system-application}/src/main/java/cn/iocoder/mall/admin/application/config/SwaggerConfiguration.java (100%) rename {admin/admin-application => system/system-application}/src/main/java/cn/iocoder/mall/admin/application/controller/admins/AdminController.java (100%) rename {admin/admin-application => system/system-application}/src/main/java/cn/iocoder/mall/admin/application/controller/admins/DataDictController.java (100%) rename {admin/admin-application => system/system-application}/src/main/java/cn/iocoder/mall/admin/application/controller/admins/FileController.java (100%) rename {admin/admin-application => system/system-application}/src/main/java/cn/iocoder/mall/admin/application/controller/admins/PassportController.java (100%) rename {admin/admin-application => system/system-application}/src/main/java/cn/iocoder/mall/admin/application/controller/admins/ResourceController.java (100%) rename {admin/admin-application => system/system-application}/src/main/java/cn/iocoder/mall/admin/application/controller/admins/RoleController.java (100%) rename {admin/admin-application => system/system-application}/src/main/java/cn/iocoder/mall/admin/application/convert/AdminConvert.java (100%) rename {admin/admin-application => system/system-application}/src/main/java/cn/iocoder/mall/admin/application/convert/DataDictConvert.java (100%) rename {admin/admin-application => system/system-application}/src/main/java/cn/iocoder/mall/admin/application/convert/PassportConvert.java (100%) rename {admin/admin-application => system/system-application}/src/main/java/cn/iocoder/mall/admin/application/convert/ResourceConvert.java (100%) rename {admin/admin-application => system/system-application}/src/main/java/cn/iocoder/mall/admin/application/convert/RoleConvert.java (100%) rename {admin/admin-application => system/system-application}/src/main/java/cn/iocoder/mall/admin/application/vo/AdminInfoVO.java (100%) rename {admin/admin-application => system/system-application}/src/main/java/cn/iocoder/mall/admin/application/vo/AdminMenuTreeNodeVO.java (100%) rename {admin/admin-application => system/system-application}/src/main/java/cn/iocoder/mall/admin/application/vo/AdminPageVO.java (100%) rename {admin/admin-application => system/system-application}/src/main/java/cn/iocoder/mall/admin/application/vo/AdminRoleVO.java (100%) rename {admin/admin-application => system/system-application}/src/main/java/cn/iocoder/mall/admin/application/vo/AdminVO.java (100%) rename {admin/admin-application => system/system-application}/src/main/java/cn/iocoder/mall/admin/application/vo/DataDictEnumVO.java (100%) rename {admin/admin-application => system/system-application}/src/main/java/cn/iocoder/mall/admin/application/vo/DataDictVO.java (100%) rename {admin/admin-application => system/system-application}/src/main/java/cn/iocoder/mall/admin/application/vo/DataDictValueVO.java (100%) rename {admin/admin-application => system/system-application}/src/main/java/cn/iocoder/mall/admin/application/vo/PassportLoginVO.java (100%) rename {admin/admin-application => system/system-application}/src/main/java/cn/iocoder/mall/admin/application/vo/ResourceTreeNodeVO.java (100%) rename {admin/admin-application => system/system-application}/src/main/java/cn/iocoder/mall/admin/application/vo/ResourceVO.java (100%) rename {admin/admin-application => system/system-application}/src/main/java/cn/iocoder/mall/admin/application/vo/RolePageVO.java (100%) rename {admin/admin-application => system/system-application}/src/main/java/cn/iocoder/mall/admin/application/vo/RoleResourceTreeNodeVO.java (100%) rename {admin/admin-application => system/system-application}/src/main/java/cn/iocoder/mall/admin/application/vo/RoleVO.java (100%) rename {admin/admin-application => system/system-application}/src/main/resources/application-test.yaml (100%) rename {admin/admin-application => system/system-application}/src/main/resources/application.yaml (100%) rename {admin/admin-sdk => system/system-sdk}/pom.xml (91%) rename {admin/admin-sdk => system/system-sdk}/src/main/java/cn/iocoder/mall/admin/sdk/context/AdminSecurityContext.java (100%) rename {admin/admin-sdk => system/system-sdk}/src/main/java/cn/iocoder/mall/admin/sdk/context/AdminSecurityContextHolder.java (100%) rename {admin/admin-sdk => system/system-sdk}/src/main/java/cn/iocoder/mall/admin/sdk/dict/Bean.java (100%) rename {admin/admin-sdk => system/system-sdk}/src/main/java/cn/iocoder/mall/admin/sdk/dict/DictVal.java (100%) rename {admin/admin-sdk => system/system-sdk}/src/main/java/cn/iocoder/mall/admin/sdk/dict/DictValProcessor.java (100%) rename {admin/admin-sdk => system/system-sdk}/src/main/java/cn/iocoder/mall/admin/sdk/interceptor/AdminAccessLogInterceptor.java (100%) rename {admin/admin-sdk => system/system-sdk}/src/main/java/cn/iocoder/mall/admin/sdk/interceptor/AdminSecurityInterceptor.java (100%) rename {admin/admin-sdk => system/system-sdk}/src/main/java/cn/iocoder/mall/admin/sdk/package-info.java (100%) rename {admin/admin-service-api => system/system-service-api}/pom.xml (93%) rename {admin/admin-service-api => system/system-service-api}/src/main/java/cn/iocoder/mall/admin/api/AdminAccessLogService.java (100%) rename {admin/admin-service-api => system/system-service-api}/src/main/java/cn/iocoder/mall/admin/api/AdminService.java (100%) rename {admin/admin-service-api => system/system-service-api}/src/main/java/cn/iocoder/mall/admin/api/DataDictService.java (100%) rename {admin/admin-service-api => system/system-service-api}/src/main/java/cn/iocoder/mall/admin/api/OAuth2Service.java (100%) rename {admin/admin-service-api => system/system-service-api}/src/main/java/cn/iocoder/mall/admin/api/ResourceService.java (100%) rename {admin/admin-service-api => system/system-service-api}/src/main/java/cn/iocoder/mall/admin/api/RoleService.java (100%) rename {admin/admin-service-api => system/system-service-api}/src/main/java/cn/iocoder/mall/admin/api/bo/AdminBO.java (100%) rename {admin/admin-service-api => system/system-service-api}/src/main/java/cn/iocoder/mall/admin/api/bo/AdminPageBO.java (100%) rename {admin/admin-service-api => system/system-service-api}/src/main/java/cn/iocoder/mall/admin/api/bo/DataDictBO.java (100%) rename {admin/admin-service-api => system/system-service-api}/src/main/java/cn/iocoder/mall/admin/api/bo/OAuth2AccessTokenBO.java (100%) rename {admin/admin-service-api => system/system-service-api}/src/main/java/cn/iocoder/mall/admin/api/bo/OAuth2AuthenticationBO.java (100%) rename {admin/admin-service-api => system/system-service-api}/src/main/java/cn/iocoder/mall/admin/api/bo/ResourceBO.java (100%) rename {admin/admin-service-api => system/system-service-api}/src/main/java/cn/iocoder/mall/admin/api/bo/RoleBO.java (100%) rename {admin/admin-service-api => system/system-service-api}/src/main/java/cn/iocoder/mall/admin/api/bo/RolePageBO.java (100%) rename {admin/admin-service-api => system/system-service-api}/src/main/java/cn/iocoder/mall/admin/api/constant/AdminConstants.java (100%) rename {admin/admin-service-api => system/system-service-api}/src/main/java/cn/iocoder/mall/admin/api/constant/AdminErrorCodeEnum.java (100%) rename {admin/admin-service-api => system/system-service-api}/src/main/java/cn/iocoder/mall/admin/api/constant/ResourceConstants.java (100%) rename {admin/admin-service-api => system/system-service-api}/src/main/java/cn/iocoder/mall/admin/api/dto/AdminAccessLogAddDTO.java (100%) rename {admin/admin-service-api => system/system-service-api}/src/main/java/cn/iocoder/mall/admin/api/dto/AdminAddDTO.java (100%) rename {admin/admin-service-api => system/system-service-api}/src/main/java/cn/iocoder/mall/admin/api/dto/AdminPageDTO.java (100%) rename {admin/admin-service-api => system/system-service-api}/src/main/java/cn/iocoder/mall/admin/api/dto/AdminUpdateDTO.java (100%) rename {admin/admin-service-api => system/system-service-api}/src/main/java/cn/iocoder/mall/admin/api/dto/DataDictAddDTO.java (100%) rename {admin/admin-service-api => system/system-service-api}/src/main/java/cn/iocoder/mall/admin/api/dto/DataDictUpdateDTO.java (100%) rename {admin/admin-service-api => system/system-service-api}/src/main/java/cn/iocoder/mall/admin/api/dto/ResourceAddDTO.java (100%) rename {admin/admin-service-api => system/system-service-api}/src/main/java/cn/iocoder/mall/admin/api/dto/ResourceUpdateDTO.java (100%) rename {admin/admin-service-api => system/system-service-api}/src/main/java/cn/iocoder/mall/admin/api/dto/RoleAddDTO.java (100%) rename {admin/admin-service-api => system/system-service-api}/src/main/java/cn/iocoder/mall/admin/api/dto/RolePageDTO.java (100%) rename {admin/admin-service-api => system/system-service-api}/src/main/java/cn/iocoder/mall/admin/api/dto/RoleUpdateDTO.java (100%) rename {admin/admin-service-impl => system/system-service-impl}/pom.xml (93%) rename {admin/admin-service-impl => system/system-service-impl}/src/main/java/cn/iocoder/mall/admin/config/DatabaseConfiguration.java (100%) rename {admin/admin-service-impl => system/system-service-impl}/src/main/java/cn/iocoder/mall/admin/config/ServiceExceptionConfiguration.java (100%) rename {admin/admin-service-impl => system/system-service-impl}/src/main/java/cn/iocoder/mall/admin/convert/AdminAccessLogConvert.java (100%) rename {admin/admin-service-impl => system/system-service-impl}/src/main/java/cn/iocoder/mall/admin/convert/AdminConvert.java (100%) rename {admin/admin-service-impl => system/system-service-impl}/src/main/java/cn/iocoder/mall/admin/convert/DataDictConvert.java (100%) rename {admin/admin-service-impl => system/system-service-impl}/src/main/java/cn/iocoder/mall/admin/convert/OAuth2Convert.java (100%) rename {admin/admin-service-impl => system/system-service-impl}/src/main/java/cn/iocoder/mall/admin/convert/ResourceConvert.java (100%) rename {admin/admin-service-impl => system/system-service-impl}/src/main/java/cn/iocoder/mall/admin/convert/RoleConvert.java (100%) rename {admin/admin-service-impl => system/system-service-impl}/src/main/java/cn/iocoder/mall/admin/dao/AdminAccessLogMapper.java (100%) rename {admin/admin-service-impl => system/system-service-impl}/src/main/java/cn/iocoder/mall/admin/dao/AdminMapper.java (100%) rename {admin/admin-service-impl => system/system-service-impl}/src/main/java/cn/iocoder/mall/admin/dao/AdminRoleMapper.java (100%) rename {admin/admin-service-impl => system/system-service-impl}/src/main/java/cn/iocoder/mall/admin/dao/DataDictMapper.java (100%) rename {admin/admin-service-impl => system/system-service-impl}/src/main/java/cn/iocoder/mall/admin/dao/OAuth2AccessTokenMapper.java (100%) rename {admin/admin-service-impl => system/system-service-impl}/src/main/java/cn/iocoder/mall/admin/dao/OAuth2RefreshTokenMapper.java (100%) rename {admin/admin-service-impl => system/system-service-impl}/src/main/java/cn/iocoder/mall/admin/dao/ResourceMapper.java (100%) rename {admin/admin-service-impl => system/system-service-impl}/src/main/java/cn/iocoder/mall/admin/dao/RoleMapper.java (100%) rename {admin/admin-service-impl => system/system-service-impl}/src/main/java/cn/iocoder/mall/admin/dao/RoleResourceMapper.java (100%) rename {admin/admin-service-impl => system/system-service-impl}/src/main/java/cn/iocoder/mall/admin/dataobject/AdminAccessLogDO.java (100%) rename {admin/admin-service-impl => system/system-service-impl}/src/main/java/cn/iocoder/mall/admin/dataobject/AdminDO.java (100%) rename {admin/admin-service-impl => system/system-service-impl}/src/main/java/cn/iocoder/mall/admin/dataobject/AdminRoleDO.java (100%) rename {admin/admin-service-impl => system/system-service-impl}/src/main/java/cn/iocoder/mall/admin/dataobject/DataDictDO.java (100%) rename {admin/admin-service-impl => system/system-service-impl}/src/main/java/cn/iocoder/mall/admin/dataobject/OAuth2AccessTokenDO.java (100%) rename {admin/admin-service-impl => system/system-service-impl}/src/main/java/cn/iocoder/mall/admin/dataobject/OAuth2RefreshTokenDO.java (100%) rename {admin/admin-service-impl => system/system-service-impl}/src/main/java/cn/iocoder/mall/admin/dataobject/ResourceDO.java (100%) rename {admin/admin-service-impl => system/system-service-impl}/src/main/java/cn/iocoder/mall/admin/dataobject/RoleDO.java (100%) rename {admin/admin-service-impl => system/system-service-impl}/src/main/java/cn/iocoder/mall/admin/dataobject/RoleResourceDO.java (100%) rename {admin/admin-service-impl => system/system-service-impl}/src/main/java/cn/iocoder/mall/admin/service/AdminAccessLogServiceImpl.java (100%) rename {admin/admin-service-impl => system/system-service-impl}/src/main/java/cn/iocoder/mall/admin/service/AdminServiceImpl.java (100%) rename {admin/admin-service-impl => system/system-service-impl}/src/main/java/cn/iocoder/mall/admin/service/DataDictServiceImpl.java (100%) rename {admin/admin-service-impl => system/system-service-impl}/src/main/java/cn/iocoder/mall/admin/service/OAuth2ServiceImpl.java (100%) rename {admin/admin-service-impl => system/system-service-impl}/src/main/java/cn/iocoder/mall/admin/service/ResourceServiceImpl.java (100%) rename {admin/admin-service-impl => system/system-service-impl}/src/main/java/cn/iocoder/mall/admin/service/RoleServiceImpl.java (100%) rename {admin/admin-service-impl => system/system-service-impl}/src/main/resources/config/application.properties (100%) rename {admin/admin-service-impl => system/system-service-impl}/src/main/resources/config/application.yaml (100%) rename {admin/admin-service-impl => system/system-service-impl}/src/main/resources/mapper/AdminAccessLogMapper.xml (100%) rename {admin/admin-service-impl => system/system-service-impl}/src/main/resources/mapper/AdminMapper.xml (100%) rename {admin/admin-service-impl => system/system-service-impl}/src/main/resources/mapper/AdminRoleMapper.xml (100%) rename {admin/admin-service-impl => system/system-service-impl}/src/main/resources/mapper/DataDictMapper.xml (100%) rename {admin/admin-service-impl => system/system-service-impl}/src/main/resources/mapper/OAuth2AccessTokenMapper.xml (100%) rename {admin/admin-service-impl => system/system-service-impl}/src/main/resources/mapper/OAuth2RefreshTokenMapper.xml (100%) rename {admin/admin-service-impl => system/system-service-impl}/src/main/resources/mapper/ResourceMapper.xml (100%) rename {admin/admin-service-impl => system/system-service-impl}/src/main/resources/mapper/RoleMapper.xml (100%) rename {admin/admin-service-impl => system/system-service-impl}/src/main/resources/mapper/RoleResourceMapper.xml (100%) rename {admin/admin-service-impl => system/system-service-impl}/src/main/resources/mybatis-config.xml (100%) diff --git a/order/order-application/pom.xml b/order/order-application/pom.xml index d6421ee3..1eb9932a 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 70ce33e0..a89dac8b 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 b7e736b9..9e0734fe 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 e15df21f..337fe9ef 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 fc84fb7b..341895fe 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 94b643b5..cd4e4d06 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 ea0ca611..b0c6d477 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 68% rename from admin/pom.xml rename to system/pom.xml index ea03dd1c..cba0e597 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 061cc411..63ba9b76 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 80f49a79..eea6c267 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 fc2d3d38..79a8b864 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 67c28849..ab75ffb7 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 2667b748..39cd6b88 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