From 0cbbe2c1cbfbf73e02e1796d921c2911c96d370b Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期一, 23 十二月 2024 11:46:31 +0800
Subject: [PATCH] Merge branch 'master' of http://dlindusit.com:53929/r/iailab-plat

---
 iailab-cloud/iailab-gateway/src/main/resources/application.yaml |   59 +++++++++++++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 53 insertions(+), 6 deletions(-)

diff --git a/iailab-cloud/iailab-gateway/src/main/resources/application.yaml b/iailab-cloud/iailab-gateway/src/main/resources/application.yaml
index 846d4de..600cd0a 100644
--- a/iailab-cloud/iailab-gateway/src/main/resources/application.yaml
+++ b/iailab-cloud/iailab-gateway/src/main/resources/application.yaml
@@ -2,11 +2,11 @@
   application:
     name: gateway-server
 
-  profiles:
-    active: local
-
   main:
     allow-circular-references: true # 允许循环依赖,因为项目是三层架构,无法避免这个情况。
+
+  profiles:
+    active: @profiles.active@
 
   config:
     import:
@@ -14,6 +14,20 @@
       - optional:nacos:${spring.application.name}-${spring.profiles.active}.yaml # 加载【Nacos】的配置
 
   cloud:
+    nacos:
+      server-addr: @nacos.server@ # Nacos 服务器地址
+      username: @nacos.username@
+      password: @nacos.password@
+      discovery: # 【配置中心】配置项
+        namespace: @profiles.active@
+        group: DEFAULT_GROUP # 使用的 Nacos 配置分组,默认为 DEFAULT_GROUP
+        metadata:
+          version: @nacos.metadata.version@ # 服务实例的版本号,可用于灰度发布
+          management.context-path: ${server.servlet.context-path}/actuator
+      config: # 【注册中心】配置项
+        namespace: @profiles.active@
+        group: DEFAULT_GROUP # 使用的 Nacos 配置分组,默认为 DEFAULT_GROUP
+
     # Spring Cloud Gateway 配置项,对应 GatewayProperties 类
     gateway:
       # 路由配置项,对应 RouteDefinition 数组
@@ -69,7 +83,7 @@
         - id: report-jimu # 路由的编号(积木报表)
           uri: grayLb://report-server
           predicates: # 断言,作为路由的匹配条件,对应 RouteDefinition 数组
-            - Path=/jmreport/**
+            - Path=/jmreport/**, /drag/**
         ## statistics-server 服务
         - id: statistics-admin-api # 路由的编号
           uri: grayLb://statistics-server
@@ -101,15 +115,40 @@
             - Path=/admin-api/model/**
           filters:
             - RewritePath=/admin-api/model/v3/api-docs, /v3/api-docs
+        ## shasteel 服务
+        - id: shasteel-admin-api # 路由的编号
+          uri: grayLb://shasteel-server
+          predicates: # 断言,作为路由的匹配条件,对应 RouteDefinition 数组
+            - Path=/admin-api/shasteel/**
+          filters:
+            - RewritePath=/admin-api/shasteel/v3/api-docs, /v3/api-docs
+        ## xmcpms 服务
+        - id: xmcpms-admin-api # 路由的编号
+          uri: grayLb://xmcpms-server
+          predicates: # 断言,作为路由的匹配条件,对应 RouteDefinition 数组
+            - Path=/admin-api/xmcpms/**
+          filters:
+            - RewritePath=/admin-api/xmcpms/v3/api-docs, /v3/api-docs
+        ## xmcsms 服务
+        - id: xmcsms-admin-api # 路由的编号
+          uri: grayLb://xmcsms-server
+          predicates: # 断言,作为路由的匹配条件,对应 RouteDefinition 数组
+            - Path=/admin-api/xmcsms/**
+          filters:
+            - RewritePath=/admin-api/xmcsms/v3/api-docs, /v3/api-docs
       x-forwarded:
         prefix-enabled: true # 避免 Swagger 重复带上额外的 /admin-api/system 前缀
 
 server:
   port: 48080
+  servlet:
+    context-path: /
+    session:
+      timeout: 120s
 
 logging:
   file:
-    name: ${user.home}/logs/${spring.application.name}.log # 日志文件名,全路径
+    name: @log.path@/logs/${spring.application.name}.log # 日志文件名,全路径
 
 knife4j:
   # 聚合 Swagger 文档,参考 https://doc.xiaominfo.com/docs/action/springcloud-gateway 文档
@@ -131,6 +170,9 @@
       - name: model-server
         service-name: model-server
         url: /admin-api/model/v3/api-docs
+      - name: report-server
+        service-name: report-server
+        url: /admin-api/report/v3/api-docs
 --- #################### 平台相关配置 ####################
 
 iailab:
@@ -148,4 +190,9 @@
         include: "*"
   endpoint:
     health:
-      show-details: always
\ No newline at end of file
+      show-details: always
+
+# 日志文件配置
+logging:
+  level:
+    org.springframework.context.support.PostProcessorRegistrationDelegate: ERROR # TODO 芋艿:先禁用,Spring Boot 3.X 存在部分错误的 WARN 提示
\ No newline at end of file

--
Gitblit v1.9.3