Merge branch 'master' of https://git.steerinfo.com/JQGT-JLXT/jg_wzjl_api

src/main/resources/application-dev.properties

@@ -73,11 +73,11 @@ openfeign.dil.url= ${DIL_URL:192.168.107.61:8000}
 #multiple.datasource.master.password=Lims123789
 
 multiple.datasource.master.driver-class-name=oracle.jdbc.driver.OracleDriver
-multiple.datasource.master.url=jdbc:oracle:thin:@10.99.200.87:1521/jgwzjl
+multiple.datasource.master.url=jdbc:oracle:thin:@192.168.0.46/STEER
 multiple.datasource.master.username=lims
 multiple.datasource.master.password=lims_2021
 
-multiple.datasource.master.initial-size=15
+multiple.datasource.master.initial-size=3
 multiple.datasource.master.min-idle=15
 multiple.datasource.master.maxActive=75
 multiple.datasource.master.maxWait=1000

src/main/resources/application-prod.properties

@@ -73,11 +73,11 @@ openfeign.dil.url= ${DIL_URL:192.168.107.61:8000}
 #multiple.datasource.master.password=Lims123789
 
 multiple.datasource.master.driver-class-name=oracle.jdbc.driver.OracleDriver
-multiple.datasource.master.url=jdbc:oracle:thin:@10.99.200.87:1521/jgwzjl
+multiple.datasource.master.url=jdbc:oracle:thin:@192.168.0.46/STEER
 multiple.datasource.master.username=lims
 multiple.datasource.master.password=lims_2021
 
-multiple.datasource.master.initial-size=15
+multiple.datasource.master.initial-size=3
 multiple.datasource.master.min-idle=15
 multiple.datasource.master.maxActive=75
 multiple.datasource.master.maxWait=1000

src/main/resources/application.properties

@@ -73,11 +73,11 @@ openfeign.dil.url= ${DIL_URL:192.168.107.61:8000}
 #multiple.datasource.master.password=Lims123789
 
 multiple.datasource.master.driver-class-name=oracle.jdbc.driver.OracleDriver
-multiple.datasource.master.url=jdbc:oracle:thin:@10.99.200.87:1521/jgwzjl
+multiple.datasource.master.url=jdbc:oracle:thin:@192.168.0.46/STEER
 multiple.datasource.master.username=lims
 multiple.datasource.master.password=lims_2021
 
-multiple.datasource.master.initial-size=15
+multiple.datasource.master.initial-size=3
 multiple.datasource.master.min-idle=15
 multiple.datasource.master.maxActive=75
 multiple.datasource.master.maxWait=1000