HUJIANGUO 3 anos atrás
pai
commit
5255cbfd2e

+ 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-api

+ 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-api

+ 46 - 44
src/main/resources/bootstrap.yml

@@ -16,66 +16,67 @@ spring:
 eureka:
   client:
     service-url:
-      defaultZone: http://root:root@${EUREKA_HOST:172.16.33.162}:${EUREKA_PORT:8081}/eureka/
+      defaultZone: http://root:root@${EUREKA_HOST:172.16.33.161}:${EUREKA_PORT:8081}/eureka/
   instance:
     prefer-ip-address: true
     status-page-url: http://${spring.cloud.client.ip-address}:${server.port}/swagger-ui.html#/
     instance-id: ${spring.cloud.client.ip-address}:${server.port}
 openfeign:
   #  正式环境
+  #    ColumnDataFeign:
+  #      url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
+  #    AmsFeign:
+  #      url: ${AMSFEIGN_URL:172.16.33.166:8079}
+  #    BmsshipFeign:
+  #      url: ${BMSSHIPFEIGN_URL:172.16.33.166:8078}
+  #    BmstrainFeign:
+  #      url: ${BMSTRAINFEIGN_URL:172.16.33.166:8077}
+  #    BmstruckFeign:
+  #      url: ${BMSTRUCKFEIGN_URL:172.16.33.166:8076}
+  #    QmsTruckFeign:
+  #      url: ${QMSTRUCKFEIGN_URL:172.16.33.166:8047}
+  #    TmsTrainFeign:
+  #      url: ${TMSTRAINFEIGN_URL:172.16.33.166:8086}
+  #    TmsTruckFeign:
+  #      url: ${TMSTRUCKFEIGN_URL:172.16.33.166:8088}
+  #    TmsshipFeign:
+  #      url: ${TMSSHIPFEIGN_URL:172.16.33.166:8090}
+  #    WMSHFeign:
+  #      url: ${WMSHFEIGN_URL:172.16.33.166:8070}
+  #    WMSFeign:
+  #      url: ${WMSFEIGN_URL:172.16.33.166:8093}
+  #    OMSFeign:
+  #      url: ${OMSFEIGN_URL:172.16.33.166:8095}
+  #    RmsFeign:
+  #      url: ${RMSFEIGN_HRL:172.16.33.166:8060}
+
+  #测试环境
   ColumnDataFeign:
-    url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
+    url: ${COLUMNDATAFEIGN_URL:172.16.33.162:8001}
   AmsFeign:
-    url: ${AMSFEIGN_URL:172.16.33.166:8079}
+    url: ${AMSFEIGN_URL:172.16.33.162:8015}
   BmsshipFeign:
-    url: ${BMSSHIPFEIGN_URL:172.16.33.166:8078}
+    url: ${BMSSHIPFEIGN_URL:172.16.33.162:8007}
   BmstrainFeign:
-    url: ${BMSTRAINFEIGN_URL:172.16.33.166:8077}
+    url: ${BMSTRAINFEIGN_URL:172.16.33.162:8005}
   BmstruckFeign:
-    url: ${BMSTRUCKFEIGN_URL:172.16.33.166:8076}
+    url: ${BMSTRUCKFEIGN_URL:172.16.33.162:8009}
   QmsTruckFeign:
-    url: ${QMSTRUCKFEIGN_URL:172.16.33.166:8047}
+    url: ${QMSTRUCKFEIGN_URL:172.16.33.162:8017}
   TmsTrainFeign:
-    url: ${TMSTRAINFEIGN_URL:172.16.33.166:8086}
+    url: ${TMSTRAINFEIGN_URL:172.16.33.162:8004}
   TmsTruckFeign:
-    url: ${TMSTRUCKFEIGN_URL:172.16.33.166:8088}
+    url: ${TMSTRUCKFEIGN_URL:172.16.33.162:8008}
   TmsshipFeign:
-    url: ${TMSSHIPFEIGN_URL:172.16.33.166:8090}
+    url: ${TMSSHIPFEIGN_URL:172.16.33.162:8003}
   WMSHFeign:
-    url: ${WMSHFEIGN_URL:172.16.33.166:8070}
+    url: ${WMSHFEIGN_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}
   RmsFeign:
-    url: ${RMSFEIGN_URL:172.16.33.166:8060}
-  #测试环境
-#  ColumnDataFeign:
-#    url: ${COLUMNDATAFEIGN_URL:172.16.33.162:8001}
-#  AmsFeign:
-#    url: ${AMSFEIGN_URL:172.16.33.162:8015}
-#  BmsshipFeign:
-#    url: ${BMSSHIPFEIGN_URL:172.16.33.162:8007}
-#  BmstrainFeign:
-#    url: ${BMSTRAINFEIGN_URL:172.16.33.162:8005}
-#  BmstruckFeign:
-#    url: ${BMSTRUCKFEIGN_URL:172.16.33.162:8009}
-#  QmsTruckFeign:
-#    url: ${QMSTRUCKFEIGN_URL:172.16.33.162:8017}
-#  TmsTrainFeign:
-#    url: ${TMSTRAINFEIGN_URL:172.16.33.162:8004}
-#  TmsTruckFeign:
-#    url: ${TMSTRUCKFEIGN_URL:172.16.33.162:8008}
-#  TmsshipFeign:
-#    url: ${TMSSHIPFEIGN_URL:172.16.33.162:8003}
-#  WMSHFeign:
-#    url: ${WMSHFEIGN_URL:172.16.33.162:8013}
-#  WMSFeign:
-#    url: ${WMSFEIGN_URL:172.16.33.162:8012}
-#  OMSFeign:
-#    url: ${OMSFEIGN_URL:172.16.33.162:8016}
-#  RmsFeign:
-#    url: ${RMSFEIGN_HRL:172.16.33.162:8014}
+    url: ${RMSFEIGN_HRL:172.16.33.162:8014}
 
 
 
@@ -108,6 +109,7 @@ mybatis:
     mapUnderscoreToCamelCase: true
     call-setters-on-nulls: true
 server:
-  port: 8080
-#测试环境
-#  port: 8019
+  #  port: 8080
+  #测试环境
+  port: 8019
+