Merge remote-tracking branch 'origin/master'

twzd-admin/src/main/resources/application-dev.yml

@@ -82,7 +82,7 @@ spring:
 
 app:
     appId: wx67ca1b8c9816ef28
-    appSecret: 343ab0f9ac267c25dcd91b2aeea715a7
+    appSecret: 8604f2a6eb6338cfa64e7df4ec2c08b3
 
 
 

twzd-admin/src/main/resources/application-prod.yml

@@ -78,4 +78,4 @@ spring:
 
 app:
     appId: wx67ca1b8c9816ef28
-    appSecret: 343ab0f9ac267c25dcd91b2aeea715a7
+    appSecret: 8604f2a6eb6338cfa64e7df4ec2c08b3

twzd-admin/src/main/resources/application.yml

@@ -84,7 +84,7 @@ token:
     # 令牌密钥
     secret: abcdefghijklmnopqrstuvwxyz
     # 令牌有效期（默认30分钟）
-    expireTime: 30
+    expireTime: 1440
 
 # MyBatis配置
 # https://baomidou.com/config/