From 5513b767dcfd92a1c529dbada2cf6efa1cb65902 Mon Sep 17 00:00:00 2001 From: cherishsince Date: Fri, 1 May 2020 09:14:51 +0800 Subject: [PATCH] =?UTF-8?q?-=20=E4=BC=98=E5=8C=96=EF=BC=9A=E8=B7=B3?= =?UTF-8?q?=E8=BD=AC=20request=20=E7=9B=AE=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/{admin => }/file/AdminsFileController.java | 2 +- .../{admin => }/sms/AdminsSmsSignController.java | 6 +++--- .../{admin => }/sms/AdminsSmsTemplateController.java | 8 ++++---- .../mall/system/rest/convert/sms/AdminsSmsConvert.java | 6 +++--- .../rest/request/{smsSign => sms}/AddSignRequest.java | 3 +-- .../{smsTemplate => sms}/AddSmsTemplateRequest.java | 2 +- .../{smsTemplate => sms}/ListSmsTemplateRequest.java | 2 +- .../rest/request/{smsSign => sms}/UpdateSignRequest.java | 2 +- .../{smsTemplate => sms}/UpdateSmsTemplateRequest.java | 2 +- 9 files changed, 16 insertions(+), 17 deletions(-) rename system/system-rest/src/main/java/cn/iocoder/mall/system/rest/controller/{admin => }/file/AdminsFileController.java (94%) rename system/system-rest/src/main/java/cn/iocoder/mall/system/rest/controller/{admin => }/sms/AdminsSmsSignController.java (90%) rename system/system-rest/src/main/java/cn/iocoder/mall/system/rest/controller/{admin => }/sms/AdminsSmsTemplateController.java (88%) rename system/system-rest/src/main/java/cn/iocoder/mall/system/rest/request/{smsSign => sms}/AddSignRequest.java (72%) rename system/system-rest/src/main/java/cn/iocoder/mall/system/rest/request/{smsTemplate => sms}/AddSmsTemplateRequest.java (95%) rename system/system-rest/src/main/java/cn/iocoder/mall/system/rest/request/{smsTemplate => sms}/ListSmsTemplateRequest.java (89%) rename system/system-rest/src/main/java/cn/iocoder/mall/system/rest/request/{smsSign => sms}/UpdateSignRequest.java (86%) rename system/system-rest/src/main/java/cn/iocoder/mall/system/rest/request/{smsTemplate => sms}/UpdateSmsTemplateRequest.java (96%) diff --git a/system/system-rest/src/main/java/cn/iocoder/mall/system/rest/controller/admin/file/AdminsFileController.java b/system/system-rest/src/main/java/cn/iocoder/mall/system/rest/controller/file/AdminsFileController.java similarity index 94% rename from system/system-rest/src/main/java/cn/iocoder/mall/system/rest/controller/admin/file/AdminsFileController.java rename to system/system-rest/src/main/java/cn/iocoder/mall/system/rest/controller/file/AdminsFileController.java index 06667626b..63709079c 100644 --- a/system/system-rest/src/main/java/cn/iocoder/mall/system/rest/controller/admin/file/AdminsFileController.java +++ b/system/system-rest/src/main/java/cn/iocoder/mall/system/rest/controller/file/AdminsFileController.java @@ -1,4 +1,4 @@ -package cn.iocoder.mall.system.rest.controller.admin.file; +package cn.iocoder.mall.system.rest.controller.file; import cn.iocoder.common.framework.vo.CommonResult; import com.qiniu.util.Auth; diff --git a/system/system-rest/src/main/java/cn/iocoder/mall/system/rest/controller/admin/sms/AdminsSmsSignController.java b/system/system-rest/src/main/java/cn/iocoder/mall/system/rest/controller/sms/AdminsSmsSignController.java similarity index 90% rename from system/system-rest/src/main/java/cn/iocoder/mall/system/rest/controller/admin/sms/AdminsSmsSignController.java rename to system/system-rest/src/main/java/cn/iocoder/mall/system/rest/controller/sms/AdminsSmsSignController.java index ebfa38e62..5771fc5aa 100644 --- a/system/system-rest/src/main/java/cn/iocoder/mall/system/rest/controller/admin/sms/AdminsSmsSignController.java +++ b/system/system-rest/src/main/java/cn/iocoder/mall/system/rest/controller/sms/AdminsSmsSignController.java @@ -1,4 +1,4 @@ -package cn.iocoder.mall.system.rest.controller.admin.sms; +package cn.iocoder.mall.system.rest.controller.sms; import cn.iocoder.common.framework.vo.CommonResult; import cn.iocoder.common.framework.vo.PageResult; @@ -6,8 +6,8 @@ import cn.iocoder.mall.system.biz.bo.smsSign.ListSmsSignBO; import cn.iocoder.mall.system.biz.dto.smsSign.ListSmsSignDTO; import cn.iocoder.mall.system.biz.service.sms.SmsService; import cn.iocoder.mall.system.rest.convert.sms.AdminsSmsConvert; -import cn.iocoder.mall.system.rest.request.smsSign.AddSignRequest; -import cn.iocoder.mall.system.rest.request.smsSign.UpdateSignRequest; +import cn.iocoder.mall.system.rest.request.sms.AddSignRequest; +import cn.iocoder.mall.system.rest.request.sms.UpdateSignRequest; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; diff --git a/system/system-rest/src/main/java/cn/iocoder/mall/system/rest/controller/admin/sms/AdminsSmsTemplateController.java b/system/system-rest/src/main/java/cn/iocoder/mall/system/rest/controller/sms/AdminsSmsTemplateController.java similarity index 88% rename from system/system-rest/src/main/java/cn/iocoder/mall/system/rest/controller/admin/sms/AdminsSmsTemplateController.java rename to system/system-rest/src/main/java/cn/iocoder/mall/system/rest/controller/sms/AdminsSmsTemplateController.java index 0821cc595..373246676 100644 --- a/system/system-rest/src/main/java/cn/iocoder/mall/system/rest/controller/admin/sms/AdminsSmsTemplateController.java +++ b/system/system-rest/src/main/java/cn/iocoder/mall/system/rest/controller/sms/AdminsSmsTemplateController.java @@ -1,13 +1,13 @@ -package cn.iocoder.mall.system.rest.controller.admin.sms; +package cn.iocoder.mall.system.rest.controller.sms; import cn.iocoder.common.framework.vo.CommonResult; import cn.iocoder.common.framework.vo.PageResult; import cn.iocoder.mall.system.biz.bo.smsTemplate.ListSmsTemplateBO; import cn.iocoder.mall.system.biz.service.sms.SmsService; import cn.iocoder.mall.system.rest.convert.sms.AdminsSmsConvert; -import cn.iocoder.mall.system.rest.request.smsTemplate.AddSmsTemplateRequest; -import cn.iocoder.mall.system.rest.request.smsTemplate.ListSmsTemplateRequest; -import cn.iocoder.mall.system.rest.request.smsTemplate.UpdateSmsTemplateRequest; +import cn.iocoder.mall.system.rest.request.sms.AddSmsTemplateRequest; +import cn.iocoder.mall.system.rest.request.sms.ListSmsTemplateRequest; +import cn.iocoder.mall.system.rest.request.sms.UpdateSmsTemplateRequest; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; diff --git a/system/system-rest/src/main/java/cn/iocoder/mall/system/rest/convert/sms/AdminsSmsConvert.java b/system/system-rest/src/main/java/cn/iocoder/mall/system/rest/convert/sms/AdminsSmsConvert.java index 5054b04b8..b6dc4cac9 100644 --- a/system/system-rest/src/main/java/cn/iocoder/mall/system/rest/convert/sms/AdminsSmsConvert.java +++ b/system/system-rest/src/main/java/cn/iocoder/mall/system/rest/convert/sms/AdminsSmsConvert.java @@ -3,9 +3,9 @@ package cn.iocoder.mall.system.rest.convert.sms; import cn.iocoder.mall.system.biz.dto.smsSign.AddSignDTO; import cn.iocoder.mall.system.biz.dto.smsSign.UpdateSignDTO; import cn.iocoder.mall.system.biz.dto.smsTemplate.ListSmsTemplateDTO; -import cn.iocoder.mall.system.rest.request.smsSign.AddSignRequest; -import cn.iocoder.mall.system.rest.request.smsSign.UpdateSignRequest; -import cn.iocoder.mall.system.rest.request.smsTemplate.ListSmsTemplateRequest; +import cn.iocoder.mall.system.rest.request.sms.AddSignRequest; +import cn.iocoder.mall.system.rest.request.sms.UpdateSignRequest; +import cn.iocoder.mall.system.rest.request.sms.ListSmsTemplateRequest; import org.mapstruct.Mapper; import org.mapstruct.Mappings; import org.mapstruct.factory.Mappers; diff --git a/system/system-rest/src/main/java/cn/iocoder/mall/system/rest/request/smsSign/AddSignRequest.java b/system/system-rest/src/main/java/cn/iocoder/mall/system/rest/request/sms/AddSignRequest.java similarity index 72% rename from system/system-rest/src/main/java/cn/iocoder/mall/system/rest/request/smsSign/AddSignRequest.java rename to system/system-rest/src/main/java/cn/iocoder/mall/system/rest/request/sms/AddSignRequest.java index 071711db0..55be319db 100644 --- a/system/system-rest/src/main/java/cn/iocoder/mall/system/rest/request/smsSign/AddSignRequest.java +++ b/system/system-rest/src/main/java/cn/iocoder/mall/system/rest/request/sms/AddSignRequest.java @@ -1,8 +1,7 @@ -package cn.iocoder.mall.system.rest.request.smsSign; +package cn.iocoder.mall.system.rest.request.sms; import lombok.Data; import lombok.experimental.Accessors; -import org.springframework.web.bind.annotation.RequestParam; import java.io.Serializable; diff --git a/system/system-rest/src/main/java/cn/iocoder/mall/system/rest/request/smsTemplate/AddSmsTemplateRequest.java b/system/system-rest/src/main/java/cn/iocoder/mall/system/rest/request/sms/AddSmsTemplateRequest.java similarity index 95% rename from system/system-rest/src/main/java/cn/iocoder/mall/system/rest/request/smsTemplate/AddSmsTemplateRequest.java rename to system/system-rest/src/main/java/cn/iocoder/mall/system/rest/request/sms/AddSmsTemplateRequest.java index 36ab20484..6357f9aa3 100644 --- a/system/system-rest/src/main/java/cn/iocoder/mall/system/rest/request/smsTemplate/AddSmsTemplateRequest.java +++ b/system/system-rest/src/main/java/cn/iocoder/mall/system/rest/request/sms/AddSmsTemplateRequest.java @@ -1,4 +1,4 @@ -package cn.iocoder.mall.system.rest.request.smsTemplate; +package cn.iocoder.mall.system.rest.request.sms; import cn.iocoder.common.framework.validator.InEnum; import cn.iocoder.mall.system.biz.enums.sms.SmsPlatformEnum; diff --git a/system/system-rest/src/main/java/cn/iocoder/mall/system/rest/request/smsTemplate/ListSmsTemplateRequest.java b/system/system-rest/src/main/java/cn/iocoder/mall/system/rest/request/sms/ListSmsTemplateRequest.java similarity index 89% rename from system/system-rest/src/main/java/cn/iocoder/mall/system/rest/request/smsTemplate/ListSmsTemplateRequest.java rename to system/system-rest/src/main/java/cn/iocoder/mall/system/rest/request/sms/ListSmsTemplateRequest.java index 285d11e7c..7c26646d1 100644 --- a/system/system-rest/src/main/java/cn/iocoder/mall/system/rest/request/smsTemplate/ListSmsTemplateRequest.java +++ b/system/system-rest/src/main/java/cn/iocoder/mall/system/rest/request/sms/ListSmsTemplateRequest.java @@ -1,4 +1,4 @@ -package cn.iocoder.mall.system.rest.request.smsTemplate; +package cn.iocoder.mall.system.rest.request.sms; import cn.iocoder.common.framework.vo.PageParam; import lombok.Data; diff --git a/system/system-rest/src/main/java/cn/iocoder/mall/system/rest/request/smsSign/UpdateSignRequest.java b/system/system-rest/src/main/java/cn/iocoder/mall/system/rest/request/sms/UpdateSignRequest.java similarity index 86% rename from system/system-rest/src/main/java/cn/iocoder/mall/system/rest/request/smsSign/UpdateSignRequest.java rename to system/system-rest/src/main/java/cn/iocoder/mall/system/rest/request/sms/UpdateSignRequest.java index f8d05e91b..cbde8ea4a 100644 --- a/system/system-rest/src/main/java/cn/iocoder/mall/system/rest/request/smsSign/UpdateSignRequest.java +++ b/system/system-rest/src/main/java/cn/iocoder/mall/system/rest/request/sms/UpdateSignRequest.java @@ -1,4 +1,4 @@ -package cn.iocoder.mall.system.rest.request.smsSign; +package cn.iocoder.mall.system.rest.request.sms; import lombok.Data; import lombok.experimental.Accessors; diff --git a/system/system-rest/src/main/java/cn/iocoder/mall/system/rest/request/smsTemplate/UpdateSmsTemplateRequest.java b/system/system-rest/src/main/java/cn/iocoder/mall/system/rest/request/sms/UpdateSmsTemplateRequest.java similarity index 96% rename from system/system-rest/src/main/java/cn/iocoder/mall/system/rest/request/smsTemplate/UpdateSmsTemplateRequest.java rename to system/system-rest/src/main/java/cn/iocoder/mall/system/rest/request/sms/UpdateSmsTemplateRequest.java index b879893d0..1a45de2e3 100644 --- a/system/system-rest/src/main/java/cn/iocoder/mall/system/rest/request/smsTemplate/UpdateSmsTemplateRequest.java +++ b/system/system-rest/src/main/java/cn/iocoder/mall/system/rest/request/sms/UpdateSmsTemplateRequest.java @@ -1,4 +1,4 @@ -package cn.iocoder.mall.system.rest.request.smsTemplate; +package cn.iocoder.mall.system.rest.request.sms; import cn.iocoder.common.framework.validator.InEnum; import cn.iocoder.mall.system.biz.enums.sms.SmsPlatformEnum;