From 09eb25f62f90a6072b0b4d6c2f2118e628bbdfe7 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Thu, 4 Apr 2019 15:31:47 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=94=AF=E6=8C=81test=E7=8E=AF=E5=A2=83][?= =?UTF-8?q?=E6=96=B0=E5=A2=9E]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/iformall/WechatOpenApplication.java | 6 +++--- .../com/iformall/controller/WxWeappBasicSetController.java | 4 ++-- .../java/com/iformall/controller/WxWeappInfoController.java | 4 ++-- mlWechatOpen/src/main/resources/application-dev.yml | 2 +- mlWechatOpen/src/main/resources/application-prod.yml | 2 +- mlWechatOpen/src/main/resources/application-test.yml | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/mlWechatOpen/src/main/java/com/iformall/WechatOpenApplication.java b/mlWechatOpen/src/main/java/com/iformall/WechatOpenApplication.java index 18a87a7..0c2ecab 100644 --- a/mlWechatOpen/src/main/java/com/iformall/WechatOpenApplication.java +++ b/mlWechatOpen/src/main/java/com/iformall/WechatOpenApplication.java @@ -27,11 +27,11 @@ public class WechatOpenApplication { return fmException; } - @Value("${fm.delay}") - private Integer fmDelay; + @Value("${fm.deploy}") + private Integer fmDeploy; @Bean - public Integer getFmDelay() { return fmDelay; } + public Integer getFmDeploy() { return fmDeploy; } diff --git a/mlWechatOpen/src/main/java/com/iformall/controller/WxWeappBasicSetController.java b/mlWechatOpen/src/main/java/com/iformall/controller/WxWeappBasicSetController.java index c124e11..c32f35d 100644 --- a/mlWechatOpen/src/main/java/com/iformall/controller/WxWeappBasicSetController.java +++ b/mlWechatOpen/src/main/java/com/iformall/controller/WxWeappBasicSetController.java @@ -25,7 +25,7 @@ public class WxWeappBasicSetController extends BaseController { private final Logger logger = LoggerFactory.getLogger(getClass()); @Autowired - private Integer getFmDelay; + private Integer getFmDeploy; @Autowired private WxWeappBasicSetService weappBasicSetService; @@ -38,7 +38,7 @@ public class WxWeappBasicSetController extends BaseController { public ResultData list(@ModelAttribute WxWeappBasicSet weappBasicSet, Integer pageNum, Integer pageSize) { logger.debug("[" + getIpAddr() + "] WxWeappBasicSetController::list"); if (null == weappBasicSet) weappBasicSet = new WxWeappBasicSet(); - weappBasicSet.setDeploy(getFmDelay); + weappBasicSet.setDeploy(getFmDeploy); final PageInfo page = weappBasicSetService.listAsPage(weappBasicSet, pageNum, pageSize); return new ResultData(page); } diff --git a/mlWechatOpen/src/main/java/com/iformall/controller/WxWeappInfoController.java b/mlWechatOpen/src/main/java/com/iformall/controller/WxWeappInfoController.java index 6607e03..39d492d 100644 --- a/mlWechatOpen/src/main/java/com/iformall/controller/WxWeappInfoController.java +++ b/mlWechatOpen/src/main/java/com/iformall/controller/WxWeappInfoController.java @@ -52,7 +52,7 @@ public class WxWeappInfoController extends BaseController { private final Logger logger = LoggerFactory.getLogger(getClass()); @Autowired - private Integer getFmDelay; + private Integer getFmDeploy; @Autowired private WxAuthorizerInfoService authorizerInfoService; @@ -137,7 +137,7 @@ public class WxWeappInfoController extends BaseController { // 检查基础配置参数 WxWeappBasicSet weappBasicSetQ = new WxWeappBasicSet(); weappBasicSetQ.setType(type); - weappBasicSetQ.setDeploy(getFmDelay); + weappBasicSetQ.setDeploy(getFmDeploy); WxWeappBasicSet weappBasicSet = weappBasicSetService.getByTypeAndDeploy(weappBasicSetQ); if(weappBasicSet == null) { logger.error("未找到相关的基础设置参数"); diff --git a/mlWechatOpen/src/main/resources/application-dev.yml b/mlWechatOpen/src/main/resources/application-dev.yml index 10c1f16..24a353b 100644 --- a/mlWechatOpen/src/main/resources/application-dev.yml +++ b/mlWechatOpen/src/main/resources/application-dev.yml @@ -84,7 +84,7 @@ jasypt: fm: exception: false - delay: 1 + deploy: 1 logging: level: diff --git a/mlWechatOpen/src/main/resources/application-prod.yml b/mlWechatOpen/src/main/resources/application-prod.yml index fc9b970..c20c2d2 100644 --- a/mlWechatOpen/src/main/resources/application-prod.yml +++ b/mlWechatOpen/src/main/resources/application-prod.yml @@ -78,7 +78,7 @@ wechat: fm: exception: true - delay: 3 + deploy: 3 logging: level: diff --git a/mlWechatOpen/src/main/resources/application-test.yml b/mlWechatOpen/src/main/resources/application-test.yml index 359b65b..39c2819 100644 --- a/mlWechatOpen/src/main/resources/application-test.yml +++ b/mlWechatOpen/src/main/resources/application-test.yml @@ -91,7 +91,7 @@ wechat: fm: exception: true - delay: 2 + deploy: 2 ueditor: config: config.json