From 34981c30a78e8bbd7791131059a9210f9928b62c Mon Sep 17 00:00:00 2001
From: 刘光辉 <347230014@qq.com>
Date: 星期四, 17 九月 2026 09:24:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
config/shared/datasource.yaml | 116 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 116 insertions(+), 0 deletions(-)
diff --git a/config/shared/datasource.yaml b/config/shared/datasource.yaml
new file mode 100644
index 0000000..fcf279a
--- /dev/null
+++ b/config/shared/datasource.yaml
@@ -0,0 +1,116 @@
+spring:
+ # redis鍗曟満妯″紡
+ # 馃敶 閿綅鏄� spring.data.redis 鑰岄潪涓婃父鐨� spring.redis锛�2026-08-11 鏀跺彛锛夛細Spring Boot 3 璧�
+ # spring.redis.* 鏁翠綋鎼埌 spring.data.redis.*銆傛鍓嶇暀鍦ㄦ棫閿綅浠嶈兘杩炰笂锛屾槸闈犱緷璧栨爲閲岀殑
+ # spring-boot-properties-migrator 鍦ㄨ繍琛屾椂閲嶆槧灏勫厹鐫�鈥斺�旈偅鏄�岃縼绉绘湡涓存椂渚濊禆銆嶏紝涓嶈闀挎湡鎵挎媴
+ # 杩愯鏃惰亴璐ｏ紱鑰屼笖瀹冨鏃犳浛浠ｉ敭鐨� lettuce.pool.* 姣忔鍚姩鍒� 4 鏉� ERROR锛屾饭娌＄湡閿欒銆�
+ # 鍚屾椂鍒犳帀浜� lettuce pool 娈碉細鏈爤杩炴帴灞傛槸 redisson-spring-boot-starter锛�3.52.0锛夛紝
+ # 涓嶈 lettuce 閰嶇疆锛岃繛鎺ユ睜璧� Redisson 榛樿锛坈onnectionPoolSize=64/minIdle=24 绛夛級锛�
+ # 閭ｆ閰嶇疆鍦ㄦ柊鏃ч敭浣嶄笅閮芥槸姝荤殑銆�
+ data:
+ redis:
+ #缂撳瓨搴撶紪鍙�
+ database: 1
+ # 鍧愭爣璧� env锛堜笌 PG 鐨� CUSTOMER_DB_HOST/PORT 鍚屾瀯锛夛細榛樿鍊� = 浜や粯/鏈満褰㈡�侊紙鏍堝唴 cx-redis 瀹瑰櫒锛夛紝
+ # 鎸� CVM 鍏变韩瀹炰緥鏃跺湪 .env 璁� JNPF_REDIS_HOST=YOUR_DB_HOST + 瀵瑰簲瀹㈡埛绔彛锛堝鎴稟 16432/瀹㈡埛B 16433锛�
+ # 绔彛=16431+N 涓� PG 15431+N 灏炬暟瀵归綈锛涘瘑鐮佽 .env.tencent 瀵瑰簲瀹㈡埛娈碉級
+ host: ${JNPF_REDIS_HOST:cx-redis}
+ port: ${JNPF_REDIS_PORT:6379}
+ # 瀵嗙爜璧� env锛坈ompose x-cx-env 閫忎紶锛屽�煎湪 .env锛夛紱榛樿鍊间粎鏈満寮�鍙戝厹搴曘��
+ # 浜や粯鐜鍔″繀鍦� .env 璁惧己瀵嗙爜鈥斺�旀湰鏂囦欢杩� git锛屼笉璁稿嚭鐜扮湡瀹炰氦浠樺瘑鐮併��
+ password: ${JNPF_REDIS_PASSWORD:jnpf_redis_2026} # 瀵嗙爜涓虹┖鏃讹紝璇峰皢鏈娉ㄩ噴
+ timeout: 3000 #瓒呮椂鏃堕棿(鍗曚綅锛氱)
+
+ # redis闆嗙兢妯″紡锛堜笂娓稿師鏍蜂繚鐣欎綔瀵圭収锛涘惎鐢ㄦ椂鍚屾牱瑕佹寕鍦� spring.data.redis 涓嬶級
+ # data:
+ # redis:
+ # cluster:
+ # nodes:
+ # - 192.168.0.225:6380
+ # - 192.168.0.225:6381
+ # - 192.168.0.225:6382
+ # - 192.168.0.225:6383
+ # - 192.168.0.225:6384
+ # - 192.168.0.225:6385
+ # password: 123456 # 瀵嗙爜涓虹┖鏃讹紝璇峰皢鏈娉ㄩ噴
+ # timeout: 3000 # 瓒呮椂鏃堕棿(鍗曚綅锛氱)
+
+
+ # 鏁版嵁婧�
+ datasource:
+ # 鏁版嵁搴撶被鍨�(鍙�夊�� MySQL銆丼QLServer銆丱racle銆丏M銆並ingbaseES銆丳ostgreSQL锛岃涓ユ牸鎸夊彲閫夊�煎～鍐�)
+ db-type: PostgreSQL
+ db-name: jnpf_init
+ # 瀹㈡埛鍧愭爣锛氬敮涓�寮�鍏筹紝鐢卞悇鐜 .env 鎻愪緵锛坉ocs/adr-multi-customer-db-isolation.md 搂3锛夈��
+ # 寮曟搸搴� jnpf_flow 鍦� docker-compose.yml 閲岃鍚屼竴瀵瑰彉閲忥紝涓ゅ簱蹇呯劧鍚屾簮鈥斺��
+ # 缁撴瀯涓婃潨缁� 2026-08-03銆屼笟鍔″簱鍒囦簡寮曟搸搴撴病鍒囥�嶅鑷� 44/49 娴佺▼鎶ラ敊鐨勬晠闅溿��
+ # 榛樿鍊� cx-postgres:5432 = 浜や粯褰㈡�侊紙PG 涓庝笟鍔℃湇鍔″湪鍚屼竴涓� compose 鏍堝唴锛夈��
+ host: ${CUSTOMER_DB_HOST:cx-postgres}
+ port: ${CUSTOMER_DB_PORT:5432}
+ # 璐﹀彿瀵嗙爜鍚屾牱璧板崰浣嶇锛氭瘡涓鎴峰疄渚嬬殑瑙掕壊瀵嗙爜涓嶅悓锛屽啓姝诲氨寰楁瘡鍒囦竴涓鎴�
+ # 杩� Nacos 鎺у埗鍙版敼涓�娆♀�斺�旈偅绛変簬鎶娿�屽崟涓�寮�鍏炽�嶅張鎷嗘垚涓ゅ銆�
+ # 鍊兼潵鑷悇鐜 .env 鐨� JNPF_APP_DB_USER / JNPF_APP_DB_PASSWORD锛岀敱 compose 閫忎紶杩涘鍣ㄣ��
+ username: ${JNPF_APP_DB_USER:jnpf_app}
+ password: ${JNPF_APP_DB_PASSWORD:jnpf_app_2026}
+ db-schema: #閲戜粨杈炬ⅵ閫夊～
+ prepare-url: #鑷畾涔塽rl
+ # 琛ㄧ┖闂�(褰撴暟鎹簱涓篛racle銆佽揪姊M銆侀噾浠揔ingbaseES鏃惰〃绌洪棿蹇呴』鎸囧畾锛屽叾浠栨暟鎹簱涓虹┖鍗冲彲)
+ tablespace:
+ # 澶氭暟鎹簮閰嶇疆
+ dynamic:
+ seata: false
+ # 璁剧疆榛樿鐨勬暟鎹簮鎴栬�呮暟鎹簮缁�,榛樿鍊煎嵆涓簃aster
+ primary: master
+ # 涓ユ牸鍖归厤鏁版嵁婧�,榛樿false. true鏈尮閰嶅埌鎸囧畾鏁版嵁婧愭椂鎶涘紓甯�,false浣跨敤榛樿鏁版嵁婧�
+ strict: true
+ druid:
+ # 绌洪棽鏃舵墽琛岃繛鎺ユ祴璇�
+ test-while-idle: true
+ # 杩炴帴娴嬭瘯鏈�灏忛棿闅�
+ time-between-eviction-runs-millis: 60000
+ # 鑾峰彇杩炴帴绛夊緟3绉� 鏍规嵁缃戠粶鎯呭喌璁惧畾
+ max-wait: 3000
+ # 鍒濆鍖�1涓繛鎺ワ紙澶氬鎴峰瀹炰緥鍚庢瘡瀹炰緥鍙湁 150 妲斤紝瑙� adr-multi-customer-db-isolation 搂5锛�
+ initial-size: 1
+ # 鏈�澶�5涓繛鎺ワ紙鍘� 10锛氬疄娴嬪崟鏈嶅姟 active 杩炴帴鎭掍负 0銆佺函姹犵┖鍗狅紱涓�濂楅暱璺戞爤 45鈫拁25 杩炴帴锛�
+ max-active: 5
+ # 鏈�灏戜繚鎸�1涓┖闂茶繛鎺ワ紙min-idle 鏄�"姘歌繙淇濇俯"鍦版澘锛屆楁湇鍔℃暟脳鐜鏁板嵆鎭掑崰锛�
+ min-idle: 1
+ # 绌洪棽杩炴帴淇濇椿, 瓒呰繃閰嶇疆鐨勭┖闂叉椂闂翠細杩涜杩炴帴妫�鏌ュ畬鎴愪繚娲绘搷浣�(鏁版嵁搴撹嚜韬細鏂紑杈惧埌绌洪棽鏃堕棿鐨勮繛鎺ワ紝 绋嬪簭浣跨敤鏂紑鐨勮繛鎺ヤ細鎶ラ敊)
+ keep-alive: true
+ # 杩炴帴瓒呮椂
+ connect-timeout: 10000
+ # 杩炴帴瓒呮椂
+ socket-timeout: 10000
+ # 鏌ヨ瓒呮椂
+ query-timeout: 90000
+ # 浜嬪姟鏌ヨ瓒呮椂
+ transaction-query-timeout: 90000
+ # 鏁版嵁搴撹浆鐮�
+# proxy-filters: druidEncodingFilter
+# connection-properties:
+# clientEncoding: GB2312
+# serverEncoding: windows-1252
+ # 瑙ｉ櫎娉ㄩ噴鍚嶥ruid杩炴帴姹犳墦鍗癝QL璇彞 蹇界暐鏃ュ織绛夌骇閰嶇疆
+ #filters: slf4j
+ slf4j:
+ statementLogEnabled: true
+ resultSetLogEnabled: false
+ connectionLogEnabled: false
+ dataSourceLogEnabled: false
+ statementCreateAfterLogEnabled: false
+ statementCloseAfterLogEnabled: false
+ statementExecuteAfterLogEnabled: false
+ #鎵撳嵃SQL鏇挎崲鍙傛暟
+ statementExecutableSqlLogEnable: true
+ statementPrepareAfterLogEnabled: false
+ statementPrepareCallAfterLogEnabled: false
+ statementParameterSetLogEnabled: false
+# datasource:
+# # 棰濆鐨勬暟鎹簮 Service绫讳腑浣跨敤DS鍔ㄦ�佸垏鎹�
+# SQLSERVER11:
+# url: jdbc:mysql://192.168.0.30:3306/jnpf_project?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowMultiQueries=true&serverTimezone=GMT%2B8
+# username: jnpf_project
+# password: DsNnnYHscifFDfEZ
+# driver-class-name: com.mysql.cj.jdbc.Driver
+
--
Gitblit v1.8.0