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
---
jnpf-flow-engine/src/main/resources/application-dev.yml | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 58 insertions(+), 0 deletions(-)
diff --git a/jnpf-flow-engine/src/main/resources/application-dev.yml b/jnpf-flow-engine/src/main/resources/application-dev.yml
new file mode 100644
index 0000000..df73d35
--- /dev/null
+++ b/jnpf-flow-engine/src/main/resources/application-dev.yml
@@ -0,0 +1,58 @@
+# 搴旂敤鏈嶅姟鍣�
+server:
+ tomcat:
+ uri-encoding: UTF-8 #tomcat缂栫爜
+ port: 31000
+
+# 鈺愨晲鈺愨晲鈺愨晲鈺愨晲鈺愨晲鈺愨晲鈺愨晲鈺愨晲鈺愨晲鈺愨晲鈺愨晲鈺愨晲鈺愨晲鈺愨晲鈺愨晲鈺愨晲鈺愨晲鈺愨晲鈺愨晲鈺愨晲鈺愨晲鈺愨晲鈺愨晲鈺愨晲鈺愨晲鈺愨晲鈺愨晲鈺愨晲鈺愨晲鈺愨晲鈺愨晲鈺愨晲鈺愨晲鈺愨晲鈺愨晲鈺愨晲鈺愨晲鈺愨晲鈺�
+# 杩欎唤鏄� **jar 鍐呯殑鍑哄巶榛樿鍊�**锛屽彧鍦ㄣ�孖DE 鐩磋窇婧愮爜 / java -jar 瑁歌窇銆嶆椂鐢熸晥銆�
+# 瀹瑰櫒閲屽畠浼氳澶栭儴 config 瑕嗙洊锛歞ocker/flow-engine/conf/application-dev.yml
+# 锛圖ockerfile 鐨� `COPY conf/ config/` 钀藉湪 WORKDIR 涓嬶紝Spring Boot 澶栭儴 config/
+# 浼樺厛绾ч珮浜� jar 鍐� classpath锛屼笖鏄�**鎸夊睘鎬у悎骞�**鈥斺�旈�愬睘鎬ц鐩栬�岄潪鏁翠綋鏇挎崲锛�
+#
+# 2026-08-03 鏀癸細鍘熸湰鏄� JNPF 鍑哄巶鐨� MySQL 妯℃澘锛坖dbc:mysql://127.0.0.1:3306锛宺oot/123456锛夈��
+# 鏈」鐩� 7-20 宸叉暣浣撹縼鍒� PostgreSQL锛岄偅浠介粯璁ゅ�间細璁� IDE 鐩磋窇鏃�**闈欓粯杩炲埌涓�涓畬鍏ㄩ敊璇殑搴�**
+# 鈥斺�斾笉鎶ラ敊锛屽彧鏄繛閿欍�傝繖姝ｆ槸 2026-08-03銆屾壘涓嶅埌娴佺▼妯℃澘锛岃閲嶆柊鍙戝竷璇ユ祦绋嬨�嶆晠闅滅殑褰㈢姸锛�
+# 瀹夸富 flowApi 鐢ㄧ潃 MySQL 閰嶇疆鍐欎簡鍗婁釜鏈堬紝閾捐矾涓婃病鏈変换浣曚竴澶勬姤閿欙紝鐩村埌娴嬭瘯鐜鐐逛笉寮�娴佺▼銆�
+# 娉ㄦ剰鏈� jar 閲� mysql-connector-j 涓� postgresql 椹卞姩**骞跺瓨**锛屾墍浠ラ偅浠� MySQL 閰嶇疆鏄湡鑳借繛涓婄殑銆�
+#
+# 鏁呮敼涓轰笌瀹為檯鎷撴墤涓�鑷寸殑 PG锛屽苟閬靛畧涓ゆ潯锛�
+# 鈶� url 榛樿鍊肩敤**瀹瑰櫒鏈嶅姟鍚�** cx-postgres锛堜笌 compose 榛樿涓�鑷达級鈥斺�斾笉纭紪鐮佷换浣曠湡瀹� IP锛�
+# 浜や粯缁欏鎴风殑 jar 閲屼笉璇ュ嚭鐜版垜鏂瑰湴鍧�锛汭DE 鐩磋窇鏃跺畠瑙ｆ瀽涓嶄簡锛屼細鏄庣‘鎶�
+# UnknownHostException 鑰屼笉鏄潤榛樿繛閿欏簱锛屾彁绀哄紑鍙戣�呭幓閰� FLOW_DB_URL銆�
+# 鈶� password **涓嶇粰榛樿鍊�**鈥斺�旂己浜嗗氨鍚姩澶辫触锛坒ail fast锛夈�傚嚟鎹 .env.tencent锛坓itignored锛夈��
+#
+# 鈿狅笍 寮曟搸搴撳繀椤讳笌涓氬姟搴撳悓婧愶紙鍚屼竴涓� PG 瀹炰緥锛夈�備笟鍔″簱 workflow_template.f_flowable_id
+# 璺ㄥ簱寮曠敤寮曟搸搴� act_re_deployment.id_锛屼袱鑰呬笉鍚屾簮 = 娴佺▼妯℃澘鍏ㄧ嚎澶辨晥銆�
+# 鑳屾櫙涓庡疄娴嬫暟鎹細tasks/flow-engine-db-unify-plan.md
+# 鈺愨晲鈺愨晲鈺愨晲鈺愨晲鈺愨晲鈺愨晲鈺愨晲鈺愨晲鈺愨晲鈺愨晲鈺愨晲鈺愨晲鈺愨晲鈺愨晲鈺愨晲鈺愨晲鈺愨晲鈺愨晲鈺愨晲鈺愨晲鈺愨晲鈺愨晲鈺愨晲鈺愨晲鈺愨晲鈺愨晲鈺愨晲鈺愨晲鈺愨晲鈺愨晲鈺愨晲鈺愨晲鈺愨晲鈺愨晲鈺愨晲鈺愨晲鈺愨晲鈺愨晲鈺�
+
+# 娉ㄦ剰锛�
+# 鑻ヤ娇鐢� PostgreSQL 榛樿 public 妯″紡鏃犻渶閰嶇疆 database-schema锛涙寚瀹氭ā寮忔椂鎵嶉渶瑕�
+#flowable:
+# database-schema: jnpf_flow
+
+spring:
+ datasource:
+ driver-class-name: org.postgresql.Driver
+ # 銆愬繀椤绘樉寮忔寚瀹� type銆戞湰 jar 鍐� MySQL 涓� PG 椹卞姩骞跺瓨锛涗笉鏄惧紡澹版槑鏃�
+ # Spring Boot 浼氭寜 classpath 鑷姩鎸戦�夛紝鍘嗗彶涓婂嚭杩囥�孧ySQL 椹卞姩鍘昏繛 postgresql:// URL銆�
+ # 鐨勪簨鏁咃紙璇﹁ docker/flow-engine/conf/application-dev.yml 鍚屼綅缃敞閲婏級銆�
+ type: com.zaxxer.hikari.HikariDataSource
+ url: ${FLOW_DB_URL:jdbc:postgresql://cx-postgres:5432/jnpf_flow}
+ username: ${FLOW_DB_USER:jnpf_flow_app}
+ # 鏃犻粯璁ゅ�� = 涓嶆敞鍏ュ氨鍚姩澶辫触锛岀粷涓嶉潤榛樿繛鍒伴敊璇殑搴�
+ password: ${FLOW_DB_PASSWORD}
+ hikari:
+ # 鍏变韩搴撱�佸鐜骞跺瓨锛屽崟鏈烘睜瑕佸皬锛圥G 瑙掕壊 jnpf_flow_app 鏈� CONNECTION LIMIT 閰嶉锛夈��
+ # 瀹归噺棰勭畻瑙� docs/db-connection-pool-guide.md銆�
+ maximum-pool-size: 6
+ minimum-idle: 1
+ connection-timeout: 5000 # 搴撴弧鏃跺揩閫熷け璐ワ紝涓嶆棤闄愭寕璧锋嫋鍨� Flowable 閲囬泦绾跨▼
+ keepalive-time: 120000 # 绌洪棽杩炴帴淇濇椿锛岄槻琚� PG/闃茬伀澧欓潤榛樻柇寮�
+ max-lifetime: 1800000 # 杩炴帴鏈�闀垮鍛� 30min锛屽畾鏈熻疆鎹㈤伩鍏嶈�佸寲
+
+# 鍏朵綑鏁版嵁搴擄紙MySQL / SQLServer / Oracle / 杈炬ⅵ / KingbaseES锛夌殑鍑哄巶鏍蜂緥娈靛凡鍒犻櫎锛�
+# 鏈」鐩暟鎹簱鎷撴墤宸插畾涓� PostgreSQL锛坉ocs/db-connection-pool-guide.md 鏄敮涓�鏉冨▉锛夛紝
+# 鐣欑潃閭ｄ簺 127.0.0.1 鐨勫亣閰嶇疆鍙細鎴愪负銆岄潤榛樿繛閿欏簱銆嶇殑璇遍サ銆�
+# 闇�瑕佹椂浠� git 鍘嗗彶鍙栧洖鏈枃浠� 2026-08-03 涔嬪墠鐨勭増鏈��
--
Gitblit v1.8.0