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

diff --git a/jnpf-app/jnpf-app-server/src/main/resources/application.yml b/jnpf-app/jnpf-app-server/src/main/resources/application.yml
new file mode 100644
index 0000000..21b7bea
--- /dev/null
+++ b/jnpf-app/jnpf-app-server/src/main/resources/application.yml
@@ -0,0 +1,44 @@
+# 搴旂敤鏈嶅姟鍣�
+server:
+  tomcat:
+    uri-encoding: UTF-8
+  port: 30012
+
+# Spring
+spring:
+  application:
+    name: jnpf-app
+  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
+      - file:${JNPF_CONFIG_DIR:config}/shared/discovery.yaml
+      - optional:file:${JNPF_CONFIG_DIR:config}/host-override/discovery.yaml
+  profiles:
+    # 鐜閰嶇疆
+    active: test
+
+management:
+  endpoints:
+    web:
+      exposure:
+        include: '*'
+  endpoint:
+    health:
+      show-details: always
+    # 寮�鍚湪绾挎棩蹇楁煡鐪嬪姛鑳�
+    logfile:
+      enabled: true

--
Gitblit v1.8.0