txf 3 lat temu
rodzic
commit
55211c7454

+ 2 - 2
src/main/resources/application-dev.yml

@@ -1,8 +1,8 @@
 spring:
   datasource:
     url: jdbc:oracle:thin:@172.16.33.163:1521:ilsdbpri
-    password: Dil123789
-    username: dil
+    password: root123
+    username: dagang
     driver-class-name: oracle.jdbc.OracleDriver
   application:
     name: dil-tms-truck-dev

+ 2 - 2
src/main/resources/application-prod.yml

@@ -1,8 +1,8 @@
 spring:
   datasource:
       url: jdbc:oracle:thin:@172.16.33.163:1521:ilsdbpri
-      password: Dil123789
-      username: dil
+      password: root123
+      username: dagang
     driver-class-name: oracle.jdbc.OracleDriver
   application:
     name: dil-tms-truck-prod

+ 38 - 38
src/main/resources/bootstrap.yml

@@ -3,9 +3,9 @@ spring:
   profiles:
     include: ${SPRING_PROFILES:dev}
   jackson:
-      date-format: yyyy-MM-dd HH:mm:ss
-      time-zone: GMT+8
-#    serialization: {WRITE_DATES_AS_TIMESTAMPS: true}
+    date-format: yyyy-MM-dd HH:mm:ss
+    time-zone: GMT+8
+  #    serialization: {WRITE_DATES_AS_TIMESTAMPS: true}
   messages:
     basename: message
     encoding: UTF-8
@@ -16,46 +16,46 @@ spring:
 #feign设置
 openfeign:
 
-#    正式环境
+  #    正式环境
+  #  ColumnDataFeign:
+  #    url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
+  #  BmsShipFeign:
+  #    url: ${BMSSHIPFEIGN_URL:172.16.33.166:8078}
+  #  BmsTruckFeign:
+  #    url: ${BMSTRUCKFEIGN_URL:172.16.33.166:8076}
+  #  WmshBoundFeign:
+  #    url: ${WMSHBOUNDFEIGN_URL:172.16.33.166:8070}
+  #  WMSFeign:
+  #    url: ${WMSFEIGN_URL:172.16.33.166:8093}
+  #  OmsFeign:
+  #    url: ${OMSFEIGN_URL:172.16.33.166:8095}
+  #  JoinFeign:
+  #    url: ${JOINFEIGN_URL:172.16.33.166:8066}
+  #  QmsFeign:
+  #    url: ${QMSFEIGN_URL:172.16.33.166:8047}
+  #  ImFeign:
+  #    url: ${IMFEIGN_URL:172.16.33.161:8055}
+
+
+  ##    测试环境
   ColumnDataFeign:
-    url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
+    url: ${COLUMNDATAFEIGN_URL:172.16.33.162:8001}
   BmsShipFeign:
-    url: ${BMSSHIPFEIGN_URL:172.16.33.166:8078}
+    url: ${BMSSHIPFEIGN_URL:172.16.33.162:8007}
   BmsTruckFeign:
-    url: ${BMSTRUCKFEIGN_URL:172.16.33.166:8076}
+    url: ${BMSTRUCKFEIGN_URL:172.16.33.162:8009}
   WmshBoundFeign:
-    url: ${WMSHBOUNDFEIGN_URL:172.16.33.166:8070}
+    url: ${WMSHBOUNDFEIGN_URL:172.16.33.162:8013}
   WMSFeign:
-    url: ${WMSFEIGN_URL:172.16.33.166:8093}
+    url: ${WMSFEIGN_URL:172.16.33.162:8012}
   OmsFeign:
-    url: ${OMSFEIGN_URL:172.16.33.166:8095}
+    url: ${OMSFEIGN_URL:172.16.33.162:8016}
   JoinFeign:
-    url: ${JOINFEIGN_URL:172.16.33.166:8066}
+    url: ${JOINFEIGN_URL:172.16.33.162:8006}
   QmsFeign:
-    url: ${QMSFEIGN_URL:172.16.33.166:8047}
+    url: ${QMSFEIGN_URL:172.16.33.162:8017}
   ImFeign:
-    url: ${IMFEIGN_URL:172.16.33.161:8055}
-
-
-##    测试环境
-#  ColumnDataFeign:
-#    url: ${COLUMNDATAFEIGN_URL:172.16.33.162:8001}
-#  BmsShipFeign:
-#    url: ${BMSSHIPFEIGN_URL:172.16.33.162:8007}
-#  BmsTruckFeign:
-#    url: ${BMSTRUCKFEIGN_URL:172.16.33.162:8009}
-#  WmshBoundFeign:
-#    url: ${WMSHBOUNDFEIGN_URL:172.16.33.162:8013}
-#  WMSFeign:
-#    url: ${WMSFEIGN_URL:172.16.33.162:8012}
-#  OmsFeign:
-#    url: ${OMSFEIGN_URL:172.16.33.162:8016}
-#  JoinFeign:
-#    url: ${JOINFEIGN_URL:172.16.33.162:8006}
-#  QmsFeign:
-#    url: ${QMSFEIGN_URL:172.16.33.162:8017}
-#  ImFeign:
-#    url: ${IMFEIGN_URL:172.16.33.162:8018}
+    url: ${IMFEIGN_URL:172.16.33.162:8018}
 
 #eureka设置
 eureka:
@@ -86,7 +86,7 @@ redis:
     time: 864000000
   database: 0
 
-#自定义配置Redis相关配置
+  #自定义配置Redis相关配置
   prefix:
     order: order
     line: line
@@ -108,7 +108,7 @@ str:
     abnMins: 60
       #处理类型type=1 异常线路预警
       #type=2 异常线路预警
-      #+停车
+    #+停车
     #type=3 异常线路预警
     #+离线
     #type=4 异常线路预警
@@ -125,9 +125,9 @@ mybatis:
 
 server:
   #正式环境
-  port: 8088
+  #  port: 8088
   #测试环境
-#  port: 8008
+  port: 8008