Merge branch 'master' into dev

src/main/resources/application-dev.yml

@@ -5,4 +5,15 @@ spring:
     username: dil
     driver-class-name: oracle.jdbc.OracleDriver
   application:
-    name: dil-tms-train-dev
+    name: dil-tms-train-dev
+
+openfeign:
+  #测试环境
+  ColumnDataFeign:
+    url: ${COLUMNDATAFEIGN_URL:172.16.33.162:8001}
+  WmshBoundFeign:
+    url: ${WMSHBOUNDFEIGN_URL:172.16.33.162:8013}
+
+server:
+#测试环境
+  port: 8004

src/main/resources/application-prod.yml

@@ -5,4 +5,15 @@ spring:
     username: dil
     driver-class-name: oracle.jdbc.OracleDriver
   application:
-    name: dil-tms-train-dev
+    name: dil-tms-train-dev
+
+openfeign:
+  #正式环境
+  ColumnDataFeign:
+    url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
+  WmshBoundFeign:
+    url: ${WMSHBOUNDFEIGN_URL:172.16.33.166:8070}
+
+server:
+  #正式环境
+  port: 8086

src/main/resources/bootstrap.yml

@@ -1,7 +1,7 @@
 api.version: api/v1/trainTms
 spring:
   profiles:
-    include: ${SPRING_PROFILES:dev}
+    include: ${SPRING_PROFILES:prod}
   jackson:
         date-format: yyyy-MM-dd HH:mm:ss
         time-zone: GMT+8
@@ -21,18 +21,6 @@ eureka:
     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}
-#feign设置
-openfeign:
-  #正式环境
-  ColumnDataFeign:
-    url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
-  WmshBoundFeign:
-    url: ${WMSHBOUNDFEIGN_URL:172.16.33.166:8070}
-  #测试环境
-#  ColumnDataFeign:
-#    url: ${COLUMNDATAFEIGN_URL:172.16.33.162:8001}
-#  WmshBoundFeign:
-#    url: ${WMSHBOUNDFEIGN_URL:172.16.33.162:8013}
 
 genxml:
   pth: com/a
@@ -53,7 +41,6 @@ redis:
   database: 0
 
 
-
 mybatis:
   type-aliases-package: com.steerinfo.dil.model
   mapper-locations: classpath:com/steerinfo/dil/mapper/*.xml
@@ -61,9 +48,3 @@ mybatis:
     #    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
     mapUnderscoreToCamelCase: true
     call-setters-on-nulls: true
-
-server:
-  #正式环境
-  port: 8086
-  #测试环境
-#  port: 8004