更新代码

pom.xml

@@ -30,8 +30,6 @@
         <mybatis-spring-boot.version>2.1.1</mybatis-spring-boot.version>
         <druid.version>1.1.21</druid.version>
         <swagger.version>2.9.2</swagger.version>
-        <!--<swagger-bootstrap.version>1.9.1</swagger-bootstrap.version>-->
-        <logstash.version>5.2</logstash.version>
         <poi.version>4.1.1</poi.version>
         <aggregator.version>1.1.0</aggregator.version>
         <okhttp.version>4.2.2</okhttp.version>
@@ -39,9 +37,6 @@
         <patchca.version>1.1.2</patchca.version>
         <hutool.version>5.0.7</hutool.version>
         <bitwalker.version>1.21</bitwalker.version>
-        <docker-maven-plugin.version>1.2.1</docker-maven-plugin.version>
-        <docker.image.prefix>192.168.2.122:5000/diagbotcloud</docker.image.prefix>
-        <registryUrl>http://192.168.2.122:5000/repository/diagbotcloud/</registryUrl>
     </properties>
 
     <dependencyManagement>
@@ -62,11 +57,6 @@
             <artifactId>common</artifactId>
             <version>0.0.1-SNAPSHOT</version>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.jolokia</groupId>
             <artifactId>jolokia-core</artifactId>
@@ -100,22 +90,15 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-actuator</artifactId>
         </dependency>
-        <!--hystrix-dashboard-->
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-netflix-hystrix-dashboard</artifactId>
-        </dependency>
         <!--hystrix -->
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-netflix-hystrix</artifactId>
         </dependency>
-
         <dependency>
             <groupId>com.bladejava</groupId>
             <artifactId>blade-patchca</artifactId>
             <version>${patchca.version}</version>
-
         </dependency>
 
         <dependency>
@@ -153,13 +136,6 @@
             <optional>true</optional>
         </dependency>
 
-        <dependency>
-            <groupId>net.logstash.logback</groupId>
-            <artifactId>logstash-logback-encoder</artifactId>
-            <version>${logstash.version}</version>
-        </dependency>
-
-
         <!-- mybatis-plus begin -->
         <dependency>
             <groupId>com.baomidou</groupId>
@@ -220,18 +196,6 @@
             <version>3.3.1</version>
         </dependency>
 
-        <dependency>
-            <groupId>com.oracle</groupId>
-            <artifactId>ojdbc6</artifactId>
-            <version>11.2.0.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>com.microsoft.sqlserver</groupId>
-            <artifactId>mssql-jdbc</artifactId>
-            <version>6.2.0.jre8</version>
-            <scope>runtime</scope>
-        </dependency>
         <!-- 解析客户端操作系统、浏览器等 -->
         <dependency>
             <groupId>eu.bitwalker</groupId>
@@ -240,81 +204,62 @@
         </dependency>
     </dependencies>
 
-    <!-- 私有仓库 -->
-    <repositories>
-        <repository>
-            <id>nexus-releases</id>
-            <name>Nexus Release Repository</name>
-            <url>http://192.168.2.236:8081/repository/maven-releases/</url>
-        </repository>
-        <repository>
-            <id>nexus-snapshots</id>
-            <name>Nexus Snapshot Repository</name>
-            <url>http://192.168.2.236:8081/repository/maven-snapshots/</url>
-        </repository>
-    </repositories>
-    <!-- 私有仓库 -->
-    <pluginRepositories>
-        <pluginRepository>
-            <id>nexus-releases</id>
-            <name>Nexus Release Repository</name>
-            <url>http://192.168.2.236:8081/repository/maven-releases/</url>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-        </pluginRepository>
-        <pluginRepository>
-            <id>nexus-snapshots</id>
-            <name>Nexus Snapshot Repository</name>
-            <url>http://192.168.2.236:8081/repository/maven-snapshots/</url>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </pluginRepository>
-    </pluginRepositories>
-
-    <distributionManagement>
-        <repository>
-            <id>nexus-releases</id>
-            <name>Nexus Release Repository</name>
-            <url>http://192.168.2.236:8081/repository/maven-releases/</url>
-        </repository>
-        <snapshotRepository>
-            <id>nexus-snapshots</id>
-            <name>Nexus Snapshot Repository</name>
-            <url>http://192.168.2.236:8081/repository/maven-snapshots/</url>
-        </snapshotRepository>
-    </distributionManagement>
-
+   
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-            </plugin>
-            <!-- 添加docker-maven插件 -->
-            <plugin>
-                <groupId>com.spotify</groupId>
-                <artifactId>docker-maven-plugin</artifactId>
-                <version>1.1.1</version>
-                <configuration>
-                    <imageName>${docker.image.prefix}/${project.artifactId}:${project.version}</imageName>
-                    <forceTags>true</forceTags>
-                    <!--镜像的FROM，使用压缩的小镜像-->
-                    <baseImage>frolvlad/alpine-oraclejre8:slim</baseImage>
-                    <entryPoint>["java", "-jar", "-Xms256m", "-Xmx1024m", "-Duser.timezone=GMT+8", "/${project.build.finalName}.jar"]</entryPoint>
-                    <resources>
-                        <resource>
-                            <targetPath>/</targetPath>
-                            <directory>${project.build.directory}</directory>
-                            <include>${project.build.finalName}.jar</include>
-                        </resource>
-                    </resources>
-                    <serverId>docker-registry</serverId>
-                    <registryUrl>${registryUrl}</registryUrl>
-                </configuration>
-            </plugin>
-        </plugins>
+			<plugin>
+				<artifactId>maven-dependency-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>copy</id>
+						<phase>package</phase>
+						<goals>
+							<goal>copy-dependencies</goal>
+						</goals>
+						<configuration>
+							<outputDirectory>${project.build.directory}/lib</outputDirectory>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<artifactId>maven-resources-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>copy-resources</id>
+						<phase>package</phase>
+						<goals>
+							<goal>copy-resources</goal>
+						</goals>
+						<configuration>
+							<resources>
+								<resource>
+									<directory>src/main/resources</directory>
+								</resource>
+							</resources>
+							<outputDirectory>${project.build.directory}/resources</outputDirectory>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<artifactId>maven-jar-plugin</artifactId>
+				<configuration>
+					<excludes>
+						<exclude>*.**</exclude>
+					</excludes>
+					<archive>
+						<manifest>
+							<mainClass>${main-class}</mainClass>
+							<addClasspath>true</addClasspath>
+							<classpathPrefix>lib/</classpathPrefix>
+							<useUniqueVersions>false</useUniqueVersions>
+						</manifest>
+					</archive>
+					<outputDirectory>${project.build.directory}</outputDirectory>
+				</configuration>
+			</plugin>
+		</plugins>
     </build>
 
 </project>

src/main/java/com/diagbot/MrqcSysApplication.java

@@ -1,6 +1,5 @@
 package com.diagbot;
 
-import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
@@ -10,9 +9,10 @@ import org.springframework.boot.autoconfigure.thymeleaf.ThymeleafAutoConfigurati
 import org.springframework.boot.context.properties.ConfigurationPropertiesScan;
 import org.springframework.cloud.client.circuitbreaker.EnableCircuitBreaker;
 import org.springframework.cloud.netflix.hystrix.EnableHystrix;
