Merge remote-tracking branch 'origin/master'

lin

2024-04-23 2be4713d25c0a295e3f84772dfc3faa0e4930ed2

Merge remote-tracking branch 'origin/master'

 src/test/resources/application.yml

@@ -23,8 +23,8 @@
      # Oracle校验
      #validation-query: select 1 from dual
      validation-query-timeout: 2000
      initial-size: 5
      max-active: 20
      initial-size: 50
      max-active: 200
      min-idle: 5
      max-wait: 60000
      test-on-borrow: false
@@ -42,6 +42,12 @@
        exclusions: '*.js,*.gif,*.jpg,*.bmp,*.png,*.css,*.ico,/druid/*'
        session-stat-enable: true
        session-stat-max-count: 10
      # 超过时间限制是否回收
      remove-abandoned: true
      # 超时时间；单位为秒。180秒=3分钟
      remove-abandoned-timeout: 180
      # 关闭abanded连接时输出错误日志
      log-abandoned: true

# mybatis
mybatis-plus: