From 6015f41f2d154412537b2929128c82d6526613b4 Mon Sep 17 00:00:00 2001 From: YunaiV <> Date: Thu, 28 Feb 2019 00:04:05 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=AE=A1=E7=90=86=E5=91=98?= =?UTF-8?q?=E8=8E=B7=E5=BE=97=E8=8F=9C=E5=8D=95=E6=8E=A5=E5=8F=A3=EF=BC=88?= =?UTF-8?q?=E5=AE=8C=E5=96=84=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mall/admin/{ => application}/AdminApplication.java | 2 +- .../admin/{ => application}/config/MVCConfiguration.java | 2 +- .../{ => application}/config/SwaggerConfiguration.java | 2 +- .../admin/{ => application}/controller/AdminController.java | 6 +++--- .../{ => application}/controller/PassportController.java | 6 +++--- .../{ => application}/controller/ResourceController.java | 6 +++--- .../mall/admin/{ => application}/convert/AdminConvert.java | 4 ++-- .../admin/{ => application}/convert/PassportConvert.java | 4 ++-- .../admin/{ => application}/convert/ResourceConvert.java | 4 ++-- .../mall/admin/{ => application}/vo/AdminInfoVO.java | 2 +- .../admin/{ => application}/vo/AdminMenuTreeNodeVO.java | 2 +- .../mall/admin/{ => application}/vo/PassportLoginVO.java | 2 +- 12 files changed, 21 insertions(+), 21 deletions(-) rename admin/admin-application/src/main/java/cn/iocoder/mall/admin/{ => application}/AdminApplication.java (88%) rename admin/admin-application/src/main/java/cn/iocoder/mall/admin/{ => application}/config/MVCConfiguration.java (97%) rename admin/admin-application/src/main/java/cn/iocoder/mall/admin/{ => application}/config/SwaggerConfiguration.java (96%) rename admin/admin-application/src/main/java/cn/iocoder/mall/admin/{ => application}/controller/AdminController.java (78%) rename admin/admin-application/src/main/java/cn/iocoder/mall/admin/{ => application}/controller/PassportController.java (89%) rename admin/admin-application/src/main/java/cn/iocoder/mall/admin/{ => application}/controller/ResourceController.java (92%) rename admin/admin-application/src/main/java/cn/iocoder/mall/admin/{ => application}/convert/AdminConvert.java (76%) rename admin/admin-application/src/main/java/cn/iocoder/mall/admin/{ => application}/convert/PassportConvert.java (82%) rename admin/admin-application/src/main/java/cn/iocoder/mall/admin/{ => application}/convert/ResourceConvert.java (74%) rename admin/admin-application/src/main/java/cn/iocoder/mall/admin/{ => application}/vo/AdminInfoVO.java (94%) rename admin/admin-application/src/main/java/cn/iocoder/mall/admin/{ => application}/vo/AdminMenuTreeNodeVO.java (96%) rename admin/admin-application/src/main/java/cn/iocoder/mall/admin/{ => application}/vo/PassportLoginVO.java (96%) diff --git a/admin/admin-application/src/main/java/cn/iocoder/mall/admin/AdminApplication.java b/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/AdminApplication.java similarity index 88% rename from admin/admin-application/src/main/java/cn/iocoder/mall/admin/AdminApplication.java rename to admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/AdminApplication.java index 46385f023..5513088f7 100644 --- a/admin/admin-application/src/main/java/cn/iocoder/mall/admin/AdminApplication.java +++ b/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/AdminApplication.java @@ -1,4 +1,4 @@ -package cn.iocoder.mall.admin; +package cn.iocoder.mall.admin.application; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/admin/admin-application/src/main/java/cn/iocoder/mall/admin/config/MVCConfiguration.java b/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/config/MVCConfiguration.java similarity index 97% rename from admin/admin-application/src/main/java/cn/iocoder/mall/admin/config/MVCConfiguration.java rename to admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/config/MVCConfiguration.java index 1de4d78a9..f052bb8a6 100644 --- a/admin/admin-application/src/main/java/cn/iocoder/mall/admin/config/MVCConfiguration.java +++ b/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/config/MVCConfiguration.java @@ -1,4 +1,4 @@ -package cn.iocoder.mall.admin.config; +package cn.iocoder.mall.admin.application.config; import cn.iocoder.common.framework.config.GlobalExceptionHandler; import cn.iocoder.mall.admin.sdk.interceptor.AdminSecurityInterceptor; diff --git a/admin/admin-application/src/main/java/cn/iocoder/mall/admin/config/SwaggerConfiguration.java b/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/config/SwaggerConfiguration.java similarity index 96% rename from admin/admin-application/src/main/java/cn/iocoder/mall/admin/config/SwaggerConfiguration.java rename to admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/config/SwaggerConfiguration.java index a6b26cd2b..eae66c317 100644 --- a/admin/admin-application/src/main/java/cn/iocoder/mall/admin/config/SwaggerConfiguration.java +++ b/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/config/SwaggerConfiguration.java @@ -1,4 +1,4 @@ -package cn.iocoder.mall.admin.config; +package cn.iocoder.mall.admin.application.config; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/admin/admin-application/src/main/java/cn/iocoder/mall/admin/controller/AdminController.java b/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/controller/AdminController.java similarity index 78% rename from admin/admin-application/src/main/java/cn/iocoder/mall/admin/controller/AdminController.java rename to admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/controller/AdminController.java index 56a32126a..0c7248cdf 100644 --- a/admin/admin-application/src/main/java/cn/iocoder/mall/admin/controller/AdminController.java +++ b/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/controller/AdminController.java @@ -1,9 +1,9 @@ -package cn.iocoder.mall.admin.controller; +package cn.iocoder.mall.admin.application.controller; import cn.iocoder.common.framework.vo.CommonResult; import cn.iocoder.mall.admin.sdk.context.AdminSecurityContextHolder; -import cn.iocoder.mall.admin.convert.AdminConvert; -import cn.iocoder.mall.admin.vo.AdminInfoVO; +import cn.iocoder.mall.admin.application.convert.AdminConvert; +import cn.iocoder.mall.admin.application.vo.AdminInfoVO; import io.swagger.annotations.Api; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/admin/admin-application/src/main/java/cn/iocoder/mall/admin/controller/PassportController.java b/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/controller/PassportController.java similarity index 89% rename from admin/admin-application/src/main/java/cn/iocoder/mall/admin/controller/PassportController.java rename to admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/controller/PassportController.java index 4e5c5ef7f..e2cc2bdd3 100644 --- a/admin/admin-application/src/main/java/cn/iocoder/mall/admin/controller/PassportController.java +++ b/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/controller/PassportController.java @@ -1,10 +1,10 @@ -package cn.iocoder.mall.admin.controller; +package cn.iocoder.mall.admin.application.controller; import cn.iocoder.common.framework.vo.CommonResult; import cn.iocoder.mall.admin.api.OAuth2Service; import cn.iocoder.mall.admin.api.bo.OAuth2AccessTokenBO; -import cn.iocoder.mall.admin.convert.PassportConvert; -import cn.iocoder.mall.admin.vo.PassportLoginVO; +import cn.iocoder.mall.admin.application.convert.PassportConvert; +import cn.iocoder.mall.admin.application.vo.PassportLoginVO; import com.alibaba.dubbo.config.annotation.Reference; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; diff --git a/admin/admin-application/src/main/java/cn/iocoder/mall/admin/controller/ResourceController.java b/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/controller/ResourceController.java similarity index 92% rename from admin/admin-application/src/main/java/cn/iocoder/mall/admin/controller/ResourceController.java rename to admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/controller/ResourceController.java index 216e6c05c..1316a6b25 100644 --- a/admin/admin-application/src/main/java/cn/iocoder/mall/admin/controller/ResourceController.java +++ b/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/controller/ResourceController.java @@ -1,12 +1,12 @@ -package cn.iocoder.mall.admin.controller; +package cn.iocoder.mall.admin.application.controller; import cn.iocoder.common.framework.vo.CommonResult; import cn.iocoder.mall.admin.api.ResourceService; import cn.iocoder.mall.admin.api.bo.ResourceBO; import cn.iocoder.mall.admin.api.constant.ResourceType; -import cn.iocoder.mall.admin.convert.ResourceConvert; +import cn.iocoder.mall.admin.application.convert.ResourceConvert; import cn.iocoder.mall.admin.sdk.context.AdminSecurityContextHolder; -import cn.iocoder.mall.admin.vo.AdminMenuTreeNodeVO; +import cn.iocoder.mall.admin.application.vo.AdminMenuTreeNodeVO; import com.alibaba.dubbo.config.annotation.Reference; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/admin/admin-application/src/main/java/cn/iocoder/mall/admin/convert/AdminConvert.java b/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/convert/AdminConvert.java similarity index 76% rename from admin/admin-application/src/main/java/cn/iocoder/mall/admin/convert/AdminConvert.java rename to admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/convert/AdminConvert.java index e18fc9e71..a97eb25ae 100644 --- a/admin/admin-application/src/main/java/cn/iocoder/mall/admin/convert/AdminConvert.java +++ b/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/convert/AdminConvert.java @@ -1,7 +1,7 @@ -package cn.iocoder.mall.admin.convert; +package cn.iocoder.mall.admin.application.convert; import cn.iocoder.mall.admin.sdk.context.AdminSecurityContext; -import cn.iocoder.mall.admin.vo.AdminInfoVO; +import cn.iocoder.mall.admin.application.vo.AdminInfoVO; import org.mapstruct.Mapper; import org.mapstruct.Mappings; import org.mapstruct.factory.Mappers; diff --git a/admin/admin-application/src/main/java/cn/iocoder/mall/admin/convert/PassportConvert.java b/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/convert/PassportConvert.java similarity index 82% rename from admin/admin-application/src/main/java/cn/iocoder/mall/admin/convert/PassportConvert.java rename to admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/convert/PassportConvert.java index 1572dfbfd..35389ac90 100644 --- a/admin/admin-application/src/main/java/cn/iocoder/mall/admin/convert/PassportConvert.java +++ b/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/convert/PassportConvert.java @@ -1,8 +1,8 @@ -package cn.iocoder.mall.admin.convert; +package cn.iocoder.mall.admin.application.convert; import cn.iocoder.common.framework.vo.CommonResult; import cn.iocoder.mall.admin.api.bo.OAuth2AccessTokenBO; -import cn.iocoder.mall.admin.vo.PassportLoginVO; +import cn.iocoder.mall.admin.application.vo.PassportLoginVO; import org.mapstruct.Mapper; import org.mapstruct.Mappings; import org.mapstruct.factory.Mappers; diff --git a/admin/admin-application/src/main/java/cn/iocoder/mall/admin/convert/ResourceConvert.java b/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/convert/ResourceConvert.java similarity index 74% rename from admin/admin-application/src/main/java/cn/iocoder/mall/admin/convert/ResourceConvert.java rename to admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/convert/ResourceConvert.java index c0a9cd34e..71ac94cc6 100644 --- a/admin/admin-application/src/main/java/cn/iocoder/mall/admin/convert/ResourceConvert.java +++ b/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/convert/ResourceConvert.java @@ -1,7 +1,7 @@ -package cn.iocoder.mall.admin.convert; +package cn.iocoder.mall.admin.application.convert; import cn.iocoder.mall.admin.api.bo.ResourceBO; -import cn.iocoder.mall.admin.vo.AdminMenuTreeNodeVO; +import cn.iocoder.mall.admin.application.vo.AdminMenuTreeNodeVO; import org.mapstruct.Mapper; import org.mapstruct.Mappings; import org.mapstruct.factory.Mappers; diff --git a/admin/admin-application/src/main/java/cn/iocoder/mall/admin/vo/AdminInfoVO.java b/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/AdminInfoVO.java similarity index 94% rename from admin/admin-application/src/main/java/cn/iocoder/mall/admin/vo/AdminInfoVO.java rename to admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/AdminInfoVO.java index b0e609e5e..25cf0e545 100644 --- a/admin/admin-application/src/main/java/cn/iocoder/mall/admin/vo/AdminInfoVO.java +++ b/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/AdminInfoVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.mall.admin.vo; +package cn.iocoder.mall.admin.application.vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/admin/admin-application/src/main/java/cn/iocoder/mall/admin/vo/AdminMenuTreeNodeVO.java b/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/AdminMenuTreeNodeVO.java similarity index 96% rename from admin/admin-application/src/main/java/cn/iocoder/mall/admin/vo/AdminMenuTreeNodeVO.java rename to admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/AdminMenuTreeNodeVO.java index 1e9d8b883..39faf1f18 100644 --- a/admin/admin-application/src/main/java/cn/iocoder/mall/admin/vo/AdminMenuTreeNodeVO.java +++ b/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/AdminMenuTreeNodeVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.mall.admin.vo; +package cn.iocoder.mall.admin.application.vo; import java.util.List; diff --git a/admin/admin-application/src/main/java/cn/iocoder/mall/admin/vo/PassportLoginVO.java b/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/PassportLoginVO.java similarity index 96% rename from admin/admin-application/src/main/java/cn/iocoder/mall/admin/vo/PassportLoginVO.java rename to admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/PassportLoginVO.java index b1376bcde..7913f4c3f 100644 --- a/admin/admin-application/src/main/java/cn/iocoder/mall/admin/vo/PassportLoginVO.java +++ b/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/PassportLoginVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.mall.admin.vo; +package cn.iocoder.mall.admin.application.vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty;