hujh преди 3 години
родител
ревизия
e5f44d3ac1
променени са 2 файла, в които са добавени 18 реда и са изтрити 25 реда
  1. 2 2
      src/main/resources/application-prod.yml
  2. 16 23
      src/main/resources/bootstrap.yml

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

@@ -4,8 +4,8 @@ spring:
       password: Dil123789
       username: dil
       driver-class-name: oracle.jdbc.OracleDriver
-  application:
-    name: dil-wms-api
+    application:
+      name: dil-wms-api
 
 #feign设置
 openfeign:

+ 16 - 23
src/main/resources/bootstrap.yml

@@ -1,22 +1,27 @@
 api.version: api/v1/wms
 spring:
+  profiles:
+    include: ${SPRING_PROFILES:prod}
   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
   mvc:
     static-path-pattern:
-  profiles:
-    include: ${SPRING_PROFILES:prod}
-#  cloud:
-#    config:
-#      fail-fast: true
-#      discovery:
-#        enabled: true
-#        service-id: config-server
+
+#eureka设置
+eureka:
+  client:
+    service-url:
+      defaultZone: http://root:root@${EUREKA_HOST:172.16.33.161}:${EUREKA_PORT:8081}/eureka/
+  instance:
+    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}
+
 genxml:
   pth: com/a
 cache:
@@ -35,18 +40,6 @@ redis:
     time: 864000000
   database: 0
 
-#eureka设置
-eureka:
-  client:
-    service-url:
-      defaultZone: http://root:root@${EUREKA_HOST:172.16.33.166}:${EUREKA_PORT:8081}/eureka/
-  instance:
-    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}
-
-
-
 mybatis:
   type-aliases-package: com.steerinfo.dil.model
   mapper-locations: classpath:com/steerinfo/dil/mapper/*.xml