diff --git a/src/main/java/com/zcloud/controller/keyProjects/OutSourcedController.java b/src/main/java/com/zcloud/controller/keyProjects/OutSourcedController.java index 76086e04..5b9ac6a7 100644 --- a/src/main/java/com/zcloud/controller/keyProjects/OutSourcedController.java +++ b/src/main/java/com/zcloud/controller/keyProjects/OutSourcedController.java @@ -806,6 +806,7 @@ public class OutSourcedController extends BaseController { */ @RequestMapping(value = "/updateState") @ResponseBody + @DockAnnotation public Object updateState() throws Exception { Map map = new HashMap(); String errInfo = "success"; @@ -813,6 +814,7 @@ public class OutSourcedController extends BaseController { pd = this.getPageData(); outsourcedService.updateState(pd); map.put("result", errInfo); //返回结果 + map.put("dockData", JSON.toJSONString(pd)); //返回结果 return map; } diff --git a/src/main/java/com/zcloud/controller/keyProjects/app/AppKeyprojectCheckController.java b/src/main/java/com/zcloud/controller/keyProjects/app/AppKeyprojectCheckController.java index b604fcc8..c3f1bc3f 100644 --- a/src/main/java/com/zcloud/controller/keyProjects/app/AppKeyprojectCheckController.java +++ b/src/main/java/com/zcloud/controller/keyProjects/app/AppKeyprojectCheckController.java @@ -125,6 +125,7 @@ public class AppKeyprojectCheckController extends BaseController { hiddenList.add(hidden); time = DateUtil.calculateDateSecond(time, 1); } + pd.put("hiddenList", hiddenList); } try { diff --git a/src/main/java/com/zcloud/controller/keyProjects/app/AppKeyprojectPunishController.java b/src/main/java/com/zcloud/controller/keyProjects/app/AppKeyprojectPunishController.java index e8fc5904..736eeaea 100644 --- a/src/main/java/com/zcloud/controller/keyProjects/app/AppKeyprojectPunishController.java +++ b/src/main/java/com/zcloud/controller/keyProjects/app/AppKeyprojectPunishController.java @@ -103,8 +103,8 @@ public class AppKeyprojectPunishController extends BaseController { e.printStackTrace(); }finally { map.put("result", errInfo); + map.put("dockData", JSON.toJSONString(pd)); } - map.put("dockData", JSON.toJSONString(pd)); return map; } diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties index 7ddd108a..567082c8 100644 --- a/src/main/resources/application-dev.properties +++ b/src/main/resources/application-dev.properties @@ -58,18 +58,18 @@ qa-regulatory-gwj.api.url=http://192.168.0.31:8992/qa-regulatory-gwj/ #preventionxgf.api.url=https://qgxgf.qhdsafety.com/qa-prevention-xgf/ #qa-regulatory-gwj.api.url=https://qgjg.qhdsafety.com/qa-regulatory-gwj/ #????? -smb.host=39.103.224.166 +smb.host=39.101.130.96 smb.port=22 smb.user=root smb.password=Zcloud@zcloud88888 -smb.basePath=/mnt/qgfile/file/ +smb.basePath=/mnt/wwag/file/ #Mq\u914D\u7F6E rocketmq.consumer.group2=edu-admin-edit rocketmq.consumer.group1=edu-admin-add #rocketmq.name-server=10.0.140.141:9876 #rocketmq.name-server=192.168.0.70:9876 -rocketmq.name-server=192.168.0.31:9876 +rocketmq.name-server=192.168.0.79:9876 rocketmq.producer.group=libmiddle rocketmq.producer.send-message-timeout=3000 rocketmq.producer.compress-message-body-threshold=4096