-import org.springframework.cloud.netflix.hystrix.dashboard.EnableHystrixDashboard;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 
+import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure;
+
 
 /**
  * @Description: 病历质控系统启动文件
@@ -22,7 +22,6 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
 @SpringBootApplication(exclude = { DataSourceAutoConfiguration.class, HibernateJpaAutoConfiguration.class,
         JmxAutoConfiguration.class, ThymeleafAutoConfiguration.class , DruidDataSourceAutoConfigure.class})
 @EnableFeignClients({ "com.diagbot.client" })
-@EnableHystrixDashboard
 @EnableHystrix
 @EnableCircuitBreaker
 @ConfigurationPropertiesScan

src/main/java/com/diagbot/facade/str/BStrBloodResultFacade.java

@@ -1,13 +1,20 @@
 package com.diagbot.facade.str;
 
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.data.ColumnZhAndChDTO;
-import com.diagbot.entity.StrAdmissionNote;
 import com.diagbot.entity.StrBloodResult;
-import com.diagbot.enums.CacheKeyEnum;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.facade.data.AMedAbnormalInfoFacade;
 import com.diagbot.facade.data.ColumnFacade;
@@ -20,15 +27,6 @@ import com.diagbot.vo.data.AStrBloodResultVO;
 import com.diagbot.vo.str.StrBloodResultVO;
 import com.diagbot.vo.str.StrContentVO;
 import com.google.common.collect.Lists;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
-
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
 
 /**
  * @Description:输血后效果评价-业务类
@@ -38,9 +36,9 @@ import java.util.Map;
 @Component
 public class BStrBloodResultFacade extends StrBloodResultServiceImpl {
 
-    @Autowired
-    @Qualifier("strBloodResultServiceImpl")
-    private StrBloodResultServiceImpl strBloodResultService;
+//    @Autowired
+//    @Qualifier("strBloodResultServiceImpl")
+//    private StrBloodResultServiceImpl strBloodResultService;
     @Autowired
     private ColumnFacade columnFacade;
     @Autowired
@@ -193,9 +191,9 @@ public class BStrBloodResultFacade extends StrBloodResultServiceImpl {
             if(StringUtil.isNotEmpty(s.getAuditDate())){
                 t.setAuditDate(DateUtil.parseDateTime(s.getAuditDate()));//审核时间
             }
-            Map<String, String> columnMap=columnFacade.getColumn(CacheKeyEnum.BLOOD_RESULT.getName());
-            Map<String, Object> entityMap=MapUtil.objectToMap(s);
-            Map<String, Object> wholeMap=MapUtil.objcetKeyConvert(columnMap,entityMap);
+//            Map<String, String> columnMap=columnFacade.getColumn(CacheKeyEnum.BLOOD_RESULT.getName());
+//            Map<String, Object> entityMap=MapUtil.objectToMap(s);
+//            Map<String, Object> wholeMap=MapUtil.objcetKeyConvert(columnMap,entityMap);
             //t.setWholeData(JSON.toJSONString(wholeMap));
             tList.add(t);
         }
@@ -222,7 +220,7 @@ public class BStrBloodResultFacade extends StrBloodResultServiceImpl {
             });
         }
         if(addE.size()>0){
-            strBloodResultService.saveBatch(addE);
+            saveBatch(addE);
         }
         if(updateE.size()>0){
             this.baseMapper.updateBatchByKey(updateE);

src/main/java/com/diagbot/facade/str/BStrBloodTransfusionFacade.java

@@ -1,13 +1,20 @@
 package com.diagbot.facade.str;
 
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.data.ColumnZhAndChDTO;
 import com.diagbot.entity.StrBloodTransfusion;
-import com.diagbot.entity.StrBloodTransfusion;
-import com.diagbot.enums.CacheKeyEnum;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.facade.data.AMedAbnormalInfoFacade;
 import com.diagbot.facade.data.ColumnFacade;
@@ -20,15 +27,6 @@ import com.diagbot.vo.data.AStrBloodTransfusionVO;
 import com.diagbot.vo.str.StrBloodTransfusionVO;
 import com.diagbot.vo.str.StrContentVO;
 import com.google.common.collect.Lists;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
-
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
 
 /**
  * @Description:输血/血制品病程记录-业务类
@@ -38,9 +36,9 @@ import java.util.Map;
 @Component
 public class BStrBloodTransfusionFacade extends StrBloodTransfusionServiceImpl {
 
-    @Autowired
-    @Qualifier("strBloodTransfusionServiceImpl")
-    private StrBloodTransfusionServiceImpl strBloodTransfusionService;
+//    @Autowired
+//    @Qualifier("strBloodTransfusionServiceImpl")
+//    private StrBloodTransfusionServiceImpl strBloodTransfusionService;
     @Autowired
     private ColumnFacade columnFacade;
     @Autowired
@@ -199,9 +197,9 @@ public class BStrBloodTransfusionFacade extends StrBloodTransfusionServiceImpl {
             if(StringUtil.isNotEmpty(s.getAuditDate())){
                 t.setAuditDate(DateUtil.parseDateTime(s.getAuditDate()));//审核时间
             }
-            Map<String, String> columnMap=columnFacade.getColumn(CacheKeyEnum.BLOOD_TRANSFUSION.getName());
-            Map<String, Object> entityMap=MapUtil.objectToMap(s);
-            Map<String, Object> wholeMap=MapUtil.objcetKeyConvert(columnMap,entityMap);
+//            Map<String, String> columnMap=columnFacade.getColumn(CacheKeyEnum.BLOOD_TRANSFUSION.getName());
+//            Map<String, Object> entityMap=MapUtil.objectToMap(s);
+//            Map<String, Object> wholeMap=MapUtil.objcetKeyConvert(columnMap,entityMap);
             //t.setWholeData(JSON.toJSONString(wholeMap));
             tList.add(t);
         }
@@ -229,7 +227,7 @@ public class BStrBloodTransfusionFacade extends StrBloodTransfusionServiceImpl {
                 });
             }
             if(addE.size()>0){
-                strBloodTransfusionService.saveBatch(addE);
+                saveBatch(addE);
             }
             if(updateE.size()>0){
                 this.baseMapper.updateBatchByKey(updateE);

src/main/java/com/diagbot/util/ColumnCacheUtil.java

@@ -1,13 +1,36 @@
 package com.diagbot.util;
 
-import com.diagbot.facade.data.*;
-import com.diagbot.facade.str.*;
-import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.ApplicationArguments;
 import org.springframework.boot.ApplicationRunner;
 import org.springframework.stereotype.Component;
 
+import com.diagbot.facade.str.BStrAdmissionNoteFacade;
+import com.diagbot.facade.str.BStrBloodResultFacade;
+import com.diagbot.facade.str.BStrBloodTransfusionFacade;
+import com.diagbot.facade.str.BStrConsultationApplyFacade;
+import com.diagbot.facade.str.BStrConsultationNoteFacade;
+import com.diagbot.facade.str.BStrConsultationRecordFacade;
+import com.diagbot.facade.str.BStrConsultationResultFacade;
+import com.diagbot.facade.str.BStrCrisisNoteFacade;
+import com.diagbot.facade.str.BStrDeathDiscussionFacade;
+import com.diagbot.facade.str.BStrDeathNoteFacade;
+import com.diagbot.facade.str.BStrDifficultCaseFacade;
+import com.diagbot.facade.str.BStrFirstRecordFacade;
+import com.diagbot.facade.str.BStrIllCriticallyFacade;
+import com.diagbot.facade.str.BStrIllSeriouslFacade;
+import com.diagbot.facade.str.BStrLeaveHospitalFacade;
+import com.diagbot.facade.str.BStrOperativeFirstRecordFacade;
+import com.diagbot.facade.str.BStrOperativeNoteFacade;
+import com.diagbot.facade.str.BStrPeriodConclusionFacade;
+import com.diagbot.facade.str.BStrPreoperativeDiscussionFacade;
+import com.diagbot.facade.str.BStrRescueNoteFacade;
+import com.diagbot.facade.str.BStrTransferInNoteFacade;
+import com.diagbot.facade.str.BStrTransferOutNoteFacade;
+import com.diagbot.facade.str.BStrWardRecordFacade;
+
+import lombok.extern.slf4j.Slf4j;
+
 /**
  * 启动时执行缓存，将字段名和注释存储到MAP类型的缓存中
  */

