HUJIANGUO пре 3 година
родитељ
комит
35fd3453cc

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

+ 15 - 15
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
@@ -13,17 +13,17 @@ spring:
     static-path-pattern:
 
 openfeign:
-#   正式环境
+  #   正式环境
+  #  ESFeign:
+  #    url: ${ESFEIGN_URL:172.16.33.166:8089}
+  #  ColumnDataFeign:
+  #    url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
+
+  #   测试环境
   ESFeign:
-    url: ${ESFEIGN_URL:172.16.33.166:8089}
+    url: ${ESFEIGN_URL:172.16.33.162:8011}
   ColumnDataFeign:
-    url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
-
-#   测试环境
-#  ESFeign:
-#    url: ${ESFEIGN_URL:172.16.33.162:8011}
-#  ColumnDataFeign:
-#    url: ${COLUMNDATAFEIGN_URL:172.16.33.162:8001}
+    url: ${COLUMNDATAFEIGN_URL:172.16.33.162:8001}
 
 #eureka设置
 eureka:
@@ -64,7 +64,7 @@ mybatis:
     call-setters-on-nulls: true
 
 server:
-#  正式
-#  port: 8079
-#  测试
+  #  正式
+  #  port: 8079
+  #  测试
   port: 8015