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/jnpf-biz-common.yaml |  118 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 118 insertions(+), 0 deletions(-)

diff --git a/config/shared/jnpf-biz-common.yaml b/config/shared/jnpf-biz-common.yaml
new file mode 100644
index 0000000..006bad1
--- /dev/null
+++ b/config/shared/jnpf-biz-common.yaml
@@ -0,0 +1,118 @@
+onlyoffice:
+  # 娴忚鍣ㄥ姞杞界紪杈戝櫒 api.js 鐨勫湴鍧�銆傛敞鎰忚繖鏄�**娴忚鍣ㄨ瑙�**鐨勫湴鍧�锛屼笉鏄鍣ㄨ瑙掆�斺��
+  # 瀹瑰櫒鍚� cx-onlyoffice 娴忚鍣ㄨВ鏋愪笉浜嗭紝鏈満寮�鍙戣蛋 override 鍙戝竷鐨� 20000 绔彛銆�
+  # 浜や粯鐜鏀逛负 Nginx 鍙嶄唬鐨� https://<鍩熷悕>/onlyoffice锛堟柟妗� 搂8.4锛夈��
+  ds-public-url: ${ONLYOFFICE_DS_PUBLIC_URL:http://localhost:20000}
+
+  # 缁� DS 鍥炴簮鎷夊師濮嬫枃妗g敤锛圖S 瑙嗚锛夈�傝矾寰� /api/file/Image/** 鍦� GatewayWhite
+  # 纭紪鐮佺櫧鍚嶅崟鍐咃紝DS 鏃犵櫥褰曟�佷篃鑳藉彇锛岄潬 URL 涓婄殑 securityKey 绁ㄦ嵁閴存潈銆�
+  # 瀹夸富 java -jar 鏍堥渶瑕嗙洊涓� http://host.docker.internal:30000锛圖S 鍦ㄥ鍣ㄣ�佺綉鍏冲湪瀹夸富锛夈��
+  file-fetch-base-url: ${ONLYOFFICE_FILE_FETCH_BASE_URL:http://cx-gateway:30000}
+
+  # 缁� DS 鍥炶皟鍚庣鐢紙DS 瑙嗚锛夈�傚繀椤荤粡缃戝叧鈥斺�旂洿杩� 30015 鎸� L042 浼氳 inner-auth 鎷掞紝
+  # 鑰� DS 涓嶆槸 JNPF 鏈嶅姟銆佹敞鍏ヤ笉浜� SA-SAME-TOKEN銆傚洖璋冭矾寰勫凡杩涚綉鍏崇櫧鍚嶅崟锛堝钩鍙拌ˉ涓� #9锛夈��
+  callback-base-url: ${ONLYOFFICE_CALLBACK_BASE_URL:http://cx-gateway:30000}
+
+  # 鍚庣鍙嶅悜鎷夊彇 DS 浜х墿鐨勫湴鍧�锛堝悗绔瑙掞級銆備繚瀛樺洖璋冮噷 DS 缁欑殑涓嬭浇 url 鐢ㄧ殑鏄畠鑷繁
+  # 瑙嗚鐨勪富鏈哄悕锛屽悗绔笉涓�瀹氳兘鐩磋繛锛涢厤浜嗘湰椤瑰氨鍙繚鐣欏叾 path+query 鎹㈠埌杩欎釜涓绘満涓娿��
+  # 鐣欑┖鍒欏師鏍蜂娇鐢� DS 缁欑殑 url銆傚涓� java -jar 鏍堥渶瑕嗙洊涓� http://localhost:20000銆�
+  ds-internal-url: ${ONLYOFFICE_DS_INTERNAL_URL:http://cx-onlyoffice}
+
+  # 涓� DS 瀹瑰櫒鐨� JWT_SECRET 鍚屾簮锛堥兘璇� .env 鐨� ONLYOFFICE_JWT_SECRET锛夈��
+  # 鍚庣鐢ㄥ畠绛惧彂缂栬緫鍣� config锛屽苟鏍¢獙 DS 鍥炶皟鐨� Authorization: Bearer銆�
+  # 馃敶 鍥炶皟绔偣鍖垮悕鍙揪锛堢櫧鍚嶅崟鏀捐锛夛紝杩欎釜 secret 鏄畠鍞竴鐨勫畨鍏ㄨ竟鐣屻��
+  # 鏃犻粯璁ゅ�硷細缂哄け鍗冲惎鍔ㄥけ璐ワ紝閬垮厤鐢ㄧ┖涓查潤榛樿窇璧锋潵鍚庡洖璋冨叏琚嫆銆佷笖鏃ュ織涓嶆槑鏄俱��
+  jwt-secret: ${ONLYOFFICE_JWT_SECRET}
+
+  # 缂栬緫閿佺殑蹇冭烦瓒呮椂锛堝垎閽燂級銆傞攣姝e父鐢� status 2/4 鍥炶皟閲婃斁锛涙祻瑙堝櫒宕╂簝绛夊紓甯�
+  # 鍦烘櫙涓嬮潬杩欎釜鍏滃簳锛屽惁鍒欐枃妗d細姘镐箙閿佹銆傝鏂规 搂6.2銆�
+  lock-timeout-minutes: ${ONLYOFFICE_LOCK_TIMEOUT_MINUTES:30}
+
+  # 缂栬緫鍣ㄩ噷鏄惁缁欎笅杞�/鎵撳嵃鍏ュ彛锛堛�屾枃浠� 鈫� 涓嬭浇涓恒�嶃�屾枃浠� 鈫� 鎵撳嵃銆嶄笌椤舵爮鍙充晶閭d袱涓浘鏍囷級銆�
+  # 榛樿鍏ㄥ叧銆�
+  # 鈿狅笍 杩欎袱椤瑰彧鏀剁晫闈㈠叆鍙o紝**涓嶆槸瀹夊叏杈圭晫**锛�/api/file/Image/** 鍦ㄧ綉鍏崇櫧鍚嶅崟鍐呫�佸彧闈�
+  #   securityKey 绁ㄦ嵁閴存潈锛岀煡閬� URL 鐨勪汉鐓ф牱鑳芥妸鍘熸枃浠舵媺璧般�傜湡姝g殑涓嬭浇绠℃帶瑕佽惤鍦ㄦ枃浠舵湇鍔″眰銆�
+  # 闇�瑕佹寜浜哄尯鍒嗘椂锛岀敤 edit-permission 閭e bizModule鈫抦oduleId 鐧昏琛ㄥ垽
+  #   moduleId::btn_download / btn_batchPrint锛圥ermissionConst 閲屽凡鏈夎繖涓や釜鐮侊級锛屾満鍒剁幇鎴愩��
+  allow-download: ${ONLYOFFICE_ALLOW_DOWNLOAD:false}
+  allow-print: ${ONLYOFFICE_ALLOW_PRINT:false}
+
+  # ELN 妯℃澘鏍囨敞鎻掍欢銆傚叕缃戝熀纭�鍦板潃浠庨儴缃茬幆澧冩敞鍏ワ紝release 鐢变笉鍙彉鍙戝竷鐩綍鍐冲畾銆�
+  plugins:
+    definitions:
+      eln-template-annotator:
+        guid: asc.{2D6D6CB6-F6FC-45B7-8EC7-0CC1940F1A6F}
+        version: 0.1.0
+        public-base-url: ${ONLYOFFICE_PLUGIN_PUBLIC_BASE_URL:http://localhost:4173/onlyoffice-plugins}
+        release: ${ONLYOFFICE_PLUGIN_RELEASE:0.1.0-dev}
+        api-base-url: ${ONLYOFFICE_PLUGIN_API_BASE_URL:http://localhost:30000}
+      eln-template-filler:
+        guid: asc.{7F4E8F35-5D66-47F8-A5B4-6AB3FAACF565}
+        version: 0.1.0
+        public-base-url: ${ONLYOFFICE_PLUGIN_PUBLIC_BASE_URL:http://localhost:4173/onlyoffice-plugins}
+        release: ${ONLYOFFICE_PLUGIN_RELEASE:0.1.0-dev}
+        api-base-url: ${ONLYOFFICE_PLUGIN_API_BASE_URL:http://localhost:30000}
+    scenes:
+      - biz-scene: eln.template.annotate
+        biz-module: eln.template
+        plugin-codes:
+          - eln-template-annotator
+        autostart-plugin-code: eln-template-annotator
+        disabled-plugin-guids:
+          - asc.{AA2EA9B6-9EC2-415F-9762-634EE8D9A95E}
+      - biz-scene: eln.template.fill
+        biz-module: eln.template
+        plugin-codes:
+          - eln-template-filler
+        autostart-plugin-code: eln-template-filler
+        disabled-plugin-guids:
+          - asc.{AA2EA9B6-9EC2-415F-9762-634EE8D9A95E}
+
+  # 鈹�鈹� 璋佽兘缂栬緫锛堥噷绋嬬 4锛屾柟妗� 搂6.1锛夆攢鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�
+  # 绮掑害鏄�**鑿滃崟/鎸夐挳绾�**锛屽拰骞冲彴鍦ㄧ嚎琛ㄥ崟鐨勫崟鏉℃洿鏂扮鐐逛竴涓彛寰勶紙閭h竟涔熷彧鍋�
+  # StpUtil.checkPermission锛屾暟鎹寖鍥村彧鐢ㄤ簬鍒楄〃 WHERE锛夈�傛潈闄愮爜鐧诲綍鏃跺凡杩� Sa-Token
+  # 浼氳瘽锛屽垽瀹氱函鏈湴銆佹棤杩滅▼璋冪敤銆�
+  #
+  # 鍋氫笉鍒般�岃褰曠骇銆嶏紙杩欎竴鏉℃楠屽崟璇ヤ笉璇ョ粰杩欎釜浜烘敼锛夋槸鏈夋剰涓轰箣锛氶偅瑕佽涓氬姟琛ㄧ殑鐝粍/
+  # 璐熻矗浜�/娴佺▼鐘舵�侊紝灞炰簬涓氬姟瑙勫垯锛宐iz-common 鐨勫噯鍏ヨ鍒欑姝㈠畠鍚崟涓�涓氬姟妯″潡鐨勪笓灞為�昏緫銆�
+  # 闇�瑕佽褰曠骇鏃讹紝鐢变笟鍔℃ā鍧楄嚜宸卞垽瀹屽啀鎵撳紑缂栬緫鍣ㄣ��
+  edit-permission:
+    # 鏈櫥璁扮殑 bizModule锛堟垨璇锋眰鍘嬫牴娌″甫 bizModule锛夋椂鐨勫彇鍚戙��
+    #   false锛堥粯璁わ級= 鏀捐缂栬緫 + 涓�鏉� warn銆傚吋瀹归粯璁ゅ�硷細鍓嶇鏈�绠�璋冪敤
+    #     onlineUtils.openOfficeDocument({ file }) 骞朵笉浼� bizModule锛屼竴涓婃潵灏变弗鏍间細
+    #     璁╂墍鏈夋棦鏈夎皟鐢ㄦ柟绐佺劧鍏ㄥ彉鍙銆�
+    #   true = 涓�寰嬪彧璇汇��**璇ョ櫥璁扮殑閮界櫥璁板畬涔嬪悗搴斿綋鎵撳紑瀹�**鈥斺�斿惁鍒欍�屾紡鐧昏銆嶇殑琛ㄧ幇鏄�
+    #     鎮勬倓鏀捐缂栬緫锛岃�屼笉鏄兘琚汉鍙戠幇鐨勬姤閿欍��
+    strict: ${ONLYOFFICE_EDIT_PERMISSION_STRICT:false}
+
+    # bizModule 鈫� 鍦ㄧ嚎琛ㄥ崟 moduleId 鐨勭櫥璁拌〃銆備笟鍔′晶鑷姪鍔犺锛屼笉鐢ㄦ敼 biz-common 浠g爜銆�
+    # 鐢� List 涓嶇敤 Map锛歋pring Boot Binder 瀵� Map 鏄悎骞惰涔夈�佸 List 鏄暣浣撴浛鎹紝
+    # 鍐欐垚 Map 鐨勮瘽鍒犳帀涓�鏉$櫥璁版牴鏈笉鐢熸晥锛坅udit 鐨� layer0 娉ㄥ唽琛ㄨ俯杩囪繖涓潙锛夈��
+    #
+    # 鈿狅笍 require-btn-edit 鏄櫡闃变綅锛氬湪绾胯〃鍗曞彧鏈夊嬀浜嗐�屽惎鐢ㄦ寜閽潈闄愩�嶏紝鐢ㄦ埛鏉冮檺琛ㄩ噷鎵嶄細鏈�
+    #   <moduleId>::btn_edit銆傛病鍚敤鍗寸暀 true锛岀粨鏋滄槸**鎵�鏈変汉閮借闄嶇骇鍙**銆�
+    #   璇ヨ〃鍗曟病鍚敤鎸夐挳鏉冮檺鏃跺~ false锛屾鏃跺彧鏍¢獙鑿滃崟绾ф潈闄愩��
+    #
+    # modules:
+    #   - biz-module: lims_jianyan_baogao
+    #     module-id: '507748874527276549'   # base_module.f_id
+    #     require-btn-edit: true
+    modules: []
+# 鈺愨晲 2026-08-11锛氱敱 jnpf-audit.yaml 杩佺Щ鑰屾潵 鈺愨晲
+# audit 鎼叆 biz-common銆乯npf-audit-server 閫�褰瑰悗锛屽師 config/shared/jnpf-audit.yaml 宸插垹闄ゃ��
+# 璇ユ枃浠堕噷鍞竴鐨勬椿閰嶇疆灏辨槸涓嬮潰杩欒鏃ュ織绾у埆锛�**蹇呴』璺熺潃鏈嶅姟鍚嶄竴璧疯縼绉�**锛�
+# logback-spring.xml 鍙栫殑鏄� `log.level.<spring.application.name>`
+#   锛坖npf-biz-common-server/src/main/resources/logback-spring.xml:14
+#    <springProperty ... source="log.level.jnpf-biz-common"/>锛夛紝
+# 鏈嶅姟鍚嶄粠 jnpf-audit 鍙樻垚 jnpf-biz-common锛屽師鏉ラ偅琛� `log.level.jnpf-audit` 灏卞啀涔熶笉浼氳璇诲埌鈥斺��
+# 琛ㄧ幇涓嶆槸鎶ラ敊锛岃�屾槸**瀹¤娑堣垂/钀藉簱閾捐矾鐨� log.info 琚叡浜� logger.yaml 鐨� root: ERROR 闈欓粯鍘嬫帀**銆�
+#
+# 鍘� jnpf-audit.yaml 涓彟涓�娈碉紙AUDIT_EVENT 鐨� Spring Cloud Stream binding 涓轰綍蹇呴』绉婚櫎锛�
+# 宸查殢闄嶇骇閾剧涓�绾� MQ 涓�骞朵綔搴燂紝鍏跺巻鍙茶璇佽浆璁颁簬
+# docs/handoff-2026-08-11-audit-into-biz-common.md锛屼笉鍦ㄩ厤缃枃浠堕噷鐣欏瓨銆�
+log:
+  level:
+    # 鍏变韩 logger.yaml 鎶� log.level.root 鍘嬪埌 ERROR锛涙湰鏂囦欢鍦� application.yml 鐨�
+    # spring.config.import 鍒楄〃閲屾帓鍦� logger.yaml 涔嬪悗锛屼紭鍏堢骇鏇撮珮锛岃繖閲岃鐩栧洖 INFO
+    # 璁╁璁℃秷璐�/钀藉簱閾捐矾鐨� log.info 鍙锛屼笉鍔ㄥ叡浜枃浠躲��
+    jnpf-biz-common: INFO

--
Gitblit v1.8.0