src/main/resources/application-dev.yml

@@ -104,17 +104,17 @@ spring:
         master:
           driver-class-name: com.mysql.cj.jdbc.Driver
           platform: mysql
-          url: jdbc:mysql://192.168.2.237:3307/qc?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
+          url: jdbc:mysql://192.168.2.31:3306/qc?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
           username: root
-          password: lantone
+          password: dsYun8!@#
           druid:
             initial-size: 5
         slave:
           driver-class-name: com.mysql.cj.jdbc.Driver
           platform: mysql
-          url: jdbc:mysql://192.168.2.126:3307/xy_st?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
+          url: jdbc:mysql://192.168.2.31:3306/qc?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
           username: root
-          password: Lat0ne@tesT
+          password: dsYun8!@#
           druid:
             initial-size: 5
 
@@ -127,9 +127,9 @@ spring:
     database:
       cache: 8 # cache索引
       token: 8 # Token索引
-    host: 192.168.2.237  #Redis服务器地址
-    port: 63791 # Redis服务器连接端口(本地环境端口6378，其他环境端口是6379)
-    password: emrais # Redis服务器连接密码（默认为空）
+    host: 192.168.2.31  #Redis服务器地址
+    port: 6379 # Redis服务器连接端口(本地环境端口6378，其他环境端口是6379)
+    password: # Redis服务器连接密码（默认为空）
     lettuce:
       pool:
         max-active: 8 # 连接池最大连接数（使用负值表示没有限制）
@@ -175,8 +175,7 @@ io.github.lvyahui8.spring:
   base-packages: com.diagbot.aggregate
   thread-number: 12
 
-myhost: localhost
-oath.self.address: http://${myhost}:${server.port}
+oath.self.address: http://localhost:${server.port}
 
 # 加解密开关
 encrypt:
@@ -197,4 +196,4 @@ initmodeid:
 log_switch:
   enable: true
 
-appeal.address: http://192.168.2.237:8871
+appeal.address: http://192.168.2.32:8871

src/main/resources/application-his.yml

