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.override.yml | 141 +++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 141 insertions(+), 0 deletions(-)
diff --git a/docker-compose.override.yml b/docker-compose.override.yml
new file mode 100644
index 0000000..790413e
--- /dev/null
+++ b/docker-compose.override.yml
@@ -0,0 +1,141 @@
+# 鏈湴寮�鍙戣鐩栵紙Backlog A 绔彛鏀舵暃鍚庡熀绾垮彧鍙戝竷 gateway 30000锛涜ˉ涓� #8 杩藉姞 config/shared 鎸傝浇锛夈��
+#
+# 鐢ㄩ�旓細
+# 1. 瀹夸富渚ц皟璇曞叆鍙ｏ細psql/redis-cli/mqadmin/curl 涓氬姟绔彛銆佸紩鎿庡绾︽祴璇曡剼鏈�
+# 2. 琛ヤ竵 #8锛�16 涓笟鍔℃湇鍔″彧璇绘寕杞� ./config/shared:/config/shared:ro锛岃惤瀹�
+# config/README.md 涓� config/shared/audit-layer0-forms.yaml 閲�"寮�鍙� override 宸叉寕杞�
+# config/shared锛屾敼瀹岄噸鍚敓鏁�"鐨勬壙璇衡�斺�旀敼閰嶇疆鏂囦欢鍚� `docker compose restart <鏈嶅姟>`
+# 鍗崇敓鏁堬紝涓嶅繀閲嶅缓闀滃儚锛涢暅鍍忓唴 COPY 鐨勫悓浠介厤缃綔浜や粯/鏃犳寕杞藉満鏅殑鑷寘鍚厹搴�
+#
+# 瑙勫垯锛�
+# - 绔彛鍏ㄩ儴缁� 127.0.0.1锛屾湰鏈哄彲鐢ㄣ�佷笉鏆撮湶灞�鍩熺綉
+# - docker compose 鑷姩鍚堝苟鏈枃浠讹紙鏃犻渶 -f锛夛紱**浜や粯鍖呬笉鍚湰鏂囦欢**锛坅ssemble-offline-package.sh
+# 鍙� cp docker-compose.yml + .env.example锛夛紝浜や粯鐜鏁版嵁闈㈡敼閰嶇疆涓績鏈嶅姟鍚嶇洿杩�
+# 锛堣 docs/release-checklist.md 搂0锛夛紝鏃犻渶杩欎簺绔彛锛屼篃涓嶅彈涓嬫柟 profiles 闂ㄦ帶褰卞搷
+# - 闇�瑕佷复鏃跺灞�鍩熺綉寮�鏀炬煇绔彛锛堝鎵嬫満鑱旇皟锛夋椂锛屾敼鏈枃浠跺搴旇鍘绘帀 127.0.0.1: 鍓嶇紑
+# - ports/volumes 鍚堝苟閮芥槸鏁扮粍鎷兼帴锛堥潪鎸� key 瑕嗙洊锛夛細鍚屼竴鏈嶅姟鐨勫悓涓�绔彛鏄犲皠/鍚屼竴鎸傝浇鐐�
+# 涓嶈鍦ㄤ袱涓枃浠堕噷閲嶅鍐欙紝鍚﹀垯 docker 浼氶噸澶嶇粦瀹氬悓涓�瀹夸富绔彛 / 閲嶅鎸傝浇鑰屾姤閿�
+# - 鈿狅笍 !override / !reset 闇�瑕� docker compose v2.24+
+
+# 琛ヤ竵 #8锛氬崟涓�閿氱偣锛�16 涓笟鍔℃湇鍔″叡鐢紝鏀规寕杞芥簮鍙敼杩欎竴澶�
+x-config-shared-volume: &config-shared-volume
+ - ./config/shared:/config/shared:ro
+
+# 鏈満 .env 鐨� CUSTOMER_DB_HOST/JNPF_REDIS_HOST 宸叉寚 CVM锛圷OUR_DB_HOST:15432 / :16432锛夛紝
+# 鏍堝唴 cx-postgres / cx-redis 娌℃湁浠讳綍娑堣垂鑰呫�備絾鍩虹嚎 x-cx 閿氱偣瀵逛袱鑰呮槸 service_healthy 寮轰緷璧栵紝
+# depends_on 浼氶殣寮忔妸瀹冧滑鎷夎捣鏉モ�斺�旂櫧鍗犲唴瀛橈紝涓� cx/postgres 鏄� amd64 闀滃儚锛屾湰鏈鸿蛋 Rosetta 鏈�鍚� CPU銆�
+# 鏁咃細鈶� profiles 闂ㄦ帶璁╁畠浠笉闅� up -d 鍚姩锛涒憽 娓呯┖涓氬姟鏈嶅姟鐨勬湰鍦版暟鎹潰渚濊禆銆�
+#
+# 鍥炲垏鏈満娌欑洅妗ｏ紙.env 鎶� .env.local锛屽潗鏍囨敼鍥� cx-postgres:5432锛夋椂浜岄�変竴锛�
+# docker compose --profile local-db --profile local-redis up -d
+# 鎴� .env 閲岃 COMPOSE_PROFILES=local-db,local-redis
+# PG 鏁版嵁鍗� pgdata 淇濈暀鏈垹锛屾媺鍥炲嵆鐢ㄣ�俤ocker/preflight.sh 鐨勮嚜鎰堣矾寰勶紙鏄惧紡
+# `docker compose up -d cx-postgres`锛変粛鏈夋晥鈥斺�旀樉寮忕偣鍚嶆湇鍔′細鑷姩婵�娲诲叾 profile銆�
+# 锛圥G/Redis 鍦� CVM锛孧Q 宸插垹锛夈�傜敤 !reset 鑰岄潪 !override 娓呯┖锛屼笌涓嬫柟 cx-flow-engine 鍚屾鍐欐硶銆�
+# 鈿狅笍 杩欓噷蹇呴』璺熺潃鍩虹嚎涓�璧锋敼锛氭湰閿氱偣鏄� !override/!reset 璇箟锛屼細**鏁翠綋鏇挎崲**
+# docker-compose.yml 閲� x-cx 鐨� depends_on鈥斺�斿彧鏀瑰熀绾夸笉鏀硅繖閲岋紝鏀瑰姩浼氳杩欓噷瑕嗙洊鍥炲幓銆�
+x-no-local-data-plane: &no-local-data-plane
+ depends_on: !override {}
+
+services:
+ cx-postgres:
+ profiles: [local-db]
+ ports:
+ # 鏈満 Homebrew postgresql@18 鍗� 5432锛�127.0.0.1 绮剧‘缁戝畾浼樺厛锛孡016锛夛紝娌跨敤 5433
+ - "127.0.0.1:5433:5432"
+
+ cx-redis:
+ profiles: [local-redis]
+ ports:
+ - "127.0.0.1:6379:6379"
+
+ # cx-mq-namesrv / cx-mq-broker 鐨勮皟璇曠鍙ｅ彂甯冨凡闅� RocketMQ 涓�骞剁Щ闄�
+
+ cx-flow-engine:
+ # 寮曟搸搴撳悓鏍峰湪 CVM锛團LOW_DB_URL 鐢� CUSTOMER_DB_HOST/PORT 鎺ㄥ锛夛紝鏈湴鏃犱緷璧�
+ depends_on: !reset {}
+ ports:
+ # 寮曟搸娴嬭瘯鑴氭湰鍏ュ彛锛坈x-flow-engine/test/*.sh http://127.0.0.1:31000锛�+ 鏈湴 FlowDomain hairpin
+ - "127.0.0.1:31000:31000"
+
+ cx-onlyoffice:
+ ports:
+ # 娴忚鍣ㄧ洿杩� DS 杞藉叆 api.js 骞舵覆鏌撶紪杈戝櫒锛堝墠绔� VITE_GLOB_ONLYOFFICE_URL 鎸囧悜杩欓噷锛夈��
+ # 涓庡叾浠栬皟璇曠鍙ｄ笉鍚岋紝杩欐潯鏄�**鍔熻兘蹇呴渶**鑰岄潪浠呬緵璋冭瘯锛欴S 鐨勭紪杈戝櫒鍓嶇璧勬簮鐢辨祻瑙堝櫒
+ # 鐩存帴鍔犺浇锛屼笉缁忕綉鍏炽�備氦浠樼幆澧冩敼涓� Nginx 鍙嶄唬 https://<鍩熷悕>/onlyoffice/锛堣鏂规 搂8.4锛夈��
+ - "127.0.0.1:20000:80"
+
+ # 浠ヤ笅涓氬姟鏈嶅姟锛�<<: *no-local-data-plane 娓呯┖ depends_on
+ # 骞冲彴鑱氬悎鍚庨粯璁ゅ悗绔负 gateway/platform/biz-common/lims/dms锛沞ln/scheduletask 鎸� profile 鍚敤銆�
+ # 锛圥G/Redis 鍦� CVM锛孧Q 宸蹭簬 2026-08-10 绉婚櫎锛屾湰鍦板凡鏃犱换浣曟暟鎹潰渚濊禆鍙瓑锛�
+ cx-gateway:
+ <<: *no-local-data-plane
+ volumes: *config-shared-volume
+ # 骞冲彴鑱氬悎鏈嶅姟锛�2026-08-11锛夛細鍙栦唬鍘� cx-oauth / cx-system / cx-visualdev / cx-flowable /
+ # cx-file / cx-message / cx-permission / cx-visualdata / cx-app 涔濇銆�
+ # 鍙彂甯� 30002 涓�涓皟璇曞彛鈥斺�斾節涓ā鍧楀悓杩涚▼锛屽師鏉ラ偅 8 涓鍙ｅ凡鏃犲搴旂洃鍚��
+ # 鍥炴粴鏃舵妸涓嬮潰琚敞閲婄殑涔濇鏀惧洖鏉ワ紙涓� docker-compose.yml 鐨勬敞閲婃涓�涓�瀵瑰簲锛夈��
+ cx-platform:
+ <<: *no-local-data-plane
+ ports: ["127.0.0.1:30002:30002"]
+ volumes: *config-shared-volume
+ # 鈹�鈹� 浠ヤ笅涔濇闅忓钩鍙拌仛鍚堝仠鐢紝淇濈暀浠ヤ究鍥炴粴 鈹�鈹�
+ # cx-oauth:
+ # <<: *no-local-data-plane
+ # ports: ["127.0.0.1:30001:30001"]
+ # volumes: *config-shared-volume
+ # cx-system:
+ # <<: *no-local-data-plane
+ # ports: ["127.0.0.1:30002:30002"]
+ # volumes: *config-shared-volume
+ # cx-visualdev:
+ # <<: *no-local-data-plane
+ # ports: ["127.0.0.1:30003:30003"]
+ # volumes: *config-shared-volume
+ # cx-flowable:
+ # <<: *no-local-data-plane
+ # ports: ["127.0.0.1:30004:30004"]
+ # volumes: *config-shared-volume
+ # cx-file:
+ # <<: *no-local-data-plane
+ # ports: ["127.0.0.1:30005:30005"]
+ # volumes: *config-shared-volume
+ # cx-message:
+ # <<: *no-local-data-plane
+ # ports: ["127.0.0.1:30008:30008"]
+ # volumes: *config-shared-volume
+ # cx-permission:
+ # <<: *no-local-data-plane
+ # ports: ["127.0.0.1:30010:30010"]
+ # volumes: *config-shared-volume
+ cx-lims:
+ <<: *no-local-data-plane
+ ports: ["127.0.0.1:30019:30019"]
+ volumes: *config-shared-volume
+ cx-eln:
+ <<: *no-local-data-plane
+ profiles: ["eln"]
+ ports: ["127.0.0.1:30013:30013"]
+ volumes: *config-shared-volume
+ cx-biz-common:
+ <<: *no-local-data-plane
+ ports: ["127.0.0.1:30015:30015"]
+ volumes: *config-shared-volume
+ cx-dms:
+ <<: *no-local-data-plane
+ ports: ["127.0.0.1:30016:30016"]
+ volumes: *config-shared-volume
+ # cx-visualdata 闅忓钩鍙拌仛鍚堝仠鐢紝淇濈暀浠ヤ究鍥炴粴
+ # cx-visualdata:
+ # <<: *no-local-data-plane
+ # ports: ["127.0.0.1:30011:30011"]
+ # volumes: *config-shared-volume
+ cx-scheduletask:
+ <<: *no-local-data-plane
+ ports: ["127.0.0.1:30009:30009"]
+ volumes: *config-shared-volume
+ # cx-app 闅忓钩鍙拌仛鍚堝仠鐢紝淇濈暀浠ヤ究鍥炴粴
+ # cx-app:
+ # <<: *no-local-data-plane
+ # ports: ["127.0.0.1:30012:30012"]
+ # volumes: *config-shared-volume
--
Gitblit v1.8.0