Browse Source

规范测试正式端口位置

txf 3 years ago
parent
commit
bb1bac39be

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

@@ -1,8 +1,9 @@
+#测试环境
 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
@@ -17,3 +18,26 @@ spring:
       time-to-live: 300000
       cache-null-values: true
 
+#feign设置
+openfeign:
+  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}
+
+server:
+  port: 8008

+ 39 - 4
src/main/resources/application-prod.yml

@@ -1,8 +1,43 @@
+#正式环境
 spring:
   datasource:
-      url: jdbc:oracle:thin:@172.16.33.163:1521:ilsdbpri
-      password: Dil123789
-      username: dil
+    url: jdbc:oracle:thin:@172.16.33.163:1521:ilsdbpri
+    password: Dil123789
+    username: dil
     driver-class-name: oracle.jdbc.OracleDriver
   application:
-    name: dil-tms-truck-prod
+    name: dil-tms-truck-prod
+  #Redis相关配置
+  redis:
+    host: 172.16.33.161
+    port: 6379
+    password: 123456
+  cache:
+    type: redis
+    redis:
+      time-to-live: 300000
+      cache-null-values: true
+
+#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}
+
+server:
+  port: 8088

+ 1 - 50
src/main/resources/bootstrap.yml

@@ -1,7 +1,7 @@
 api.version: api/v1/truckTms
 spring:
   profiles:
-    include: ${SPRING_PROFILES:dev}
+    include: ${SPRING_PROFILES:prod}
   jackson:
       date-format: yyyy-MM-dd HH:mm:ss
       time-zone: GMT+8
@@ -13,50 +13,6 @@ spring:
     static-path-pattern:
 
 
-#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.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}
-
 #eureka设置
 eureka:
   client:
@@ -123,11 +79,6 @@ mybatis:
     mapUnderscoreToCamelCase: true
     call-setters-on-nulls: true
 
-server:
-  #正式环境
-  port: 8088
-  #测试环境
-#  port: 8008