@@ -1,209 +0,0 @@
-server:
-  port: 5858
-  max-http-header-size: 10MB
-  tomcat:
-    uri-encoding: utf-8
-
-hystrix:
-  threadpool:
-    default:
-      coreSize: 200 #并发执行的最大线程数，默认10
-      maxQueueSize: 200 #BlockingQueue的最大队列数
-      queueSizeRejectionThreshold: 50 #即使maxQueueSize没有达到，达到queueSizeRejectionThreshold该值后，请求也会被拒绝
-  command:
-    QcServiceClient#extract(QueryVo).execution.isolation.thread.timeoutInMilliseconds: 3600000
-    default:
-      execution:
-        timeout:
-          enabled: true
-        isolation:
-          strategy: SEMAPHORE
-          semaphore:
-            maxConcurrentRequests: 2000
-          thread:
-            timeoutInMilliseconds: 20000
-
-ribbon:
-  ReadTimeout: 20000
-  ConnectTimeout: 20000
-  MaxAutoRetries: 0
-  MaxAutoRetriesNextServer: 1
-
-feign:
-  hystrix:
-    enabled: true
-  #开启Feign请求压缩
-  compression:
-    response:
-      enabled: true
-  httpclient:
-    enabled: false
-  okhttp:
-    enabled: true
-    max-connections: 1000 # 默认值
-    max-connections-per-route: 250 # 默认值
-
-management:
-  endpoints:
-    web:
-      exposure:
-        include: bus-refresh,health,info,hystrix.stream
-      cors:
-        allowed-origins: "*"
-        allowed-methods: "*"
-  endpoint:
-    health:
-      show-details: always
-
-# 驱动配置信息
-spring:
-  application:
-    name: gateway-service
-  datasource:
-    dynamic:
-      primary: master
-      druid:
-        # 连接池的配置信息
-        # 初始化大小，最小，最大
-        initialSize: 5
-        minIdle: 5
-        maxActive: 20
-        # 配置获取连接等待超时的时间
-        maxWait: 60000
-        # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
-        timeBetweenEvictionRunsMillis: 60000
-        # 配置一个连接在池中最小生存的时间，单位是毫秒
-        minEvictableIdleTimeMillis: 300000
-        validationQuery: SELECT 1 FROM DUAL
-        testWhileIdle: true
-        testOnBorrow: false
-        testOnReturn: false
-        # 打开PSCache，并且指定每个连接上PSCache的大小
-        poolPreparedStatements: true
-        maxPoolPreparedStatementPerConnectionSize: 20
-        # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-        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
-          url-pattern: /*
-          exclusions: '*.js,*.gif,*.jpg,*.bmp,*.png,*.css,*.ico,/druid/*'
-
-        # StatViewServlet配置，说明请参考Druid Wiki，配置_StatViewServlet配置
-        stat-view-servlet:
-          enabled: true
-          url-pattern: /druid/*
-          reset-enable: false
-          login-username: root
-          login-password: root
-      datasource:
-        master:
-          driver-class-name: com.mysql.cj.jdbc.Driver
-          platform: mysql
-          url: jdbc:mysql://192.168.2.126:3307/qc?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
-          username: root
-          password: Lat0ne@tesT
-          druid:
-            initial-size: 5
-        slave:
-          driver-class-name: com.mysql.cj.jdbc.Driver
-          platform: mysql
-          url: jdbc:mysql://192.168.2.126:3307/xy_st?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
-          username: root
-          password: Lat0ne@tesT
-          druid:
-            initial-size: 5
-  jackson:
-    date-format: yyyy-MM-dd HH:mm:ss
-    time-zone: GMT+8
-
-  #redis
-  redis:
-    database:
-      cache: 8 # cache索引
-      token: 8 # Token索引
-    host: 192.168.2.237  #Redis服务器地址
-    port: 63791 # Redis服务器连接端口(本地环境端口6378，其他环境端口是6379)
-    password: emrais # Redis服务器连接密码（默认为空）
-    lettuce:
-      pool:
-        max-active: 8 # 连接池最大连接数（使用负值表示没有限制）
-        max-idle: 5 # 连接池中的最大空闲连接
-        max-wait: -1 # 连接池最大阻塞等待时间（使用负值表示没有限制）
-        min-idle: 0 # 连接池中的最小空闲连接
-    timeout: 20000 # 连接超时时间（毫秒）
-
-  servlet:
-    multipart:
-      max-request-size: 2048MB
-  http:
-    encoding:
-      charset: utf-8
-      force: true
-      enabled: true
-
-#mybatis
-mybatis-plus:
-  mapper-locations: classpath:/mapper/*Mapper.xml,classpath:/mapper/his/*Mapper.xml
-  #实体扫描，多个package用逗号或者分号分隔
-  typeAliasesPackage: com.diagbot.entity
-  global-config:
-    #刷新mapper 调试神器
-    db-config:
-      #主键类型  0:"数据库ID自增", 1:"用户输入ID",2:"全局唯一ID (数字类型唯一ID)", 3:"全局唯一ID UUID";
-      id-type: id_worker
-      #字段策略 0:"忽略判断",1:"非 NULL 判断"),2:"非空判断"
-      field-strategy: not_empty
-      #驼峰下划线转换
-      column-underline: true
-      #数据库大写下划线转换
-      #capital-mode: true
-      #刷新mapper 调试神器
-      refresh-mapper: true
-      #逻辑删除配置
-      logic-delete-value: 0
-      logic-not-delete-value: 1
-      #自定义填充策略接口实现
-      #meta-object-handler: com.baomidou.springboot.xxx
-      #自定义SQL注入器
-      #sql-injector: com.baomidou.springboot.xxx
-  configuration:
-    map-underscore-to-camel-case: true
-    cache-enabled: false
-
-io.github.lvyahui8.spring:
-  base-packages: com.diagbot.aggregate
-  thread-number: 12
-
-myhost: localhost
-oath.self.address: http://${myhost}:${server.port}
-
-# 加解密开关
-encrypt:
-  enable: false
-
-swagger:
-  enable: true
-
-#xml解析成结构化开关
-xml_analyse:
-  enable: false
-
-#函数初始化modeId开关
-initmodeid:
-  enable: false
-
-#对接过程中是否记录正常流程的日志
-log_switch:
-  enable: false
-
-mrqcLog:
-  enable: false
-
-appeal.address: http://132.147.253.31:8871

src/main/resources/application-local.yml

@@ -1,200 +0,0 @@
-server:
-  port: 5858
-  max-http-header-size: 10MB
-
-hystrix:
-  threadpool:
-    default:
-      coreSize: 200 #并发执行的最大线程数，默认10
-      maxQueueSize: 200 #BlockingQueue的最大队列数
-      queueSizeRejectionThreshold: 50 #即使maxQueueSize没有达到，达到queueSizeRejectionThreshold该值后，请求也会被拒绝
-  command:
-    QcServiceClient#extract(QueryVo).execution.isolation.thread.timeoutInMilliseconds: 3600000
-    default:
-      execution:
-        timeout:
-          enabled: true
-        isolation:
-          strategy: SEMAPHORE
-          semaphore:
-            maxConcurrentRequests: 2000
-          thread:
-            timeoutInMilliseconds: 20000
-
-ribbon:
-  ReadTimeout: 20000
-  ConnectTimeout: 20000
-  MaxAutoRetries: 0
-  MaxAutoRetriesNextServer: 1
-
-feign:
-  hystrix:
-    enabled: true
-  #开启Feign请求压缩
-  compression:
-    response:
-      enabled: true
-  httpclient:
-    enabled: false
-  okhttp:
-    enabled: true
-    max-connections: 1000 # 默认值
-    max-connections-per-route: 250 # 默认值
-
-management:
-  endpoints:
-    web:
-      exposure:
-        include: bus-refresh,health,info,hystrix.stream
-      cors:
-        allowed-origins: "*"
-        allowed-methods: "*"
-  endpoint:
-    health:
-      show-details: always
-
-# 驱动配置信息
-spring:
-  application:
-    name: gateway-service
-  datasource:
-    dynamic:
-      primary: master
-      druid:
-        # 连接池的配置信息
-        # 初始化大小，最小，最大
-        initialSize: 5
-        minIdle: 5
-        maxActive: 20
-        # 配置获取连接等待超时的时间
-        maxWait: 60000
-        # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
-        timeBetweenEvictionRunsMillis: 60000
-        # 配置一个连接在池中最小生存的时间，单位是毫秒
-        minEvictableIdleTimeMillis: 300000
-        validationQuery: SELECT 1 FROM DUAL
-        testWhileIdle: true
-        testOnBorrow: false
-        testOnReturn: false
-        # 打开PSCache，并且指定每个连接上PSCache的大小
-        poolPreparedStatements: true
-        maxPoolPreparedStatementPerConnectionSize: 20
-        # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-        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
-          url-pattern: /*
-          exclusions: '*.js,*.gif,*.jpg,*.bmp,*.png,*.css,*.ico,/druid/*'
-
-        # StatViewServlet配置，说明请参考Druid Wiki，配置_StatViewServlet配置
-        stat-view-servlet:
-          enabled: true
-          url-pattern: /druid/*
-          reset-enable: false
-          login-username: root
-          login-password: root
-      datasource:
-        master:
-          driver-class-name: com.mysql.cj.jdbc.Driver
-          platform: mysql
-          url: jdbc:mysql://192.168.2.31:3306/qc?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
-          username: root
-          password: dsYun8!@#
-          druid:
-            initial-size: 5
-        slave:
-          driver-class-name: com.mysql.cj.jdbc.Driver
-          platform: mysql
-          url: jdbc:mysql://192.168.2.31:3306/qc?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
-          username: root
-          password: dsYun8!@#
-          druid:
-            initial-size: 5
-
-  jackson:
-    date-format: yyyy-MM-dd HH:mm:ss
-    time-zone: GMT+8
-
-  #redis
-  redis:
-    database:
-      cache: 8 # cache索引
-      token: 8 # Token索引
-    host: 192.168.2.31  #Redis服务器地址
-    port: 6379 # Redis服务器连接端口(本地环境端口6378，其他环境端口是6379)
-    password:  # Redis服务器连接密码（默认为空）
-    lettuce:
-      pool:
-        max-active: 8 # 连接池最大连接数（使用负值表示没有限制）
-        max-idle: 5 # 连接池中的最大空闲连接
-        max-wait: -1 # 连接池最大阻塞等待时间（使用负值表示没有限制）
-        min-idle: 0 # 连接池中的最小空闲连接
-    timeout: 20000 # 连接超时时间（毫秒）
-
-  servlet:
-    multipart:
-      max-request-size: 2048MB
-
-#mybatis
-mybatis-plus:
-  mapper-locations: classpath:/mapper/*Mapper.xml
-  #实体扫描，多个package用逗号或者分号分隔
-  typeAliasesPackage: com.diagbot.entity
-  global-config:
-    #刷新mapper 调试神器
-    db-config:
-      #主键类型  0:"数据库ID自增", 1:"用户输入ID",2:"全局唯一ID (数字类型唯一ID)", 3:"全局唯一ID UUID";
-      id-type: id_worker
-      #字段策略 0:"忽略判断",1:"非 NULL 判断"),2:"非空判断"
-      field-strategy: not_empty
-      #驼峰下划线转换
-      column-underline: true
-      #数据库大写下划线转换
-      #capital-mode: true
-      #刷新mapper 调试神器
-      refresh-mapper: true
-      #逻辑删除配置
-      logic-delete-value: 0
-      logic-not-delete-value: 1
-      #自定义填充策略接口实现
-      #meta-object-handler: com.baomidou.springboot.xxx
-      #自定义SQL注入器
-      #sql-injector: com.baomidou.springboot.xxx
-  configuration:
-    map-underscore-to-camel-case: true
-    cache-enabled: false
-
-io.github.lvyahui8.spring:
-  base-packages: com.diagbot.aggregate
-  thread-number: 12
-
-myhost: localhost
-oath.self.address: http://${myhost}:${server.port}
-
-# 加解密开关
-encrypt:
-  enable: true
-
-swagger:
-  enable: true
-
-#xml解析成结构化开关
-xml_analyse:
-  enable: false
-
-#函数初始化modeId开关
-initmodeid:
-  enable: false
-
-#对接过程中是否记录正常流程的日志
-log_switch:
-  enable: true
-
-appeal.address: http://192.168.2.32:8871

src/main/resources/application-pre.yml

@@ -1,199 +0,0 @@
-server:
-  port: 5858
-  max-http-header-size: 10MB
-
-hystrix:
-  threadpool:
-    default:
-      coreSize: 200 #并发执行的最大线程数，默认10
-      maxQueueSize: 200 #BlockingQueue的最大队列数
-      queueSizeRejectionThreshold: 50 #即使maxQueueSize没有达到，达到queueSizeRejectionThreshold该值后，请求也会被拒绝
-  command:
-    QcServiceClient#extract(QueryVo).execution.isolation.thread.timeoutInMilliseconds: 3600000
-    default:
-      execution:
-        timeout:
-          enabled: true
-        isolation:
-          strategy: SEMAPHORE
-          semaphore:
-            maxConcurrentRequests: 2000
-          thread:
-            timeoutInMilliseconds: 20000
-
-ribbon:
-  ReadTimeout: 20000
-  ConnectTimeout: 20000
-  MaxAutoRetries: 0
-  MaxAutoRetriesNextServer: 1
-
-feign:
-  hystrix:
-    enabled: true
-  #开启Feign请求压缩
-  compression:
-    response:
-      enabled: true
-  httpclient:
-    enabled: false
-  okhttp:
-    enabled: true
-    max-connections: 1000 # 默认值
-    max-connections-per-route: 250 # 默认值
-
-management:
-  endpoints:
-    web:
-      exposure:
-        include: bus-refresh,health,info,hystrix.stream
-      cors:
-        allowed-origins: "*"
-        allowed-methods: "*"
-  endpoint:
-    health:
-      show-details: always
-
-# 驱动配置信息
-spring:
-  application:
-    name: gateway-service
-  datasource:
-    dynamic:
-      primary: master
-      druid:
-        # 连接池的配置信息
-        # 初始化大小，最小，最大
-        initialSize: 5
-        minIdle: 5
-        maxActive: 20
-        # 配置获取连接等待超时的时间
-        maxWait: 60000
-        # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
-        timeBetweenEvictionRunsMillis: 60000
-        # 配置一个连接在池中最小生存的时间，单位是毫秒
-        minEvictableIdleTimeMillis: 300000
-        validationQuery: SELECT 1 FROM DUAL
-        testWhileIdle: true
-        testOnBorrow: false
-        testOnReturn: false
-        # 打开PSCache，并且指定每个连接上PSCache的大小
-        poolPreparedStatements: true
-        maxPoolPreparedStatementPerConnectionSize: 20
-        # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-        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
-          url-pattern: /*
-          exclusions: '*.js,*.gif,*.jpg,*.bmp,*.png,*.css,*.ico,/druid/*'
-
-        # StatViewServlet配置，说明请参考Druid Wiki，配置_StatViewServlet配置
-        stat-view-servlet:
-          enabled: true
-          url-pattern: /druid/*
-          reset-enable: false
-          login-username: root
-          login-password: root
-      datasource:
-        master:
-          driver-class-name: com.mysql.cj.jdbc.Driver
-          platform: mysql
-          url: jdbc:mysql://192.168.2.125:3307/qc?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
-          username: root
-          password: LangT0ng@lt
-          druid:
-            initial-size: 5
-        slave:
-          driver-class-name: com.mysql.cj.jdbc.Driver
-          platform: mysql
-          url: jdbc:mysql://192.168.2.126:3307/xy_st?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
-          username: root
-          password: Lat0ne@tesT
-          druid:
-            initial-size: 5
-  jackson:
-    date-format: yyyy-MM-dd HH:mm:ss
-    time-zone: GMT+8
-
-  #redis
-  redis:
-    database:
-      cache: 8 # cache索引
-      token: 8 # Token索引
-    host: 192.168.2.125  #Redis服务器地址
-    port: 6379 # Redis服务器连接端口(本地环境端口6378，其他环境端口是6379)
-    password: lantone # Redis服务器连接密码（默认为空）
-    lettuce:
-      pool:
-        max-active: 8 # 连接池最大连接数（使用负值表示没有限制）
-        max-idle: 5 # 连接池中的最大空闲连接
-        max-wait: -1 # 连接池最大阻塞等待时间（使用负值表示没有限制）
-        min-idle: 0 # 连接池中的最小空闲连接
-    timeout: 20000 # 连接超时时间（毫秒）
-
-  servlet:
-    multipart:
-      max-request-size: 2048MB
-
-#mybatis
-mybatis-plus:
-  mapper-locations: classpath:/mapper/*Mapper.xml
-  #实体扫描，多个package用逗号或者分号分隔
-  typeAliasesPackage: com.diagbot.entity
-  global-config:
-    #刷新mapper 调试神器
-    db-config:
-      #主键类型  0:"数据库ID自增", 1:"用户输入ID",2:"全局唯一ID (数字类型唯一ID)", 3:"全局唯一ID UUID";
-      id-type: id_worker
-      #字段策略 0:"忽略判断",1:"非 NULL 判断"),2:"非空判断"
-      field-strategy: not_empty
-      #驼峰下划线转换
-      column-underline: true
-      #数据库大写下划线转换
-      #capital-mode: true
-      #刷新mapper 调试神器
-      refresh-mapper: true
-      #逻辑删除配置
-      logic-delete-value: 0
-      logic-not-delete-value: 1
-      #自定义填充策略接口实现
-      #meta-object-handler: com.baomidou.springboot.xxx
-      #自定义SQL注入器
-      #sql-injector: com.baomidou.springboot.xxx
-  configuration:
-    map-underscore-to-camel-case: true
-    cache-enabled: false
-
-io.github.lvyahui8.spring:
-  base-packages: com.diagbot.aggregate
-  thread-number: 12
-
-myhost: localhost
-oath.self.address: http://${myhost}:${server.port}
-
-# 加解密开关
-encrypt:
-  enable: true
-
-swagger:
-  enable: true
-
-#xml解析成结构化开关
-xml_analyse:
-  enable: false
-
-#函数初始化modeId开关
-initmodeid:
-  enable: false
-
-#对接过程中是否记录正常流程的日志
-log_switch:
-  enable: true
-
-appeal.address: http://192.168.2.125:8871

src/main/resources/application-pro.yml

@@ -1,200 +0,0 @@
-server:
-  port: 5858
-  max-http-header-size: 10MB
-
-hystrix:
-  threadpool:
-    default:
-      coreSize: 200 #并发执行的最大线程数，默认10
-      maxQueueSize: 200 #BlockingQueue的最大队列数
-      queueSizeRejectionThreshold: 50 #即使maxQueueSize没有达到，达到queueSizeRejectionThreshold该值后，请求也会被拒绝
-  command:
-    QcServiceClient#extract(QueryVo).execution.isolation.thread.timeoutInMilliseconds: 3600000
-    default:
-      execution:
-        timeout:
-          enabled: true
-        isolation:
-          strategy: SEMAPHORE
-          semaphore:
-            maxConcurrentRequests: 2000
-          thread:
-            timeoutInMilliseconds: 20000
-
-ribbon:
-  ReadTimeout: 20000
-  ConnectTimeout: 20000
-  MaxAutoRetries: 0
-  MaxAutoRetriesNextServer: 1
-
-feign:
-  hystrix:
-    enabled: true
-  #开启Feign请求压缩
-  compression:
-    response:
-      enabled: true
-  httpclient:
-    enabled: false
-  okhttp:
-    enabled: true
-    max-connections: 1000 # 默认值
-    max-connections-per-route: 250 # 默认值
-
-management:
-  endpoints:
-    web:
-      exposure:
-        include: bus-refresh,health,info,hystrix.stream
-      cors:
-        allowed-origins: "*"
-        allowed-methods: "*"
-  endpoint:
-    health:
-      show-details: always
-
-# 驱动配置信息
-spring:
-  application:
-    name: gateway-service
-  datasource:
-    dynamic:
-      primary: master
-      druid:
-        # 连接池的配置信息
-        # 初始化大小，最小，最大
-        initialSize: 5
-        minIdle: 5
-        maxActive: 20
-        # 配置获取连接等待超时的时间
-        maxWait: 60000
-        # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
-        timeBetweenEvictionRunsMillis: 60000
-        # 配置一个连接在池中最小生存的时间，单位是毫秒
-        minEvictableIdleTimeMillis: 300000
-        validationQuery: SELECT 1 FROM DUAL
-        testWhileIdle: true
-        testOnBorrow: false
-        testOnReturn: false
-        # 打开PSCache，并且指定每个连接上PSCache的大小
-        poolPreparedStatements: true
-        maxPoolPreparedStatementPerConnectionSize: 20
-        # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-        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
-          url-pattern: /*
-          exclusions: '*.js,*.gif,*.jpg,*.bmp,*.png,*.css,*.ico,/druid/*'
-
-        # StatViewServlet配置，说明请参考Druid Wiki，配置_StatViewServlet配置
-        stat-view-servlet:
-          enabled: true
-          url-pattern: /druid/*
-          reset-enable: false
-          login-username: root
-          login-password: root
-      datasource:
-        master:
-          driver-class-name: com.mysql.cj.jdbc.Driver
-          platform: mysql
-          url: jdbc:mysql://192.168.2.129:3307/qc?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
-          username: root
-          password: LangT0ng@122lt
-          druid:
-            initial-size: 5
-        slave:
-          driver-class-name: com.mysql.cj.jdbc.Driver
-          platform: mysql
-          url: jdbc:mysql://192.168.2.126:3307/xy_st?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
-          username: root
-          password: Lat0ne@tesT
-          druid:
-            initial-size: 5
-
-  jackson:
-    date-format: yyyy-MM-dd HH:mm:ss
-    time-zone: GMT+8
-
-  #redis
-  redis:
-    database:
-      cache: 8 # cache索引
-      token: 8 # Token索引
-    host: 192.168.2.129  #Redis服务器地址
-    port: 6379 # Redis服务器连接端口(本地环境端口6378，其他环境端口是6379)
-    password: lantone # Redis服务器连接密码（默认为空）
-    lettuce:
-      pool:
-        max-active: 8 # 连接池最大连接数（使用负值表示没有限制）
-        max-idle: 5 # 连接池中的最大空闲连接
-        max-wait: -1 # 连接池最大阻塞等待时间（使用负值表示没有限制）
-        min-idle: 0 # 连接池中的最小空闲连接
-    timeout: 20000 # 连接超时时间（毫秒）
-
-  servlet:
-    multipart:
-      max-request-size: 2048MB
-
-#mybatis
-mybatis-plus:
-  mapper-locations: classpath:/mapper/*Mapper.xml
-  #实体扫描，多个package用逗号或者分号分隔
-  typeAliasesPackage: com.diagbot.entity
-  global-config:
-    #刷新mapper 调试神器
-    db-config:
-      #主键类型  0:"数据库ID自增", 1:"用户输入ID",2:"全局唯一ID (数字类型唯一ID)", 3:"全局唯一ID UUID";
-      id-type: id_worker
-      #字段策略 0:"忽略判断",1:"非 NULL 判断"),2:"非空判断"
-      field-strategy: not_empty
-      #驼峰下划线转换
-      column-underline: true
-      #数据库大写下划线转换
-      #capital-mode: true
-      #刷新mapper 调试神器
-      refresh-mapper: true
-      #逻辑删除配置
-      logic-delete-value: 0
-      logic-not-delete-value: 1
-      #自定义填充策略接口实现
-      #meta-object-handler: com.baomidou.springboot.xxx
-      #自定义SQL注入器
-      #sql-injector: com.baomidou.springboot.xxx
-  configuration:
-    map-underscore-to-camel-case: true
-    cache-enabled: false
-
-io.github.lvyahui8.spring:
-  base-packages: com.diagbot.aggregate
-  thread-number: 12
-
-myhost: localhost
-oath.self.address: http://${myhost}:${server.port}
-
-# 加解密开关
-encrypt:
-  enable: false
-
-swagger:
-  enable: true
-
-#xml解析成结构化开关
-xml_analyse:
-  enable: false
-
-#函数初始化modeId开关
-initmodeid:
-  enable: false
-
-#对接过程中是否记录正常流程的日志
-log_switch:
-  enable: true
-
-appeal.address: http://192.168.2.129:8871

src/main/resources/application-test.yml

@@ -1,200 +0,0 @@
-server:
-  port: 5858
-  max-http-header-size: 10MB
-
-hystrix:
-  threadpool:
-    default:
-      coreSize: 200 #并发执行的最大线程数，默认10
-      maxQueueSize: 200 #BlockingQueue的最大队列数
-      queueSizeRejectionThreshold: 50 #即使maxQueueSize没有达到，达到queueSizeRejectionThreshold该值后，请求也会被拒绝
-  command:
-    QcServiceClient#extract(QueryVo).execution.isolation.thread.timeoutInMilliseconds: 3600000
-    default:
-      execution:
-        timeout:
-          enabled: true
-        isolation:
-          strategy: SEMAPHORE
-          semaphore:
-            maxConcurrentRequests: 2000
-          thread:
-            timeoutInMilliseconds: 20000
-
-ribbon:
-  ReadTimeout: 20000
-  ConnectTimeout: 20000
-  MaxAutoRetries: 0
-  MaxAutoRetriesNextServer: 1
-
-feign:
-  hystrix:
-    enabled: true
-  #开启Feign请求压缩
-  compression:
-    response:
-      enabled: true
-  httpclient:
-    enabled: false
-  okhttp:
-    enabled: true
-    max-connections: 1000 # 默认值
-    max-connections-per-route: 250 # 默认值
-
-management:
-  endpoints:
-    web:
-      exposure:
-        include: bus-refresh,health,info,hystrix.stream
-      cors:
-        allowed-origins: "*"
-        allowed-methods: "*"
-  endpoint:
-    health:
-      show-details: always
-
-# 驱动配置信息
-spring:
-  application:
-    name: gateway-service
-  datasource:
-    dynamic:
-      primary: master
-      druid:
-        # 连接池的配置信息
-        # 初始化大小，最小，最大
-        initialSize: 5
-        minIdle: 5
-        maxActive: 20
-        # 配置获取连接等待超时的时间
-        maxWait: 60000
-        # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
-        timeBetweenEvictionRunsMillis: 60000
-        # 配置一个连接在池中最小生存的时间，单位是毫秒
-        minEvictableIdleTimeMillis: 300000
-        validationQuery: SELECT 1 FROM DUAL
-        testWhileIdle: true
-        testOnBorrow: false
-        testOnReturn: false
-        # 打开PSCache，并且指定每个连接上PSCache的大小
-        poolPreparedStatements: true
-        maxPoolPreparedStatementPerConnectionSize: 20
-        # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-        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
-          url-pattern: /*
-          exclusions: '*.js,*.gif,*.jpg,*.bmp,*.png,*.css,*.ico,/druid/*'
-
-        # StatViewServlet配置，说明请参考Druid Wiki，配置_StatViewServlet配置
-        stat-view-servlet:
-          enabled: true
-          url-pattern: /druid/*
-          reset-enable: false
-          login-username: root
-          login-password: root
-      datasource:
-        master:
-          driver-class-name: com.mysql.cj.jdbc.Driver
-          platform: mysql
-          url: jdbc:mysql://192.168.2.126:3307/qc?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
-          username: root
-          password: Lat0ne@tesT
-          druid:
-            initial-size: 5
-        slave:
-          driver-class-name: com.mysql.cj.jdbc.Driver
-          platform: mysql
-          url: jdbc:mysql://192.168.2.126:3307/xy_st?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
-          username: root
-          password: Lat0ne@tesT
-          druid:
-            initial-size: 5
-
-  jackson:
-    date-format: yyyy-MM-dd HH:mm:ss
-    time-zone: GMT+8
-
-  #redis
-  redis:
-    database:
-      cache: 8 # cache索引
-      token: 8 # Token索引
-    host: 192.168.2.126  #Redis服务器地址
-    port: 6379 # Redis服务器连接端口(本地环境端口6378，其他环境端口是6379)
-    password: lantone # Redis服务器连接密码（默认为空）
-    lettuce:
-      pool:
-        max-active: 8 # 连接池最大连接数（使用负值表示没有限制）
-        max-idle: 5 # 连接池中的最大空闲连接
-        max-wait: -1 # 连接池最大阻塞等待时间（使用负值表示没有限制）
-        min-idle: 0 # 连接池中的最小空闲连接
-    timeout: 20000 # 连接超时时间（毫秒）
-
-  servlet:
-    multipart:
-      max-request-size: 2048MB
-
-#mybatis
-mybatis-plus:
-  mapper-locations: classpath:/mapper/*Mapper.xml
-  #实体扫描，多个package用逗号或者分号分隔
-  typeAliasesPackage: com.diagbot.entity
-  global-config:
-    #刷新mapper 调试神器
-    db-config:
-      #主键类型  0:"数据库ID自增", 1:"用户输入ID",2:"全局唯一ID (数字类型唯一ID)", 3:"全局唯一ID UUID";
-      id-type: id_worker
-      #字段策略 0:"忽略判断",1:"非 NULL 判断"),2:"非空判断"
-      field-strategy: not_empty
-      #驼峰下划线转换
-      column-underline: true
-      #数据库大写下划线转换
-      #capital-mode: true
-      #刷新mapper 调试神器
-      refresh-mapper: true
-      #逻辑删除配置
-      logic-delete-value: 0
-      logic-not-delete-value: 1
-      #自定义填充策略接口实现
-      #meta-object-handler: com.baomidou.springboot.xxx
-      #自定义SQL注入器
-      #sql-injector: com.baomidou.springboot.xxx
-  configuration:
-    map-underscore-to-camel-case: true
-    cache-enabled: false
-
-io.github.lvyahui8.spring:
-  base-packages: com.diagbot.aggregate
-  thread-number: 12
-
-myhost: localhost
-oath.self.address: http://${myhost}:${server.port}
-
-# 加解密开关
-encrypt:
-  enable: false
-
-swagger:
-  enable: true
-
-#xml解析成结构化开关
-xml_analyse:
-  enable: false
-
-#函数初始化modeId开关
-initmodeid:
-  enable: false
-
-#对接过程中是否记录正常流程的日志
-log_switch:
-  enable: true
-
-appeal.address: http://192.168.2.237:8871

src/main/resources/bootstrap.yml

@@ -2,7 +2,7 @@ spring:
   application:
     name: mrqc-sys
   profiles:
-    active: local
+    active: dev
   main:
     allow-bean-definition-overriding: true
 

src/main/resources/logback-spring.xml

@@ -1,28 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
-    <!-- 项目名称 -->
     <property name="APPDIR" value="mrqc-sys"/>
-    <!--定义日志文件的存储地址 勿在 LogBack 的配置中使用相对路径-->
-    <property name="LOG_PATH" value="../logs"/>
+    <property name="LOG_PATH" value="logs"/>
 
-    <!-- 彩色日志 -->
-    <!-- 彩色日志依赖的渲染类 -->
-    <conversionRule conversionWord="clr"
-                    converterClass="org.springframework.boot.logging.logback.ColorConverter"/>
-    <conversionRule conversionWord="wex"
-                    converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter"/>
-    <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(-&#45;&#45;){faint} %clr([%15.15t]){faint} %clr(%logger){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>-->
+    <conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter"/>
+    <conversionRule conversionWord="wex" converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter"/>
+    <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(%-40.40logger{39}){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}}"/>
 
-    <!--  日志记录器，日期滚动记录
-            ERROR 级别
-     -->
     <appender name="ERROR" class="ch.qos.logback.core.rolling.RollingFileAppender">
         <!-- 正在记录的日志文件的路径及文件名 -->
         <file>${LOG_PATH}/${APPDIR}/${APPDIR}_error.log</file>
@@ -58,10 +44,6 @@
         </filter>
     </appender>
 
-
-    <!-- 日志记录器，日期滚动记录
-            WARN  级别
-     -->
     <appender name="WARN" class="ch.qos.logback.core.rolling.RollingFileAppender">
         <!-- 正在记录的日志文件的路径及文件名 -->
         <file>${LOG_PATH}/${APPDIR}/${APPDIR}_warn.log</file>
@@ -97,10 +79,6 @@
         </filter>
     </appender>
 
-
-    <!-- 日志记录器，日期滚动记录
-            INFO  级别
-    -->
     <appender name="INFO" class="ch.qos.logback.core.rolling.RollingFileAppender">
         <!-- 正在记录的日志文件的路径及文件名 -->
         <file>${LOG_PATH}/${APPDIR}/${APPDIR}_info.log</file>
@@ -136,10 +114,6 @@
         </filter>
     </appender>
 
-
-    <!-- 日志记录器，日期滚动记录
-            DEBUG  级别
-    -->
     <appender name="DEBUG" class="ch.qos.logback.core.rolling.RollingFileAppender">
         <!-- 正在记录的日志文件的路径及文件名 -->
         <file>${LOG_PATH}/${APPDIR}/${APPDIR}_debug.log</file>
@@ -175,7 +149,6 @@
         </filter>
     </appender>
 
-    <!-- ConsoleAppender 控制台输出日志 -->
     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
         <!--encoder 默认配置为PatternLayoutEncoder-->
         <encoder>
@@ -189,74 +162,11 @@
         </filter>
     </appender>
 
-
-    <!--&lt;!&ndash;输出到mysql数据库的appender配置     &ndash;&gt;-->
-    <!--<appender name="db" class="ch.qos.logback.classic.db.DBAppender">-->
-    <!--<connectionSource-->
-    <!--class="ch.qos.logback.core.db.DriverManagerConnectionSource">-->
-    <!--<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>-->
-    <!--</connectionSource>-->
-    <!--</appender>-->
-
-    <!-- FrameworkServlet日志-->
     <logger name="org.springframework" level="WARN"/>
-
-    <!-- mybatis日志打印-->
     <logger name="org.apache.ibatis" level="DEBUG"/>
     <logger name="java.sql" level="DEBUG"/>
-
-    <!--  项目 mapper 路径
-            console控制台显示sql语句：STDOUT.filter.level -> debug级别
-    -->
     <logger name="com.diagbot.mapper" level="DEBUG"/>
 
-    <appender name="LOGSTASHDEV" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
-        <destination>192.168.2.236:5044</destination>
-        <!-- encoder必须配置,有多种可选 -->
-        <encoder charset="UTF-8" class="net.logstash.logback.encoder.LogstashEncoder">
-            <customFields>{"appname":"mrqc-sys"}</customFields>
-        </encoder>
-    </appender>
-
-    <appender name="LOGSTASHTEST" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
-        <destination>192.168.2.241:5044</destination>
-        <!-- encoder必须配置,有多种可选 -->
-        <encoder charset="UTF-8" class="net.logstash.logback.encoder.LogstashEncoder">
-            <customFields>{"appname":"mrqc-sys"}</customFields>
-        </encoder>
-    </appender>
-
-    <appender name="LOGSTASHPRE" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
-        <destination>192.168.2.121:5044</destination>
-        <!-- encoder必须配置,有多种可选 -->
-        <encoder charset="UTF-8" class="net.logstash.logback.encoder.LogstashEncoder">
-            <customFields>{"appname":"mrqc-sys"}</customFields>
-        </encoder>
-    </appender>
-
-    <appender name="LOGSTASHPRO" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
-        <destination>192.168.2.122:5044</destination>
-        <!-- encoder必须配置,有多种可选 -->
-        <encoder charset="UTF-8" class="net.logstash.logback.encoder.LogstashEncoder">
-            <customFields>{"appname":"mrqc-sys"}</customFields>
-        </encoder>
-    </appender>
-
-    <!-- 本地环境下的日志配置 -->
-    <springProfile name="local">
-        <root level="INFO">
-            <appender-ref ref="ERROR"/>
-            <appender-ref ref="WARN"/>
-            <appender-ref ref="INFO"/>
-            <appender-ref ref="DEBUG"/>
-            <appender-ref ref="STDOUT"/>
-        </root>
-    </springProfile>
-
-    <!-- 开发环境下的日志配置 -->
     <springProfile name="dev">
         <root level="INFO">
             <appender-ref ref="ERROR"/>
@@ -264,55 +174,7 @@
             <appender-ref ref="INFO"/>
             <appender-ref ref="DEBUG"/>
             <appender-ref ref="STDOUT"/>
-            <appender-ref ref="LOGSTASHDEV"/>
         </root>
     </springProfile>
 
-    <!-- 测试环境下的日志配置 -->
-    <springProfile name="test">
-        <root level="INFO">
-            <appender-ref ref="ERROR"/>
-            <appender-ref ref="WARN"/>
-            <appender-ref ref="INFO"/>
-            <appender-ref ref="DEBUG"/>
-            <appender-ref ref="STDOUT"/>
-            <appender-ref ref="LOGSTASHTEST"/>
-        </root>
-    </springProfile>
-
-    <!-- 预发布环境下的日志配置 -->
-    <springProfile name="pre">
-        <root level="INFO">
-            <appender-ref ref="ERROR"/>
-            <appender-ref ref="WARN"/>
-            <appender-ref ref="INFO"/>
-            <appender-ref ref="DEBUG"/>
-            <appender-ref ref="STDOUT"/>
-            <appender-ref ref="LOGSTASHPRE"/>
-        </root>
-    </springProfile>
-
-    <!-- 生产环境下的日志配置 -->
-    <springProfile name="pro">
-        <root level="INFO">
-            <appender-ref ref="ERROR"/>
-            <appender-ref ref="WARN"/>
-            <appender-ref ref="INFO"/>
-            <appender-ref ref="DEBUG"/>
-            <appender-ref ref="STDOUT"/>
-            <appender-ref ref="LOGSTASHPRO"/>
-        </root>
-    </springProfile>
-
-    <!-- 生产环境下的日志配置 -->
-    <springProfile name="his">
-        <root level="INFO">
-            <appender-ref ref="ERROR"/>
-            <appender-ref ref="WARN"/>
-            <appender-ref ref="INFO"/>
-            <appender-ref ref="DEBUG"/>
-            <appender-ref ref="STDOUT"/>
-            <appender-ref ref="LOGSTASHPRO"/>
-        </root>
-    </springProfile>
 </configuration>

src/test/java/com/diagbot/CodeGeneration.java

@@ -1,83 +0,0 @@
-package com.diagbot;
-
-import com.baomidou.mybatisplus.annotation.DbType;
-import com.baomidou.mybatisplus.generator.AutoGenerator;
-import com.baomidou.mybatisplus.generator.config.DataSourceConfig;
-import com.baomidou.mybatisplus.generator.config.GlobalConfig;
-import com.baomidou.mybatisplus.generator.config.PackageConfig;
-import com.baomidou.mybatisplus.generator.config.StrategyConfig;
-import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
-import com.baomidou.mybatisplus.generator.engine.FreemarkerTemplateEngine;
-
-/**
- * @Description: 代码生成器
- * @author: gaodm
- * @time: 2018/8/2 10:15
- */
-public class CodeGeneration {
-
-    /**
-     *
-     * @Title: main
-     * @Description: 生成
-     * @param args
-     */
-    public static void main(String[] args) {
-        AutoGenerator mpg = new AutoGenerator();
-
-        // 全局配置
-        GlobalConfig gc = new GlobalConfig();
-        gc.setOutputDir("C://code");
-        gc.setFileOverride(true);
-        gc.setActiveRecord(false);// 不需要ActiveRecord特性的请改为false
-        gc.setEnableCache(false);// XML 二级缓存
-        gc.setBaseResultMap(true);// XML ResultMap
-        gc.setBaseColumnList(false);// XML columList
-        gc.setAuthor("zhanghang");// 作者
-
-        // 自定义文件命名，注意 %s 会自动填充表实体属性！
-        gc.setControllerName("%sController");
-        gc.setServiceName("%sService");
-        gc.setServiceImplName("%sServiceImpl");
-        gc.setMapperName("%sMapper");
-        gc.setXmlName("%sMapper");
-        mpg.setGlobalConfig(gc);
-
-        // 数据源配置
-        DataSourceConfig dsc = new DataSourceConfig();
-        dsc.setDbType(DbType.MYSQL);
-        dsc.setDriverName("com.mysql.cj.jdbc.Driver");
-        dsc.setUsername("root");
-        dsc.setPassword("Lat0ne@tesT");
-        dsc.setUrl("jdbc:mysql://192.168.2.126:3307/xy_st?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf-8");
-        mpg.setDataSource(dsc);
-
-        // 策略配置
-        StrategyConfig strategy = new StrategyConfig();
-//        strategy.setTablePrefix(new String[] { "med_" });// 此处可以修改为您的表前缀
-        strategy.setNaming(NamingStrategy.underline_to_camel);// 表名生成策略
-        strategy.setInclude(new String[] { "DOCTOR_HOS"}); // 需要生成的表
-
-        strategy.setSuperServiceClass(null);
-        strategy.setSuperServiceImplClass(null);
-        strategy.setSuperMapperClass(null);
-
-        mpg.setStrategy(strategy);
-
-        // 包配置
-        PackageConfig pc = new PackageConfig();
-        pc.setParent("com.diagbot");
-        pc.setController("web");
-        pc.setService("service");
-        pc.setServiceImpl("service.impl");
-        pc.setMapper("mapper");
-        pc.setEntity("entity");
-        pc.setXml("resources.mapper");
-        mpg.setPackageInfo(pc);
-
-        // 执行生成
-        mpg.setTemplateEngine(new FreemarkerTemplateEngine());
-        mpg.execute();
-
-    }
-}

src/test/java/com/diagbot/MrqcSysApplicationTests.java

@@ -1,16 +0,0 @@
-package com.diagbot;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
-
-@RunWith(SpringRunner.class)
-@SpringBootTest
-public class MrqcSysApplicationTests {
-
-    @Test
-    public void contextLoads() {
-    }
-
-}