Merge branch 'master' of http://gitlab.gaoxiaobang.com/zygj/huike-eaas-config

多国蒙
2 parents 6f3141c6 b2f56c19
Showing 3 changed files with 29 additions and 3 deletions
class-service.yml
gateway.yml
user-service.yml
@@ -67,7 +67,12 @@ spring:
     #sentinel:
       #master: mymaster1
       #nodes: redis-server:16379,redis-server:16379
-
+      
+  #jackson:
+    #time-zone: GMT+8
+    #date-format: yyyy-MM-dd HH:mm:ss
+    #deserialization.accept_empty_string_as_null_object: true
+         
 mybatis:
   mapperLocations: classpath:/mybatis/*.xml
@@ -323,6 +328,12 @@ spring:
     #sentinel:
       #master: mymaster1
       #nodes: redis1:16379,redis2:16379
+      
+  #jackson:
+    #time-zone: GMT+8
+    #date-format: yyyy-MM-dd HH:mm:ss
+    #deserialization.accept_empty_string_as_null_object: true
+         
 mybatis:
   mapperLocations: classpath:/mybatis/*.xml
@@ -110,7 +110,7 @@ cas:
   casServerUrlPrefix: http://cas/
   casServerLoginUrl: https://cas.gaoxiaobang.com/login
   casServerLogoutUrl: https://cas.gaoxiaobang.com/logout
-  ignorePattern: (^(/mvc/goto/)|(/order)|(/app/cxcy)|(\.ico)|(/js)|(/image)|(/css)|(/fonts)|(/api)|(/downloadfile))|(.jsp$)|(/health)
+  ignorePattern: (^(/mvc/goto/)|(/order)|(/app/cxcy)|(\.ico)|(/js)|(/image)|(/css)|(/fonts)|(/api)|(/downloadfile))|(.jsp$)|(/health)|(access_token)
 tenant:
   tenantId: 991
@@ -243,6 +243,12 @@ spring:
     #sentinel:
       #master: mymaster1
       #nodes: redis1:16379,redis2:16379
+      
+  jackson:
+    time-zone: GMT+8
+    date-format: yyyy-MM-dd HH:mm:ss
+    deserialization.accept_empty_string_as_null_object: true
+         
 endpoints:
   restart:
@@ -34,7 +34,7 @@ spring:
     #sentinel:
       #master: mymaster1
       #nodes: redis-server:16379,redis-server:16379
-    
+      
   activemq:
     broker-url: failover:(tcp://mqserver:61616)?initialReconnectDelay=100 #ActiveMQ use static transport for broker clusters. multicast discovery for broker clusters, JmsListener cannot auto receive messages from some ActiveMQ servers
     inMemory: true
@@ -43,6 +43,10 @@ spring:
       max-connections: 5
       idle-timeout: 30000
       expiry-timeout: 0
+  jackson:
+    time-zone: GMT+8
+    date-format: yyyy-MM-dd HH:mm:ss
+    deserialization.accept_empty_string_as_null_object: true      
 mybatis:
@@ -205,6 +209,11 @@ spring:
       max-connections: 5
       idle-timeout: 30000
       expiry-timeout: 0
+      
+  jackson:
+    time-zone: GMT+8
+    date-format: yyyy-MM-dd HH:mm:ss
+    deserialization.accept_empty_string_as_null_object: true      
 mybatis: