From 489ef78c97e3abe1f4b034532c8d3f829aa05790 Mon Sep 17 00:00:00 2001
From: zy_Java <654600784@qq.com>
Date: Sun, 25 Apr 2021 14:08:54 +0800
Subject: [PATCH] v

---
 tall/src/main/java/com/ccsens/tall/bean/vo/TaskVo.java | 6 ++++++
 tall/src/main/resources/application.yml                | 4 ++--
 util/src/main/java/com/ccsens/util/wx/WxXcxUtil.java   | 7 +++++++
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/tall/src/main/java/com/ccsens/tall/bean/vo/TaskVo.java b/tall/src/main/java/com/ccsens/tall/bean/vo/TaskVo.java
index ef73c024..33fd1b2e 100644
--- a/tall/src/main/java/com/ccsens/tall/bean/vo/TaskVo.java
+++ b/tall/src/main/java/com/ccsens/tall/bean/vo/TaskVo.java
@@ -73,6 +73,8 @@ public class TaskVo {
         private Byte routineLocation;
         @ApiModelProperty("入参")
         private String importParam;
+        @ApiModelProperty("任务配置")
+        private ProTaskShow proTaskConfig = new ProTaskShow();
         public Long getDuration(){
             if(ObjectUtil.isNotNull(beginTime) && ObjectUtil.isNotNull(endTime)) {
                 return endTime - beginTime;
@@ -101,6 +103,10 @@ public class TaskVo {
         private Long executorRole;
         @ApiModelProperty("负责人名称")
         private String executorRoleName;
+        @ApiModelProperty("检查人Id")
+        private Long checkerRole;
+        @ApiModelProperty("检查人名称")
+        private String checkerRoleName;
         @ApiModelProperty("开始时间")
         private Long beginTime;
         @ApiModelProperty("结束时间")
diff --git a/tall/src/main/resources/application.yml b/tall/src/main/resources/application.yml
index b5408a3a..e75cc2c3 100644
--- a/tall/src/main/resources/application.yml
+++ b/tall/src/main/resources/application.yml
@@ -1,5 +1,5 @@
 spring:
   profiles:
-    active: dev
-    include: util-dev,common
+    active: prod
+    include: util-prod,common
 
diff --git a/util/src/main/java/com/ccsens/util/wx/WxXcxUtil.java b/util/src/main/java/com/ccsens/util/wx/WxXcxUtil.java
index b115c96b..74a499ed 100644
--- a/util/src/main/java/com/ccsens/util/wx/WxXcxUtil.java
+++ b/util/src/main/java/com/ccsens/util/wx/WxXcxUtil.java
@@ -171,6 +171,9 @@ public class WxXcxUtil {
     private static final String appid_health = "wx2f9ef33e08053bbf";
     private static final String secret_health = "af90801c26bc177681b2c39a603605b9";
 
+    private static final String appid_enterprise = "wx808fa75921bd8f22";
+    private static final String secret_enterprise = "8d2e95462bfeab363ee84776bc807859";
+
     private static final String mchid = "";
     private static final String key = "";
 
@@ -184,6 +187,8 @@ public class WxXcxUtil {
                 return appid_bh;
             case "health":
                 return appid_health;
+            case "enterprise":
+                return appid_enterprise;
             default:
                 return appid;
         }
@@ -199,6 +204,8 @@ public class WxXcxUtil {
                 return secret_bh;
             case "health":
                 return secret_health;
+            case "enterprise":
+                return secret_enterprise;
             default:
                 return secret;
         }