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

---
 docker/flow-engine/conf/application-dev.yml |   30 ++++++++++++++++++++++++++++++
 1 files changed, 30 insertions(+), 0 deletions(-)

diff --git a/docker/flow-engine/conf/application-dev.yml b/docker/flow-engine/conf/application-dev.yml
new file mode 100644
index 0000000..45dbede
--- /dev/null
+++ b/docker/flow-engine/conf/application-dev.yml
@@ -0,0 +1,30 @@
+server:
+  port: 31000
+
+logging:
+  level:
+    root: info
+    org.flowable.engine.impl.persistence.entity.*: debug
+    org.flowable.task.service.impl.persistence.entity.*: debug
+
+spring:
+  datasource:
+    # 銆愬繀椤绘樉寮忔寚瀹� type銆慾ar 鍐呯疆 application-dev.yml 鏄� MySQL 妯℃澘
+    # (type: com.mysql.cj.jdbc.MysqlDataSource)锛汼pring Boot 澶栭儴 config 涓� jar 鍐呴厤缃槸
+    # 銆屾寜灞炴�у悎骞躲�嶈�岄潪鏁翠綋鏇挎崲鈥斺�斿彧鍘绘帀鏈枃浠剁殑 type锛屼細璁� jar 鍐呯殑 MysqlDataSource 澶嶆椿锛�
+    # 瀵艰嚧 MySQL 椹卞姩鍘昏繛 postgres URL 鎶� "Connector/J cannot handle jdbc:postgresql://..."銆�
+    # 鍘� PGSimpleDataSource 涔熸槸闈犺繖琛屾樉寮� type 鍘嬩綇 jar 鍐� MySQL 鐨勶紱鏀规睜灏辨妸瀹冩崲鎴� Hikari銆�
+    type: com.zaxxer.hikari.HikariDataSource
+    driver-class-name: org.postgresql.Driver
+    url: ${FLOW_DB_URL:jdbc:postgresql://cx-postgres:5432/jnpf_flow}
+    username: ${FLOW_DB_USER:postgres}
+    # 瀵嗙爜鏃犻粯璁ゅ�硷細鐢� compose 娉ㄥ叆锛堝�煎湪 .env锛岃 .env.example锛�
+    password: ${FLOW_DB_PASSWORD}
+    hikari:
+      # 鍘� PGSimpleDataSource 鏃犳睜銆佹瘡浜嬪姟寮�/鍏宠繛鎺� churn 澶т笖绐佸彂鏃犱笂闄愶紱鎹� Hikari 灏忚�屽皝椤躲��
+      # 15 澶� Flowable 澶氬紩鎿�(bpmn/cmmn/dmn) timer+async 閲囬泦绾跨▼ + HTTP 璇锋眰鍏变韩锛屼笖 < 瑙掕壊閰嶉銆�
+      maximum-pool-size: 15
+      minimum-idle: 2
+      connection-timeout: 5000   # 搴撴弧鏃� 5s 蹇�熷け璐ワ紝涓嶆棤闄愭寕璧锋嫋鍨噰闆嗙嚎绋�
+      keepalive-time: 120000     # 绌洪棽杩炴帴淇濇椿锛岄槻琚� PG/闃茬伀澧欓潤榛樻柇寮�
+      max-lifetime: 1800000      # 杩炴帴鏈�闀垮鍛� 30min锛屽畾鏈熻疆鎹㈤伩鍏嶈�佸寲

--
Gitblit v1.8.0