合并代码，更新配置

admin-service/pom.xml

@@ -49,7 +49,7 @@
         <dependency>
             <groupId>de.codecentric</groupId>
             <artifactId>spring-boot-admin-starter-server</artifactId>
-            <version>2.0.2</version>
+            <version>2.1.3</version>
         </dependency>
 
         <dependency>
@@ -99,7 +99,7 @@
                     <imageName>${docker.image.prefix}/${project.artifactId}:${project.version}</imageName>
                     <forceTags>true</forceTags>
                     <!--镜像的FROM，使用压缩的小镜像-->
-                    <baseImage>frolvlad/alpine-oraclejdk8:slim</baseImage>
+                    <baseImage>frolvlad/alpine-oraclejre8:slim</baseImage>
                     <entryPoint>["java", "-jar", "-Xms256m", "-Xmx1024m", "-Duser.timezone=GMT+8", "/${project.build.finalName}.jar"]</entryPoint>
                     <resources>
                         <resource>

admin-service/src/main/resources/logback-spring.xml

@@ -14,8 +14,8 @@
     <conversionRule conversionWord="wEx"
                     converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter"/>
     <!-- 彩色日志格式 -->
-    <property name="CONSOLE_LOG_PATTERN"
-              value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%logger){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
+    <!--<property name="CONSOLE_LOG_PATTERN"-->
+              <!--value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(-&#45;&#45;){faint} %clr([%15.15t]){faint} %clr(%logger){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>-->
     <!--包名输出缩进对齐-->
     <property name="CONSOLE_LOG_PATTERN"
               value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
@@ -194,7 +194,7 @@
     <!--<appender name="db" class="ch.qos.logback.classic.db.DBAppender">-->
     <!--<connectionSource-->
     <!--class="ch.qos.logback.core.db.DriverManagerConnectionSource">-->
-    <!--<driverClass>com.mysql.jdbc.Driver</driverClass>-->
+    <!--<driverClass>com.mysql.cj.jdbc.Driver</driverClass>-->
     <!--<url>jdbc:mysql://120.77.222.42:3306/logback_member?characterEncoding=utf8</url>-->
     <!--<user>root</user>-->
     <!--<password>a123456789</password>-->

aipt-service/pom.xml

@@ -129,6 +129,11 @@
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-boot-starter</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-generator</artifactId>
+        </dependency>
         <!-- mybatis-plus end -->
 
         <!-- 阿里巴巴druid数据库连接池 -->
@@ -165,7 +170,7 @@
                     <imageName>${docker.image.prefix}/${project.artifactId}:${project.version}</imageName>
                     <forceTags>true</forceTags>
                     <!--镜像的FROM，使用压缩的小镜像-->
-                    <baseImage>frolvlad/alpine-oraclejdk8:slim</baseImage>
+                    <baseImage>frolvlad/alpine-oraclejre8:slim</baseImage>
                     <entryPoint>["java", "-jar", "-Xms256m", "-Xmx1024m", "-Duser.timezone=GMT+8", "/${project.build.finalName}.jar"]</entryPoint>
                     <resources>
                         <resource>

aipt-service/src/main/java/com/diagbot/client/AIServiceClient.java

@@ -1,13 +1,17 @@
 package com.diagbot.client;
 
+import com.diagbot.client.bean.CalculateData;
+import com.diagbot.client.bean.GdbResponse;
 import com.diagbot.client.bean.Response;
 import com.diagbot.client.bean.ResponseData;
-import com.diagbot.vo.SearchVo;
 import com.diagbot.client.hystrix.AIServiceHystrix;
+import com.diagbot.vo.SearchVo;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
+import java.util.Map;
+
 /**
  * @Description:
  * @Author:zhaops
@@ -17,4 +21,13 @@ import org.springframework.web.bind.annotation.RequestBody;
 public interface AIServiceClient {
     @PostMapping(value = "/push-web/algorithm/neural")
     Response<ResponseData> bayesPageData(@RequestBody SearchVo searchVo);
-}
+
+    @PostMapping(value = "/push-web/graph/scale")
+    Map<String, Object> scale(@RequestBody SearchVo searchVo);
+
+    @PostMapping(value = "/push-web/graph/highRisk")
+    Response<GdbResponse> highRiskPageData(@RequestBody SearchVo searchVo);
+
+    @PostMapping(value = "/push-web/graph/scaleCalc")
+    Map<String, Object> scaleCalc(@RequestBody CalculateData calculateData);
+}

icss-service/src/main/java/com/diagbot/client/NLPServiceClient.java

@@ -12,7 +12,7 @@ import java.util.Map;
 /**
  * @Description:调用NLP对接层服务
  * @Author:zhaops
- * @time: 2019/2/26 10:33
+ * @time: 2019/4/2 15:31
  */
 @FeignClient(name = "NLP", url = "${nlp.server.address}", fallback = NLPServiceHystrix.class)
 public interface NLPServiceClient {

aipt-service/src/main/java/com/diagbot/client/bean/CalculateData.java

@@ -0,0 +1,17 @@
+package com.diagbot.client.bean;
+
+import com.alibaba.fastjson.JSONObject;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:计算接口入参
+ * @Author:zhaops
+ * @time: 2019/4/24 15:15
+ */
+@Getter
+@Setter
+public class CalculateData {
+    private Integer type;  //1-量表，2-计算公式
+    private JSONObject data;
+}

aipt-service/src/main/java/com/diagbot/client/bean/GdbResponse.java

@@ -0,0 +1,18 @@
+package com.diagbot.client.bean;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 图形数据库数据返回结构
+ * Created by Mark Huang on 2018/10/26.
+ */
+@Getter
+@Setter
+public class GdbResponse {
+    private String status = "";
+    private Map<String, String> Result = new HashMap<>();
+}

aipt-service/src/main/java/com/diagbot/client/bean/MedicalIndication.java

@@ -0,0 +1,19 @@
+package com.diagbot.client.bean;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+
+/**
+ * @Description:推送指标
+ * @Author:zhaops
+ * @time: 2019/3/14 14:40
+ */
+@Getter
+@Setter
+public class MedicalIndication {
+    private String name;
+    private List<MedicalIndicationDetail> details;
+}

aipt-service/src/main/java/com/diagbot/client/bean/MedicalIndicationDetail.java

@@ -0,0 +1,17 @@
+package com.diagbot.client.bean;
+
+import com.alibaba.fastjson.JSONObject;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:推送指标明细
+ * @Author:zhaops
+ * @time: 2019/4/11 10:15
+ */
+@Getter
+@Setter
+public class MedicalIndicationDetail {
+    private Integer type; //1-量表，2-公式，3-其他指标
+    private JSONObject content;  //type<>1 非量表,返回内容;type=1 量表,返回量表名称{"name":""}
+}

aipt-service/src/main/java/com/diagbot/client/bean/ResponseData.java

@@ -18,8 +18,11 @@ public class ResponseData {
     private List<FeatureRate> dis = new ArrayList<>(10);
     private List<FeatureRate> labs = new ArrayList<>(10);
     private List<FeatureRate> pacs = new ArrayList<>(10);
-    private List<FeatureRate> history=new ArrayList<>(10);
-    private Map<String, JSONObject> treat;
+    private List<FeatureRate> history = new ArrayList<>(10);
+    private Map<String, JSONObject> treat;   //治疗方案
+    private Map<String, JSONObject> scale;   //量表内容
+    private Map<String, JSONObject> managementEvaluation;   //管理评估
+    private List<MedicalIndication> medicalIndications;     //量表和指标项推送
 
     private Map<String, Map<String, String>> inputs = new HashMap<>(10, 0.5f);
 
@@ -95,4 +98,28 @@ public class ResponseData {
     public void setInputs(Map<String, Map<String, String>> inputs) {
         this.inputs = inputs;
     }
+
+    public Map<String, JSONObject> getScale() {
+        return scale;
+    }
+
+    public void setScale(Map<String, JSONObject> scale) {
+        this.scale = scale;
+    }
+
+    public Map<String, JSONObject> getManagementEvaluation() {
+        return managementEvaluation;
+    }
+
+    public void setManagementEvaluation(Map<String, JSONObject> managementEvaluation) {
+        this.managementEvaluation = managementEvaluation;
+    }
+
+    public List<MedicalIndication> getMedicalIndications() {
+        return medicalIndications;
+    }
+
+    public void setMedicalIndications(List<MedicalIndication> medicalIndications) {
+        this.medicalIndications = medicalIndications;
+    }
 }

aipt-service/src/main/java/com/diagbot/client/bean/SearchData.java

@@ -3,6 +3,8 @@ package com.diagbot.client.bean;
 import com.diagbot.client.AlgorithmClassify;
 import com.diagbot.client.Feature;
 import com.diagbot.dto.LisResult;
+import lombok.Getter;
+import lombok.Setter;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -12,6 +14,8 @@ import java.util.Map;
 /**
  * Created by fyeman on 2018/1/31.
  */
+@Getter
+@Setter
 public class SearchData {
     private int length = 10;
     private int age_start = 0;
@@ -29,7 +33,9 @@ public class SearchData {
     private String past = "";
     private String other = "";
     private List<LisResult> lisArr;
-
+    private Integer disType; //0-普通病（默认不填），1-慢病，2-急诊
+    private String scaleName;
+    private String indications;
 
     //特征类别
     private String featureType;
@@ -53,221 +59,4 @@ public class SearchData {
     private List<Feature> pacsFeatureList = new ArrayList<>();
     private List<Feature> diagFeatureList = new ArrayList<>();
     private List<Feature> symptompropertyFeatureList = new ArrayList<>();
-
-    public int getLength() {
-        return length;
-    }
-
-    public void setLength(int length) {
-        this.length = length;
-    }
-
-    public int getAge_start() {
-        return age_start;
-    }
-
-    public void setAge_start(int age_start) {
-        this.age_start = age_start;
-    }
-
-    public int getAge_end() {
-        return age_end;
-    }
-
-    public void setAge_end(int age_end) {
-        this.age_end = age_end;
-    }
-
-    public int getAge() {
-        return age;
-    }
-
-    public void setAge(int age) {
-        this.age = age;
-    }
-
-    public String getSex() {
-        return sex;
-    }
-
-    public void setSex(String sex) {
-        this.sex = sex;
-    }
-
-    public String getSymptom() {
-        return symptom;
-    }
-
-    public void setSymptom(String symptom) {
-        this.symptom = symptom;
-    }
-
-    public String getVital() {
-        return vital;
-    }
-
-    public void setVital(String vital) {
-        this.vital = vital;
-    }
-
-    public String getLis() {
-        return lis;
-    }
-
-    public void setLis(String lis) {
-        this.lis = lis;
-    }
-
-    public String getPacs() {
-        return pacs;
-    }
-
-    public void setPacs(String pacs) {
-        this.pacs = pacs;
-    }
-
-    public String getDiag() {
-        return diag;
-    }
-
-    public void setDiag(String diag) {
-        this.diag = diag;
-    }
-
-    public String getPast() {
-        return past;
-    }
-
-    public void setPast(String past) {
-        this.past = past;
-    }
-
-    public String getOther() {
-        return other;
-    }
-
-    public void setOther(String other) {
-        this.other = other;
-    }
-
-    public String getFeatureType() {
-        return featureType;
-    }
-
-    public void setFeatureType(String featureType) {
-        this.featureType = featureType;
-    }
-
-    public String[] getFeatureTypes() {
-        return featureTypes;
-    }
-
-    public void setFeatureTypes(String[] featureTypes) {
-        this.featureTypes = featureTypes;
-    }
-
-    public String getResourceType() {
-        return resourceType;
-    }
-
-    public void setResourceType(String resourceType) {
-        this.resourceType = resourceType;
-    }
-
-    public String getSysCode() {
-        return sysCode;
-    }
-
-    public void setSysCode(String sysCode) {
-        this.sysCode = sysCode;
-    }
-
-    public void setThreshold(String threshold) {
-        this.threshold = threshold;
-    }
-
-    public float getThreshold() {
-        return Float.parseFloat(threshold);
-    }
-
-    public List<Feature> getSymptomFeatureList() {
-        return symptomFeatureList;
-    }
-
-    public void setSymptomFeatureList(List<Feature> symptomFeatureList) {
-        this.symptomFeatureList = symptomFeatureList;
-    }
-
-    public List<Feature> getVitalFeatureList() {
-        return vitalFeatureList;
-    }
-
-    public void setVitalFeatureList(List<Feature> vitalFeatureList) {
-        this.vitalFeatureList = vitalFeatureList;
-    }
-
-    public List<Feature> getLisFeatureList() {
-        return lisFeatureList;
-    }
-
-    public void setLisFeatureList(List<Feature> lisFeatureList) {
-        this.lisFeatureList = lisFeatureList;
-    }
-
-    public List<Feature> getPacsFeatureList() {
-        return pacsFeatureList;
-    }
-
-    public void setPacsFeatureList(List<Feature> pacsFeatureList) {
-        this.pacsFeatureList = pacsFeatureList;
-    }
-
-
-    public List<Feature> getSymptompropertyFeatureList() {
-        return symptompropertyFeatureList;
-    }
-
-    public void setSymptompropertyFeatureList(List<Feature> symptompropertyFeatureList) {
-        this.symptompropertyFeatureList = symptompropertyFeatureList;
-    }
-
-    public List<Feature> getDiagFeatureList() {
-        return diagFeatureList;
-    }
-
-    public void setDiagFeatureList(List<Feature> diagFeatureList) {
-        this.diagFeatureList = diagFeatureList;
-    }
-
-    public Map<String, Map<String, String>> getInputs() {
-        return inputs;
-    }
-
-    public void setInputs(Map<String, Map<String, String>> inputs) {
-        this.inputs = inputs;
-    }
-
-    public AlgorithmClassify[] getAlgorithmClassify() {
-        return algorithmClassify;
-    }
-
-    public void setAlgorithmClassify(AlgorithmClassify[] algorithmClassify) {
-        this.algorithmClassify = algorithmClassify;
-    }
-
-    public String getAlgorithmClassifyValue() {
-        return algorithmClassifyValue;
-    }
-
-    public void setAlgorithmClassifyValue(String algorithmClassifyValue) {
-        this.algorithmClassifyValue = algorithmClassifyValue;
-    }
-
-    public List<LisResult> getLisArr() {
-        return lisArr;
-    }
-
-    public void setLisArr(List<LisResult> lisArr) {
-        this.lisArr = lisArr;
-    }
 }

aipt-service/src/main/java/com/diagbot/client/hystrix/AIServiceHystrix.java

@@ -1,11 +1,16 @@
 package com.diagbot.client.hystrix;
 
 import com.diagbot.client.AIServiceClient;
+import com.diagbot.client.bean.CalculateData;
+import com.diagbot.client.bean.GdbResponse;
 import com.diagbot.client.bean.Response;
 import com.diagbot.client.bean.ResponseData;
 import com.diagbot.vo.SearchVo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.Map;
 
 /**
  * @Description:
@@ -20,4 +25,22 @@ public class AIServiceHystrix implements AIServiceClient {
         log.error("【hystrix】调用{}异常", "bayesPageData");
         return null;
     }
+
+    @Override
+    public Map<String, Object> scale(@RequestBody SearchVo searchVo) {
+        log.error("【hystrix】调用{}异常", "scale");
+        return null;
+    }
+
+    @Override
+    public Response<GdbResponse> highRiskPageData(@RequestBody SearchVo searchVo) {
+        log.error("【hystrix】调用{}异常", "highRiskPageData");
+        return null;
+    }
+
+    @Override
+    public Map<String, Object> scaleCalc(@RequestBody CalculateData calculateData) {
+        log.error("【hystrix】调用{}异常", "scaleCalc");
+        return null;
+    }
 }

icss-service/src/main/java/com/diagbot/client/hystrix/NLPServiceHystrix.java

@@ -12,7 +12,7 @@ import java.util.Map;
 /**
  * @Description:调用NLP对接层服务
  * @Author:zhaops
- * @time: 2019/2/26 10:33
+ * @time: 2019/4/2 15:36
  */
 @Component
 @Slf4j
@@ -23,4 +23,4 @@ public class NLPServiceHystrix implements NLPServiceClient {
         log.error("【hystrix】调用{}异常", "symptomFeaturePageData");
         return null;
     }
-}
+}

aipt-service/src/main/java/com/diagbot/config/SwaggerConfigurer.java

@@ -10,6 +10,7 @@ import springfox.documentation.builders.PathSelectors;
 import springfox.documentation.builders.RequestHandlerSelectors;
 import springfox.documentation.schema.ModelRef;
 import springfox.documentation.service.ApiInfo;
+import springfox.documentation.service.Contact;
 import springfox.documentation.service.Parameter;
 import springfox.documentation.spi.DocumentationType;
 import springfox.documentation.spring.web.plugins.Docket;
@@ -61,7 +62,7 @@ public class SwaggerConfigurer {
                 .title(" aipt-service api ")
                 .description("aipt-service 微服务")
                 .termsOfServiceUrl("")
-                .contact("diagbot")
+                .contact(new Contact("diagbot","",""))
                 .version("1.0")
                 .build();
     }

aipt-service/src/main/java/com/diagbot/facade/ClinicalFacade.java

@@ -1,15 +1,22 @@
 package com.diagbot.facade;
 
 import com.diagbot.client.AIServiceClient;
+import com.diagbot.client.bean.CalculateData;
+import com.diagbot.client.bean.GdbResponse;
 import com.diagbot.client.bean.Response;
 import com.diagbot.client.bean.ResponseData;
 import com.diagbot.dto.LisResult;
+import com.diagbot.exception.CommonErrorCode;
+import com.diagbot.exception.CommonException;
+import com.diagbot.util.ListUtil;
+import com.diagbot.vo.SearchVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.web.bind.annotation.RequestBody;
-import com.diagbot.vo.SearchVo;
 
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -25,6 +32,13 @@ public class ClinicalFacade {
     @Autowired
     private AIServiceClient aiServiceClient;
 
+    private static String up = "增高";
+    private static String down = "降低";
+    private static String normal = "正常";
+
+    private static String pos = "阳性";
+    private static String neg = "阴性";
+
     /**
      * 处理临床数据
      *
@@ -32,33 +46,95 @@ public class ClinicalFacade {
      * @return ResponseData
      */
     public ResponseData processClinicalData(@RequestBody SearchVo searchVo) {
-        processLis(searchVo);
-        Response<ResponseData> res = aiServiceClient.bayesPageData(searchVo);
+        SearchVo sData = searchVo;
+
+        sData.setLisArr(processLis(sData.getLisArr()));
+
+        if (ListUtil.isNotEmpty(sData.getLisArr())) {
+            List<String> otherVal = sData.getLisArr().stream().map(lisArr -> lisArr.getOtherValue()).collect(Collectors.toList());
+            sData.setLis(String.join(",", otherVal));
+        }
+
+        Response<ResponseData> res = aiServiceClient.bayesPageData(sData);
+        if (res == null || res.getData() == null) {
+            throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "AI没有返回结果");
+        }
 
         return res.getData();
     }
 
-    private void processLis(SearchVo sData) {
+    private List<LisResult> processLis(List<LisResult> lisArr) {
+        if (ListUtil.isEmpty(lisArr)) {
+            return lisArr;
+        }
 
         String Otherval = "";
-        String lisresult = "";
-        List<LisResult> lisArr = sData.getLisArr();
 
-        for (int i=0; i<lisArr.size(); i++) {
+        for (int i = 0; i < lisArr.size(); i++) {
             LisResult lisres = lisArr.get(i);
 
-            Otherval = (lisres.getOtherValue().trim().length() > 0)? lisres.getOtherValue().trim()+"\n":"";
+            Otherval = (lisres.getOtherValue().trim().length() > 0) ? lisres.getOtherValue().trim() + "\n" : "";
+            Otherval = lisres.getOtherValue();
 
-            if (lisres.getMaxValue() != null && lisres.getValue() > lisres.getMaxValue()) {
-                lisres.setOtherValue(Otherval + "\n" + lisres.getDetailName() + "升高");
+            if (Otherval.indexOf(pos) >= 0 || Otherval.indexOf(neg) >= 0) {
+                lisres.setOtherValue(lisres.getDetailName() + Otherval);
+            } else {
+                Otherval = (Otherval.trim().length() > 0) ? Otherval.trim() + "\n" : "";
 
+                if (lisres.getValue() == null) {
+                    continue;
+                } else if (lisres.getMaxValue() != null && lisres.getValue() > lisres.getMaxValue()) {
+                    lisres.setOtherValue(Otherval + lisres.getDetailName() + up);
+                } else if (lisres.getMinValue() != null && lisres.getValue() < lisres.getMinValue()) {
+                    lisres.setOtherValue(Otherval + lisres.getDetailName() + down);
+                } else {
+                    lisres.setOtherValue(Otherval + lisres.getDetailName() + normal);
+                }
             }
-            else if (lisres.getMinValue() != null && lisres.getValue() < lisres.getMinValue()) {
-                lisres.setOtherValue(Otherval + "\n" + lisres.getDetailName() + "下降");
-            }
-            lisresult += lisres.getOtherValue() + "\n";
         }
 
-        sData.setLis(lisresult);
+        return lisArr;
+    }
+
+    /**
+     * 获取量表内容
+     *
+     * @param searchVo
+     * @return
+     */
+    public Map<String, Object> scale(SearchVo searchVo) {
+        Map<String, Object> response = aiServiceClient.scale(searchVo);
+        if (null == response) {
+            throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "量表没有返回结果");
+        }
+        return response;
+    }
+
+    /**
+     * 高危诊断
+     *
+     * @param searchVo
+     * @return
+     */
+    public GdbResponse highRiskPageData(SearchVo searchVo) {
+        Response<GdbResponse> response = aiServiceClient.highRiskPageData(searchVo);
+        if (response == null || response.getData() == null) {
+            throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "高危没有返回结果");
+        }
+        return response.getData();
+    }
+
+    /**
+     * 计算接口
+     *
+     * @param calculateData
+     * @return
+     */
+    public Map<String, Object> scaleCalc(CalculateData calculateData) {
+        Map<String, Object> response = aiServiceClient.scaleCalc(calculateData);
+        if (response == null) {
+            throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "计算没有返回结构");
+        }
+        return response;
     }
-}
+}

aipt-service/src/main/java/com/diagbot/facade/NLPFacade.java

@@ -0,0 +1,36 @@
+package com.diagbot.facade;
+
+import com.diagbot.client.NLPServiceClient;
+import com.diagbot.client.bean.Response;
+import com.diagbot.exception.CommonErrorCode;
+import com.diagbot.exception.CommonException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2019/4/2 15:37
+ */
+@Component
+public class NLPFacade {
+    @Autowired
+    private NLPServiceClient nlpServiceClient;
+
+    /**
+     * 症状特征词提取
+     *
+     * @param text
+     * @return
+     */
+    public List<Map<String, Object>> symptomFeaturePageData(String text) {
+        Response<List<Map<String, Object>>> response = nlpServiceClient.symptomFeaturePageData(text);
+        if (response == null || response.getData() == null) {
+            throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "NLP没有返回结果");
+        }
+        return response.getData();
+    }
+}

aipt-service/src/main/java/com/diagbot/vo/SearchVo.java

@@ -38,6 +38,7 @@ public class SearchVo {
 
     //特征类别
     private String featureType;
+    private Integer disType;
     /*
     //特征类别对","进行分割后数据
     private String[] featureTypes;
@@ -61,4 +62,6 @@ public class SearchVo {
     private List<Feature> diagFeatureList;
     private Map<String, Map<String, String>> inputs;
 
+    private String scaleName;
+    private String indications;
 }

aipt-service/src/main/java/com/diagbot/web/ClinicalController.java

@@ -1,7 +1,10 @@
 package com.diagbot.web;
 
 
+import com.alibaba.fastjson.JSONObject;
 import com.diagbot.annotation.SysLogger;
+import com.diagbot.client.bean.CalculateData;
+import com.diagbot.client.bean.GdbResponse;
 import com.diagbot.client.bean.ResponseData;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.facade.ClinicalFacade;
@@ -12,10 +15,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
-
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.Map;
 
 /**
  * <p>
@@ -43,4 +46,27 @@ public class ClinicalController {
         return RespDTO.onSuc(data);
     }
 
+    @ApiOperation(value = "获取量表", notes = "")
+    @PostMapping("/scale")
+    @SysLogger("scale")
+    public RespDTO<Map<String, Object>> scale(@RequestBody SearchVo searchVo) {
+        Map<String, Object> data = clinicalFacade.scale(searchVo);
+        return RespDTO.onSuc(data);
+    }
+
+    @ApiOperation(value = "高危诊断", notes = "")
+    @PostMapping("/highRisk")
+    @SysLogger("highRisk")
+    public RespDTO<GdbResponse> highRisk(@RequestBody SearchVo searchVo) {
+        GdbResponse data = clinicalFacade.highRiskPageData(searchVo);
+        return RespDTO.onSuc(data);
+    }
+
+    @ApiOperation(value = "计算接口", notes = "")
+    @PostMapping("/scaleCalc")
+    @SysLogger("scaleCalc")
+    public RespDTO<Map<String, Object>> scaleCalc(@RequestBody CalculateData calculateData) {
+        Map<String, Object> data = clinicalFacade.scaleCalc(calculateData);
+        return RespDTO.onSuc(data);
+    }
 }

aipt-service/src/main/java/com/diagbot/web/NLPController.java

@@ -0,0 +1,36 @@
+package com.diagbot.web;
+
+import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.facade.NLPFacade;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2019/4/2 11:31
+ */
+@RestController
+@RequestMapping("/nlpService")
+@Api(value = "NLP相关API", tags = { "NLP相关API" })
+public class NLPController {
+    @Autowired
+    NLPFacade nlpFacade;
+
+    @ApiOperation(value = "症状特征词提取", notes = "")
+    @PostMapping("/symptomFeature")
+    @SysLogger("symptomFeature")
+    public RespDTO<List<Map<String, Object>>> symptomFeaturePageData(@RequestParam("text") String text) {
+        List<Map<String, Object>> data = nlpFacade.symptomFeaturePageData(text);
+        return RespDTO.onSuc(data);
+    }
+}

aipt-service/src/main/resources/logback-spring.xml

@@ -14,8 +14,8 @@
     <conversionRule conversionWord="wEx"
                     converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter"/>
     <!-- 彩色日志格式 -->
-    <property name="CONSOLE_LOG_PATTERN"
-              value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%logger){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
+    <!--<property name="CONSOLE_LOG_PATTERN"-->
+              <!--value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(-&#45;&#45;){faint} %clr([%15.15t]){faint} %clr(%logger){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>-->
     <!--包名输出缩进对齐-->
     <property name="CONSOLE_LOG_PATTERN"
               value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
@@ -194,7 +194,7 @@
     <!--<appender name="db" class="ch.qos.logback.classic.db.DBAppender">-->
     <!--<connectionSource-->
     <!--class="ch.qos.logback.core.db.DriverManagerConnectionSource">-->
-    <!--<driverClass>com.mysql.jdbc.Driver</driverClass>-->
+    <!--<driverClass>com.mysql.cj.jdbc.Driver</driverClass>-->
     <!--<url>jdbc:mysql://120.77.222.42:3306/logback_member?characterEncoding=utf8</url>-->
     <!--<user>root</user>-->
     <!--<password>a123456789</password>-->

aipt-service/src/test/java/com/diagbot/CodeGeneration.java

@@ -46,10 +46,10 @@ public class CodeGeneration {
         // 数据源配置
         DataSourceConfig dsc = new DataSourceConfig();
         dsc.setDbType(DbType.MYSQL);
-        dsc.setDriverName("com.mysql.jdbc.Driver");
+        dsc.setDriverName("com.mysql.cj.jdbc.Driver");
         dsc.setUsername("root");
         dsc.setPassword("root");
-        dsc.setUrl("jdbc:mysql://127.0.0.1:3306/sys-log?useUnicode=true&characterEncoding=utf-8");
+        dsc.setUrl("jdbc:mysql://127.0.0.1:3306/sys-log?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf-8");
         mpg.setDataSource(dsc);
 
         // 策略配置

bi-service/pom.xml

@@ -129,6 +129,11 @@
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-boot-starter</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-generator</artifactId>
+        </dependency>
         <!-- mybatis-plus end -->
 
         <!-- 阿里巴巴druid数据库连接池 -->
@@ -165,7 +170,7 @@
                     <imageName>${docker.image.prefix}/${project.artifactId}:${project.version}</imageName>
                     <forceTags>true</forceTags>
                     <!--镜像的FROM，使用压缩的小镜像-->
-                    <baseImage>frolvlad/alpine-oraclejdk8:slim</baseImage>
+                    <baseImage>frolvlad/alpine-oraclejre8:slim</baseImage>
                     <entryPoint>["java", "-jar", "-Xms256m", "-Xmx1024m", "-Duser.timezone=GMT+8", "/${project.build.finalName}.jar"]</entryPoint>
                     <resources>
                         <resource>

bi-service/src/main/java/com/diagbot/config/SwaggerConfigurer.java

@@ -10,6 +10,7 @@ import springfox.documentation.builders.PathSelectors;
 import springfox.documentation.builders.RequestHandlerSelectors;
 import springfox.documentation.schema.ModelRef;
 import springfox.documentation.service.ApiInfo;
+import springfox.documentation.service.Contact;
 import springfox.documentation.service.Parameter;
 import springfox.documentation.spi.DocumentationType;
 import springfox.documentation.spring.web.plugins.Docket;
@@ -61,7 +62,7 @@ public class SwaggerConfigurer {
                 .title(" bi-service api ")
                 .description("bi-service 微服务")
                 .termsOfServiceUrl("")
-                .contact("diagbot")
+                .contact(new Contact("diagbot","",""))
                 .version("1.0")
                 .build();
     }

bi-service/src/main/resources/logback-spring.xml

@@ -14,8 +14,8 @@
     <conversionRule conversionWord="wEx"
                     converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter"/>
     <!-- 彩色日志格式 -->
-    <property name="CONSOLE_LOG_PATTERN"
-              value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%logger){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
+    <!--<property name="CONSOLE_LOG_PATTERN"-->
+              <!--value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(-&#45;&#45;){faint} %clr([%15.15t]){faint} %clr(%logger){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>-->
     <!--包名输出缩进对齐-->
     <property name="CONSOLE_LOG_PATTERN"
               value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
@@ -194,7 +194,7 @@
     <!--<appender name="db" class="ch.qos.logback.classic.db.DBAppender">-->
     <!--<connectionSource-->
     <!--class="ch.qos.logback.core.db.DriverManagerConnectionSource">-->
-    <!--<driverClass>com.mysql.jdbc.Driver</driverClass>-->
+    <!--<driverClass>com.mysql.cj.jdbc.Driver</driverClass>-->
     <!--<url>jdbc:mysql://120.77.222.42:3306/logback_member?characterEncoding=utf8</url>-->
     <!--<user>root</user>-->
     <!--<password>a123456789</password>-->

bi-service/src/test/java/com/diagbot/CodeGeneration.java

@@ -46,10 +46,10 @@ public class CodeGeneration {
         // 数据源配置
         DataSourceConfig dsc = new DataSourceConfig();
         dsc.setDbType(DbType.MYSQL);
-        dsc.setDriverName("com.mysql.jdbc.Driver");
+        dsc.setDriverName("com.mysql.cj.jdbc.Driver");
         dsc.setUsername("root");
         dsc.setPassword("root");
-        dsc.setUrl("jdbc:mysql://127.0.0.1:3306/sys-log?useUnicode=true&characterEncoding=utf-8");
+        dsc.setUrl("jdbc:mysql://127.0.0.1:3306/sys-log?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf-8");
         mpg.setDataSource(dsc);
 
         // 策略配置

common/pom.xml

@@ -23,21 +23,21 @@
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
-            <version>3.8</version>
+            <version>3.8.1</version>
             <!--<scope>provided</scope>-->
         </dependency>
 
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.18.2</version>
+            <version>1.18.6</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-webmvc</artifactId>
-            <version>5.0.9.RELEASE</version>
+            <version>5.1.6.RELEASE</version>
             <scope>provided</scope>
         </dependency>
 
@@ -51,21 +51,21 @@
         <dependency>
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-core</artifactId>
-            <version>5.0.8.RELEASE</version>
+            <version>5.1.4.RELEASE</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.springframework.security.oauth</groupId>
             <artifactId>spring-security-oauth2</artifactId>
-            <version>2.3.3.RELEASE</version>
+            <version>2.3.5.RELEASE</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>1.7.25</version>
+            <version>1.7.26</version>
             <scope>provided</scope>
         </dependency>
 
@@ -79,7 +79,7 @@
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>fastjson</artifactId>
-            <version>1.2.54</version>
+            <version>1.2.56</version>
             <scope>compile</scope>
         </dependency>
 
@@ -87,13 +87,13 @@
         <dependency>
             <groupId>org.apache.poi</groupId>
             <artifactId>poi</artifactId>
-            <version>4.0.0</version>
+            <version>4.0.1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.poi</groupId>
             <artifactId>poi-ooxml</artifactId>
-            <version>4.0.0</version>
+            <version>4.0.1</version>
         </dependency>
 
         <dependency>
@@ -139,7 +139,7 @@
                     <pushImage>true</pushImage>
                     <!--<forceTags>true</forceTags>-->
                     <!--镜像的FROM，使用java官方镜像-->
-                    <baseImage>frolvlad/alpine-oraclejdk8:slim</baseImage>
+                    <baseImage>frolvlad/alpine-oraclejre8:slim</baseImage>
                     <entryPoint>["java", "-jar", "-Xms256m", "-Xmx1024m", "-Duser.timezone=GMT+8", "/${project.build.finalName}.jar"]</entryPoint>
                     <resources>
                         <resource>

common/src/main/java/com/diagbot/util/ListUtil.java

@@ -1,6 +1,7 @@
 package com.diagbot.util;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -71,4 +72,17 @@ public class ListUtil {
         }
         return list.get(FIRST);
     }
+
+    public static <E> ArrayList<E> arrayToList(E[] strArray) {
+        ArrayList<E> arrayList = new ArrayList<>(strArray.length);
+        Collections.addAll(arrayList, strArray);
+        return arrayList;
+    }
+
+    public static void main(String[] args) throws Exception {
+        String[] i ={"A","B"};
+        List<String> o = arrayToList(i);
+        System.out.println("输入参数:"+ i);
+        System.out.println("输出参数:"+ o);
+    }
 }

config-server/pom.xml

@@ -84,7 +84,7 @@
                     <imageName>${docker.image.prefix}/${project.artifactId}:${project.version}</imageName>
                     <forceTags>true</forceTags>
                     <!--镜像的FROM，使用压缩的小镜像-->
-                    <baseImage>frolvlad/alpine-oraclejdk8:slim</baseImage>
+                    <baseImage>frolvlad/alpine-oraclejre8:slim</baseImage>
                     <entryPoint>["java", "-jar", "-Xms256m", "-Xmx1024m", "-Duser.timezone=GMT+8", "/${project.build.finalName}.jar"]</entryPoint>
                     <resources>
                         <resource>

config-server/src/main/resources/application.yml

@@ -57,8 +57,8 @@ management:
   endpoint:
     health:
       show-details: ALWAYS
-  security:
-    enabled: false
+#  security:
+#    enabled: false
 
 myuri: localhost
 

config-server/src/main/resources/logback-spring.xml

@@ -14,8 +14,8 @@
     <conversionRule conversionWord="wEx"
                     converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter"/>
     <!-- 彩色日志格式 -->
-    <property name="CONSOLE_LOG_PATTERN"
-              value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%logger){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
+    <!--<property name="CONSOLE_LOG_PATTERN"-->
+              <!--value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(-&#45;&#45;){faint} %clr([%15.15t]){faint} %clr(%logger){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>-->
     <!--包名输出缩进对齐-->
     <property name="CONSOLE_LOG_PATTERN"
               value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
@@ -194,7 +194,7 @@
     <!--<appender name="db" class="ch.qos.logback.classic.db.DBAppender">-->
     <!--<connectionSource-->
     <!--class="ch.qos.logback.core.db.DriverManagerConnectionSource">-->
-    <!--<driverClass>com.mysql.jdbc.Driver</driverClass>-->
+    <!--<driverClass>com.mysql.cj.jdbc.Driver</driverClass>-->
     <!--<url>jdbc:mysql://120.77.222.42:3306/logback_member?characterEncoding=utf8</url>-->
     <!--<user>root</user>-->
     <!--<password>a123456789</password>-->

config-server/src/main/resources/shared/aipt-service-dev.yml

@@ -5,10 +5,9 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
-      url: jdbc:mysql://192.168.2.236:3306/sys-log?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
+      url: jdbc:mysql://192.168.2.236:3306/sys-log?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root
       password: lantone
       # 连接池的配置信息
@@ -30,9 +29,13 @@ spring:
       poolPreparedStatements: true
       maxPoolPreparedStatementPerConnectionSize: 20
       # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-      filters.commons-log.connection-logger-name: stat,wall,log4j
-      filter.stat.log-slow-sql: true
-      filter.stat.slow-sql-millis: 2000
+      filters.commons-log.connection-logger-name: wall,log4j
+      filter:
+        stat:
+          enabled: true
+          mergeSql: true
+          log-slow-sql: true
+          slow-sql-millis: 2000
       #监控配置
       web-stat-filter:
         enabled: true
@@ -94,4 +97,8 @@ mybatis-plus:
 
 ai:
   server:
-    address: http://192.168.2.234:5008
+    address: http://192.168.2.234:5008
+
+nlp:
+  server:
+    address: http://192.168.2.234:5002

config-server/src/main/resources/shared/aipt-service-local.yml

@@ -5,10 +5,9 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
-      url: jdbc:mysql://192.168.2.236:3306/sys-log?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
+      url: jdbc:mysql://192.168.2.236:3306/sys-log?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root
       password: lantone
       # 连接池的配置信息
@@ -30,9 +29,13 @@ spring:
       poolPreparedStatements: true
       maxPoolPreparedStatementPerConnectionSize: 20
       # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-      filters.commons-log.connection-logger-name: stat,wall,log4j
-      filter.stat.log-slow-sql: true
-      filter.stat.slow-sql-millis: 2000
+      filters.commons-log.connection-logger-name: wall,log4j
+      filter:
+        stat:
+          enabled: true
+          mergeSql: true
+          log-slow-sql: true
+          slow-sql-millis: 2000
       #监控配置
       web-stat-filter:
         enabled: true
@@ -94,4 +97,8 @@ mybatis-plus:
 
 ai:
   server:
-    address: http://192.168.2.234:5008
+    address: http://192.168.2.226:5008
+
+nlp:
+  server:
+    address: http://192.168.2.226:5002

config-server/src/main/resources/shared/aipt-service-pro.yml

@@ -5,10 +5,9 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
-      url: jdbc:mysql://192.168.2.236:3306/sys-log?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
+      url: jdbc:mysql://192.168.2.236:3306/sys-log?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root
       password: lantone
       # 连接池的配置信息
@@ -30,9 +29,13 @@ spring:
       poolPreparedStatements: true
       maxPoolPreparedStatementPerConnectionSize: 20
       # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-      filters.commons-log.connection-logger-name: stat,wall,log4j
-      filter.stat.log-slow-sql: true
-      filter.stat.slow-sql-millis: 2000
+      filters.commons-log.connection-logger-name: wall,log4j
+      filter:
+        stat:
+          enabled: true
+          mergeSql: true
+          log-slow-sql: true
+          slow-sql-millis: 2000
       #监控配置
       web-stat-filter:
         enabled: true
@@ -94,4 +97,8 @@ mybatis-plus:
 
 ai:
   server:
-    address: http://192.168.2.234:5008
+    address: http://192.168.2.234:5008
+
+nlp:
+  server:
+    address: http://192.168.2.234:5002

config-server/src/main/resources/shared/aipt-service-test.yml

@@ -5,10 +5,9 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
-      url: jdbc:mysql://192.168.2.241:3306/sys-log?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
+      url: jdbc:mysql://192.168.2.241:3306/sys-log?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root
       password: lantone
       # 连接池的配置信息
@@ -30,9 +29,13 @@ spring:
       poolPreparedStatements: true
       maxPoolPreparedStatementPerConnectionSize: 20
       # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-      filters.commons-log.connection-logger-name: stat,wall,log4j
-      filter.stat.log-slow-sql: true
-      filter.stat.slow-sql-millis: 2000
+      filters.commons-log.connection-logger-name: wall,log4j
+      filter:
+        stat:
+          enabled: true
+          mergeSql: true
+          log-slow-sql: true
+          slow-sql-millis: 2000
       #监控配置
       web-stat-filter:
         enabled: true
@@ -94,4 +97,8 @@ mybatis-plus:
 
 ai:
   server:
-    address: http://192.168.2.234:5008
+    address: http://192.168.2.234:5008
+
+nlp:
+  server:
+    address: http://192.168.2.234:5002

config-server/src/main/resources/shared/application-dev.yml

@@ -65,5 +65,8 @@ spring:
     date-format: yyyy-MM-dd HH:mm:ss
     time-zone: GMT+8
 
+server:
+  max-http-header-size: 10MB
+
 swagger:
   enable: true

config-server/src/main/resources/shared/application-local.yml

@@ -65,5 +65,8 @@ spring:
     date-format: yyyy-MM-dd HH:mm:ss
     time-zone: GMT+8
 
+server:
+  max-http-header-size: 10MB
+
 swagger:
   enable: true

config-server/src/main/resources/shared/application-pro.yml

@@ -65,5 +65,8 @@ spring:
     date-format: yyyy-MM-dd HH:mm:ss
     time-zone: GMT+8
 
+server:
+  max-http-header-size: 10MB
+
 swagger:
   enable: false

config-server/src/main/resources/shared/application-test.yml

@@ -65,5 +65,8 @@ spring:
     date-format: yyyy-MM-dd HH:mm:ss
     time-zone: GMT+8
 
+server:
+  max-http-header-size: 10MB
+
 swagger:
   enable: true

config-server/src/main/resources/shared/bi-service-dev.yml

@@ -5,10 +5,9 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
-      url: jdbc:mysql://192.168.2.236:3306/sys-log?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
+      url: jdbc:mysql://192.168.2.236:3306/sys-log?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root
       password: lantone
       # 连接池的配置信息
@@ -30,9 +29,13 @@ spring:
       poolPreparedStatements: true
       maxPoolPreparedStatementPerConnectionSize: 20
       # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-      filters.commons-log.connection-logger-name: stat,wall,log4j
-      filter.stat.log-slow-sql: true
-      filter.stat.slow-sql-millis: 2000
+      filters.commons-log.connection-logger-name: wall,log4j
+      filter:
+        stat:
+          enabled: true
+          mergeSql: true
+          log-slow-sql: true
+          slow-sql-millis: 2000
       #监控配置
       web-stat-filter:
         enabled: true

config-server/src/main/resources/shared/bi-service-local.yml

@@ -5,10 +5,9 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
-      url: jdbc:mysql://192.168.2.236:3306/sys-log?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
+      url: jdbc:mysql://192.168.2.236:3306/sys-log?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root
       password: lantone
       # 连接池的配置信息
@@ -30,9 +29,13 @@ spring:
       poolPreparedStatements: true
       maxPoolPreparedStatementPerConnectionSize: 20
       # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-      filters.commons-log.connection-logger-name: stat,wall,log4j
-      filter.stat.log-slow-sql: true
-      filter.stat.slow-sql-millis: 2000
+      filters.commons-log.connection-logger-name: wall,log4j
+      filter:
+        stat:
+          enabled: true
+          mergeSql: true
+          log-slow-sql: true
+          slow-sql-millis: 2000
       #监控配置
       web-stat-filter:
         enabled: true

config-server/src/main/resources/shared/bi-service-pro.yml

@@ -5,10 +5,9 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
-      url: jdbc:mysql://192.168.2.236:3306/sys-log?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
+      url: jdbc:mysql://192.168.2.236:3306/sys-log?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root
       password: lantone
       # 连接池的配置信息
@@ -30,9 +29,13 @@ spring:
       poolPreparedStatements: true
       maxPoolPreparedStatementPerConnectionSize: 20
       # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-      filters.commons-log.connection-logger-name: stat,wall,log4j
-      filter.stat.log-slow-sql: true
-      filter.stat.slow-sql-millis: 2000
+      filters.commons-log.connection-logger-name: wall,log4j
+      filter:
+        stat:
+          enabled: true
+          mergeSql: true
+          log-slow-sql: true
+          slow-sql-millis: 2000
       #监控配置
       web-stat-filter:
         enabled: true

config-server/src/main/resources/shared/bi-service-test.yml

@@ -5,10 +5,9 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
-      url: jdbc:mysql://192.168.2.241:3306/sys-log?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
+      url: jdbc:mysql://192.168.2.241:3306/sys-log?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root
       password: lantone
       # 连接池的配置信息
@@ -30,9 +29,13 @@ spring:
       poolPreparedStatements: true
       maxPoolPreparedStatementPerConnectionSize: 20
       # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-      filters.commons-log.connection-logger-name: stat,wall,log4j
-      filter.stat.log-slow-sql: true
-      filter.stat.slow-sql-millis: 2000
+      filters.commons-log.connection-logger-name: wall,log4j
+      filter:
+        stat:
+          enabled: true
+          mergeSql: true
+          log-slow-sql: true
+          slow-sql-millis: 2000
       #监控配置
       web-stat-filter:
         enabled: true

config-server/src/main/resources/shared/diagbotman-service-dev.yml

@@ -5,10 +5,9 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
-      url: jdbc:mysql://192.168.2.236:3306/sys-diagbotman?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
+      url: jdbc:mysql://192.168.2.236:3306/sys-diagbotman?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root
       password: lantone
       # 连接池的配置信息
@@ -30,9 +29,13 @@ spring:
       poolPreparedStatements: true
       maxPoolPreparedStatementPerConnectionSize: 20
       # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-      filters.commons-log.connection-logger-name: stat,wall,log4j
-      filter.stat.log-slow-sql: true
-      filter.stat.slow-sql-millis: 2000
+      filters.commons-log.connection-logger-name: wall,log4j
+      filter:
+        stat:
+          enabled: true
+          mergeSql: true
+          log-slow-sql: true
+          slow-sql-millis: 2000
       #监控配置
       web-stat-filter:
         enabled: true

config-server/src/main/resources/shared/diagbotman-service-local.yml

@@ -5,8 +5,7 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
       url: jdbc:mysql://192.168.2.239:3306/sys-diagbotman?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root
@@ -30,9 +29,13 @@ spring:
       poolPreparedStatements: true
       maxPoolPreparedStatementPerConnectionSize: 20
       # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-      filters.commons-log.connection-logger-name: stat,wall,log4j
-      filter.stat.log-slow-sql: true
-      filter.stat.slow-sql-millis: 2000
+      filters.commons-log.connection-logger-name: wall,log4j
+      filter:
+        stat:
+          enabled: true
+          mergeSql: true
+          log-slow-sql: true
+          slow-sql-millis: 2000
       #监控配置
       web-stat-filter:
         enabled: true

config-server/src/main/resources/shared/diagbotman-service-pro.yml

@@ -5,10 +5,9 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
-      url: jdbc:mysql://192.168.2.236:3306/sys-diagbotman?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
+      url: jdbc:mysql://192.168.2.236:3306/sys-diagbotman?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root
       password: lantone
       # 连接池的配置信息
@@ -30,9 +29,13 @@ spring:
       poolPreparedStatements: true
       maxPoolPreparedStatementPerConnectionSize: 20
       # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-      filters.commons-log.connection-logger-name: stat,wall,log4j
-      filter.stat.log-slow-sql: true
-      filter.stat.slow-sql-millis: 2000
+      filters.commons-log.connection-logger-name: wall,log4j
+      filter:
+        stat:
+          enabled: true
+          mergeSql: true
+          log-slow-sql: true
+          slow-sql-millis: 2000
       #监控配置
       web-stat-filter:
         enabled: true

config-server/src/main/resources/shared/diagbotman-service-test.yml

@@ -5,10 +5,9 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
-      url: jdbc:mysql://192.168.2.241:3306/sys-diagbotman?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
+      url: jdbc:mysql://192.168.2.241:3306/sys-diagbotman?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root
       password: lantone
       # 连接池的配置信息
@@ -30,9 +29,13 @@ spring:
       poolPreparedStatements: true
       maxPoolPreparedStatementPerConnectionSize: 20
       # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-      filters.commons-log.connection-logger-name: stat,wall,log4j
-      filter.stat.log-slow-sql: true
-      filter.stat.slow-sql-millis: 2000
+      filters.commons-log.connection-logger-name: wall,log4j
+      filter:
+        stat:
+          enabled: true
+          mergeSql: true
+          log-slow-sql: true
+          slow-sql-millis: 2000
       #监控配置
       web-stat-filter:
         enabled: true

config-server/src/main/resources/shared/feedback-service-dev.yml

@@ -5,10 +5,9 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
-      url: jdbc:mysql://192.168.2.236:3306/sys-log?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
+      url: jdbc:mysql://192.168.2.236:3306/sys-log?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root
       password: lantone
       # 连接池的配置信息
@@ -30,9 +29,13 @@ spring:
       poolPreparedStatements: true
       maxPoolPreparedStatementPerConnectionSize: 20
       # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-      filters.commons-log.connection-logger-name: stat,wall,log4j
-      filter.stat.log-slow-sql: true
-      filter.stat.slow-sql-millis: 2000
+      filters.commons-log.connection-logger-name: wall,log4j
+      filter:
+        stat:
+          enabled: true
+          mergeSql: true
+          log-slow-sql: true
+          slow-sql-millis: 2000
       #监控配置
       web-stat-filter:
         enabled: true

config-server/src/main/resources/shared/feedback-service-local.yml

@@ -5,10 +5,9 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
-      url: jdbc:mysql://192.168.2.236:3306/sys-log?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
+      url: jdbc:mysql://192.168.2.236:3306/sys-log?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root
       password: lantone
       # 连接池的配置信息
@@ -30,9 +29,13 @@ spring:
       poolPreparedStatements: true
       maxPoolPreparedStatementPerConnectionSize: 20
       # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-      filters.commons-log.connection-logger-name: stat,wall,log4j
-      filter.stat.log-slow-sql: true
-      filter.stat.slow-sql-millis: 2000
+      filters.commons-log.connection-logger-name: wall,log4j
+      filter:
+        stat:
+          enabled: true
+          mergeSql: true
+          log-slow-sql: true
+          slow-sql-millis: 2000
       #监控配置
       web-stat-filter:
         enabled: true

config-server/src/main/resources/shared/feedback-service-pro.yml

@@ -5,10 +5,9 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
-      url: jdbc:mysql://192.168.2.236:3306/sys-log?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
+      url: jdbc:mysql://192.168.2.236:3306/sys-log?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root
       password: lantone
       # 连接池的配置信息
@@ -30,9 +29,13 @@ spring:
       poolPreparedStatements: true
       maxPoolPreparedStatementPerConnectionSize: 20
       # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-      filters.commons-log.connection-logger-name: stat,wall,log4j
-      filter.stat.log-slow-sql: true
-      filter.stat.slow-sql-millis: 2000
+      filters.commons-log.connection-logger-name: wall,log4j
+      filter:
+        stat:
+          enabled: true
+          mergeSql: true
+          log-slow-sql: true
+          slow-sql-millis: 2000
       #监控配置
       web-stat-filter:
         enabled: true

config-server/src/main/resources/shared/feedback-service-test.yml

@@ -5,10 +5,9 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
-      url: jdbc:mysql://192.168.2.241:3306/sys-log?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
+      url: jdbc:mysql://192.168.2.241:3306/sys-log?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root
       password: lantone
       # 连接池的配置信息
@@ -30,9 +29,13 @@ spring:
       poolPreparedStatements: true
       maxPoolPreparedStatementPerConnectionSize: 20
       # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-      filters.commons-log.connection-logger-name: stat,wall,log4j
-      filter.stat.log-slow-sql: true
-      filter.stat.slow-sql-millis: 2000
+      filters.commons-log.connection-logger-name: wall,log4j
+      filter:
+        stat:
+          enabled: true
+          mergeSql: true
+          log-slow-sql: true
+          slow-sql-millis: 2000
       #监控配置
       web-stat-filter:
         enabled: true

config-server/src/main/resources/shared/gateway-service-dev.yml

@@ -21,42 +21,42 @@ spring:
         predicates:
         - Path=/api/user/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: logger-service
         uri: lb://logger-service
         predicates:
         - Path=/api/log/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: bi-service
         uri: lb://bi-service
         predicates:
         - Path=/api/bi/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: diagbotman-service
         uri: lb://diagbotman-service
         predicates:
         - Path=/api/diagbotman/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: feedback-service
         uri: lb://feedback-service
         predicates:
         - Path=/api/feedback/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: knowledge-service
         uri: lb://knowledge-service
         predicates:
         - Path=/api/knowledge/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: icssold
         uri: http://192.168.2.165:8080
@@ -69,42 +69,42 @@ spring:
         predicates:
         - Path=/api/triage/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: icss-service
         uri: lb://icss-service
         predicates:
         - Path=/api/icss/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: icssman-service
         uri: lb://icssman-service
         predicates:
         - Path=/api/icssman/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: knowledgeman-service
         uri: lb://knowledgeman-service
         predicates:
         - Path=/api/knowledgeman/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: tran-service
         uri: lb://tran-service
         predicates:
         - Path=/api/tran/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: aipt-service
         uri: lb://aipt-service
         predicates:
         - Path=/api/aipt/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
 
 server:

config-server/src/main/resources/shared/gateway-service-local.yml

@@ -14,6 +14,10 @@ spring:
           destination: myLog
       #          contentType: text/plain      # 实体 json string 在传递的类型装换 查看 http://docs.spring
     gateway:
+      discovery:
+        locator:
+          enabled: false
+          lowerCaseServiceId: true
       default-filters:
       routes:
       - id: user-service
@@ -21,42 +25,42 @@ spring:
         predicates:
         - Path=/api/user/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: logger-service
         uri: lb://logger-service
         predicates:
         - Path=/api/log/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: bi-service
         uri: lb://bi-service
         predicates:
         - Path=/api/bi/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: diagbotman-service
         uri: lb://diagbotman-service
         predicates:
         - Path=/api/diagbotman/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: feedback-service
         uri: lb://feedback-service
         predicates:
         - Path=/api/feedback/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: knowledge-service
         uri: lb://knowledge-service
         predicates:
         - Path=/api/knowledge/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: icssold
         uri: http://192.168.2.165:8080
@@ -69,42 +73,42 @@ spring:
         predicates:
         - Path=/api/triage/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: icss-service
         uri: lb://icss-service
         predicates:
         - Path=/api/icss/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: icssman-service
         uri: lb://icssman-service
         predicates:
         - Path=/api/icssman/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: knowledgeman-service
         uri: lb://knowledgeman-service
         predicates:
         - Path=/api/knowledgeman/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: tran-service
         uri: lb://tran-service
         predicates:
         - Path=/api/tran/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: aipt-service
         uri: lb://aipt-service
         predicates:
         - Path=/api/aipt/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
 
 server:

config-server/src/main/resources/shared/gateway-service-pro.yml

@@ -21,42 +21,42 @@ spring:
         predicates:
         - Path=/api/user/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: logger-service
         uri: lb://logger-service
         predicates:
         - Path=/api/log/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: bi-service
         uri: lb://bi-service
         predicates:
         - Path=/api/bi/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: diagbotman-service
         uri: lb://diagbotman-service
         predicates:
         - Path=/api/diagbotman/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: feedback-service
         uri: lb://feedback-service
         predicates:
         - Path=/api/feedback/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: knowledge-service
         uri: lb://knowledge-service
         predicates:
         - Path=/api/knowledge/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: icssold
         uri: http://192.168.2.165:8080
@@ -69,42 +69,42 @@ spring:
         predicates:
         - Path=/api/triage/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: icss-service
         uri: lb://icss-service
         predicates:
         - Path=/api/icss/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: icssman-service
         uri: lb://icssman-service
         predicates:
         - Path=/api/icssman/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: knowledgeman-service
         uri: lb://knowledgeman-service
         predicates:
         - Path=/api/knowledgeman/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: tran-service
         uri: lb://tran-service
         predicates:
         - Path=/api/tran/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: aipt-service
         uri: lb://aipt-service
         predicates:
         - Path=/api/aipt/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
 
 server:

config-server/src/main/resources/shared/gateway-service-test.yml

@@ -21,42 +21,42 @@ spring:
         predicates:
         - Path=/api/user/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: logger-service
         uri: lb://logger-service
         predicates:
         - Path=/api/log/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: bi-service
         uri: lb://bi-service
         predicates:
         - Path=/api/bi/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: diagbotman-service
         uri: lb://diagbotman-service
         predicates:
         - Path=/api/diagbotman/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: feedback-service
         uri: lb://feedback-service
         predicates:
         - Path=/api/feedback/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: knowledge-service
         uri: lb://knowledge-service
         predicates:
         - Path=/api/knowledge/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: icssold
         uri: http://192.168.2.164:8080
@@ -69,49 +69,49 @@ spring:
         predicates:
         - Path=/api/triage/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: icss-service
         uri: lb://icss-service
         predicates:
         - Path=/api/icss/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: icssman-service
         uri: lb://icssman-service
         predicates:
         - Path=/api/icssman/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: knowledgeman-service
         uri: lb://knowledgeman-service
         predicates:
         - Path=/api/knowledgeman/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: tran-service
         uri: lb://tran-service
         predicates:
         - Path=/api/tran/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: aipt-service
         uri: lb://aipt-service
         predicates:
         - Path=/api/aipt/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
       - id: icssyz-service
         uri: lb://icss-service
         predicates:
         - Path=/api/icssyz/**
         filters:
-        - SwaggerHeaderFilter
+#        - SwaggerHeaderFilter
         - StripPrefix=2
 
 server:

config-server/src/main/resources/shared/icss-service-dev.yml

@@ -5,10 +5,9 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
-      url: jdbc:mysql://192.168.2.236:3306/sys-icss?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
+      url: jdbc:mysql://192.168.2.236:3306/sys-icss?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root
       password: lantone
       # 连接池的配置信息
@@ -30,9 +29,13 @@ spring:
       poolPreparedStatements: true
       maxPoolPreparedStatementPerConnectionSize: 20
       # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-      filters.commons-log.connection-logger-name: stat,wall,log4j
-      filter.stat.log-slow-sql: true
-      filter.stat.slow-sql-millis: 2000
+      filters.commons-log.connection-logger-name: wall,log4j
+      filter:
+        stat:
+          enabled: true
+          mergeSql: true
+          log-slow-sql: true
+          slow-sql-millis: 2000
       #监控配置
       web-stat-filter:
         enabled: true
@@ -69,6 +72,21 @@ spring:
     publisher-confirms: true
     virtual-host: /
 
+  #redis
+  redis:
+    database:
+      cache: 5 # Redis缓存索引
+    host: 192.168.2.236  #Redis服务器地址
+    port: 6379 # Redis服务器连接端口
+    password: lantone # Redis服务器连接密码（默认为空）
+    lettuce:
+      pool:
+        max-active: 8 # 连接池最大连接数（使用负值表示没有限制）
+        max-idle: 5 # 连接池中的最大空闲连接
+        max-wait: -1 # 连接池最大阻塞等待时间（使用负值表示没有限制）
+        min-idle: 0 # 连接池中的最小空闲连接
+    timeout: 20000 # 连接超时时间（毫秒）
+
 #mybatis
 mybatis-plus:
   mapper-locations: classpath:/mapper/*Mapper.xml
@@ -96,16 +114,4 @@ mybatis-plus:
       #sql-injector: com.baomidou.springboot.xxx
   configuration:
     map-underscore-to-camel-case: true
-    cache-enabled: false
-
-bigdata:
-  server:
-    address: http://192.168.2.234:5008
-
-graph:
-  server:
-    address: http://192.168.2.234:5003
-
-nlp:
-  server:
-    address: http://192.168.2.234:5002
+    cache-enabled: false

config-server/src/main/resources/shared/icss-service-local.yml

@@ -5,8 +5,7 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
       url: jdbc:mysql://192.168.2.239:3306/sys-icss?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root
@@ -30,9 +29,13 @@ spring:
       poolPreparedStatements: true
       maxPoolPreparedStatementPerConnectionSize: 20
       # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-      filters.commons-log.connection-logger-name: stat,wall,log4j
-      filter.stat.log-slow-sql: true
-      filter.stat.slow-sql-millis: 2000
+      filters.commons-log.connection-logger-name: wall,log4j
+      filter:
+        stat:
+          enabled: true
+          mergeSql: true
+          log-slow-sql: true
+          slow-sql-millis: 2000
       #监控配置
       web-stat-filter:
         enabled: true
@@ -69,6 +72,21 @@ spring:
     publisher-confirms: true
     virtual-host: /
 
+  #redis
+  redis:
+    database:
+      cache: 15 # Redis缓存索引
+    host: 192.168.2.236  #Redis服务器地址
+    port: 6379 # Redis服务器连接端口
+    password: lantone # Redis服务器连接密码（默认为空）
+    lettuce:
+      pool:
+        max-active: 8 # 连接池最大连接数（使用负值表示没有限制）
+        max-idle: 5 # 连接池中的最大空闲连接
+        max-wait: -1 # 连接池最大阻塞等待时间（使用负值表示没有限制）
+        min-idle: 0 # 连接池中的最小空闲连接
+    timeout: 20000 # 连接超时时间（毫秒）
+
 #mybatis
 mybatis-plus:
   mapper-locations: classpath:/mapper/*Mapper.xml
@@ -97,15 +115,17 @@ mybatis-plus:
   configuration:
     map-underscore-to-camel-case: true
     cache-enabled: false
-
-bigdata:
-  server:
-    address: http://192.168.2.234:5008
-
-graph:
-  server:
-    address: http://192.168.2.234:5003
-
-nlp:
-  server:
-    address: http://192.168.2.234:5002
+#redis   
+redis:
+  database:
+    cache: 5 # Redis缓存索引
+    host: 192.168.2.236  #Redis服务器地址
+    port: 6379 # Redis服务器连接端口
+    password: lantone # Redis服务器连接密码（默认为空）
+    lettuce:
+      pool:
+        max-active: 8 # 连接池最大连接数（使用负值表示没有限制）
+        max-idle: 5 # 连接池中的最大空闲连接
+        max-wait: -1 # 连接池最大阻塞等待时间（使用负值表示没有限制）
+        min-idle: 0 # 连接池中的最小空闲连接
+    timeout: 20000 # 连接超时时间（毫秒）

config-server/src/main/resources/shared/icss-service-pro.yml

@@ -5,10 +5,9 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
-      url: jdbc:mysql://192.168.2.236:3306/sys-icss?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
+      url: jdbc:mysql://192.168.2.236:3306/sys-icss?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root
       password: lantone
       # 连接池的配置信息
@@ -30,9 +29,13 @@ spring:
       poolPreparedStatements: true
       maxPoolPreparedStatementPerConnectionSize: 20
       # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-      filters.commons-log.connection-logger-name: stat,wall,log4j
-      filter.stat.log-slow-sql: true
-      filter.stat.slow-sql-millis: 2000
+      filters.commons-log.connection-logger-name: wall,log4j
+      filter:
+        stat:
+          enabled: true
+          mergeSql: true
+          log-slow-sql: true
+          slow-sql-millis: 2000
       #监控配置
       web-stat-filter:
         enabled: true
@@ -69,6 +72,21 @@ spring:
     publisher-confirms: true
     virtual-host: /
 
+  #redis
+  redis:
+    database:
+      cache: 5 # Redis缓存索引
+    host: 192.168.2.236  #Redis服务器地址
+    port: 6379 # Redis服务器连接端口
+    password: lantone # Redis服务器连接密码（默认为空）
+    lettuce:
+      pool:
+        max-active: 8 # 连接池最大连接数（使用负值表示没有限制）
+        max-idle: 5 # 连接池中的最大空闲连接
+        max-wait: -1 # 连接池最大阻塞等待时间（使用负值表示没有限制）
+        min-idle: 0 # 连接池中的最小空闲连接
+    timeout: 20000 # 连接超时时间（毫秒）
+
 #mybatis
 mybatis-plus:
   mapper-locations: classpath:/mapper/*Mapper.xml
@@ -97,16 +115,3 @@ mybatis-plus:
   configuration:
     map-underscore-to-camel-case: true
     cache-enabled: false
-
-bigdata:
-  server:
-    address: http://192.168.2.234:5008
-
-graph:
-  server:
-    address: http://192.168.2.234:5003
-
-nlp:
-  server:
-    address: http://192.168.2.234:5002
-

config-server/src/main/resources/shared/icss-service-test.yml

@@ -5,10 +5,9 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
-      url: jdbc:mysql://192.168.2.241:3306/sys-icss?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
+      url: jdbc:mysql://192.168.2.241:3306/sys-icss?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root
       password: lantone
       # 连接池的配置信息
@@ -30,9 +29,13 @@ spring:
       poolPreparedStatements: true
       maxPoolPreparedStatementPerConnectionSize: 20
       # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-      filters.commons-log.connection-logger-name: stat,wall,log4j
-      filter.stat.log-slow-sql: true
-      filter.stat.slow-sql-millis: 2000
+      filters.commons-log.connection-logger-name: wall,log4j
+      filter:
+        stat:
+          enabled: true
+          mergeSql: true
+          log-slow-sql: true
+          slow-sql-millis: 2000
       #监控配置
       web-stat-filter:
         enabled: true
@@ -69,6 +72,21 @@ spring:
     publisher-confirms: true
     virtual-host: /
 
+  #redis
+  redis:
+    database:
+      cache: 5 # Redis缓存索引
+    host: 192.168.2.241  #Redis服务器地址
+    port: 6379 # Redis服务器连接端口
+    password: lantone # Redis服务器连接密码（默认为空）
+    lettuce:
+      pool:
+        max-active: 8 # 连接池最大连接数（使用负值表示没有限制）
+        max-idle: 5 # 连接池中的最大空闲连接
+        max-wait: -1 # 连接池最大阻塞等待时间（使用负值表示没有限制）
+        min-idle: 0 # 连接池中的最小空闲连接
+    timeout: 20000 # 连接超时时间（毫秒）
+
 #mybatis
 mybatis-plus:
   mapper-locations: classpath:/mapper/*Mapper.xml
@@ -96,16 +114,4 @@ mybatis-plus:
       #sql-injector: com.baomidou.springboot.xxx
   configuration:
     map-underscore-to-camel-case: true
-    cache-enabled: false
-
-bigdata:
-  server:
-    address: http://192.168.2.234:5008
-
-graph:
-  server:
-    address: http://192.168.2.234:5003
-
-nlp:
-  server:
-    address: http://192.168.2.234:5002
+    cache-enabled: false

config-server/src/main/resources/shared/icssman-service-dev.yml

@@ -5,10 +5,9 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
-      url: jdbc:mysql://192.168.2.236:3306/sys-icssman?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
+      url: jdbc:mysql://192.168.2.236:3306/sys-icssman?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root
       password: lantone
       # 连接池的配置信息
@@ -30,9 +29,13 @@ spring:
       poolPreparedStatements: true
       maxPoolPreparedStatementPerConnectionSize: 20
       # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-      filters.commons-log.connection-logger-name: stat,wall,log4j
-      filter.stat.log-slow-sql: true
-      filter.stat.slow-sql-millis: 2000
+      filters.commons-log.connection-logger-name: wall,log4j
+      filter:
+        stat:
+          enabled: true
+          mergeSql: true
+          log-slow-sql: true
+          slow-sql-millis: 2000
       #监控配置
       web-stat-filter:
         enabled: true
@@ -69,6 +72,21 @@ spring:
     publisher-confirms: true
     virtual-host: /
 
+  #redis
+  redis:
+    database:
+      cache: 5 # Redis缓存索引
+    host: 192.168.2.236  #Redis服务器地址
+    port: 6379 # Redis服务器连接端口
+    password: lantone # Redis服务器连接密码（默认为空）
+    lettuce:
+      pool:
+        max-active: 8 # 连接池最大连接数（使用负值表示没有限制）
+        max-idle: 5 # 连接池中的最大空闲连接
+        max-wait: -1 # 连接池最大阻塞等待时间（使用负值表示没有限制）
+        min-idle: 0 # 连接池中的最小空闲连接
+    timeout: 20000 # 连接超时时间（毫秒）
+
 #mybatis
 mybatis-plus:
   mapper-locations: classpath:/mapper/*Mapper.xml

config-server/src/main/resources/shared/icssman-service-local.yml

@@ -5,8 +5,7 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
       url: jdbc:mysql://192.168.2.239:3306/sys-icssman?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root
@@ -30,9 +29,13 @@ spring:
       poolPreparedStatements: true
       maxPoolPreparedStatementPerConnectionSize: 20
       # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-      filters.commons-log.connection-logger-name: stat,wall,log4j
-      filter.stat.log-slow-sql: true
-      filter.stat.slow-sql-millis: 2000
+      filters.commons-log.connection-logger-name: wall,log4j
+      filter:
+        stat:
+          enabled: true
+          mergeSql: true
+          log-slow-sql: true
+          slow-sql-millis: 2000
       #监控配置
       web-stat-filter:
         enabled: true
@@ -69,6 +72,21 @@ spring:
     publisher-confirms: true
     virtual-host: /
 
+  #redis
+  redis:
+    database:
+      cache: 15 # Redis缓存索引
+    host: 192.168.2.236  #Redis服务器地址
+    port: 6379 # Redis服务器连接端口
+    password: lantone # Redis服务器连接密码（默认为空）
+    lettuce:
+      pool:
+        max-active: 8 # 连接池最大连接数（使用负值表示没有限制）
+        max-idle: 5 # 连接池中的最大空闲连接
+        max-wait: -1 # 连接池最大阻塞等待时间（使用负值表示没有限制）
+        min-idle: 0 # 连接池中的最小空闲连接
+    timeout: 20000 # 连接超时时间（毫秒）
+
 #mybatis
 mybatis-plus:
   mapper-locations: classpath:/mapper/*Mapper.xml
@@ -106,4 +124,17 @@ fastdfs:
   http_anti_steal_token: no
   tracker_servers: 192.168.2.236:22122
 
-
+#redis   
+redis:
+  database:
+    cache: 5 # Redis缓存索引
+    host: 192.168.2.236  #Redis服务器地址
+    port: 6379 # Redis服务器连接端口
+    password: lantone # Redis服务器连接密码（默认为空）
+    lettuce:
+      pool:
+        max-active: 8 # 连接池最大连接数（使用负值表示没有限制）
+        max-idle: 5 # 连接池中的最大空闲连接
+        max-wait: -1 # 连接池最大阻塞等待时间（使用负值表示没有限制）
+        min-idle: 0 # 连接池中的最小空闲连接
+    timeout: 20000 # 连接超时时间（毫秒）

config-server/src/main/resources/shared/icssman-service-pro.yml

@@ -5,10 +5,9 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
-      url: jdbc:mysql://192.168.2.236:3306/sys-icssman?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
+      url: jdbc:mysql://192.168.2.236:3306/sys-icssman?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root
       password: lantone
       # 连接池的配置信息
@@ -30,9 +29,13 @@ spring:
       poolPreparedStatements: true
       maxPoolPreparedStatementPerConnectionSize: 20
       # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-      filters.commons-log.connection-logger-name: stat,wall,log4j
-      filter.stat.log-slow-sql: true
-      filter.stat.slow-sql-millis: 2000
+      filters.commons-log.connection-logger-name: wall,log4j
+      filter:
+        stat:
+          enabled: true
+          mergeSql: true
+          log-slow-sql: true
+          slow-sql-millis: 2000
       #监控配置
       web-stat-filter:
         enabled: true
@@ -69,6 +72,21 @@ spring:
     publisher-confirms: true
     virtual-host: /
 
+  #redis
+  redis:
+    database:
+      cache: 5 # Redis缓存索引
+    host: 192.168.2.236  #Redis服务器地址
+    port: 6379 # Redis服务器连接端口
+    password: lantone # Redis服务器连接密码（默认为空）
+    lettuce:
+      pool:
+        max-active: 8 # 连接池最大连接数（使用负值表示没有限制）
+        max-idle: 5 # 连接池中的最大空闲连接
+        max-wait: -1 # 连接池最大阻塞等待时间（使用负值表示没有限制）
+        min-idle: 0 # 连接池中的最小空闲连接
+    timeout: 20000 # 连接超时时间（毫秒）
+
 #mybatis
 mybatis-plus:
   mapper-locations: classpath:/mapper/*Mapper.xml

config-server/src/main/resources/shared/icssman-service-test.yml

@@ -5,10 +5,9 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
-      url: jdbc:mysql://192.168.2.241:3306/sys-icssman?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
+      url: jdbc:mysql://192.168.2.241:3306/sys-icssman?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root
       password: lantone
       # 连接池的配置信息
@@ -30,9 +29,13 @@ spring:
       poolPreparedStatements: true
       maxPoolPreparedStatementPerConnectionSize: 20
       # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-      filters.commons-log.connection-logger-name: stat,wall,log4j
-      filter.stat.log-slow-sql: true
-      filter.stat.slow-sql-millis: 2000
+      filters.commons-log.connection-logger-name: wall,log4j
+      filter:
+        stat:
+          enabled: true
+          mergeSql: true
+          log-slow-sql: true
+          slow-sql-millis: 2000
       #监控配置
       web-stat-filter:
         enabled: true
@@ -69,6 +72,21 @@ spring:
     publisher-confirms: true
     virtual-host: /
 
+  #redis
+  redis:
+    database:
+      cache: 5 # Redis缓存索引
+    host: 192.168.2.241  #Redis服务器地址
+    port: 6379 # Redis服务器连接端口
+    password: lantone # Redis服务器连接密码（默认为空）
+    lettuce:
+      pool:
+        max-active: 8 # 连接池最大连接数（使用负值表示没有限制）
+        max-idle: 5 # 连接池中的最大空闲连接
+        max-wait: -1 # 连接池最大阻塞等待时间（使用负值表示没有限制）
+        min-idle: 0 # 连接池中的最小空闲连接
+    timeout: 20000 # 连接超时时间（毫秒）
+
 #mybatis
 mybatis-plus:
   mapper-locations: classpath:/mapper/*Mapper.xml

config-server/src/main/resources/shared/knowledge-service-dev.yml

@@ -5,10 +5,9 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
-      url: jdbc:mysql://192.168.2.235:3306/diagbot-med?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
+      url: jdbc:mysql://192.168.2.235:3306/diagbot-med?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root
       password: diagbot@20180822
       # 连接池的配置信息
@@ -30,9 +29,13 @@ spring:
       poolPreparedStatements: true
       maxPoolPreparedStatementPerConnectionSize: 20
       # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-      filters.commons-log.connection-logger-name: stat,wall,log4j
-      filter.stat.log-slow-sql: true
-      filter.stat.slow-sql-millis: 2000
+      filters.commons-log.connection-logger-name: wall,log4j
+      filter:
+        stat:
+          enabled: true
+          mergeSql: true
+          log-slow-sql: true
+          slow-sql-millis: 2000
       #监控配置
       web-stat-filter:
         enabled: true

config-server/src/main/resources/shared/knowledge-service-local.yml

@@ -5,10 +5,9 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
-      url: jdbc:mysql://192.168.2.235:3306/diagbot-med?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
+      url: jdbc:mysql://192.168.2.235:3306/diagbot-med?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root
       password: diagbot@20180822
       # 连接池的配置信息
@@ -30,9 +29,13 @@ spring:
       poolPreparedStatements: true
       maxPoolPreparedStatementPerConnectionSize: 20
       # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-      filters.commons-log.connection-logger-name: stat,wall,log4j
-      filter.stat.log-slow-sql: true
-      filter.stat.slow-sql-millis: 2000
+      filters.commons-log.connection-logger-name: wall,log4j
+      filter:
+        stat:
+          enabled: true
+          mergeSql: true
+          log-slow-sql: true
+          slow-sql-millis: 2000
       #监控配置
       web-stat-filter:
         enabled: true

config-server/src/main/resources/shared/knowledge-service-pro.yml

@@ -5,10 +5,9 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
-      url: jdbc:mysql://192.168.2.236:3306/sys-log?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
+      url: jdbc:mysql://192.168.2.236:3306/sys-log?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root
       password: lantone
       # 连接池的配置信息
@@ -30,9 +29,13 @@ spring:
       poolPreparedStatements: true
       maxPoolPreparedStatementPerConnectionSize: 20
       # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-      filters.commons-log.connection-logger-name: stat,wall,log4j
-      filter.stat.log-slow-sql: true
-      filter.stat.slow-sql-millis: 2000
+      filters.commons-log.connection-logger-name: wall,log4j
+      filter:
+        stat:
+          enabled: true
+          mergeSql: true
+          log-slow-sql: true
+          slow-sql-millis: 2000
       #监控配置
       web-stat-filter:
         enabled: true

config-server/src/main/resources/shared/knowledge-service-test.yml

@@ -5,10 +5,9 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
-      url: jdbc:mysql://192.168.2.241:3306/sys-log?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
+      url: jdbc:mysql://192.168.2.241:3306/sys-log?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root
       password: lantone
       # 连接池的配置信息
@@ -30,9 +29,13 @@ spring:
       poolPreparedStatements: true
       maxPoolPreparedStatementPerConnectionSize: 20
       # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-      filters.commons-log.connection-logger-name: stat,wall,log4j
-      filter.stat.log-slow-sql: true
-      filter.stat.slow-sql-millis: 2000
+      filters.commons-log.connection-logger-name: wall,log4j
+      filter:
+        stat:
+          enabled: true
+          mergeSql: true
+          log-slow-sql: true
+          slow-sql-millis: 2000
       #监控配置
       web-stat-filter:
         enabled: true

config-server/src/main/resources/shared/knowledgeman-service-dev.yml

@@ -5,10 +5,9 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
-      url: jdbc:mysql://192.168.2.235:3306/diagbot-med?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
+      url: jdbc:mysql://192.168.2.235:3306/diagbot-med?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root
       password: diagbot@20180822
       # 连接池的配置信息
@@ -30,9 +29,13 @@ spring:
       poolPreparedStatements: true
       maxPoolPreparedStatementPerConnectionSize: 20
       # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-      filters.commons-log.connection-logger-name: stat,wall,log4j
-      filter.stat.log-slow-sql: true
-      filter.stat.slow-sql-millis: 2000
+      filters.commons-log.connection-logger-name: wall,log4j
+      filter:
+        stat:
+          enabled: true
+          mergeSql: true
+          log-slow-sql: true
+          slow-sql-millis: 2000
       #监控配置
       web-stat-filter:
         enabled: true

config-server/src/main/resources/shared/knowledgeman-service-local.yml

@@ -5,10 +5,9 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
-      url: jdbc:mysql://192.168.2.235:3306/diagbot-med?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
+      url: jdbc:mysql://192.168.2.235:3306/diagbot-med?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root
       password: diagbot@20180822
       # 连接池的配置信息
@@ -30,9 +29,13 @@ spring:
       poolPreparedStatements: true
       maxPoolPreparedStatementPerConnectionSize: 20
       # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-      filters.commons-log.connection-logger-name: stat,wall,log4j
-      filter.stat.log-slow-sql: true
-      filter.stat.slow-sql-millis: 2000
+      filters.commons-log.connection-logger-name: wall,log4j
+      filter:
+        stat:
+          enabled: true
+          mergeSql: true
+          log-slow-sql: true
+          slow-sql-millis: 2000
       #监控配置
       web-stat-filter:
         enabled: true

config-server/src/main/resources/shared/knowledgeman-service-pro.yml

@@ -5,10 +5,9 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
-      url: jdbc:mysql://192.168.2.236:3306/sys-log?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
+      url: jdbc:mysql://192.168.2.236:3306/sys-log?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root
       password: lantone
       # 连接池的配置信息
@@ -30,9 +29,13 @@ spring:
       poolPreparedStatements: true
       maxPoolPreparedStatementPerConnectionSize: 20
       # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-      filters.commons-log.connection-logger-name: stat,wall,log4j
-      filter.stat.log-slow-sql: true
-      filter.stat.slow-sql-millis: 2000
+      filters.commons-log.connection-logger-name: wall,log4j
+      filter:
+        stat:
+          enabled: true
+          mergeSql: true
+          log-slow-sql: true
+          slow-sql-millis: 2000
       #监控配置
       web-stat-filter:
         enabled: true

config-server/src/main/resources/shared/knowledgeman-service-test.yml

@@ -5,10 +5,9 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
-      url: jdbc:mysql://192.168.2.235:3306/diagbot-med-test?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
+      url: jdbc:mysql://192.168.2.235:3306/diagbot-med-test?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root
       password: diagbot@20180822
       # 连接池的配置信息
@@ -30,9 +29,13 @@ spring:
       poolPreparedStatements: true
       maxPoolPreparedStatementPerConnectionSize: 20
       # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-      filters.commons-log.connection-logger-name: stat,wall,log4j
-      filter.stat.log-slow-sql: true
-      filter.stat.slow-sql-millis: 2000
+      filters.commons-log.connection-logger-name: wall,log4j
+      filter:
+        stat:
+          enabled: true
+          mergeSql: true
+          log-slow-sql: true
+          slow-sql-millis: 2000
       #监控配置
       web-stat-filter:
         enabled: true

config-server/src/main/resources/shared/logger-service-dev.yml

@@ -5,10 +5,9 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
-      url: jdbc:mysql://192.168.2.236:3306/sys-log?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
+      url: jdbc:mysql://192.168.2.236:3306/sys-log?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root
       password: lantone
       # 连接池的配置信息
@@ -30,9 +29,13 @@ spring:
       poolPreparedStatements: true
       maxPoolPreparedStatementPerConnectionSize: 20
       # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-      filters.commons-log.connection-logger-name: stat,wall,log4j
-      filter.stat.log-slow-sql: true
-      filter.stat.slow-sql-millis: 2000
+      filters.commons-log.connection-logger-name: wall,log4j
+      filter:
+        stat:
+          enabled: true
+          mergeSql: true
+          log-slow-sql: true
+          slow-sql-millis: 2000
       #监控配置
       web-stat-filter:
         enabled: true

config-server/src/main/resources/shared/logger-service-local.yml

@@ -5,10 +5,9 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
-      url: jdbc:mysql://192.168.2.236:3306/sys-log?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
+      url: jdbc:mysql://192.168.2.236:3306/sys-log?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root
       password: lantone
       # 连接池的配置信息
@@ -30,9 +29,13 @@ spring:
       poolPreparedStatements: true
       maxPoolPreparedStatementPerConnectionSize: 20
       # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-      filters.commons-log.connection-logger-name: stat,wall,log4j
-      filter.stat.log-slow-sql: true
-      filter.stat.slow-sql-millis: 2000
+      filters.commons-log.connection-logger-name: wall,log4j
+      filter:
+        stat:
+          enabled: true
+          mergeSql: true
+          log-slow-sql: true
+          slow-sql-millis: 2000
       #监控配置
       web-stat-filter:
         enabled: true

config-server/src/main/resources/shared/logger-service-pro.yml

@@ -5,10 +5,9 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
-      url: jdbc:mysql://192.168.2.236:3306/sys-log?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
+      url: jdbc:mysql://192.168.2.236:3306/sys-log?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root
       password: lantone
       # 连接池的配置信息
@@ -30,9 +29,13 @@ spring:
       poolPreparedStatements: true
       maxPoolPreparedStatementPerConnectionSize: 20
       # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-      filters.commons-log.connection-logger-name: stat,wall,log4j
-      filter.stat.log-slow-sql: true
-      filter.stat.slow-sql-millis: 2000
+      filters.commons-log.connection-logger-name: wall,log4j
+      filter:
+        stat:
+          enabled: true
+          mergeSql: true
+          log-slow-sql: true
+          slow-sql-millis: 2000
       #监控配置
       web-stat-filter:
         enabled: true

config-server/src/main/resources/shared/logger-service-test.yml

@@ -5,10 +5,9 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
-      url: jdbc:mysql://192.168.2.241:3306/sys-log?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
+      url: jdbc:mysql://192.168.2.241:3306/sys-log?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root
       password: lantone
       # 连接池的配置信息
@@ -30,9 +29,13 @@ spring:
       poolPreparedStatements: true
       maxPoolPreparedStatementPerConnectionSize: 20
       # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-      filters.commons-log.connection-logger-name: stat,wall,log4j
-      filter.stat.log-slow-sql: true
-      filter.stat.slow-sql-millis: 2000
+      filters.commons-log.connection-logger-name: wall,log4j
+      filter:
+        stat:
+          enabled: true
+          mergeSql: true
+          log-slow-sql: true
+          slow-sql-millis: 2000
       #监控配置
       web-stat-filter:
         enabled: true

config-server/src/main/resources/shared/monitor-service-dev.yml

@@ -1,6 +1,6 @@
 server:
   port: 8766
-security.basic.enabled: false
+#security.basic.enabled: false
 turbine:
   aggregator:
     clusterConfig: default
@@ -20,6 +20,6 @@ spring:
     publisher-confirms: true
     virtual-host: /
 
-management:
-  security:
-    enabled: false
+#management:
+#  security:
+#    enabled: false

config-server/src/main/resources/shared/monitor-service-local.yml

@@ -1,6 +1,6 @@
 server:
   port: 8766
-security.basic.enabled: false
+#security.basic.enabled: false
 turbine:
   aggregator:
     clusterConfig: default
@@ -20,6 +20,6 @@ spring:
     publisher-confirms: true
     virtual-host: /
 
-management:
-  security:
-    enabled: false
+#management:
+#  security:
+#    enabled: false

config-server/src/main/resources/shared/monitor-service-pro.yml

@@ -1,6 +1,6 @@
 server:
   port: 8766
-security.basic.enabled: false
+#security.basic.enabled: false
 turbine:
   aggregator:
     clusterConfig: default
@@ -20,6 +20,6 @@ spring:
     publisher-confirms: true
     virtual-host: /
 
-management:
-  security:
-    enabled: false
+#management:
+#  security:
+#    enabled: false

config-server/src/main/resources/shared/monitor-service-test.yml

@@ -1,6 +1,6 @@
 server:
   port: 8766
-security.basic.enabled: false
+#security.basic.enabled: false
 turbine:
   aggregator:
     clusterConfig: default
@@ -20,6 +20,6 @@ spring:
     publisher-confirms: true
     virtual-host: /
 
-management:
-  security:
-    enabled: false
+#management:
+#  security:
+#    enabled: false

config-server/src/main/resources/shared/tran-service-dev.yml

@@ -5,10 +5,9 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
-      url: jdbc:mysql://192.168.2.236:3306/sys-tran?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
+      url: jdbc:mysql://192.168.2.236:3306/sys-tran?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root
       password: lantone
       # 连接池的配置信息
@@ -30,9 +29,13 @@ spring:
       poolPreparedStatements: true
       maxPoolPreparedStatementPerConnectionSize: 20
       # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-      filters.commons-log.connection-logger-name: stat,wall,log4j
-      filter.stat.log-slow-sql: true
-      filter.stat.slow-sql-millis: 2000
+      filters.commons-log.connection-logger-name: wall,log4j
+      filter:
+        stat:
+          enabled: true
+          mergeSql: true
+          log-slow-sql: true
+          slow-sql-millis: 2000
       #监控配置
       web-stat-filter:
         enabled: true

config-server/src/main/resources/shared/tran-service-local.yml

@@ -5,8 +5,7 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
       url: jdbc:mysql://192.168.2.239:3306/sys-tran?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root
@@ -30,9 +29,13 @@ spring:
       poolPreparedStatements: true
       maxPoolPreparedStatementPerConnectionSize: 20
       # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-      filters.commons-log.connection-logger-name: stat,wall,log4j
-      filter.stat.log-slow-sql: true
-      filter.stat.slow-sql-millis: 2000
+      filters.commons-log.connection-logger-name: wall,log4j
+      filter:
+        stat:
+          enabled: true
+          mergeSql: true
+          log-slow-sql: true
+          slow-sql-millis: 2000
       #监控配置
       web-stat-filter:
         enabled: true

config-server/src/main/resources/shared/tran-service-pro.yml

@@ -5,10 +5,9 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
-      url: jdbc:mysql://192.168.2.236:3306/sys-tran?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
+      url: jdbc:mysql://192.168.2.236:3306/sys-tran?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root
       password: lantone
       # 连接池的配置信息
@@ -30,9 +29,13 @@ spring:
       poolPreparedStatements: true
       maxPoolPreparedStatementPerConnectionSize: 20
       # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-      filters.commons-log.connection-logger-name: stat,wall,log4j
-      filter.stat.log-slow-sql: true
-      filter.stat.slow-sql-millis: 2000
+      filters.commons-log.connection-logger-name: wall,log4j
+      filter:
+        stat:
+          enabled: true
+          mergeSql: true
+          log-slow-sql: true
+          slow-sql-millis: 2000
       #监控配置
       web-stat-filter:
         enabled: true

config-server/src/main/resources/shared/tran-service-test.yml

@@ -5,10 +5,9 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
-      url: jdbc:mysql://192.168.2.241:3306/sys-tran?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
+      url: jdbc:mysql://192.168.2.241:3306/sys-tran?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root
       password: lantone
       # 连接池的配置信息
@@ -30,9 +29,13 @@ spring:
       poolPreparedStatements: true
       maxPoolPreparedStatementPerConnectionSize: 20
       # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-      filters.commons-log.connection-logger-name: stat,wall,log4j
-      filter.stat.log-slow-sql: true
-      filter.stat.slow-sql-millis: 2000
+      filters.commons-log.connection-logger-name: wall,log4j
+      filter:
+        stat:
+          enabled: true
+          mergeSql: true
+          log-slow-sql: true
+          slow-sql-millis: 2000
       #监控配置
       web-stat-filter:
         enabled: true

config-server/src/main/resources/shared/triage-service-dev.yml

@@ -5,10 +5,9 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
-      url: jdbc:mysql://192.168.2.236:3306/sys-triage?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
+      url: jdbc:mysql://192.168.2.236:3306/sys-triage?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root
       password: lantone
       # 连接池的配置信息
@@ -30,9 +29,13 @@ spring:
       poolPreparedStatements: true
       maxPoolPreparedStatementPerConnectionSize: 20
       # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-      filters.commons-log.connection-logger-name: stat,wall,log4j
-      filter.stat.log-slow-sql: true
-      filter.stat.slow-sql-millis: 2000
+      filters.commons-log.connection-logger-name: wall,log4j
+      filter:
+        stat:
+          enabled: true
+          mergeSql: true
+          log-slow-sql: true
+          slow-sql-millis: 2000
       #监控配置
       web-stat-filter:
         enabled: true

config-server/src/main/resources/shared/triage-service-local.yml

@@ -5,8 +5,7 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
       url: jdbc:mysql://192.168.2.239:3306/sys-triage?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root
@@ -30,9 +29,13 @@ spring:
       poolPreparedStatements: true
       maxPoolPreparedStatementPerConnectionSize: 20
       # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-      filters.commons-log.connection-logger-name: stat,wall,log4j
-      filter.stat.log-slow-sql: true
-      filter.stat.slow-sql-millis: 2000
+      filters.commons-log.connection-logger-name: wall,log4j
+      filter:
+        stat:
+          enabled: true
+          mergeSql: true
+          log-slow-sql: true
+          slow-sql-millis: 2000
       #监控配置
       web-stat-filter:
         enabled: true

config-server/src/main/resources/shared/triage-service-pro.yml

@@ -5,10 +5,9 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
-      url: jdbc:mysql://192.168.2.236:3306/sys-triage?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
+      url: jdbc:mysql://192.168.2.236:3306/sys-triage?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root
       password: lantone
       # 连接池的配置信息
@@ -30,9 +29,13 @@ spring:
       poolPreparedStatements: true
       maxPoolPreparedStatementPerConnectionSize: 20
       # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-      filters.commons-log.connection-logger-name: stat,wall,log4j
-      filter.stat.log-slow-sql: true
-      filter.stat.slow-sql-millis: 2000
+      filters.commons-log.connection-logger-name: wall,log4j
+      filter:
+        stat:
+          enabled: true
+          mergeSql: true
+          log-slow-sql: true
+          slow-sql-millis: 2000
       #监控配置
       web-stat-filter:
         enabled: true

config-server/src/main/resources/shared/triage-service-test.yml

@@ -5,10 +5,9 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
-      url: jdbc:mysql://192.168.2.241:3306/sys-triage?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
+      url: jdbc:mysql://192.168.2.241:3306/sys-triage?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root
       password: lantone
       # 连接池的配置信息
@@ -30,9 +29,13 @@ spring:
       poolPreparedStatements: true
       maxPoolPreparedStatementPerConnectionSize: 20
       # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-      filters.commons-log.connection-logger-name: stat,wall,log4j
-      filter.stat.log-slow-sql: true
-      filter.stat.slow-sql-millis: 2000
+      filters.commons-log.connection-logger-name: wall,log4j
+      filter:
+        stat:
+          enabled: true
+          mergeSql: true
+          log-slow-sql: true
+          slow-sql-millis: 2000
       #监控配置
       web-stat-filter:
         enabled: true

config-server/src/main/resources/shared/uaa-service-dev.yml

@@ -2,10 +2,9 @@
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
-      url: jdbc:mysql://192.168.2.236:3306/sys-user?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
+      url: jdbc:mysql://192.168.2.236:3306/sys-user?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root
       password: lantone
       # 连接池的配置信息
@@ -27,9 +26,13 @@ spring:
       poolPreparedStatements: true
       maxPoolPreparedStatementPerConnectionSize: 20
       # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-      filters.commons-log.connection-logger-name: stat,wall,log4j
-      filter.stat.log-slow-sql: true
-      filter.stat.slow-sql-millis: 2000
+      filters.commons-log.connection-logger-name: wall,log4j
+      filter:
+        stat:
+          enabled: true
+          mergeSql: true
+          log-slow-sql: true
+          slow-sql-millis: 2000
       #监控配置
       web-stat-filter:
         enabled: true

config-server/src/main/resources/shared/uaa-service-local.yml

@@ -2,8 +2,7 @@
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
       url: jdbc:mysql://192.168.2.239:3306/sys-user?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root
@@ -27,9 +26,13 @@ spring:
       poolPreparedStatements: true
       maxPoolPreparedStatementPerConnectionSize: 20
       # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-      filters.commons-log.connection-logger-name: stat,wall,log4j
-      filter.stat.log-slow-sql: true
-      filter.stat.slow-sql-millis: 2000
+      filters.commons-log.connection-logger-name: wall,log4j
+      filter:
+        stat:
+          enabled: true
+          mergeSql: true
+          log-slow-sql: true
+          slow-sql-millis: 2000
       #监控配置
       web-stat-filter:
         enabled: true

config-server/src/main/resources/shared/uaa-service-pro.yml

@@ -2,10 +2,9 @@
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
-      url: jdbc:mysql://192.168.2.236:3306/sys-user?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
+      url: jdbc:mysql://192.168.2.236:3306/sys-user?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root
       password: lantone
       # 连接池的配置信息
@@ -27,9 +26,13 @@ spring:
       poolPreparedStatements: true
       maxPoolPreparedStatementPerConnectionSize: 20
       # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-      filters.commons-log.connection-logger-name: stat,wall,log4j
-      filter.stat.log-slow-sql: true
-      filter.stat.slow-sql-millis: 2000
+      filters.commons-log.connection-logger-name: wall,log4j
+      filter:
+        stat:
+          enabled: true
+          mergeSql: true
+          log-slow-sql: true
+          slow-sql-millis: 2000
       #监控配置
       web-stat-filter:
         enabled: true

config-server/src/main/resources/shared/uaa-service-test.yml

@@ -2,10 +2,9 @@
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
-      url: jdbc:mysql://192.168.2.241:3306/sys-user?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
+      url: jdbc:mysql://192.168.2.241:3306/sys-user?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root
       password: lantone
       # 连接池的配置信息
@@ -27,9 +26,13 @@ spring:
       poolPreparedStatements: true
       maxPoolPreparedStatementPerConnectionSize: 20
       # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-      filters.commons-log.connection-logger-name: stat,wall,log4j
-      filter.stat.log-slow-sql: true
-      filter.stat.slow-sql-millis: 2000
+      filters.commons-log.connection-logger-name: wall,log4j
+      filter:
+        stat:
+          enabled: true
+          mergeSql: true
+          log-slow-sql: true
+          slow-sql-millis: 2000
       #监控配置
       web-stat-filter:
         enabled: true

config-server/src/main/resources/shared/user-service-dev.yml

@@ -5,10 +5,9 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
-      url: jdbc:mysql://192.168.2.236:3306/sys-user?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
+      url: jdbc:mysql://192.168.2.236:3306/sys-user?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root
       password: lantone
       # 连接池的配置信息
@@ -30,9 +29,13 @@ spring:
       poolPreparedStatements: true
       maxPoolPreparedStatementPerConnectionSize: 20
       # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-      filters.commons-log.connection-logger-name: stat,wall,log4j
-      filter.stat.log-slow-sql: true
-      filter.stat.slow-sql-millis: 2000
+      filters.commons-log.connection-logger-name: wall,log4j
+      filter:
+        stat:
+          enabled: true
+          mergeSql: true
+          log-slow-sql: true
+          slow-sql-millis: 2000
       #监控配置
       web-stat-filter:
         enabled: true
@@ -74,13 +77,13 @@ spring:
     host: 192.168.2.236  #Redis服务器地址
     port: 6379 # Redis服务器连接端口
     password: lantone # Redis服务器连接密码（默认为空）
-    jedis:
+    lettuce:
       pool:
         max-active: 8 # 连接池最大连接数（使用负值表示没有限制）
         max-idle: 5 # 连接池中的最大空闲连接
         max-wait: -1 # 连接池最大阻塞等待时间（使用负值表示没有限制）
         min-idle: 0 # 连接池中的最小空闲连接
-    timeout: 0 # 连接超时时间（毫秒）
+    timeout: 20000 # 连接超时时间（毫秒）
 
 #mybatis
 mybatis-plus:

config-server/src/main/resources/shared/user-service-local.yml

@@ -5,8 +5,7 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
       url: jdbc:mysql://192.168.2.239:3306/sys-user?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root
@@ -30,9 +29,13 @@ spring:
       poolPreparedStatements: true
       maxPoolPreparedStatementPerConnectionSize: 20
       # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-      filters.commons-log.connection-logger-name: stat,wall,log4j
-      filter.stat.log-slow-sql: true
-      filter.stat.slow-sql-millis: 2000
+      filters.commons-log.connection-logger-name: wall,log4j
+      filter:
+        stat:
+          enabled: true
+          mergeSql: true
+          log-slow-sql: true
+          slow-sql-millis: 2000
       #监控配置
       web-stat-filter:
         enabled: true
@@ -74,13 +77,13 @@ spring:
     host: 192.168.2.236  #Redis服务器地址
     port: 6379 # Redis服务器连接端口
     password: lantone # Redis服务器连接密码（默认为空）
-    jedis:
+    lettuce:
       pool:
         max-active: 8 # 连接池最大连接数（使用负值表示没有限制）
         max-idle: 5 # 连接池中的最大空闲连接
         max-wait: -1 # 连接池最大阻塞等待时间（使用负值表示没有限制）
         min-idle: 0 # 连接池中的最小空闲连接
-    timeout: 0 # 连接超时时间（毫秒）
+    timeout: 20000 # 连接超时时间（毫秒）
 
 #mybatis
 mybatis-plus:

config-server/src/main/resources/shared/user-service-pro.yml

@@ -5,10 +5,9 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
-      url: jdbc:mysql://192.168.2.236:3306/sys-user?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
+      url: jdbc:mysql://192.168.2.236:3306/sys-user?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root
       password: lantone
       # 连接池的配置信息
@@ -30,9 +29,13 @@ spring:
       poolPreparedStatements: true
       maxPoolPreparedStatementPerConnectionSize: 20
       # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-      filters.commons-log.connection-logger-name: stat,wall,log4j
-      filter.stat.log-slow-sql: true
-      filter.stat.slow-sql-millis: 2000
+      filters.commons-log.connection-logger-name: wall,log4j
+      filter:
+        stat:
+          enabled: true
+          mergeSql: true
+          log-slow-sql: true
+          slow-sql-millis: 2000
       #监控配置
       web-stat-filter:
         enabled: true
@@ -74,13 +77,13 @@ spring:
     host: 192.168.2.236  #Redis服务器地址
     port: 6379 # Redis服务器连接端口
     password: lantone # Redis服务器连接密码（默认为空）
-    jedis:
+    lettuce:
       pool:
         max-active: 8 # 连接池最大连接数（使用负值表示没有限制）
         max-idle: 5 # 连接池中的最大空闲连接
         max-wait: -1 # 连接池最大阻塞等待时间（使用负值表示没有限制）
         min-idle: 0 # 连接池中的最小空闲连接
-    timeout: 0 # 连接超时时间（毫秒）
+    timeout: 20000 # 连接超时时间（毫秒）
 
 #mybatis
 mybatis-plus:

config-server/src/main/resources/shared/user-service-test.yml

@@ -5,10 +5,9 @@ server:
 spring:
   datasource:
     druid:
-      driverClassName: com.mysql.jdbc.Driver
-      driver-class-name: com.mysql.jdbc.Driver
+      driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
-      url: jdbc:mysql://192.168.2.241:3306/sys-user?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
+      url: jdbc:mysql://192.168.2.241:3306/sys-user?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root
       password: lantone
       # 连接池的配置信息
@@ -30,9 +29,13 @@ spring:
       poolPreparedStatements: true
       maxPoolPreparedStatementPerConnectionSize: 20
       # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-      filters.commons-log.connection-logger-name: stat,wall,log4j
-      filter.stat.log-slow-sql: true
-      filter.stat.slow-sql-millis: 2000
+      filters.commons-log.connection-logger-name: wall,log4j
+      filter:
+        stat:
+          enabled: true
+          mergeSql: true
+          log-slow-sql: true
+          slow-sql-millis: 2000
       #监控配置
       web-stat-filter:
         enabled: true
@@ -74,13 +77,13 @@ spring:
     host: 192.168.2.241  #Redis服务器地址
     port: 6379 # Redis服务器连接端口
     password: lantone # Redis服务器连接密码（默认为空）
-    jedis:
+    lettuce:
       pool:
         max-active: 8 # 连接池最大连接数（使用负值表示没有限制）
         max-idle: 5 # 连接池中的最大空闲连接
         max-wait: -1 # 连接池最大阻塞等待时间（使用负值表示没有限制）
         min-idle: 0 # 连接池中的最小空闲连接
-    timeout: 0 # 连接超时时间（毫秒）
+    timeout: 20000 # 连接超时时间（毫秒）
 
 #mybatis
 mybatis-plus:

diagbotman-service/pom.xml

@@ -129,6 +129,11 @@
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-boot-starter</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-generator</artifactId>
+        </dependency>
         <!-- mybatis-plus end -->
 
         <!-- 阿里巴巴druid数据库连接池 -->
@@ -165,7 +170,7 @@
                     <imageName>${docker.image.prefix}/${project.artifactId}:${project.version}</imageName>
                     <forceTags>true</forceTags>
                     <!--镜像的FROM，使用压缩的小镜像-->
-                    <baseImage>frolvlad/alpine-oraclejdk8:slim</baseImage>
+                    <baseImage>frolvlad/alpine-oraclejre8:slim</baseImage>
                     <entryPoint>["java", "-jar", "-Xms256m", "-Xmx1024m", "-Duser.timezone=GMT+8", "/${project.build.finalName}.jar"]</entryPoint>
                     <resources>
                         <resource>

diagbotman-service/src/main/java/com/diagbot/config/SwaggerConfigurer.java

@@ -10,6 +10,7 @@ import springfox.documentation.builders.PathSelectors;
 import springfox.documentation.builders.RequestHandlerSelectors;
 import springfox.documentation.schema.ModelRef;
 import springfox.documentation.service.ApiInfo;
+import springfox.documentation.service.Contact;
 import springfox.documentation.service.Parameter;
 import springfox.documentation.spi.DocumentationType;
 import springfox.documentation.spring.web.plugins.Docket;
@@ -61,7 +62,7 @@ public class SwaggerConfigurer {
                 .title(" diagbotman-service api ")
                 .description("diagbotman-service 微服务")
                 .termsOfServiceUrl("")
-                .contact("diagbot")
+                .contact(new Contact("diagbot","",""))
                 .version("1.0")
                 .build();
     }

diagbotman-service/src/main/resources/logback-spring.xml

@@ -14,8 +14,8 @@
     <conversionRule conversionWord="wEx"
                     converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter"/>
     <!-- 彩色日志格式 -->
-    <property name="CONSOLE_LOG_PATTERN"
-              value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%logger){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
+    <!--<property name="CONSOLE_LOG_PATTERN"-->
+              <!--value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(-&#45;&#45;){faint} %clr([%15.15t]){faint} %clr(%logger){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>-->
     <!--包名输出缩进对齐-->
     <property name="CONSOLE_LOG_PATTERN"
               value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
@@ -194,7 +194,7 @@
     <!--<appender name="db" class="ch.qos.logback.classic.db.DBAppender">-->
     <!--<connectionSource-->
     <!--class="ch.qos.logback.core.db.DriverManagerConnectionSource">-->
-    <!--<driverClass>com.mysql.jdbc.Driver</driverClass>-->
+    <!--<driverClass>com.mysql.cj.jdbc.Driver</driverClass>-->
     <!--<url>jdbc:mysql://120.77.222.42:3306/logback_member?characterEncoding=utf8</url>-->
     <!--<user>root</user>-->
     <!--<password>a123456789</password>-->

diagbotman-service/src/test/java/com/diagbot/CodeGeneration.java

@@ -46,10 +46,10 @@ public class CodeGeneration {
         // 数据源配置
         DataSourceConfig dsc = new DataSourceConfig();
         dsc.setDbType(DbType.MYSQL);
-        dsc.setDriverName("com.mysql.jdbc.Driver");
+        dsc.setDriverName("com.mysql.cj.jdbc.Driver");
         dsc.setUsername("root");
         dsc.setPassword("lantone");
-        dsc.setUrl("jdbc:mysql://192.168.2.236:3306/sys-diagbotman?useUnicode=true&characterEncoding=utf-8&useSSL=false");
+        dsc.setUrl("jdbc:mysql://192.168.2.236:3306/sys-diagbotman?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf-8&useSSL=false");
         mpg.setDataSource(dsc);
 
         // 策略配置

docs/006.20190304慢病基于icss增量脚本/init_icss_NCD.sql

@@ -0,0 +1,326 @@
+use `sys-icss`;
+
+DROP TABLE IF EXISTS `icss_vital_order`;
+DROP TABLE IF EXISTS `icss_lis_unique`;
+-- 周铁钢
+-- ----------------------------
+-- Table structure for icss_dictionary_info
+-- ----------------------------
+DROP TABLE IF EXISTS `icss_dictionary_info`;
+CREATE TABLE `icss_dictionary_info` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
+  `is_deleted` char(1) NOT NULL DEFAULT 'N' COMMENT '是否删除,N:未删除，Y:删除',
+  `gmt_create` datetime NOT NULL DEFAULT '1970-01-01 12:00:00' COMMENT '记录创建时间',
+  `gmt_modified` datetime NOT NULL DEFAULT '1970-01-01 12:00:00' COMMENT '记录修改时间,如果时间是1970年则表示纪录未修改',
+  `creator` varchar(20) NOT NULL DEFAULT '0' COMMENT '创建人，0表示无创建人值',
+  `modifier` varchar(20) NOT NULL DEFAULT '0' COMMENT '修改人,如果为0则表示纪录未修改',
+  `group_type` bigint(20) NOT NULL DEFAULT '0' COMMENT '分组（值自定义）',
+  `name` varchar(100) NOT NULL DEFAULT '' COMMENT '内容',
+  `val` varchar(255) NOT NULL DEFAULT '' COMMENT '值',
+  `return_type` int(11) NOT NULL DEFAULT '1' COMMENT '返回类型（0: 都返回，1：后台维护返回 2：icss界面返回）',
+  `order_no` int(11) NOT NULL DEFAULT '0' COMMENT '排序号',
+  `remark` varchar(300) DEFAULT NULL COMMENT '备注',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=56 DEFAULT CHARSET=utf8 ROW_FORMAT=COMPACT COMMENT='icss字典表';
+
+-- ----------------------------
+-- Records of icss_dictionary_info
+-- ----------------------------
+INSERT INTO `icss_dictionary_info` VALUES ('1', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '主诉现病史', '1', '1', '10', '标签归属');
+INSERT INTO `icss_dictionary_info` VALUES ('2', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '其他史', '3', '1', '20', '标签归属');
+INSERT INTO `icss_dictionary_info` VALUES ('3', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '查体', '4', '1', '30', '标签归属');
+INSERT INTO `icss_dictionary_info` VALUES ('4', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '化验', '5', '1', '40', '标签归属');
+INSERT INTO `icss_dictionary_info` VALUES ('5', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '辅检', '6', '1', '50', '标签归属');
+INSERT INTO `icss_dictionary_info` VALUES ('6', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '诊断', '7', '1', '60', '标签归属');
+INSERT INTO `icss_dictionary_info` VALUES ('7', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '药品', '8', '1', '70', '标签归属');
+INSERT INTO `icss_dictionary_info` VALUES ('8', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '药品分类', '9', '1', '80', '标签归属');
+INSERT INTO `icss_dictionary_info` VALUES ('9', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', '多列多选标签（杂音/初为）', '2', '1', '10', '组合标签-填写单类型');
+INSERT INTO `icss_dictionary_info` VALUES ('10', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', '多项统一横铺标签（血压）', '3', '1', '20', '组合标签-填写单类型');
+INSERT INTO `icss_dictionary_info` VALUES ('11', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', '症状详细（症状尾巴）', '4', '1', '30', '组合标签-填写单类型');
+INSERT INTO `icss_dictionary_info` VALUES ('12', 'Y', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', '单选含自由填写项', '5', '1', '40', '组合标签-填写单类型');
+INSERT INTO `icss_dictionary_info` VALUES ('13', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', '组合项标签（既往史）', '6', '1', '50', '组合标签-填写单类型');
+INSERT INTO `icss_dictionary_info` VALUES ('14', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', '化验组合', '7', '1', '60', '组合标签-填写单类型');
+INSERT INTO `icss_dictionary_info` VALUES ('15', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', '空标签', '9', '1', '70', '组合标签-填写单类型');
+INSERT INTO `icss_dictionary_info` VALUES ('16', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', '症状推送类型（添加症状）', '11', '1', '80', '组合标签-填写单类型');
+INSERT INTO `icss_dictionary_info` VALUES ('26', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '4', '主诉', '1', '1', '10', '模板类型归属');
+INSERT INTO `icss_dictionary_info` VALUES ('27', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '4', '现病史', '2', '1', '20', '模板类型归属');
+INSERT INTO `icss_dictionary_info` VALUES ('28', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '4', '其他史', '3', '1', '30', '模板类型归属');
+INSERT INTO `icss_dictionary_info` VALUES ('29', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '4', '查体', '4', '1', '40', '模板类型归属');
+INSERT INTO `icss_dictionary_info` VALUES ('30', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '4', '化验', '5', '1', '50', '模板类型归属');
+INSERT INTO `icss_dictionary_info` VALUES ('31', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '4', '辅检', '6', '1', '60', '模板类型归属');
+INSERT INTO `icss_dictionary_info` VALUES ('33', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '5', '从左到右，从上到下', '1', '1', '10', '成文顺序');
+INSERT INTO `icss_dictionary_info` VALUES ('34', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '5', '按点击顺序成文', '0', '1', '20', '成文顺序');
+INSERT INTO `icss_dictionary_info` VALUES ('35', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '6', '默认值', '0', '1', '10', '单标签组件类型');
+INSERT INTO `icss_dictionary_info` VALUES ('36', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '6', '单选', '1', '1', '20', '单标签组件类型');
+INSERT INTO `icss_dictionary_info` VALUES ('37', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '6', '多选', '2', '1', '30', '单标签组件类型');
+INSERT INTO `icss_dictionary_info` VALUES ('38', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '6', '数字键盘带单位', '5', '1', '40', '单标签组件类型');
+INSERT INTO `icss_dictionary_info` VALUES ('39', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '6', '输入框', '6', '1', '50', '单标签组件类型');
+INSERT INTO `icss_dictionary_info` VALUES ('40', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '6', '数字键盘', '7', '1', '60', '单标签组件类型');
+INSERT INTO `icss_dictionary_info` VALUES ('41', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '6', '联合推送', '99', '1', '80', '单标签组件类型');
+INSERT INTO `icss_dictionary_info` VALUES ('42', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '6', '单选含自由填写项', '11', '1', '70', '单标签组件类型');
+INSERT INTO `icss_dictionary_info` VALUES ('43', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '量表', '21', '1', '90', '标签归属');
+INSERT INTO `icss_dictionary_info` VALUES ('44', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '核心指标', '22', '1', '100', '标签归属');
+INSERT INTO `icss_dictionary_info` VALUES ('45', 'Y', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '4', '诊断', '7', '1', '70', '模板类型归属');
+INSERT INTO `icss_dictionary_info` VALUES ('46', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '7', '普通病', '0', '1', '10', '诊断类型');
+INSERT INTO `icss_dictionary_info` VALUES ('47', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '7', '慢病', '1', '1', '20', '诊断类型');
+INSERT INTO `icss_dictionary_info` VALUES ('48', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '7', '急诊', '2', '1', '30', '诊断类型');
+INSERT INTO `icss_dictionary_info` VALUES ('49', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '8', '文本模块', '0', '1', '10', '量表结构类型');
+INSERT INTO `icss_dictionary_info` VALUES ('50', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '8', '推送模块', '1', '1', '20', '量表结构类型');
+INSERT INTO `icss_dictionary_info` VALUES ('51', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '4', '现病史空模板', '22', '1', '80', '模板类型归属');
+INSERT INTO `icss_dictionary_info` VALUES ('52', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '4', '现病史空模板子模板', '322', '1', '90', '模板类型归属');
+INSERT INTO `icss_dictionary_info` VALUES ('53', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '4', '主诉子模板', '31', '1', '100', '模板类型归属');
+INSERT INTO `icss_dictionary_info` VALUES ('54', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '4', '现病史子模板', '32', '1', '110', '模板类型归属');
+INSERT INTO `icss_dictionary_info` VALUES ('55', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '1', '不良反应', '10', '1', '110', '标签归属');
+
+
+-- 导入默认的诊断类型
+-- ----------------------------
+-- Table structure for icss_dis_scale
+-- ----------------------------
+DROP TABLE IF EXISTS `icss_dis_scale`;
+CREATE TABLE `icss_dis_scale` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
+  `is_deleted` char(1) NOT NULL DEFAULT 'N' COMMENT '是否删除,N:未删除，Y:删除',
+  `gmt_create` datetime NOT NULL DEFAULT '1970-01-01 12:00:00' COMMENT '记录创建时间',
+  `gmt_modified` datetime NOT NULL DEFAULT '1970-01-01 12:00:00' COMMENT '记录修改时间,如果时间是1970年则表示纪录未修改',
+  `creator` varchar(20) NOT NULL DEFAULT '0' COMMENT '创建人，0表示无创建人值',
+  `modifier` varchar(20) NOT NULL DEFAULT '0' COMMENT '修改人,如果为0则表示纪录未修改',
+  `dis_id` bigint(20) NOT NULL DEFAULT '0' COMMENT '诊断标签id',
+  `scale_id` bigint(20) NOT NULL DEFAULT '0' COMMENT '量表标签id',
+  `order_no` smallint(6) NOT NULL DEFAULT '0' COMMENT '排序号',
+  `remark` varchar(500) DEFAULT NULL COMMENT '备注',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 ROW_FORMAT=COMPACT COMMENT='诊断量表映射表';
+
+-- ----------------------------
+-- Table structure for icss_dis_type
+-- ----------------------------
+DROP TABLE IF EXISTS `icss_dis_type`;
+CREATE TABLE `icss_dis_type` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
+  `is_deleted` char(1) NOT NULL DEFAULT 'N' COMMENT '是否删除,N:未删除，Y:删除',
+  `gmt_create` datetime NOT NULL DEFAULT '1970-01-01 12:00:00' COMMENT '记录创建时间',
+  `gmt_modified` datetime NOT NULL DEFAULT '1970-01-01 12:00:00' COMMENT '记录修改时间,如果时间是1970年则表示纪录未修改',
+  `creator` varchar(20) NOT NULL DEFAULT '0' COMMENT '创建人，0表示无创建人值',
+  `modifier` varchar(20) NOT NULL DEFAULT '0' COMMENT '修改人,如果为0则表示纪录未修改',
+  `dis_id` bigint(20) NOT NULL DEFAULT '0' COMMENT '诊断标签id',
+  `parent_id` bigint(20) NOT NULL DEFAULT '0' COMMENT '父级诊断id',
+  `type` tinyint(4) NOT NULL DEFAULT '1' COMMENT '0:普通病，1：慢病，2：急诊',
+  `remark` varchar(500) DEFAULT NULL COMMENT '备注',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 ROW_FORMAT=COMPACT COMMENT='诊断类型表';
+ALTER TABLE `icss_dis_type` ADD INDEX dis_id ( `dis_id` );
+
+insert into icss_dis_type(`dis_id`, `type`)
+SELECT id,0 FROM `icss_question_info` where type = 7 and is_deleted = 'N';
+
+-- 将糖尿病设置为慢病
+update icss_dis_type set type = 1 where dis_id = (
+	select id from icss_question_info where tag_name = '糖尿病' and is_deleted = 'N' and type = 7
+);
+
+
+
+-- ----------------------------
+-- Table structure for icss_scale_content
+-- ----------------------------
+DROP TABLE IF EXISTS `icss_scale_content`;
+CREATE TABLE `icss_scale_content` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
+  `is_deleted` char(1) NOT NULL DEFAULT 'N' COMMENT '是否删除,N:未删除，Y:删除',
+  `gmt_create` datetime NOT NULL DEFAULT '1970-01-01 12:00:00' COMMENT '记录创建时间',
+  `gmt_modified` datetime NOT NULL DEFAULT '1970-01-01 12:00:00' COMMENT '记录修改时间,如果时间是1970年则表示纪录未修改',
+  `creator` varchar(20) NOT NULL DEFAULT '0' COMMENT '创建人，0表示无创建人值',
+  `modifier` varchar(20) NOT NULL DEFAULT '0' COMMENT '修改人,如果为0则表示纪录未修改',
+  `scale_id` bigint(20) NOT NULL DEFAULT '0' COMMENT '量表标签id',
+  `content` text COMMENT '内容',
+  `type` tinyint(4) NOT NULL DEFAULT '0' COMMENT '0:文本，1：大数据接口填充',
+  `order_no` smallint(6) NOT NULL DEFAULT '0' COMMENT '排序号',
+  `remark` varchar(500) DEFAULT NULL COMMENT '备注',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 ROW_FORMAT=COMPACT COMMENT='量表内容表';
+
+
+-- 王峰
+-- ----------------------------
+-- Table structure for icss_evaluation_module_mapping
+-- ----------------------------
+DROP TABLE IF EXISTS `icss_evaluation_module_mapping`;
+CREATE TABLE `icss_evaluation_module_mapping` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `is_deleted` char(1) NOT NULL DEFAULT 'N' COMMENT '是否删除,N:未删除，Y:删除',
+  `gmt_create` datetime NOT NULL DEFAULT '1970-01-01 12:00:00' COMMENT '记录创建时间',
+  `gmt_modified` datetime NOT NULL DEFAULT '1970-01-01 12:00:00' COMMENT '记录修改时间,如果时间是1970年则表示纪录未修改',
+  `creator` varchar(20) NOT NULL DEFAULT '0' COMMENT '创建人，0表示无创建人值',
+  `modifier` varchar(20) NOT NULL DEFAULT '0' COMMENT '修改人,如果为0则表示纪录未修改',
+  `region_name` varchar(200) DEFAULT NULL COMMENT '区域名',
+  `region_type` varchar(200) DEFAULT NULL COMMENT '区域类型（0默认自定义，1大数据，2内部数据）',
+  `order_no` int(11) DEFAULT NULL COMMENT '区域顺序',
+  `disease_id` bigint(20) DEFAULT NULL COMMENT '疾病id',
+  `remark` varchar(300) DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=9 DEFAULT CHARSET=utf8 COMMENT='管理与评估模板表';
+
+-- ----------------------------
+-- Records of icss_evaluation_module_mapping
+-- ----------------------------
+INSERT INTO `icss_evaluation_module_mapping` VALUES ('1', 'N', '1970-01-02 12:00:00', '1970-01-01 12:00:00', '1', '1', '疗效评估', '1', '1', '21773', null);
+INSERT INTO `icss_evaluation_module_mapping` VALUES ('2', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '1', '1', '血糖控制情况', '10', '2', '21773', null);
+INSERT INTO `icss_evaluation_module_mapping` VALUES ('3', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '1', '整体评估', '0', '3', '21773', null);
+INSERT INTO `icss_evaluation_module_mapping` VALUES ('4', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '1', '糖尿病分级管理', '1', '4', '21773', null);
+INSERT INTO `icss_evaluation_module_mapping` VALUES ('5', 'N', '1970-01-02 12:00:00', '1970-01-01 12:00:00', '0', '1', '疗效评估820', '1', '1', '105', null);
+INSERT INTO `icss_evaluation_module_mapping` VALUES ('6', 'N', '1970-01-03 12:00:00', '1970-01-01 12:00:00', '0', '11', '疗效评估520', '1', '1', '98', null);
+INSERT INTO `icss_evaluation_module_mapping` VALUES ('7', 'N', '1970-01-04 12:00:00', '1970-01-01 12:00:00', '0', '1', '疗效评估297', '1', '1', '297', null);
+INSERT INTO `icss_evaluation_module_mapping` VALUES ('8', 'N', '1970-01-08 12:00:00', '1970-01-01 12:00:00', '0', '1', '疗效评估800', '1', '1', '20718', null);
+
+-- ----------------------------
+-- Table structure for icss_index_data
+-- ----------------------------
+DROP TABLE IF EXISTS `icss_index_data`;
+CREATE TABLE `icss_index_data` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `is_deleted` char(1) NOT NULL DEFAULT 'N' COMMENT '是否删除,N:未删除，Y:删除',
+  `gmt_create` datetime NOT NULL DEFAULT '1970-01-01 12:00:00' COMMENT '记录创建时间',
+  `gmt_modified` datetime NOT NULL DEFAULT '1970-01-01 12:00:00' COMMENT '记录修改时间,如果时间是1970年则表示纪录未修改',
+  `creator` varchar(20) NOT NULL DEFAULT '0' COMMENT '创建人，0表示无创建人值',
+  `modifier` varchar(20) NOT NULL DEFAULT '0' COMMENT '修改人,如果为0则表示纪录未修改',
+  `index_unique` varchar(200) DEFAULT NULL COMMENT '指标公表名',
+  `index_value` varchar(200) DEFAULT NULL COMMENT '指标值',
+  `index_unit` varchar(200) DEFAULT NULL COMMENT '指标单位',
+  `is_abnormal` int(11) DEFAULT NULL COMMENT '是否异常',
+  `creat_time` datetime DEFAULT NULL COMMENT '化验时间',
+  `patient_id` bigint(20) DEFAULT NULL COMMENT '患者id',
+  `inquiry_code` varchar(50) DEFAULT NULL COMMENT '就诊号',
+  `remark` varchar(300) DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=33 DEFAULT CHARSET=utf8 COMMENT='指标数据表';
+
+-- ----------------------------
+-- Records of icss_index_data
+-- ----------------------------
+INSERT INTO `icss_index_data` VALUES ('1', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '空腹血糖', '10', 'mo/L', '1', '2019-03-11 20:00:05', '1001', '2973', null);
+INSERT INTO `icss_index_data` VALUES ('2', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '空腹血糖', '20', 'mo/L', '1', '2019-03-05 20:01:15', '1001', '2979', null);
+INSERT INTO `icss_index_data` VALUES ('3', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '餐后2小时血糖', '6', 'mo/L', '0', '2019-03-11 20:02:02', '1001', '2973', null);
+INSERT INTO `icss_index_data` VALUES ('4', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '餐后2小时血糖', '4', 'mo/L', '1', '2019-03-05 20:17:32', '1001', '5454', null);
+INSERT INTO `icss_index_data` VALUES ('5', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '餐后2小时血糖', '8', 'mo/L', '1', '2019-03-01 20:17:36', '1001', '456764546798', null);
+INSERT INTO `icss_index_data` VALUES ('6', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '餐后2小时血糖', '9', 'mo/L', '1', '2019-03-11 20:17:39', '1001', '4565463', null);
+INSERT INTO `icss_index_data` VALUES ('7', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '餐后2小时血糖', '5', 'mo/L', '1', '2019-03-07 20:17:56', '1001', '436456456', null);
+INSERT INTO `icss_index_data` VALUES ('8', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '随机血糖', '1', 'mo/L', '1', '2019-02-06 20:17:41', '1001', '457896', null);
+INSERT INTO `icss_index_data` VALUES ('9', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '随机血糖', '2', 'mo/L', '1', '2019-03-12 20:17:46', '1001', '364', null);
+INSERT INTO `icss_index_data` VALUES ('10', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '随机血糖', '3', 'mo/L', '1', '2019-02-14 20:17:49', '1001', '45645', null);
+INSERT INTO `icss_index_data` VALUES ('11', 'Y', '2019-03-12 15:22:42', '2019-03-12 15:58:43', '1', '0', '空腹血糖', '18', 'mmol/L', '1', '2019-03-12 15:21:01', '1001', '297', null);
+INSERT INTO `icss_index_data` VALUES ('12', 'Y', '2019-03-12 15:24:02', '2019-03-12 15:58:43', '1', '0', '空腹血糖', '18', 'mmol/L', '1', '2019-03-12 15:21:01', '1001', '297', null);
+INSERT INTO `icss_index_data` VALUES ('13', 'Y', '2019-03-12 15:24:02', '2019-03-12 15:58:43', '1', '0', '随机血糖', '18', 'mmol/L', '1', '2019-03-12 15:21:01', '1001', '297', null);
+INSERT INTO `icss_index_data` VALUES ('14', 'Y', '2019-03-12 15:24:02', '2019-03-12 15:58:43', '1', '0', '随机血糖', '18', 'mmol/L', '1', '2019-03-12 15:21:01', '1001', '297', null);
+INSERT INTO `icss_index_data` VALUES ('15', 'Y', '2019-03-12 15:58:43', '2019-03-12 15:59:16', '1', '0', '空腹血糖', '18', 'mmol/L', '1', '2019-03-12 15:21:01', '1001', '297', null);
+INSERT INTO `icss_index_data` VALUES ('16', 'Y', '2019-03-12 15:58:43', '2019-03-12 15:59:16', '1', '0', '随机血糖', '18', 'mmol/L', '1', '2019-03-12 15:21:01', '1001', '297', null);
+INSERT INTO `icss_index_data` VALUES ('17', 'Y', '2019-03-12 15:58:43', '2019-03-12 15:59:16', '1', '0', '随机血糖', '18', 'mmol/L', '1', '2019-03-12 15:21:01', '1001', '297', null);
+INSERT INTO `icss_index_data` VALUES ('18', 'Y', '2019-03-12 15:59:16', '2019-04-10 11:23:17', '1', '0', '空腹血糖', '18', 'mmol/L', '1', '2019-03-12 15:21:01', '1001', '297', null);
+INSERT INTO `icss_index_data` VALUES ('19', 'Y', '2019-03-12 15:59:16', '2019-04-10 11:23:17', '1', '0', '随机血糖', '18', 'mmol/L', '1', '2019-03-12 15:21:01', '1001', '297', null);
+INSERT INTO `icss_index_data` VALUES ('20', 'Y', '2019-03-12 15:59:16', '2019-04-10 11:23:17', '1', '0', '随机血糖', '18', 'mmol/L', '1', '2019-03-12 15:21:01', '1001', '297', null);
+INSERT INTO `icss_index_data` VALUES ('21', 'N', '2019-03-12 16:00:04', '1970-01-01 12:00:00', '1', '0', '空腹血糖', '18', 'mmol/L', '1', '2019-03-12 15:21:01', '1002', '297', null);
+INSERT INTO `icss_index_data` VALUES ('22', 'N', '2019-03-12 16:00:04', '1970-01-01 12:00:00', '1', '0', '随机血糖', '18', 'mmol/L', '1', '2019-03-12 15:21:01', '1002', '297', null);
+INSERT INTO `icss_index_data` VALUES ('23', 'N', '2019-03-12 16:00:04', '1970-01-01 12:00:00', '1', '0', '随机血糖', '18', 'mmol/L', '1', '2019-03-12 15:21:01', '1002', '297', null);
+INSERT INTO `icss_index_data` VALUES ('24', 'Y', '2019-03-12 16:48:57', '2019-03-12 16:55:21', '1', '0', '空腹血糖', '18', 'mmol/L', '1', '2019-03-12 15:21:01', '1001', '5297', null);
+INSERT INTO `icss_index_data` VALUES ('25', 'Y', '2019-03-12 16:48:57', '2019-03-12 16:55:21', '1', '0', '随机血糖', '18', 'mmol/L', '1', '2019-03-12 15:21:01', '1001', '5297', null);
+INSERT INTO `icss_index_data` VALUES ('26', 'Y', '2019-03-12 16:48:57', '2019-03-12 16:55:21', '1', '0', '随机血糖', '18', 'mmol/L', '1', '2019-03-12 15:21:01', '1001', '5297', null);
+INSERT INTO `icss_index_data` VALUES ('27', 'N', '2019-03-12 16:55:21', '1970-01-01 12:00:00', '1', '0', '空腹血糖', '18', 'mmol/L', '1', '2019-03-12 15:21:01', '1001', '5297', null);
+INSERT INTO `icss_index_data` VALUES ('28', 'N', '2019-03-12 16:55:21', '1970-01-01 12:00:00', '1', '0', '随机血糖', '18', 'mmol/L', '1', '2019-03-12 15:21:01', '1001', '5297', null);
+INSERT INTO `icss_index_data` VALUES ('29', 'N', '2019-03-12 16:55:21', '1970-01-01 12:00:00', '1', '0', '随机血糖', '18', 'mmol/L', '1', '2019-03-12 15:21:01', '1001', '5297', null);
+INSERT INTO `icss_index_data` VALUES ('30', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '糖化血红蛋白', '19', 'mmol/L', '1', '2019-03-03 20:16:48', '1001', '5297', null);
+INSERT INTO `icss_index_data` VALUES ('31', 'Y', '2019-04-10 11:23:17', '2019-04-10 11:40:47', '1', '0', '空腹血糖', '520', 'string', '1', '2019-05-01 12:00:00', '1001', '297', null);
+INSERT INTO `icss_index_data` VALUES ('32', 'N', '2019-04-10 11:40:58', '1970-01-01 12:00:00', '1', '0', '空腹血糖', '520', 'string', '1', '2019-05-01 12:00:00', '1001', '297', null);
+
+-- ----------------------------
+-- Table structure for icss_index_config
+-- ----------------------------
+DROP TABLE IF EXISTS `icss_index_config`;
+CREATE TABLE `icss_index_config` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `is_deleted` char(1) NOT NULL DEFAULT 'N' COMMENT '是否删除,N:未删除，Y:删除',
+  `gmt_create` datetime NOT NULL DEFAULT '1970-01-01 12:00:00' COMMENT '记录创建时间',
+  `gmt_modified` datetime NOT NULL DEFAULT '1970-01-01 12:00:00' COMMENT '记录修改时间,如果时间是1970年则表示纪录未修改',
+  `creator` varchar(20) NOT NULL DEFAULT '0' COMMENT '创建人，0表示无创建人值',
+  `modifier` varchar(20) NOT NULL DEFAULT '0' COMMENT '修改人,如果为0则表示纪录未修改',
+  `index_unique` varchar(200) DEFAULT NULL COMMENT '指标公表名',
+  `disease_id` bigint(20) DEFAULT NULL COMMENT '疾病id',
+  `index_desc` int(11) DEFAULT NULL COMMENT '指标描述',
+  `order_no` int(11) DEFAULT NULL COMMENT '显示顺序',
+  `remark` varchar(300) DEFAULT NULL COMMENT '备注',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8 COMMENT='指标配置';
+
+-- ----------------------------
+-- Records of icss_index_config
+-- ----------------------------
+INSERT INTO `icss_index_config` VALUES ('1', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '空腹血糖', '21773', '1', '1', null);
+INSERT INTO `icss_index_config` VALUES ('2', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '餐后2小时血糖', '21773', '1', '2', null);
+INSERT INTO `icss_index_config` VALUES ('3', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '随机血糖', '21773', '1', '3', null);
+INSERT INTO `icss_index_config` VALUES ('4', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '糖化血红蛋白', '21773', '2', '1', null);
+INSERT INTO `icss_index_config` VALUES ('5', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '血压', '105', '1', '1', null);
+
+-- 王宇
+-- 模板信息字段修改
+alter table icss_module_info change  column disease module_type bigint(20) COMMENT '(0.通用 1.根据科室划分 2.慢病)';
+alter table icss_module_info add  column relation_id bigint(20) NOT NULL DEFAULT '0' COMMENT '关联id';
+ALTER TABLE `icss_module_info` MODIFY COLUMN `type`  varchar(20) NOT NULL DEFAULT 0 COMMENT '类型(1.主诉 2.现病史 3.其他史 4.查体 5.化验 6.辅检 7.诊断 8.医嘱 22.现病史空模板 31.主诉子模板 32.现病史子模板 322.现病史空模板子模板)' AFTER `name`;
+alter table icss_module_info modify column name VARCHAR(120);
+-- 修改普通模板的值
+UPDATE `icss_module_info` SET `module_type`='0',`relation_id`='0' WHERE (`id`='1');
+UPDATE `icss_module_info` SET `module_type`='0',`relation_id`='0' WHERE (`id`='2');
+UPDATE `icss_module_info` SET `type` = '32',`module_type`='0',`relation_id`='0' WHERE (`id`='3');
+UPDATE `icss_module_info` SET `module_type`='0',`relation_id`='0' WHERE (`id`='4');
+UPDATE `icss_module_info` SET `type` = '22',`module_type`='0',`relation_id`='0' WHERE (`id`='5');
+UPDATE `icss_module_info` SET `type` = '31',`module_type`='0',`relation_id`='0' WHERE (`id`='6');
+
+
+-- 赵佩诗
+-- 提示信息显示位置修改
+ALTER TABLE icss_introduce_detail MODIFY COLUMN `position` VARCHAR (11) DEFAULT '2' COMMENT '显示位置（多选）：1-推送展示，2-更多展示，3-一般治疗展示，4-手术治疗展示，5-药品说明书，6-不良反应';
+
+-- 任国宾
+DROP TABLE IF EXISTS `icss_inquiry_drug`;
+CREATE TABLE `icss_inquiry_drug` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
+  `is_deleted` char(1) NOT NULL DEFAULT 'N' COMMENT '是否删除,N:未删除，Y:删除',
+  `gmt_create` datetime NOT NULL DEFAULT '1970-01-01 12:00:00' COMMENT '记录创建时间',
+  `gmt_modified` datetime NOT NULL DEFAULT '1970-01-01 12:00:00' COMMENT '记录修改时间,如果时间是1970年则表示纪录未修改',
+  `creator` varchar(20) NOT NULL DEFAULT '0' COMMENT '创建人，0表示无创建人值',
+  `modifier` varchar(20) NOT NULL DEFAULT '0' COMMENT '修改人,如果为0则表示纪录未修改',
+  `inquiry_id` bigint(20) NOT NULL COMMENT '问诊记录id',
+  `question_id` bigint(20) NOT NULL DEFAULT '0' COMMENT '标签id',
+  `tag_name` varchar(100) NOT NULL DEFAULT '' COMMENT '标签名',
+  `remark` varchar(128) DEFAULT NULL COMMENT '备注',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='问诊记录处方用药明细表';
+
+DROP TABLE IF EXISTS `icss_inquiry_evaluation`;
+CREATE TABLE `icss_inquiry_evaluation` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
+  `is_deleted` char(1) NOT NULL DEFAULT 'N' COMMENT '是否删除,N:未删除，Y:删除',
+  `gmt_create` datetime NOT NULL DEFAULT '1970-01-01 12:00:00' COMMENT '记录创建时间',
+  `gmt_modified` datetime NOT NULL DEFAULT '1970-01-01 12:00:00' COMMENT '记录修改时间,如果时间是1970年则表示纪录未修改',
+  `creator` varchar(20) NOT NULL DEFAULT '0' COMMENT '创建人，0表示无创建人值',
+  `modifier` varchar(20) NOT NULL DEFAULT '0' COMMENT '修改人,如果为0则表示纪录未修改',
+  `inquiry_id` bigint(20) NOT NULL COMMENT '问诊记录id',
+  `html_content` longtext COMMENT '评估页面html内容',
+  `remark` varchar(128) DEFAULT NULL COMMENT '备注',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='问诊记录评估结果表';
+
+
+DROP TABLE IF EXISTS `icss_inquiry_scale`;
+CREATE TABLE `icss_inquiry_scale` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
+  `is_deleted` char(1) NOT NULL DEFAULT 'N' COMMENT '是否删除,N:未删除，Y:删除',
+  `gmt_create` datetime NOT NULL DEFAULT '1970-01-01 12:00:00' COMMENT '记录创建时间',
+  `gmt_modified` datetime NOT NULL DEFAULT '1970-01-01 12:00:00' COMMENT '记录修改时间,如果时间是1970年则表示纪录未修改',
+  `creator` varchar(20) NOT NULL DEFAULT '0' COMMENT '创建人，0表示无创建人值',
+  `modifier` varchar(20) NOT NULL DEFAULT '0' COMMENT '修改人,如果为0则表示纪录未修改',
+  `inquiry_id` bigint(20) NOT NULL COMMENT '问诊记录id',
+  `inquiry_evaluation_id` bigint(20) NOT NULL COMMENT '问诊记录评估结果表id',
+  `scale_id` bigint(20) NOT NULL DEFAULT '0' COMMENT '量表标签id',
+  `html_content` longtext COMMENT '量表页面html内容',
+  `remark` varchar(128) DEFAULT NULL COMMENT '备注',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='问诊记录评估结果量表明细表';