规范正式测试端口

src/main/resources/application-dev.yml

@@ -1,9 +1,24 @@
+#测试环境
 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: DAL-OMS-API-DEV
 
+#feign设置
+openfeign:
+  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}
+
+server:
+  port: 8016
+

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,18 @@ spring:
     username: dil
     driver-class-name: oracle.jdbc.OracleDriver
   application:
-    name: DAL-OMS-API-PROD
+    name: DAL-OMS-API-PROD
+
+#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}
+
+server:
+  port: 8095

src/main/resources/bootstrap.yml

@@ -1,7 +1,7 @@
 api.version: api/v1/oms
 spring:
   profiles:
-    include: ${SPRING_PROFILES:dev}
+    include: ${SPRING_PROFILES:prod}
   jackson:
     date-format: yyyy-MM-dd HH:mm:ss
     time-zone: GMT+8
@@ -43,30 +43,6 @@ redis:
     time: 864000000
   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:
   type-aliases-package: com.steerinfo.dil.model
   mapper-locations: classpath:com/steerinfo/dil/mapper/*.xml
@@ -74,9 +50,3 @@ mybatis:
     #    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
     mapUnderscoreToCamelCase: true
     call-setters-on-nulls: true
-
-server:
-  #正式
-   port: 8095
-  #测试
-#  port: 8016