Merge remote-tracking branch 'origin/dev' into dev

src/main/resources/application-pertest.yml

@@ -14,19 +14,12 @@ service:
   soffice: /opt/libreoffice6.2/program/soffice
 spring:
   datasource:
+    type: com.zaxxer.hikari.HikariDataSource
+    url: jdbc:postgresql://121.36.94.193:5432/test_lims_soil
+    username: dbsoil
+    password: ptd434%b!361
     dynamic:
-      health: true
-      datasource:
-        master:
-          username: dbmeter
-          password: sfdWrE39&d!Pt
-          url: jdbc:postgresql://121.36.94.193:5432/test_lims_meter
-          driver-class-name: org.postgresql.Driver
-        slave:
-          username: dbmeter
-          password: sfdWrE39&d!Pt
-          url: jdbc:postgresql://121.36.94.193:5432/test_lims_meter
-          driver-class-name: org.postgresql.Driver
+      enabled: false
   # 注册中心配置
   cloud:
     consul:

src/main/resources/application-pro.yml

@@ -7,26 +7,12 @@ service:
   soffice: /opt/libreoffice6.1/program/soffice
 spring:
   datasource:
+    type: com.zaxxer.hikari.HikariDataSource
+    url: jdbc:postgresql://121.36.94.193:5432/pc_lims_soil
+    username: dbsoil
+    password: ptd435%a!381
     dynamic:
-      health: true
-      datasource:
-        master:
-          username: dbmeter
-          password: ptd895%$!321
-          url: jdbc:postgresql://116.63.140.241:5432/pc_lims_meter
-          driver-class-name: org.postgresql.Driver
-        slave:
-          username: dbmeter
-          password: ptd895%$!321
-          url: jdbc:postgresql://116.63.140.241:5432/pc_lims_meter
-          driver-class-name: org.postgresql.Driver
-    hikari:
-      minimum-idle: 5 #最小连接数量
-      idle-timeout: 180000 #空闲连接存活最大时间
-      maximum-pool-size: 100 #最大连接数，默认是10
-      max-lifetime: 1800000 #在连接池中的最长生命周期
-      connection-timeout: 600000 #超时时间
-      #validation-timeout:     #默认是5秒
+      enabled: false
   # 注册中心配置
   cloud:
     consul:

src/main/resources/application-test.yml

@@ -13,19 +13,12 @@ service:
   soffice: /opt/libreoffice6.1/program/soffice
 spring:
   datasource:
+    type: com.zaxxer.hikari.HikariDataSource
+    url: jdbc:postgresql://121.36.94.193:5432/test_lims_soil
+    username: dbsoil
+    password: ptd434%b!361
     dynamic:
-      health: true
-      datasource:
-        master:
-          username: dblims
-          password: sfdWrE33&d!Pt
-          url: jdbc:postgresql://119.3.109.49:5432/test_lims
-          driver-class-name: org.postgresql.Driver
-        slave:
-          username: dblims
-          password: sfdWrE33&d!Pt
-          url: jdbc:postgresql://119.3.109.49:5432/test_lims
-          driver-class-name: org.postgresql.Driver
+      enabled: false
   # 注册中心配置
   cloud:
     consul:

src/main/resources/application.yml

 server:
-  port: 8015
+  port: 8037
   exception:
     to: 1781849245@qq.com
     subject: Meter 服务异常

src/main/resources/log4j2-pro.xml

@@ -4,7 +4,7 @@
 <Configuration status="off" monitorInterval="600">
     <properties>
         <!--通用变量-->
-        <property name="LOG_HOME">../logs/patzn-service-food</property>
+        <property name="LOG_HOME">../logs/patzn-service-soil</property>
         <property name="ERROR_LOG_FILE_NAME">error</property>
         <property name="INFO_LOG_FILE_NAME">info</property>
         <Property name="PATTERN">[%-5p] %d{yyyy-MM-dd HH:mm:ss,SSS} - (%F:%L) - %m%n</Property>