Merge remote-tracking branch 'origin/master'

jiangping

2024-12-12 142f590c9b32435f22830421a9c6f1c1e5669f0f

 server/system_timer/src/main/resources/application.yml

@@ -9,8 +9,6 @@
spring:
  application:
    name: systemTimer
  profiles:
    active: dev

  # JSON返回配置
  jackson:
@@ -37,7 +35,7 @@
cache:
  session:
    # 会话过期时长(s)
    expire: 18000
    expire: 1800
  captcha:
    # 验证码过期时长(s)
    expire: 300