tijiao

src/main/resources/application-dev.yml

@@ -1,3 +1,4 @@
+#测试环境
 spring:
   datasource:
     url: jdbc:oracle:thin:@172.16.33.163:1521:ilsdbpri
@@ -5,5 +6,19 @@ spring:
     username: dagang
     driver-class-name: oracle.jdbc.OracleDriver
   application:
-    name: dil-ams-api-dev
+    name: DAL-OMS-API-DEV
+
+#feign设置
+openfeign:
+  ESFeign:
+    url: ${ESFEIGN_URL:172.16.33.162:8011}
+  ColumnDataFeign:
+    url: ${COLUMNDATAFEIGN_URL:172.16.33.162:8001}
+  TmsTruckFeign:
+    url: ${TMSTRUCKFEIGN_URL:172.16.33.162:8008}
+  ImFeign:
+    url: ${IMFEIGN_URL:172.16.33.162:8018}
+
+server:
+  port: 8015
 

src/main/resources/application-prod.yml

@@ -1,3 +1,4 @@
+#正式环境
 spring:
   datasource:
     url: jdbc:oracle:thin:@172.16.33.163:1521:ilsdbpri
@@ -5,4 +6,19 @@ spring:
     username: dil
     driver-class-name: oracle.jdbc.OracleDriver
   application:
-    name: dil-ams-api-dev
+    name: DAL-OMS-API-PROD
+
+#feign设置
+openfeign:
+  #   正式环境
+  ESFeign:
+    url: ${ESFEIGN_URL:172.16.33.166:8089}
+  ColumnDataFeign:
+    url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
+  TmsTruckFeign:
+    url: ${TMSTRUCKFEIGN_URL:172.16.33.166:8088}
+  ImFeign:
+    url: ${IMFEIGN_URL:172.16.33.166:8055}
+
+server:
+  port: 8079

src/main/resources/bootstrap.yml

@@ -1,7 +1,7 @@
 api.version: api/v1/ams
 spring:
   profiles:
-    include: ${SPRING_PROFILES:dev}
+    include: ${SPRING_PROFILES:prod}
   jackson:
       date-format: yyyy-MM-dd HH:mm:ss
       time-zone: GMT+8
@@ -12,28 +12,6 @@ spring:
   mvc:
     static-path-pattern:
 
-openfeign:
-#   正式环境
-  ESFeign:
-    url: ${ESFEIGN_URL:172.16.33.166:8089}
-  ColumnDataFeign:
-    url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
-  TmsTruckFeign:
-    url: ${TMSTRUCKFEIGN_URL:172.16.33.166:8088}
-  ImFeign:
-    url: ${IMFEIGN_URL:172.16.33.166:8055}
-
-
-##   测试环境
-#  ESFeign:
-#    url: ${ESFEIGN_URL:172.16.33.162:8011}
-#  ColumnDataFeign:
-#    url: ${COLUMNDATAFEIGN_URL:172.16.33.162:8001}
-#  TmsTruckFeign:
-#    url: ${TMSTRUCKFEIGN_URL:172.16.33.162:8008}
-#  ImFeign:
-#    url: ${IMFEIGN_URL:172.16.33.162:8018}
-
 #eureka设置
 eureka:
   client:
@@ -71,9 +49,3 @@ mybatis:
     #    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
     mapUnderscoreToCamelCase: true
     call-setters-on-nulls: true
-
-server:
-#  正式
-  port: 8079
-##  测试
-#  port: 8015