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-biz-common/jnpf-biz-common-server/src/main/resources/application.yml |   82 +++++++++++++++++++++++++++++++++++++++++
 1 files changed, 82 insertions(+), 0 deletions(-)

diff --git a/jnpf-biz-common/jnpf-biz-common-server/src/main/resources/application.yml b/jnpf-biz-common/jnpf-biz-common-server/src/main/resources/application.yml
new file mode 100644
index 0000000..c5cc9a1
--- /dev/null
+++ b/jnpf-biz-common/jnpf-biz-common-server/src/main/resources/application.yml
@@ -0,0 +1,82 @@
+spring:
+  application:
+    name: jnpf-biz-common
+  mvc:
+    servlet:
+      load-on-startup: 0
+  main:
+    allow-bean-definition-overriding: true
+    allow-circular-references: true
+  config:
+    # 琛ヤ竵 #8锛氶厤缃潵婧� = 浠撳簱 config/锛堥暅鍍忓唴 /config锛岀粡 JNPF_CONFIG_DIR 鎸囧悜锛夈��
+    # file:锛堥潪 optional锛�= 缂烘枃浠跺惎鍔ㄥ嵆澶辫触锛岄槻闈欓粯鍗婇厤缃紱host-override 鏄涓绘爤
+    # 涓撶敤瑕嗙洊锛堝鍣ㄥ唴涓嶅瓨鍦紝optional 钀界┖璺宠繃锛夈��
+    import:
+      - file:${JNPF_CONFIG_DIR:config}/shared/datasource.yaml
+      - file:${JNPF_CONFIG_DIR:config}/shared/resources.yaml
+      - file:${JNPF_CONFIG_DIR:config}/shared/system-config.yaml
+      - file:${JNPF_CONFIG_DIR:config}/shared/frame-config.yaml
+      - file:${JNPF_CONFIG_DIR:config}/shared/logger.yaml
+      - file:${JNPF_CONFIG_DIR:config}/shared/mq.yaml
+      # 鏈湇鍔′笓灞為厤缃紙2026-08-11 鐢� jnpf-audit.yaml 杩佺Щ鑰屾潵锛屾壙鎺ユ棩蹇楃骇鍒紱
+      # 鎺掑湪 logger.yaml 涔嬪悗鎵嶈兘瑕嗙洊瀹冪殑 root: ERROR锛�
+      - file:${JNPF_CONFIG_DIR:config}/shared/jnpf-biz-common.yaml
+      # 瀹¤灞� 0 琛ㄥ崟娉ㄥ唽琛細鐢卞悇涓氬姟妯″潡鑷姪缁存姢锛屾晠鐙珛 data-id锛屼笉骞惰繘 jnpf-biz-common.yaml
+      # 锛�2026-08-11 闅� audit 鎼叆锛屽師鍏堢敱 jnpf-audit-server 寮曞叆锛�
+      - file:${JNPF_CONFIG_DIR:config}/shared/audit-layer0-forms.yaml
+      - file:${JNPF_CONFIG_DIR:config}/shared/discovery.yaml
+      # 鏈湇鍔′笓灞為厤缃紙鍚勮兘鍔涚殑鍙傛暟锛屽 onlyoffice.*锛夛紱鎺掑湪 shared 涔嬪悗浠ヤ究瑕嗙洊鍏变韩鍊�
+      - file:${JNPF_CONFIG_DIR:config}/shared/jnpf-biz-common.yaml
+      - optional:file:${JNPF_CONFIG_DIR:config}/host-override/discovery.yaml
+
+# 搴旂敤鏈嶅姟鍣�
+server:
+  tomcat:
+    uri-encoding: UTF-8
+  port: 30015
+
+management:
+  endpoints:
+    web:
+      exposure:
+        include: '*'
+  endpoint:
+    health:
+      show-details: always
+    logfile:
+      access: unrestricted
+
+# ping 鎺㈤拡鏀捐锛堜笁灞傛斁琛屾ā寮忥紱biz-common 鏄仛鍚堟湇鍔★紝姣忎釜鑳藉姏鍚勬湁鑷繁鐨勬帰閽堣矾寰勶級锛�
+#   路 onlyoffice 鑳藉姏锛�/onlyoffice/ping 鈫� 缃戝叧 /api/biz/onlyoffice/ping锛圫tripPrefix=2锛�
+#   路 audit 鑳藉姏锛�    /ping            鈫� 缃戝叧 /api/audit/ping锛圫tripPrefix=2锛�2026-08-11 鎼叆鏃�
+#     鍒绘剰淇濇寔鍘熻矾寰勪笉鍙橈紝缃戝叧璺敱涓� 42 涓洖褰掕剼鏈洜姝ら浂鏀瑰姩锛�
+# 鈿狅笍 L042锛氳繖涓夊眰鏄�**鏈嶅姟绾�**鏀捐锛屾棤 token 鏃剁粡缃戝叧浠嶄細 600銆佺洿杩炰粛琚� inner-auth 鎷︼紝
+# 閮芥槸璁捐鍐呰涓猴紱鍏ㄩ摼楠岃瘉蹇呴』甯︾湡瀹炵櫥褰� token銆�
+jnpf:
+  security:
+    ignore:
+      urls:
+        - /onlyoffice/ping
+        - /api/biz/onlyoffice/ping
+        - /dev-api/biz/onlyoffice/ping
+        - /ping
+        - /api/audit/ping
+        - /dev-api/audit/ping
+  tenant:
+    ignore-urls:
+      - /onlyoffice/ping
+      - /api/biz/onlyoffice/ping
+      - /dev-api/biz/onlyoffice/ping
+      - /ping
+      - /api/audit/ping
+      - /dev-api/audit/ping
+
+sa-token:
+  filter:
+    exclude-paths:
+      - /onlyoffice/ping
+      - /api/biz/onlyoffice/ping
+      - /dev-api/biz/onlyoffice/ping
+      - /ping
+      - /api/audit/ping
+      - /dev-api/audit/ping

--
Gitblit v1.8.0