Merge branch 'developer' into 'master'

Developer

See merge request !51

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/outer/impl/pay/WxPayStrategy.java

@@ -22,7 +22,7 @@ import com.gic.log.api.dto.SystemSetLogDTO;
 import com.gic.log.api.service.LogApiService;
 import com.gic.marketing.process.api.service.sms.SmsSendApiService;
 import com.gic.thirdparty.api.dto.ScanPayReqDataDTO;
-import com.gic.thirdparty.api.service.Pay4WxService;
+import com.gic.thirdparty.api.service.Pay4WXService;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -43,7 +43,7 @@ public class WxPayStrategy implements PayStrategy {
     private Logger logger = LogManager.getLogger(WxPayStrategy.class);
 
     @Autowired
-    private Pay4WxService pay4WxService;
+    private Pay4WXService pay4WxService;
     @Autowired
     private BillingPayInfoService billingPayInfoService;
     @Autowired
@@ -164,7 +164,7 @@ public class WxPayStrategy implements PayStrategy {
                 "",
                 "NATIVE"
         );
-        ServiceResponse<String> serviceResponse = pay4WxService.createPrePaymentOrderForWx(scanPayReqDataDTO);
+        ServiceResponse<String> serviceResponse = pay4WxService.createPrePaymentOrderForWX(scanPayReqDataDTO);
         if (serviceResponse.isSuccess()) {
             // 生成支付记录
             BillingPayInfoDTO billingPayInfoDTO = new BillingPayInfoDTO();

gic-platform-enterprise-web/src/main/java/com/gic/enterprise/web/controller/wm/WmStoreSyncController.java

@@ -464,6 +464,7 @@ public class WmStoreSyncController {
      * @throws Exception
      */
     @RequestMapping("weimob-init-error-download")
+    @HeaderSignIgnore
     public RestResponse downloadError(HttpServletRequest request, HttpServletResponse response) throws Exception {
         return downloadExportLog(REDIS_KEY, request, response);
     }