diff --git a/yudao-gateway/src/main/resources/application.yaml b/yudao-gateway/src/main/resources/application.yaml
deleted file mode 100644
index a03f08b..0000000
--- a/yudao-gateway/src/main/resources/application.yaml
+++ /dev/null
@@ -1,253 +0,0 @@
-spring:
- application:
- name: gateway-server
-
- profiles:
- active: local
-
- codec:
- max-in-memory-size: 10MB # 调整缓冲区大小https://gitee.com/zhijiantianya/yudao-cloud/pulls/176
-
- # Jackson 配置项
- jackson:
- serialization:
- write-dates-as-timestamps: true # 设置 LocalDateTime 的格式,使用时间戳
- write-date-timestamps-as-nanoseconds: false # 设置不使用 nanoseconds 的格式。例如说 1611460870.401,而是直接 1611460870401
- write-durations-as-timestamps: true # 设置 Duration 的格式,使用时间戳
- fail-on-empty-beans: false # 允许序列化无属性的 Bean
-
- main:
- allow-circular-references: true # 允许循环依赖,因为项目是三层架构,无法避免这个情况。
-
- config:
- import:
- - optional:classpath:application-${spring.profiles.active}.yaml # 加载【本地】配置
- - optional:nacos:${spring.application.name}-${spring.profiles.active}.yaml # 加载【Nacos】的配置
-
- cloud:
- # Spring Cloud Gateway 配置项,对应 GatewayProperties 类
- gateway:
- # 路由配置项,对应 RouteDefinition 数组
- routes:
- ## system-server 服务
- - id: system-admin-api # 路由的编号
- uri: grayLb://system-server
- predicates: # 断言,作为路由的匹配条件,对应 RouteDefinition 数组
- - Path=/admin-api/system/**
- filters:
- - RewritePath=/admin-api/system/v3/api-docs, /v3/api-docs # 配置,保证转发到 /v3/api-docs
- - id: system-app-api # 路由的编号
- uri: grayLb://system-server
- predicates: # 断言,作为路由的匹配条件,对应 RouteDefinition 数组
- - Path=/app-api/system/**
- filters:
- - RewritePath=/app-api/system/v3/api-docs, /v3/api-docs
- ## infra-server 服务
- - id: infra-admin-api # 路由的编号
- uri: grayLb://infra-server
- predicates: # 断言,作为路由的匹配条件,对应 RouteDefinition 数组
- - Path=/admin-api/infra/**
- filters:
- - RewritePath=/admin-api/infra/v3/api-docs, /v3/api-docs
- - id: infra-app-api # 路由的编号
- uri: grayLb://infra-server
- predicates: # 断言,作为路由的匹配条件,对应 RouteDefinition 数组
- - Path=/app-api/infra/**
- filters:
- - RewritePath=/app-api/infra/v3/api-docs, /v3/api-docs
- - id: infra-spring-boot-admin # 路由的编号(Spring Boot Admin)
- uri: grayLb://infra-server
- predicates: # 断言,作为路由的匹配条件,对应 RouteDefinition 数组
- - Path=/admin/**
- - id: infra-websocket # 路由的编号(WebSocket)
- uri: grayLb://infra-server
- predicates: # 断言,作为路由的匹配条件,对应 RouteDefinition 数组
- - Path=/infra/ws/**
- ## member-server 服务
- - id: member-admin-api # 路由的编号
- uri: grayLb://member-server
- predicates: # 断言,作为路由的匹配条件,对应 RouteDefinition 数组
- - Path=/admin-api/member/**
- filters:
- - RewritePath=/admin-api/member/v3/api-docs, /v3/api-docs
- - id: member-app-api # 路由的编号
- uri: grayLb://member-server
- predicates: # 断言,作为路由的匹配条件,对应 RouteDefinition 数组
- - Path=/app-api/member/**
- filters:
- - RewritePath=/app-api/member/v3/api-docs, /v3/api-docs
- ## bpm-server 服务
- - id: bpm-admin-api # 路由的编号
- uri: grayLb://bpm-server
- predicates: # 断言,作为路由的匹配条件,对应 RouteDefinition 数组
- - Path=/admin-api/bpm/**
- filters:
- - RewritePath=/admin-api/bpm/v3/api-docs, /v3/api-docs
- ## report-server 服务
- - id: report-admin-api # 路由的编号
- uri: grayLb://report-server
- predicates: # 断言,作为路由的匹配条件,对应 RouteDefinition 数组
- - Path=/admin-api/report/**
- filters:
- - RewritePath=/admin-api/report/v3/api-docs, /v3/api-docs
- - id: report-jimu # 路由的编号(积木报表)
- uri: grayLb://report-server
- predicates: # 断言,作为路由的匹配条件,对应 RouteDefinition 数组
- - Path=/jmreport/**, /drag/**, /jimubi/**
- ## pay-server 服务
- - id: pay-admin-api # 路由的编号
- uri: grayLb://pay-server
- predicates: # 断言,作为路由的匹配条件,对应 RouteDefinition 数组
- - Path=/admin-api/pay/**
- filters:
- - RewritePath=/admin-api/pay/v3/api-docs, /v3/api-docs # 配置,保证转发到 /v3/api-docs
- - id: pay-app-api # 路由的编号
- uri: grayLb://pay-server
- predicates: # 断言,作为路由的匹配条件,对应 RouteDefinition 数组
- - Path=/app-api/pay/**
- filters:
- - RewritePath=/app-api/pay/v3/api-docs, /v3/api-docs
- ## mp-server 服务
- - id: mp-admin-api # 路由的编号
- uri: grayLb://mp-server
- predicates: # 断言,作为路由的匹配条件,对应 RouteDefinition 数组
- - Path=/admin-api/mp/**
- filters:
- - RewritePath=/admin-api/mp/v3/api-docs, /v3/api-docs
- ## product-server 服务
- - id: product-admin-api # 路由的编号
- uri: grayLb://product-server
- predicates: # 断言,作为路由的匹配条件,对应 RouteDefinition 数组
- - Path=/admin-api/product/**
- filters:
- - RewritePath=/admin-api/product/v3/api-docs, /v3/api-docs # 配置,保证转发到 /v3/api-docs
- - id: product-app-api # 路由的编号
- uri: grayLb://product-server
- predicates: # 断言,作为路由的匹配条件,对应 RouteDefinition 数组
- - Path=/app-api/product/**
- filters:
- - RewritePath=/app-api/product/v3/api-docs, /v3/api-docs
- ## promotion-server 服务
- - id: promotion-admin-api # 路由的编号
- uri: grayLb://promotion-server
- predicates: # 断言,作为路由的匹配条件,对应 RouteDefinition 数组
- - Path=/admin-api/promotion/**
- filters:
- - RewritePath=/admin-api/promotion/v3/api-docs, /v3/api-docs # 配置,保证转发到 /v3/api-docs
- - id: promotion-app-api # 路由的编号
- uri: grayLb://promotion-server
- predicates: # 断言,作为路由的匹配条件,对应 RouteDefinition 数组
- - Path=/app-api/promotion/**
- filters:
- - RewritePath=/app-api/promotion/v3/api-docs, /v3/api-docs
- ## trade-server 服务
- - id: trade-admin-api # 路由的编号
- uri: grayLb://trade-server
- predicates: # 断言,作为路由的匹配条件,对应 RouteDefinition 数组
- - Path=/admin-api/trade/**
- filters:
- - RewritePath=/admin-api/trade/v3/api-docs, /v3/api-docs # 配置,保证转发到 /v3/api-docs
- - id: trade-app-api # 路由的编号
- uri: grayLb://trade-server
- predicates: # 断言,作为路由的匹配条件,对应 RouteDefinition 数组
- - Path=/app-api/trade/**
- filters:
- - RewritePath=/app-api/trade/v3/api-docs, /v3/api-docs
- ## statistics-server 服务
- - id: statistics-admin-api # 路由的编号
- uri: grayLb://statistics-server
- predicates: # 断言,作为路由的匹配条件,对应 RouteDefinition 数组
- - Path=/admin-api/statistics/**
- filters:
- - RewritePath=/admin-api/statistics/v3/api-docs, /v3/api-docs # 配置,保证转发到 /v3/api-docs
- ## erp-server 服务
- - id: erp-admin-api # 路由的编号
- uri: grayLb://erp-server
- predicates: # 断言,作为路由的匹配条件,对应 RouteDefinition 数组
- - Path=/admin-api/erp/**
- filters:
- - RewritePath=/admin-api/erp/v3/api-docs, /v3/api-docs # 配置,保证转发到 /v3/api-docs
- ## crm-server 服务
- - id: crm-admin-api # 路由的编号
- uri: grayLb://crm-server
- predicates: # 断言,作为路由的匹配条件,对应 RouteDefinition 数组
- - Path=/admin-api/crm/**
- filters:
- - RewritePath=/admin-api/crm/v3/api-docs, /v3/api-docs # 配置,保证转发到 /v3/api-docs
- ## ai-server 服务
- - id: ai-admin-api # 路由的编号
- uri: grayLb://ai-server
- predicates: # 断言,作为路由的匹配条件,对应 RouteDefinition 数组
- - Path=/admin-api/ai/**
- filters:
- - RewritePath=/admin-api/ai/v3/api-docs, /v3/api-docs # 配置,保证转发到 /v3/api-docs
- ## iot-server 服务
- - id: iot-admin-api # 路由的编号
- uri: grayLb://iot-server
- predicates: # 断言,作为路由的匹配条件,对应 RouteDefinition 数组
- - Path=/admin-api/iot/**
- filters:
- - RewritePath=/admin-api/iot/v3/api-docs, /v3/api-docs # 配置,保证转发到 /v3/api-docs
- x-forwarded:
- prefix-enabled: false # 避免 Swagger 重复带上额外的 /admin-api/system 前缀
-
-server:
- port: 48080
-
-logging:
- file:
- name: ${user.home}/logs/${spring.application.name}.log # 日志文件名,全路径
-
-knife4j:
- # 聚合 Swagger 文档,参考 https://doc.xiaominfo.com/docs/action/springcloud-gateway 文档
- gateway:
- enabled: true
- routes:
- - name: system-server
- service-name: system-server
- url: /admin-api/system/v3/api-docs
- - name: infra-server
- service-name: infra-server
- url: /admin-api/infra/v3/api-docs
- - name: member-server
- service-name: member-server
- url: /admin-api/member/v3/api-docs
- - name: bpm-server
- service-name: bpm-server
- url: /admin-api/bpm/v3/api-docs
- - name: pay-server
- service-name: pay-server
- url: /admin-api/pay/v3/api-docs
- - name: mp-server
- service-name: mp-server
- url: /admin-api/mp/v3/api-docs
- - name: product-server
- service-name: product-server
- url: /admin-api/product/v3/api-docs
- - name: promotion-server
- service-name: promotion-server
- url: /admin-api/promotion/v3/api-docs
- - name: trade-server
- service-name: trade-server
- url: /admin-api/trade/v3/api-docs
- - name: statistics-server
- service-name: statistics-server
- url: /admin-api/statistics/v3/api-docs
- - name: erp-server
- service-name: erp-server
- url: /admin-api/erp/v3/api-docs
- - name: crm-server
- service-name: crm-server
- url: /admin-api/crm/v3/api-docs
- - name: ai-server
- service-name: ai-server
- url: /admin-api/ai/v3/api-docs
- - name: iot-server
- service-name: iot-server
- url: /admin-api/iot/v3/api-docs
-
---- #################### 芋道相关配置 ####################
-
-yudao:
- info:
- version: 1.0.0
\ No newline at end of file
diff --git a/yudao-gateway/src/main/resources/bootstrap.yml b/yudao-gateway/src/main/resources/bootstrap.yml
index 842504d..69bb5d1 100644
--- a/yudao-gateway/src/main/resources/bootstrap.yml
+++ b/yudao-gateway/src/main/resources/bootstrap.yml
@@ -12,8 +12,8 @@ spring:
config:
group: ${DEPLOY_ENV}
namespace: ${DEPLOY_ENV}
- file-extension: yml
+ file-extension: yaml
config:
import:
- - optional:nacos:zoe-gateway.yml?group=DEFAULT_GROUP
- - optional:classpath:application.yml
\ No newline at end of file
+ - optional:nacos:zoe-gateway.yaml?group=DEFAULT_GROUP
+ - optional:classpath:application.yaml
\ No newline at end of file
diff --git a/yudao-module-ai/yudao-spring-boot-starter-ai/pom.xml b/yudao-module-ai/yudao-spring-boot-starter-ai/pom.xml
index 8f3ccc2..f820260 100644
--- a/yudao-module-ai/yudao-spring-boot-starter-ai/pom.xml
+++ b/yudao-module-ai/yudao-spring-boot-starter-ai/pom.xml
@@ -26,13 +26,13 @@
- cn.iocoder.cloud
+ com.qqchen.cloud
yudao-spring-boot-starter-biz-tenant
- cn.iocoder.cloud
+ com.qqchen.cloud
yudao-spring-boot-starter-security
diff --git a/yudao-server/pom.xml b/yudao-server/pom.xml
index 384c6a4..66a4df7 100644
--- a/yudao-server/pom.xml
+++ b/yudao-server/pom.xml
@@ -3,8 +3,8 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- cn.iocoder.cloud
- yudao
+ com.qqchen.cloud
+ zoe
${revision}
4.0.0
@@ -22,98 +22,98 @@
- cn.iocoder.cloud
+ com.qqchen.cloud
yudao-module-system-biz
${revision}
- cn.iocoder.cloud
+ com.qqchen.cloud
yudao-module-infra-biz
${revision}
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
- cn.iocoder.cloud
+ com.qqchen.cloud
yudao-module-pay-biz
${revision}
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
@@ -124,7 +124,7 @@
- cn.iocoder.cloud
+ com.qqchen.cloud
yudao-spring-boot-starter-protection
@@ -142,7 +142,7 @@
- cn.iocoder.cloud
+ com.qqchen.cloud
yudao-spring-boot-starter-rpc