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-compose.testenv.yml | 73 ++++++++++++++++++++++++++++++++++++
1 files changed, 73 insertions(+), 0 deletions(-)
diff --git a/docker-compose.testenv.yml b/docker-compose.testenv.yml
new file mode 100644
index 0000000..e02f392
--- /dev/null
+++ b/docker-compose.testenv.yml
@@ -0,0 +1,73 @@
+# cx-postgres 涓� cx-redis 閮介��鍑烘祴璇曠幆澧冩爤锛�
+# - profiles 闂ㄦ帶璁╁畠浠笉闅� docker compose up -d 鍚姩銆侾G 鏁版嵁鍗蜂繚鐣欙紝
+# 瑕佷复鏃舵媺鍥烇細docker compose --profile local-db up -d cx-postgres
+# 锛坮edis 鍚岀悊 --profile local-redis锛�
+# - 涓氬姟鏈嶅姟鐨� depends_on 鐢� !override 娓呯┖锛圥G/Redis 鍦� CVM锛汳Q 宸蹭簬 2026-08-10 閫�鏍堬級鈥斺��
+# 涓嶆敼鐨勮瘽鍩虹嚎瀵� cx-postgres/cx-redis 鐨� service_healthy 渚濊禆浼氬湪姣忔 up
+# 鏃舵妸瀹冧滑鎷夎捣鏉�
+# - 绉婚櫎鏃ф嫇鎵戠殑 3000->5432 绔彛鍙戝竷锛堛�屾湰鏈�=姝ｅ紡搴撱�佸紑鍙戞満 VPN 鐩磋繛 3000銆�
+# 鏃朵唬鐨勪骇鐗╋紝瑙� docs/adr-single-db-topology.md锛堝凡杩囨椂锛夛紱0.0.0.0 鏆撮湶 +
+# 鍑哄巶瀵嗙爜鏄畨鍏ㄩ殣鎮ｏ級銆俉indows 闃茬伀澧欑殑 cx-pg-3000 鏀捐瑙勫垯鍙竴骞跺垹闄ゃ��
+#
+# 鍚敤鏂瑰紡锛氭湇鍔″櫒 .env 璁� COMPOSE_FILE=docker-compose.yml;docker-compose.testenv.yml
+# 锛圵indows 涓� compose 璺緞鍒嗛殧绗﹂粯璁ゆ槸鍒嗗彿锛夈�備氦浠樺熀绾� / 鏈湴寮�鍙戝潎涓嶅紩鐢ㄦ湰鏂囦欢銆�
+# 鈿狅笍 !override / !reset 闇�瑕� docker compose v2.24+銆�
+services:
+ cx-postgres:
+ profiles: [local-db]
+
+ # 娴嬭瘯鐜 Redis 涔熷湪 CVM锛坈x-redis-customer1:16432锛夛紝鏈満瀹炰緥鍚屾牱閫�鏍�
+ cx-redis:
+ profiles: [local-redis]
+
+ # 寮曟搸搴撳悓鏍峰湪 CVM锛團LOW_DB_URL 鐢� CUSTOMER_DB_HOST/PORT 鎺ㄥ锛夛紝鏈湴鏃犱緷璧�
+ cx-flow-engine:
+ depends_on: !reset {}
+
+ # 2026-08-19锛欴S 缂栬緫鍣ㄧ鍙ｃ�傚熀绾夸笉鍙戝竷浠讳綍 DS 绔彛锛屽紑鍙戞満闈� docker-compose.override.yml
+ # 鐨� "127.0.0.1:20000:80"鈥斺�斾絾**娴嬭瘯鐜涓嶅姞杞� override**锛堟湰鏂囦欢椤堕儴鐨� COMPOSE_FILE 鍙覆
+ # docker-compose.yml + 鏈枃浠讹級锛屾墍浠ラ偅鏉″杩欓噷涓嶇敓鏁堬紝琛ㄧ幇灏辨槸 `compose ps` 鍙
+ # 80/tcp銆�443/tcp 鑰屾棤瀹夸富鏄犲皠銆�
+ #
+ # 馃敶 涓� override 鐨勫叧閿樊寮傦細杩欓噷**涓嶈兘**缁� 127.0.0.1銆侱S 鐨勭紪杈戝櫒鍓嶇璧勬簮锛坅pi.js 鍙�
+ # 鍏跺悗缁潤鎬佷欢锛夋槸鐢�**娴嬭瘯浜哄憳鑷繁鐢佃剳涓婄殑娴忚鍣�**鐩存帴鍔犺浇鐨勶紝涓嶇粡缃戝叧涔熶笉缁� cx-web锛�
+ # 缁� 127.0.0.1 灏卞彧鏈夌櫥鍒拌繖鍙� server 涓婂紑娴忚鍣ㄦ墠鎵撳緱寮�銆傛晠鎸� 0.0.0.0 鍙戝竷锛屼笌鍩虹嚎
+ # 宸茬粡杩欎箞鍙戝竷鐨� 80 / 30000 涓�鑷达紙閮芥槸娴嬭瘯鐜鍒绘剰瀵瑰眬鍩熺綉寮�鏀剧殑鍙ｏ級銆�
+ #
+ # 閰嶅锛氭湇鍔″櫒 .env 蹇呴』璁� ONLYOFFICE_DS_PUBLIC_URL=http://<鏈満灞�鍩熺綉IP>:20000
+ # 锛堟祻瑙堝櫒瑙嗚鐨勫湴鍧�锛岄粯璁ゅ�� http://localhost:20000 閲岀殑 localhost 鎸囩殑鏄祻瑙堝櫒鎵�鍦ㄧ殑
+ # 閭ｅ彴鏈哄櫒锛屽湪娴嬭瘯鐜鏄敊鐨勶級銆傚彟涓や釜 DS 瑙嗚鐨勯敭淇濇寔榛樿鍗冲彲鈥斺�擠S 鍦ㄦ爤鍐咃紝
+ # cx-gateway:30000 瑙ｆ瀽寰楀埌銆�
+ cx-onlyoffice:
+ ports:
+ - "20000:80"
+
+ # 涓氬姟鏈嶅姟涓や欢浜嬶紙閿氱偣澶嶇敤锛夛細
+ # 鈶� 娓呯┖ depends_on锛氭湰鍦� cx-postgres / cx-redis 宸查��鏍堬紝namesrv 闅� RocketMQ 涓�骞剁Щ闄わ紱
+ # 鈶� 鎸傝浇 config/shared锛堜笌寮�鍙� override 鍚屾銆岄厤缃窡浠撳簱璧般�嶅舰鎬侊級鈥斺�斾笉鎸傝浇鐨勮瘽
+ # 瀹瑰櫒璇荤殑鏄瀯寤洪暅鍍忔椂鐑у叆鐨勬棫閰嶇疆锛実it pull 涓嬫潵鐨� datasource.yaml 绛夊瀹瑰櫒
+ # 涓嶅彲瑙侊紙2026-08-08 瀹炶俯锛歳edis 鍧愭爣鍙傛暟鍖栧悗娴嬭瘯鐜浠嶈繛 cx-redis锛屽洜鏃ч暅鍍忓唴
+ # yaml 鏃犲崰浣嶇锛夈�傛寕杞戒笌鍩虹嚎鐨� jnpf-resources 鍗锋寜 target 鍚堝苟锛屼簰涓嶈鐩栥��
+ cx-gateway: &no-local-pg
+ # 2026-08-10 浜嬩欢鎬荤嚎鍒� Redis銆丷ocketMQ 閫�鏍堝悗锛屾湰鍦版暟鎹潰渚濊禆褰掗浂锛圥G/Redis 鍦� CVM锛�
+ depends_on: !override {}
+ volumes:
+ - ./config/shared:/config/shared:ro
+ # 2026-08-11 骞冲彴鑱氬悎锛歝x-oauth / cx-system / cx-visualdev / cx-flowable / cx-file /
+ # cx-message / cx-permission / cx-visualdata / cx-app 涔濅釜宸插悎骞朵负 cx-platform銆�
+ # 鍥炴粴鏃舵妸涓嬮潰娉ㄩ噴鐨勪節琛屾斁鍥炴潵锛堜笌 docker-compose.yml 鐨勬敞閲婃涓�涓�瀵瑰簲锛夈��
+ cx-platform: *no-local-pg
+ # cx-oauth: *no-local-pg
+ # cx-system: *no-local-pg
+ # cx-visualdev: *no-local-pg
+ # cx-flowable: *no-local-pg
+ # cx-file: *no-local-pg
+ # cx-message: *no-local-pg
+ # cx-permission: *no-local-pg
+ # cx-visualdata: *no-local-pg
+ # cx-app: *no-local-pg
+ cx-lims: *no-local-pg
+ cx-eln: *no-local-pg
+ cx-biz-common: *no-local-pg
+ cx-dms: *no-local-pg
+ cx-scheduletask: *no-local-pg
--
Gitblit v1.8.0