Merge remote-tracking branch 'origin/master'

puzhibing

2023-02-16 b3ec53a9da0c09dd03da33bfc27f278d13a5d8f9

 management/guns-admin/src/main/resources/application.yml

@@ -3,7 +3,7 @@

guns:
  swagger-open: true              #是否开启swagger (true/false)
  kaptcha-open: false             #是否开启登录时验证码 (true/false)
  kaptcha-open: true             #是否开启登录时验证码 (true/false)
  spring-session-open: false      #是否开启spring session,如果是多机环境需要开启(true/false)
  session-invalidate-time: 1800     #session失效时间(只在单机环境下生效，多机环境在SpringSessionConfig类中配置) 单位：秒
  session-validation-interval: 900  #多久检测一次失效的session(只在单机环境下生效) 单位：秒
@@ -16,6 +16,12 @@
spring:
  profiles:
    active: local
  datasource:
    url: jdbc:mysql://192.168.0.80:3306/super_save_driving?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
    username: root
    password: 123456
    db-name: super_save_driving #用来搜集数据库的所有表
    filters: wall,mergeStat
  mvc:
    static-path-pattern: /static/**
    view:
@@ -67,7 +73,7 @@
    url: jdbc:mysql://192.168.0.80:3306/super_save_driving?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
    username: root
    password: 123456
    db-name: oktravel #用来搜集数据库的所有表
    db-name: super_save_driving #用来搜集数据库的所有表
    filters: wall,mergeStat