Browse Source

修改零星

zx 3 years ago
parent
commit
e4e7520477
2 changed files with 7 additions and 25 deletions
  1. 4 4
      src/main/resources/application-prod.yml
  2. 3 21
      src/main/resources/bootstrap.yml

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

@@ -2,8 +2,8 @@
 spring:
 spring:
   datasource:
   datasource:
     url: jdbc:oracle:thin:@172.16.33.163:1521:ilsdbpri
     url: jdbc:oracle:thin:@172.16.33.163:1521:ilsdbpri
-    password: root123
-    username: dagang
+    password: Dil123789
+    username: dil
     driver-class-name: oracle.jdbc.OracleDriver
     driver-class-name: oracle.jdbc.OracleDriver
   application:
   application:
     name: DAL-OMS-API-PROD
     name: DAL-OMS-API-PROD
@@ -13,9 +13,9 @@ openfeign:
   ColumnDataFeign:
   ColumnDataFeign:
     url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
     url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
   TmsTruckFeign:
   TmsTruckFeign:
-    url: ${TMSTRUCKFEIGN_URL:localhost:8088}
+    url: ${TMSTRUCKFEIGN_URL:172.16.33.166:8088}
   AmsFeign:
   AmsFeign:
-    url: ${AMSFEIGN_URL:localhost:8079}
+    url: ${AMSFEIGN_URL:172.16.33.166:8079}
   ImFeign:
   ImFeign:
     url: ${IMFEIGN_URL:172.16.33.166:8055}
     url: ${IMFEIGN_URL:172.16.33.166:8055}
 
 

+ 3 - 21
src/main/resources/bootstrap.yml

@@ -1,7 +1,7 @@
 api.version: api/v1/oms
 api.version: api/v1/oms
 spring:
 spring:
   profiles:
   profiles:
-    include: ${SPRING_PROFILES:prod}
+    include: ${SPRING_PROFILES:dev}
   jackson:
   jackson:
     date-format: yyyy-MM-dd HH:mm:ss
     date-format: yyyy-MM-dd HH:mm:ss
     time-zone: GMT+8
     time-zone: GMT+8
@@ -44,28 +44,10 @@ redis:
   database: 0
   database: 0
 
 
 
 
-#feign设置
-openfeign:
-  #正式环境
-  ColumnDataFeign:
-    url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
-  TmsTruckFeign:
-    url: ${TMSTRUCKFEIGN_URL:172.16.33.166:8088}
-  AmsFeign:
-    url: ${AMSFEIGN_URL:172.16.33.166:8079}
-  ImFeign:
-    url: ${IMFEIGN_URL:172.16.33.166:8055}
 
 
 
 
-  #测试环境
-#  ColumnDataFeign:
-#    url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8001}
-#  TmsTruckFeign:
-#    url: ${TMSTRUCKFEIGN_URL:172.16.33.166:8008}
-#  AmsFeign:
-#    url: ${AMSFEIGN_URL:172.16.33.166:8015}
-#  ImFeign:
-#    url: ${IMFEIGN_URL:172.16.33.166:8018}
+
+
 
 
 
 
 mybatis:
 mybatis: