merge

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;

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;

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;

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;

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;

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.*;

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();
     }

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;

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;

boot-web/src/main/resources/settings.xml

@@ -55,7 +55,7 @@ under the License.
 
   <!-- interactiveMode
    | This will determine whether maven prompts you when it needs input. If set to false,
-   | maven will use a sensible default value, perhaps based on some other setting, for
+   | maven will use a sensible default value, perhaps based on some rest setting, for
    | the parameter in question.
    |
    | Default: true