浏览代码

Merge remote-tracking branch 'origin/develop' into test

wangzaijun 7 月之前
父节点
当前提交
58ec1daef5

+ 2 - 2
service-base/src/main/java/com/simuwang/base/config/ShiroConfig.java

@@ -149,8 +149,8 @@ public class ShiroConfig {
         map.put("/v1/test/**", "anon");
         map.put("/v1/test/**", "anon");
         map.put("/v1/login", "anon");
         map.put("/v1/login", "anon");
         map.put("/v1/rsa-key", "anon");
         map.put("/v1/rsa-key", "anon");
-        map.put("/v1/**", "anon");
-        map.put("/**", "anon");
+        map.put("/v1/**", "jwt");
+        map.put("/**", "jwt");
         return map;
         return map;
     }
     }
 
 

+ 3 - 0
service-deploy/src/main/resources/application.yml

@@ -46,6 +46,9 @@ spring:
         keepalive-time: 60000
         keepalive-time: 60000
   task:
   task:
     groupName: PPW_EMAIL
     groupName: PPW_EMAIL
+  jackson:
+    date-format: yyyy-MM-dd HH:mm:ss
+    time-zone: Asia/Shanghai
 
 
 email-rule:
 email-rule:
   nav: "净值,业绩报酬,规模"
   nav: "净值,业绩报酬,规模"