'修改bug'

src/main/resources/application-dev.yml

@@ -5,5 +5,9 @@ spring:
     username: dilusr
     driver-class-name: oracle.jdbc.OracleDriver
   application:
+<<<<<<< HEAD
     name: dil-column-data-dev
+=======
+    name: dil-dil-cd-api
+>>>>>>> c947bec98cdb7ac10b240a40275d31a5c64658d5
 

src/main/resources/application-prod.yml

@@ -5,4 +5,8 @@ spring:
     username: dil
     driver-class-name: oracle.jdbc.OracleDriver
   application:
+<<<<<<< HEAD
     name: dil-column-data-prod
+=======
+    name: dil-dil-cd-api
+>>>>>>> c947bec98cdb7ac10b240a40275d31a5c64658d5

src/main/resources/bootstrap.yml

@@ -3,9 +3,9 @@ spring:
   profiles:
     include: ${SPRING_PROFILES:dev}
   jackson:
-    #    date-format: yyyy-MM-dd HH:mm:ss
+    date-format: yyyy-MM-dd HH:mm:ss
     time-zone: GMT+8
-    serialization: {WRITE_DATES_AS_TIMESTAMPS: true}
+    #serialization: {WRITE_DATES_AS_TIMESTAMPS: true}
   messages:
     basename: message
     encoding: UTF-8
@@ -18,7 +18,7 @@ eureka:
     service-url:
       defaultZone: http://root:root@${EUREKA_HOST:dev-discovery.steerinfo.com}:${EUREKA_PORT:80}/eureka/
   instance:
-    prefer-ip-address: true
+    #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}