diff --git a/boot-service/src/main/java/com/xwbing/service/other/AliPayService.java b/boot-service/src/main/java/com/xwbing/service/rest/AliPayService.java similarity index 99% rename from boot-service/src/main/java/com/xwbing/service/other/AliPayService.java rename to boot-service/src/main/java/com/xwbing/service/rest/AliPayService.java index 1f55f4c..21a4b67 100644 --- a/boot-service/src/main/java/com/xwbing/service/other/AliPayService.java +++ b/boot-service/src/main/java/com/xwbing/service/rest/AliPayService.java @@ -1,4 +1,4 @@ -package com.xwbing.service.other; +package com.xwbing.service.rest; import com.alibaba.fastjson.JSONObject; import com.alipay.api.AlipayApiException; diff --git a/boot-service/src/main/java/com/xwbing/service/other/CookieSessionService.java b/boot-service/src/main/java/com/xwbing/service/rest/CookieSessionService.java similarity index 98% rename from boot-service/src/main/java/com/xwbing/service/other/CookieSessionService.java rename to boot-service/src/main/java/com/xwbing/service/rest/CookieSessionService.java index 124f760..3c42ffd 100644 --- a/boot-service/src/main/java/com/xwbing/service/other/CookieSessionService.java +++ b/boot-service/src/main/java/com/xwbing/service/rest/CookieSessionService.java @@ -1,4 +1,4 @@ -package com.xwbing.service.other; +package com.xwbing.service.rest; import com.xwbing.util.RestMessage; import org.springframework.stereotype.Service; diff --git a/boot-service/src/main/java/com/xwbing/service/other/ExpressDeliveryService.java b/boot-service/src/main/java/com/xwbing/service/rest/ExpressDeliveryService.java similarity index 99% rename from boot-service/src/main/java/com/xwbing/service/other/ExpressDeliveryService.java rename to boot-service/src/main/java/com/xwbing/service/rest/ExpressDeliveryService.java index be5c0df..e1f94bc 100644 --- a/boot-service/src/main/java/com/xwbing/service/other/ExpressDeliveryService.java +++ b/boot-service/src/main/java/com/xwbing/service/rest/ExpressDeliveryService.java @@ -1,4 +1,4 @@ -package com.xwbing.service.other; +package com.xwbing.service.rest; import com.alibaba.fastjson.JSONObject; import com.xwbing.constant.CommonEnum; diff --git a/boot-service/src/main/java/com/xwbing/service/other/MailService.java b/boot-service/src/main/java/com/xwbing/service/rest/MailService.java similarity index 99% rename from boot-service/src/main/java/com/xwbing/service/other/MailService.java rename to boot-service/src/main/java/com/xwbing/service/rest/MailService.java index 3786b87..199a5ef 100644 --- a/boot-service/src/main/java/com/xwbing/service/other/MailService.java +++ b/boot-service/src/main/java/com/xwbing/service/rest/MailService.java @@ -1,4 +1,4 @@ -package com.xwbing.service.other; +package com.xwbing.service.rest; import com.xwbing.exception.BusinessException; import com.xwbing.util.RestMessage; diff --git a/boot-service/src/main/java/com/xwbing/service/other/QRCodeZipService.java b/boot-service/src/main/java/com/xwbing/service/rest/QRCodeZipService.java similarity index 99% rename from boot-service/src/main/java/com/xwbing/service/other/QRCodeZipService.java rename to boot-service/src/main/java/com/xwbing/service/rest/QRCodeZipService.java index c479ea1..59844c6 100644 --- a/boot-service/src/main/java/com/xwbing/service/other/QRCodeZipService.java +++ b/boot-service/src/main/java/com/xwbing/service/rest/QRCodeZipService.java @@ -1,4 +1,4 @@ -package com.xwbing.service.other; +package com.xwbing.service.rest; import com.xwbing.exception.BusinessException; import com.xwbing.util.QRCodeUtils; diff --git a/boot-service/src/main/java/com/xwbing/service/other/WxPayService.java b/boot-service/src/main/java/com/xwbing/service/rest/WxPayService.java similarity index 99% rename from boot-service/src/main/java/com/xwbing/service/other/WxPayService.java rename to boot-service/src/main/java/com/xwbing/service/rest/WxPayService.java index 96dce84..71b99f6 100644 --- a/boot-service/src/main/java/com/xwbing/service/other/WxPayService.java +++ b/boot-service/src/main/java/com/xwbing/service/rest/WxPayService.java @@ -1,4 +1,4 @@ -package com.xwbing.service.other; +package com.xwbing.service.rest; import com.xwbing.constant.CommonConstant; import com.xwbing.domain.entity.pay.wxpay.*; diff --git a/boot-web/src/main/java/com/xwbing/configuration/SwaggerConfig.java b/boot-web/src/main/java/com/xwbing/configuration/SwaggerConfig.java index 05044af..81a2a33 100644 --- a/boot-web/src/main/java/com/xwbing/configuration/SwaggerConfig.java +++ b/boot-web/src/main/java/com/xwbing/configuration/SwaggerConfig.java @@ -63,7 +63,7 @@ public class SwaggerConfig { .globalResponseMessage(RequestMethod.POST, customerResponseMessage()) .globalOperationParameters(pars) .select() - .apis(RequestHandlerSelectors.basePackage("com.xwbing.controller.other")) + .apis(RequestHandlerSelectors.basePackage("com.xwbing.controller.rest")) .paths(PathSelectors.any()) .build(); } diff --git a/boot-web/src/main/java/com/xwbing/controller/other/MailTestControl.java b/boot-web/src/main/java/com/xwbing/controller/rest/MailTestControl.java similarity index 97% rename from boot-web/src/main/java/com/xwbing/controller/other/MailTestControl.java rename to boot-web/src/main/java/com/xwbing/controller/rest/MailTestControl.java index 0f78475..1e836cd 100644 --- a/boot-web/src/main/java/com/xwbing/controller/other/MailTestControl.java +++ b/boot-web/src/main/java/com/xwbing/controller/rest/MailTestControl.java @@ -1,8 +1,8 @@ -package com.xwbing.controller.other; +package com.xwbing.controller.rest; import com.alibaba.fastjson.JSONObject; import com.xwbing.annotation.LogInfo; -import com.xwbing.service.other.MailService; +import com.xwbing.service.rest.MailService; import com.xwbing.util.JsonResult; import com.xwbing.util.RestMessage; import io.swagger.annotations.Api; diff --git a/boot-web/src/main/java/com/xwbing/controller/other/TestControl.java b/boot-web/src/main/java/com/xwbing/controller/rest/TestControl.java similarity index 96% rename from boot-web/src/main/java/com/xwbing/controller/other/TestControl.java rename to boot-web/src/main/java/com/xwbing/controller/rest/TestControl.java index bf6fe38..df23685 100644 --- a/boot-web/src/main/java/com/xwbing/controller/other/TestControl.java +++ b/boot-web/src/main/java/com/xwbing/controller/rest/TestControl.java @@ -1,13 +1,13 @@ -package com.xwbing.controller.other; +package com.xwbing.controller.rest; import com.alibaba.fastjson.JSONObject; import com.xwbing.annotation.LogInfo; import com.xwbing.domain.entity.ExpressInfo; import com.xwbing.domain.entity.vo.ExpressInfoVo; import com.xwbing.redis.RedisService; -import com.xwbing.service.other.CookieSessionService; -import com.xwbing.service.other.ExpressDeliveryService; -import com.xwbing.service.other.QRCodeZipService; +import com.xwbing.service.rest.CookieSessionService; +import com.xwbing.service.rest.ExpressDeliveryService; +import com.xwbing.service.rest.QRCodeZipService; import com.xwbing.util.HttpUtil; import com.xwbing.util.JsonResult; import com.xwbing.util.RSAUtil; diff --git a/boot-web/src/main/resources/settings.xml b/boot-web/src/main/resources/settings.xml index b53f9ec..38a4666 100644 --- a/boot-web/src/main/resources/settings.xml +++ b/boot-web/src/main/resources/settings.xml @@ -55,7 +55,7 @@ under the License.