From fefed50bf97060a82aabd09e090fa08ce532532f Mon Sep 17 00:00:00 2001
From: p-honggang.li <p-honggang.li@pcitc.com>
Date: 星期三, 20 八月 2025 10:59:04 +0800
Subject: [PATCH] Merge branch 'master' of http://xearth.cn:6600/r/web-manage/web-manage-back
---
src/main/resources/application.yml | 83 +++++------------------------------------
1 files changed, 11 insertions(+), 72 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 88eaa3e..52bb679 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -11,79 +11,12 @@
jackson:
date-format: yyyy-MM-dd HH:mm:ss
time-zone: GMT+8
-
+ serialization:
+ write-dates-as-timestamps: false
#mcv閰嶇疆
mvc:
pathmatch:
matching-strategy: ant_path_matcher
-
- # 鏁版嵁婧愰厤缃�
- datasource:
- type: com.alibaba.druid.pool.DruidDataSource
- driver-class-name: org.postgresql.Driver
- url: jdbc:postgresql://localhost:5432/web_manage?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
- username: postgres
- password: zkyxpostgres
- druid:
- # 鍒濆杩炴帴鏁�
- initial-size: 5
- # 鏈�灏忚繛鎺ユ睜鏁伴噺
- min-idle: 10
- # 鏈�澶ц繛鎺ユ睜鏁伴噺
- max-active: 20
- # 閰嶇疆鑾峰彇杩炴帴绛夊緟瓒呮椂鐨勬椂闂�
- max-wait: 60000
- # 閰嶇疆闂撮殧澶氫箙鎵嶈繘琛屼竴娆℃娴嬶紝妫�娴嬮渶瑕佸叧闂殑绌洪棽杩炴帴锛屽崟浣嶆槸姣
- time-between-eviction-runs-millis: 60000
- # 閰嶇疆涓�涓繛鎺ュ湪姹犱腑鏈�灏忕敓瀛樼殑鏃堕棿锛屽崟浣嶆槸姣
- min-evictable-idle-time-millis: 300000
- # 閰嶇疆涓�涓繛鎺ュ湪姹犱腑鏈�澶х敓瀛樼殑鏃堕棿锛屽崟浣嶆槸姣
- max-evictable-idle-time-millis: 900000
- # 閰嶇疆妫�娴嬭繛鎺ユ槸鍚︽湁鏁�
- validation-query: SELECT 1
- test-while-idle: true
- test-on-borrow: false
- test-on-return: false
- # 鎵撳紑PSCache锛屽苟涓旀寚瀹氭瘡涓繛鎺ヤ笂PSCache鐨勫ぇ灏�
- pool-prepared-statements: true
- max-pool-prepared-statement-per-connection-size: 20
- # 閰嶇疆鐩戞帶缁熻鎷︽埅鐨刦ilters锛屽幓鎺夊悗鐩戞帶鐣岄潰sql鏃犳硶缁熻锛�'wall'鐢ㄤ簬闃茬伀澧�
- filters: stat,wall,slf4j
- # 閫氳繃connectProperties灞炴�ф潵鎵撳紑mergeSql鍔熻兘锛涙參SQL璁板綍
- connection-properties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
- # 閰嶇疆DruidStatFilter
- web-stat-filter:
- enabled: true
- url-pattern: /*
- exclusions: "*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*"
- # 閰嶇疆DruidStatViewServlet
- stat-view-servlet:
- enabled: true
- url-pattern: /druid/*
- reset-enable: false
- login-username: admin
- login-password: 123456
-
- # Redis閰嶇疆
- redis:
- host: 192.168.110.129
- port: 6379
- password:
- database: 0
- timeout: 10000ms
- lettuce:
- pool:
- max-active: 8
- max-wait: -1ms
- max-idle: 8
- min-idle: 0
-
-# MinIO閰嶇疆
-minio:
- endpoint: http://192.168.110.129:9000
- access-key: minioadmin
- secret-key: minioadmin
- bucket-name: web-manage
# MyBatis Plus閰嶇疆
mybatis-plus:
@@ -97,9 +30,6 @@
# 涓婚敭绫诲瀷
id-type: auto
# 閫昏緫鍒犻櫎閰嶇疆
- logic-delete-field: deleted
- logic-delete-value: 1
- logic-not-delete-value: 0
mapper-locations: classpath*:/mapper/**/*.xml
# 鏃ュ織閰嶇疆
@@ -131,3 +61,12 @@
enable-consistency-check: true
# 鍚屾绛栫暐锛歳ealtime锛堝疄鏃跺悓姝ワ級銆乥atch锛堟壒閲忓悓姝ワ級銆乵anual锛堟墜鍔ㄥ悓姝ワ級
sync-strategy: realtime
+ async:
+ executor:
+ core-pool-size: 4
+ max-pool-size: 16
+ queue-capacity: 500
+ keep-alive-seconds: 60
+ thread-name-prefix: async-cart-
+ wait-for-tasks-to-complete-on-shutdown: true
+ await-termination-seconds: 30
--
Gitblit v1.8.0