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

diff --git a/jnpf-gateway/src/main/resources/application.yml b/jnpf-gateway/src/main/resources/application.yml
new file mode 100644
index 0000000..657fce7
--- /dev/null
+++ b/jnpf-gateway/src/main/resources/application.yml
@@ -0,0 +1,106 @@
+# 搴旂敤鏈嶅姟鍣�
+server:
+  tomcat:
+    uri-encoding: UTF-8
+  port: 30000
+
+spring:
+  application:
+    name: jnpf-gateway
+  mvc:
+    servlet:
+      load-on-startup: 0
+  main:
+    #瑙e喅bean閲嶅瀹氫箟鐨勩�傝缃负true鏃讹紝鍚庡畾涔夌殑bean浼氳鐩栦箣鍓嶅畾涔夌殑鐩稿悓鍚嶇О鐨刡ean
+    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/router.yaml
+      - file:${JNPF_CONFIG_DIR:config}/shared/system-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
+  cloud:
+    sentinel:
+      # 鍙栨秷鎺у埗鍙版噿鍔犺浇
+      eager: true
+      transport:
+        dashboard: 127.0.0.1:30098
+      log:
+        dir: log/${spring.application.name}/sentinel
+#      # 闄愭祦
+#      datasource:
+#        sentinel-flow:
+#          nacos:
+#            server-addr: 127.0.0.1:30099
+#            data-id: sentinel-ruleflow-service
+#            namespace: 69c4eecb-05bd-4041-81fe-1473f95f578c
+#            groupId: DEFAULT_GROUP
+#            data-type: json
+#            rule-type: flow
+#        # 鐔旀柇
+#        sentinel-degrade:
+#          nacos:
+#            server-addr: 127.0.0.1:30099
+#            data-id: sentinel-degrade-service
+#            namespace: 69c4eecb-05bd-4041-81fe-1473f95f578c
+#            groupId: DEFAULT_GROUP
+#            data-type: json
+#            rule-type: degrade
+#        # 绯荤粺鑷�傚簲淇濇姢
+#        sentinel-system:
+#          nacos:
+#            server-addr: 127.0.0.1:30099
+#            data-id: sentinel-system-service
+#            namespace: 69c4eecb-05bd-4041-81fe-1473f95f578c
+#            groupId: DEFAULT_GROUP
+#            data-type: json
+#            rule-type: system
+#        # 鏉ユ簮璁块棶鎺у埗
+#        sentinel-authority:
+#          nacos:
+#            server-addr: 127.0.0.1:30099
+#            data-id: sentinel-authority-service
+#            namespace: 69c4eecb-05bd-4041-81fe-1473f95f578c
+#            groupId: DEFAULT_GROUP
+#            data-type: json
+#            rule-type: authority
+#        # 鐑偣鍙傛暟瑙勫垯
+#        sentinel-paramflow:
+#          nacos:
+#            server-addr: 127.0.0.1:30099
+#            data-id: sentinel-paramflow-service
+#            namespace: 69c4eecb-05bd-4041-81fe-1473f95f578c
+#            groupId: DEFAULT_GROUP
+#            data-type: json
+#            rule-type: paramflow
+    gateway:
+      discovery:
+        locator:
+          lowerCaseServiceId: true
+          enabled: true
+
+# 鈿狅笍 琛ヤ竵 #8锛氬師 bootstrap.yml 鐨� ribbon 娈碉紙eager-load 绛夛級宸蹭涪寮冣�斺�擲pring Boot 3 / 褰撳墠 Spring
+# Cloud 鐗堟湰鏃� ribbon starter锛岃閰嶇疆鏈氨鏄浠g爜锛屼笉褰卞搷浠讳綍琛屼负銆�
+
+knife4j:
+  # 鑱氬悎swagger鏂囨。
+  gateway:
+    enabled: true
+    # 鎸囧畾鎵嬪姩閰嶇疆鐨勬ā寮�(榛樿涓鸿妯″紡)
+    strategy: DISCOVER # manual
+
+# 灏嗛厤缃缃埌绯荤粺灞炴�т腑
+conf2system:
+  # sentinel鏃ュ織鐩綍
+  csp.sentinel.log.dir: log/${spring.application.name}/sentinel
+  # sentinel鏃ュ織绛夌骇 LOGGING鏃ュ織绛夌骇, ALL, INFO, WARNING, SEVERE, OFF
+  csp.sentinel.log.level: "OFF"
+  # 锛堝師 rocketmq.log.level 宸查殢 RocketMQ 浜� 2026-08-10 绉婚櫎锛岃琛ヤ竵 #10锛�

--
Gitblit v1.8.0