diff --git a/script/sentinel/gateway-server/gateway-server-degrade-rules.json b/script/sentinel/gateway-server/gateway-server-degrade-rules.json new file mode 100644 index 000000000..5cd82e079 --- /dev/null +++ b/script/sentinel/gateway-server/gateway-server-degrade-rules.json @@ -0,0 +1,11 @@ +[ + { + "resource": "feign-test", // 资源名 + "count": 1000, // 当熔断策略是慢调用时，此值为最大RT，单位是毫秒。当熔断是策略是异常比例时，此值为异常比例。当熔断策略是异常数时，此值为异常数目 + "timeWindow": 5, // 熔断时长，单位是秒 + "grade": 0, // 0: 慢调用， 1: 异常比例，2:异常数 + "minRequestAmount": 2, // 最小请求数 + "slowRatioThreshold": 0.2, // 比例阈值 + "statIntervalMs": 10000 // 统计时长，单位毫秒 + } +] \ No newline at end of file diff --git a/script/sentinel/gateway-server/gateway-server-gw-flow-rules.json b/script/sentinel/gateway-server/gateway-server-gw-flow-rules.json new file mode 100644 index 000000000..f80c1d360 --- /dev/null +++ b/script/sentinel/gateway-server/gateway-server-gw-flow-rules.json @@ -0,0 +1,12 @@ +[ + { + "resource": "feign-test", // 资源名 + "resourceMode": 0, // API类型, 0: ROUTE ID区分, 1: API + "count": 1, // 阈值，QPS类型就是限制时间间隔的请求数，线程数类型就是指并行的线程数 + "grade": 1, // 阈值类型，0：线程数，1：QPS + "controlBehavior": 2, // 流控方式，0：快速失败，2：匀速排队 + "intervalSec": 10, // 间隔，单位是秒 + "burst": 0, // burst，只有在快速失败时才有效 + "maxQueueingTimeoutMs": 1000 // 超时时间，单位是毫秒 + } +] \ No newline at end of file diff --git a/script/sentinel/gateway-server/gateway-server-system-rules.json b/script/sentinel/gateway-server/gateway-server-system-rules.json new file mode 100644 index 000000000..6fb378ca0 --- /dev/null +++ b/script/sentinel/gateway-server/gateway-server-system-rules.json @@ -0,0 +1,10 @@ +[ + { + "avgRt": 1, // RT + "highestCpuUsage": -1, // CPU 使用率 + "highestSystemLoad": -1, // LOAD + "maxThread": -1, // 线程数 + "qps": -1, // 入口 QPS + "count": 55 // 阈值，在CPU使用率中是百分比 + } +] \ No newline at end of file diff --git a/script/sentinel/system-server/system-server-authority-rules.json b/script/sentinel/system-server/system-server-authority-rules.json new file mode 100644 index 000000000..a8d6241d8 --- /dev/null +++ b/script/sentinel/system-server/system-server-authority-rules.json @@ -0,0 +1,7 @@ +[ + { + "resource": "sentinel_spring_web_context", + "limitApp": "/test", + "strategy": 0 // 授权类型(0代表白名单；1代表黑名单。) + } +] \ No newline at end of file diff --git a/script/sentinel/system-server/system-server-degrade-rules.json b/script/sentinel/system-server/system-server-degrade-rules.json new file mode 100644 index 000000000..75f6047b1 --- /dev/null +++ b/script/sentinel/system-server/system-server-degrade-rules.json @@ -0,0 +1,11 @@ +[ + { + "resource": "/degrade-test", + "grade": 0, // 熔断策略，支持慢调用比例（0），异常比例（1），异常数（2）策略 + "count": 1000, // 慢调用比例模式下为慢调用临界 RT（超出该值计为慢调用，单位ms）；异常比例/异常数模式下为对应的阈值 + "slowRatioThreshold": 0.1,// 慢调用比例阈值，仅慢调用比例模式有效（1.8.0 引入） + "minRequestAmount": 10, //熔断触发的最小请求数，请求数小于该值时即使异常比率超出阈值也不会熔断 + "timeWindow": 10, // 熔断时长，单位为 s + "statIntervalMs": 1000 // 统计时长（单位为 ms），如 60*1000 代表分钟级 + } +] diff --git a/script/sentinel/system-server/system-server-flow-rules.json b/script/sentinel/system-server/system-server-flow-rules.json new file mode 100644 index 000000000..3b07d3d7b --- /dev/null +++ b/script/sentinel/system-server/system-server-flow-rules.json @@ -0,0 +1,14 @@ +[ + { + "resource": "/flow-test", // 资源名 + "limitApp": "default", // // 针对来源，若为 default 则不区分调用来源 + "grade": 1, // 限流阈值类型(1:QPS; 0:并发线程数） + "count": 1, // 阈值 + "clusterMode": false, // 是否是集群模式 + "controlBehavior": 0, // 流控效果 (0:快速失败; 1:Warm Up(预热模式); 2:排队等待) + "strategy": 0, // 流控模式(0:直接； 1:关联; 2:链路) + "warmUpPeriodSec": 10, // 预热时间（秒，预热模式需要此参数） + "maxQueueingTimeMs": 500, // 超时时间（排队等待模式需要此参数） + "refResource": "rrr" // 关联资源、入口资源(关联、链路模式) + } +] diff --git a/script/sentinel/system-server/system-server-param-flow-rules.json b/script/sentinel/system-server/system-server-param-flow-rules.json new file mode 100644 index 000000000..ccdfd4c2b --- /dev/null +++ b/script/sentinel/system-server/system-server-param-flow-rules.json @@ -0,0 +1,18 @@ +[ + { + "resource": "/param-flow-test", + "grade": 1, // 限流模式（QPS 模式，不可更改） + "paramIdx": 0, // 参数索引 + "count": 13, // 单机阈值 + "durationInSec": 6, // 统计窗口时长 + "clusterMode": false, // 是否集群 默认false + "controlBehavior": 0, // 流控效果（支持快速失败和匀速排队模式） + "limitApp": "default", + // 高级选项 + "paramFlowItemList": [{ + "classType": "int", // 参数类型 + "count": 222, // 限流阈值 + "object": "2" // 参数值 + }] + } +] \ No newline at end of file diff --git a/script/sentinel/system-server/system-server-system-rules.json b/script/sentinel/system-server/system-server-system-rules.json new file mode 100644 index 000000000..6fb378ca0 --- /dev/null +++ b/script/sentinel/system-server/system-server-system-rules.json @@ -0,0 +1,10 @@ +[ + { + "avgRt": 1, // RT + "highestCpuUsage": -1, // CPU 使用率 + "highestSystemLoad": -1, // LOAD + "maxThread": -1, // 线程数 + "qps": -1, // 入口 QPS + "count": 55 // 阈值，在CPU使用率中是百分比 + } +] \ No newline at end of file diff --git a/yudao-dependencies/pom.xml b/yudao-dependencies/pom.xml index ca1274627..14710a3b9 100644 --- a/yudao-dependencies/pom.xml +++ b/yudao-dependencies/pom.xml @@ -166,6 +166,12 @@ ${revision} + + cn.iocoder.cloud + yudao-spring-boot-starter-sentinel + ${revision} + + org.springdoc springdoc-openapi-ui diff --git a/yudao-framework/pom.xml b/yudao-framework/pom.xml index 732364068..16cae5d21 100644 --- a/yudao-framework/pom.xml +++ b/yudao-framework/pom.xml @@ -31,6 +31,7 @@ yudao-spring-boot-starter-biz-tenant yudao-spring-boot-starter-biz-data-permission yudao-spring-boot-starter-biz-ip + yudao-spring-boot-starter-sentinel yudao-framework diff --git a/yudao-framework/yudao-spring-boot-starter-sentinel/pom.xml b/yudao-framework/yudao-spring-boot-starter-sentinel/pom.xml new file mode 100644 index 000000000..9b2540480 --- /dev/null +++ b/yudao-framework/yudao-spring-boot-starter-sentinel/pom.xml @@ -0,0 +1,46 @@ + + + 4.0.0 + + cn.iocoder.cloud + yudao-framework + ${revision} + + + yudao-spring-boot-starter-sentinel + jar + + ${project.artifactId} + + + https://github.com/YunaiV/ruoyi-vue-pro + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-sentinel + + + + + com.alibaba.csp + sentinel-datasource-nacos + + + + cn.iocoder.cloud + yudao-common + + + + + cn.iocoder.cloud + yudao-spring-boot-starter-web + provided + + + + \ No newline at end of file diff --git a/yudao-framework/yudao-spring-boot-starter-sentinel/src/main/java/cn/iocoder/yudao/framework/sentinel/config/SentinelExceptionHandlerAutoConfiguration.java b/yudao-framework/yudao-spring-boot-starter-sentinel/src/main/java/cn/iocoder/yudao/framework/sentinel/config/SentinelExceptionHandlerAutoConfiguration.java new file mode 100644 index 000000000..de718de1c --- /dev/null +++ b/yudao-framework/yudao-spring-boot-starter-sentinel/src/main/java/cn/iocoder/yudao/framework/sentinel/config/SentinelExceptionHandlerAutoConfiguration.java @@ -0,0 +1,16 @@ +package cn.iocoder.yudao.framework.sentinel.config; + +import cn.iocoder.yudao.framework.sentinel.core.handler.SentinelExceptionHandler; +import org.springframework.boot.autoconfigure.AutoConfiguration; +import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; +import org.springframework.context.annotation.Bean; + +@AutoConfiguration +public class SentinelExceptionHandlerAutoConfiguration { + + @Bean + @ConditionalOnMissingBean // 当Spring容器中不存在MyService类型的bean时，才创建这个bean + public SentinelExceptionHandler sentinelExceptionHandler() { + return new SentinelExceptionHandler(); + } +} \ No newline at end of file diff --git a/yudao-framework/yudao-spring-boot-starter-sentinel/src/main/java/cn/iocoder/yudao/framework/sentinel/core/handler/SentinelExceptionHandler.java b/yudao-framework/yudao-spring-boot-starter-sentinel/src/main/java/cn/iocoder/yudao/framework/sentinel/core/handler/SentinelExceptionHandler.java new file mode 100644 index 000000000..c7d83a657 --- /dev/null +++ b/yudao-framework/yudao-spring-boot-starter-sentinel/src/main/java/cn/iocoder/yudao/framework/sentinel/core/handler/SentinelExceptionHandler.java @@ -0,0 +1,37 @@ +package cn.iocoder.yudao.framework.sentinel.core.handler; + +import cn.iocoder.yudao.framework.common.pojo.CommonResult; +import com.alibaba.csp.sentinel.adapter.spring.webmvc.callback.BlockExceptionHandler; +import com.alibaba.csp.sentinel.slots.block.BlockException; +import com.alibaba.csp.sentinel.slots.block.authority.AuthorityException; +import com.alibaba.csp.sentinel.slots.block.degrade.DegradeException; +import com.alibaba.csp.sentinel.slots.block.flow.FlowException; +import com.alibaba.csp.sentinel.slots.block.flow.param.ParamFlowException; +import com.alibaba.fastjson.JSON; +import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +public class SentinelExceptionHandler implements BlockExceptionHandler { + @Override + public void handle(HttpServletRequest request, HttpServletResponse response, BlockException e) throws Exception { + String msg = "未知异常"; + int status = HttpStatus.TOO_MANY_REQUESTS.value(); + if (e instanceof FlowException) { + msg = "请求限流"; + } else if (e instanceof ParamFlowException) { + msg = "请求被热点参数限流"; + } else if (e instanceof DegradeException) { + msg = "请求降级"; + } else if (e instanceof AuthorityException) { + msg = "没有权限访问"; + status = HttpStatus.UNAUTHORIZED.value(); + } + + response.setContentType(MediaType.APPLICATION_JSON_UTF8_VALUE); + response.setStatus(status); + response.getWriter().println(JSON.toJSONString(CommonResult.error(status,msg))); + } +} \ No newline at end of file diff --git a/yudao-framework/yudao-spring-boot-starter-sentinel/src/main/java/cn/iocoder/yudao/framework/sentinel/core/package-info.java b/yudao-framework/yudao-spring-boot-starter-sentinel/src/main/java/cn/iocoder/yudao/framework/sentinel/core/package-info.java new file mode 100644 index 000000000..b9d23aee6 --- /dev/null +++ b/yudao-framework/yudao-spring-boot-starter-sentinel/src/main/java/cn/iocoder/yudao/framework/sentinel/core/package-info.java @@ -0,0 +1 @@ +package cn.iocoder.yudao.framework.sentinel.core; \ No newline at end of file diff --git a/yudao-framework/yudao-spring-boot-starter-sentinel/src/main/java/cn/iocoder/yudao/framework/sentinel/package-info.java b/yudao-framework/yudao-spring-boot-starter-sentinel/src/main/java/cn/iocoder/yudao/framework/sentinel/package-info.java new file mode 100644 index 000000000..26f226a2e --- /dev/null +++ b/yudao-framework/yudao-spring-boot-starter-sentinel/src/main/java/cn/iocoder/yudao/framework/sentinel/package-info.java @@ -0,0 +1 @@ +package cn.iocoder.yudao.framework.sentinel; \ No newline at end of file diff --git a/yudao-framework/yudao-spring-boot-starter-sentinel/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/yudao-framework/yudao-spring-boot-starter-sentinel/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 000000000..ef8b840f4 --- /dev/null +++ b/yudao-framework/yudao-spring-boot-starter-sentinel/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +cn.iocoder.yudao.framework.sentinel.config.SentinelExceptionHandlerAutoConfiguration \ No newline at end of file diff --git a/yudao-gateway/pom.xml b/yudao-gateway/pom.xml index 76be121ad..b3cac82ac 100644 --- a/yudao-gateway/pom.xml +++ b/yudao-gateway/pom.xml @@ -74,6 +74,18 @@ com.google.guava guava + + + + com.alibaba.cloud + spring-cloud-alibaba-sentinel-gateway + + + + cn.iocoder.cloud + yudao-spring-boot-starter-sentinel + + diff --git a/yudao-gateway/src/main/java/cn/iocoder/yudao/gateway/GatewayServerApplication.java b/yudao-gateway/src/main/java/cn/iocoder/yudao/gateway/GatewayServerApplication.java index 99984699f..39e0a5670 100644 --- a/yudao-gateway/src/main/java/cn/iocoder/yudao/gateway/GatewayServerApplication.java +++ b/yudao-gateway/src/main/java/cn/iocoder/yudao/gateway/GatewayServerApplication.java @@ -7,6 +7,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; public class GatewayServerApplication { public static void main(String[] args) { + System.setProperty("csp.sentinel.app.type", "1"); // 启动 Spring Boot 应用 SpringApplication.run(GatewayServerApplication.class, args); } diff --git a/yudao-gateway/src/main/resources/application-kolt.yaml b/yudao-gateway/src/main/resources/application-kolt.yaml new file mode 100644 index 000000000..05f552121 --- /dev/null +++ b/yudao-gateway/src/main/resources/application-kolt.yaml @@ -0,0 +1,62 @@ +--- #################### 注册中心 + 配置中心相关配置 #################### + +spring: + cloud: + nacos: + server-addr: localhost:8848 # Nacos 服务器地址 + username: nacos # Nacos 账号 + password: nacos # Nacos 密码 + discovery: # 【配置中心】配置项 + namespace: dev # 命名空间。这里使用 dev 开发环境 + group: DEFAULT_GROUP # 使用的 Nacos 配置分组，默认为 DEFAULT_GROUP + config: # 【注册中心】配置项 + namespace: dev # 命名空间。这里使用 dev 开发环境 + group: DEFAULT_GROUP # 使用的 Nacos 配置分组，默认为 DEFAULT_GROUP + + # ############ Sentinel 配置项，对应 SentinelProperties 配置属性类 ############# + sentinel: + enabled: true # 是否开启。默认为 true 开启 + eager: true # 是否饥饿加载。默认为 false 关闭 + transport: + dashboard: localhost:8080 # Sentinel 控制台地址 + filter: + url-patterns: /** # 拦截请求的地址。默认为 /* + #自定义流控降级异常信息 + scg: + fallback: + mode: response + response-body: '{"code": 429, "msg":"服务压力过大，请稍后重试!"}' + datasource: # sentinel用nacos作为数据源的配置 + # 这里的flow名字随便取 流控规则 + flow: + nacos: + server-addr: ${spring.cloud.nacos.server-addr} + namespace: dev + username: ${spring.cloud.nacos.username} + password: ${spring.cloud.nacos.password} + data-id: ${spring.application.name}-gw-flow-rules # 在修改的sentinel 源码中定义的规则名 + rule-type: gw_flow + # 降级规则 + degrade: + nacos: + server-addr: ${spring.cloud.nacos.server-addr} + namespace: dev + username: ${spring.cloud.nacos.username} + password: ${spring.cloud.nacos.password} + dataId: ${spring.application.name}-degrade-rules + rule-type: degrade + # 系统规则 + system: + nacos: + server-addr: ${spring.cloud.nacos.server-addr} + namespace: dev + username: ${spring.cloud.nacos.username} + password: ${spring.cloud.nacos.password} + dataId: ${spring.application.name}-system-rules + groupId: DEFAULT_GROUP + data-type: json + rule-type: system +# 日志文件配置 +logging: + level: + org.springframework.context.support.PostProcessorRegistrationDelegate: ERROR # TODO 芋艿：先禁用，Spring Boot 3.X 存在部分错误的 WARN 提示 diff --git a/yudao-gateway/src/main/resources/application.yaml b/yudao-gateway/src/main/resources/application.yaml index 3a5cfc637..8794ec325 100644 --- a/yudao-gateway/src/main/resources/application.yaml +++ b/yudao-gateway/src/main/resources/application.yaml @@ -3,7 +3,7 @@ spring: name: gateway-server profiles: - active: local + active: kolt main: allow-circular-references: true # 允许循环依赖，因为项目是三层架构，无法避免这个情况。 diff --git a/yudao-module-system/yudao-module-system-biz/pom.xml b/yudao-module-system/yudao-module-system-biz/pom.xml index 8b1002e27..e96c9aa59 100644 --- a/yudao-module-system/yudao-module-system-biz/pom.xml +++ b/yudao-module-system/yudao-module-system-biz/pom.xml @@ -147,6 +147,11 @@ spring-boot-starter-captcha-plus + + cn.iocoder.cloud + yudao-spring-boot-starter-sentinel + + diff --git a/yudao-module-system/yudao-module-system-biz/src/main/resources/application-kolt.yaml b/yudao-module-system/yudao-module-system-biz/src/main/resources/application-kolt.yaml new file mode 100644 index 000000000..aab3c83fc --- /dev/null +++ b/yudao-module-system/yudao-module-system-biz/src/main/resources/application-kolt.yaml @@ -0,0 +1,241 @@ +--- #################### 注册中心 + 配置中心相关配置 #################### + +spring: + cloud: + nacos: + server-addr: localhost:8848 # Nacos 服务器地址 + username: nacos # Nacos 账号 + password: nacos # Nacos 密码 + discovery: # 【配置中心】配置项 + namespace: dev # 命名空间。这里使用 dev 开发环境 + group: kolt # 使用的 Nacos 配置分组，默认为 DEFAULT_GROUP + metadata: + version: 1.0.0 # 服务实例的版本号，可用于灰度发布 + config: # 【注册中心】配置项 + namespace: dev # 命名空间。这里使用 dev 开发环境 + group: kolt # 使用的 Nacos 配置分组，默认为 DEFAULT_GROUP + + # #################### Sentinel 配置项，对应 SentinelProperties 配置属性类 #################### + sentinel: + enabled: true # 是否开启。默认为 true 开启 + eager: true # 是否饥饿加载。默认为 false 关闭 + transport: + dashboard: localhost:8080 # Sentinel 控制台地址 + filter: + url-patterns: /** # 拦截请求的地址。默认为 /* + datasource: # sentinel用nacos作为数据源的配置 + # 这里的flow名字随便取 流控规则 + flow: + nacos: + server-addr: ${spring.cloud.nacos.server-addr} + namespace: dev + username: ${spring.cloud.nacos.username} + password: ${spring.cloud.nacos.password} + data-id: ${spring.application.name}-flow-rules # 在修改的sentinel 源码中定义的规则名 + rule-type: flow + # 授权规则 + authority: + nacos: + server-addr: ${spring.cloud.nacos.server-addr} + namespace: dev + username: ${spring.cloud.nacos.username} + password: ${spring.cloud.nacos.password} + dataId: ${spring.application.name}-authority-rules + rule-type: authority + # 降级规则 + degrade: + nacos: + server-addr: ${spring.cloud.nacos.server-addr} + namespace: dev + username: ${spring.cloud.nacos.username} + password: ${spring.cloud.nacos.password} + dataId: ${spring.application.name}-degrade-rules + rule-type: degrade + # 热点规则 + param-flow: + nacos: + server-addr: ${spring.cloud.nacos.server-addr} + namespace: dev + username: ${spring.cloud.nacos.username} + password: ${spring.cloud.nacos.password} + dataId: ${spring.application.name}-param-flow-rules + rule-type: param-flow + # 系统规则 + system: + nacos: + server-addr: ${spring.cloud.nacos.server-addr} + namespace: dev + username: ${spring.cloud.nacos.username} + password: ${spring.cloud.nacos.password} + dataId: ${spring.application.name}-system-rules + groupId: DEFAULT_GROUP + data-type: json + rule-type: system + +--- #################### 数据库相关配置 #################### +spring: + # 数据源配置项 + autoconfigure: + exclude: + - com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure # 排除 Druid 的自动配置，使用 dynamic-datasource-spring-boot-starter 配置多数据源 + datasource: + druid: # Druid 【监控】相关的全局配置 + web-stat-filter: + enabled: true + stat-view-servlet: + enabled: true + allow: # 设置白名单，不填则允许所有访问 + url-pattern: /druid/* + login-username: # 控制台管理用户名和密码 + login-password: + filter: + stat: + enabled: true + log-slow-sql: true # 慢 SQL 记录 + slow-sql-millis: 100 + merge-sql: true + wall: + config: + multi-statement-allow: true + dynamic: # 多数据源配置 + druid: # Druid 【连接池】相关的全局配置 + initial-size: 5 # 初始连接数 + min-idle: 10 # 最小连接池数量 + max-active: 20 # 最大连接池数量 + max-wait: 600000 # 配置获取连接等待超时的时间，单位：毫秒 + time-between-eviction-runs-millis: 60000 # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位：毫秒 + min-evictable-idle-time-millis: 300000 # 配置一个连接在池中最小生存的时间，单位：毫秒 + max-evictable-idle-time-millis: 900000 # 配置一个连接在池中最大生存的时间，单位：毫秒 + validation-query: SELECT 1 FROM DUAL # 配置检测连接是否有效 + test-while-idle: true + test-on-borrow: false + test-on-return: false + primary: master + datasource: + master: + url: jdbc:mysql://127.0.0.1:3306/ruoyi-vue-pro?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例 + username: root + password: 123456 + slave: # 模拟从库，可根据自己需要修改 # 模拟从库，可根据自己需要修改 + lazy: true # 开启懒加载，保证启动速度 + url: jdbc:mysql://127.0.0.1:3306/ruoyi-vue-pro?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例 + username: root + password: 123456 + + # Redis 配置。Redisson 默认的配置足够使用，一般不需要进行调优 + redis: + host: localhost # 地址 + port: 6379 # 端口 + database: 1 # 数据库索引 + password: 452647457 # 密码，建议生产环境开启 + +--- #################### MQ 消息队列相关配置 #################### + +# rocketmq 配置项，对应 RocketMQProperties 配置类 +rocketmq: + name-server: 127.0.0.1:9876 # RocketMQ Namesrv + +spring: + # RabbitMQ 配置项，对应 RabbitProperties 配置类 + rabbitmq: + host: 127.0.0.1 # RabbitMQ 服务的地址 + port: 5672 # RabbitMQ 服务的端口 + username: guest # RabbitMQ 服务的账号 + password: guest # RabbitMQ 服务的密码 + # Kafka 配置项，对应 KafkaProperties 配置类 + kafka: + bootstrap-servers: 127.0.0.1:9092 # 指定 Kafka Broker 地址，可以设置多个，以逗号分隔 + +--- #################### 定时任务相关配置 #################### +xxl: + job: + admin: + addresses: http://127.0.0.1:9090/xxl-job-admin # 调度中心部署跟地址 + +--- #################### 服务保障相关配置 #################### + +# Lock4j 配置项 +lock4j: + acquire-timeout: 3000 # 获取分布式锁超时时间，默认为 3000 毫秒 + expire: 30000 # 分布式锁的超时时间，默认为 30 毫秒 + +--- #################### 监控相关配置 #################### + +# Actuator 监控端点的配置项 +management: + endpoints: + web: + base-path: /actuator # Actuator 提供的 API 接口的根目录。默认为 /actuator + exposure: + include: '*' # 需要开放的端点。默认值只打开 health 和 info 两个端点。通过设置 * ，可以开放所有端点。 + +# Spring Boot Admin 配置项 +spring: + boot: + admin: + # Spring Boot Admin Client 客户端的相关配置 + client: + instance: + service-host-type: IP # 注册实例时，优先使用 IP [IP, HOST_NAME, CANONICAL_HOST_NAME] + # Spring Boot Admin Server 服务端的相关配置 + context-path: /admin # 配置 Spring + +# 日志文件配置 +logging: + file: + name: ${user.home}/logs/${spring.application.name}.log # 日志文件名，全路径 + +--- #################### 微信公众号、小程序相关配置 #################### +wx: + mp: # 公众号配置（必填），参见 https://github.com/Wechat-Group/WxJava/blob/develop/spring-boot-starters/wx-java-mp-spring-boot-starter/README.md 文档 + # app-id: wx041349c6f39b268b + # secret: 5abee519483bc9f8cb37ce280e814bd0 + app-id: wx5b23ba7a5589ecbb # 测试号 + secret: 2a7b3b20c537e52e74afd395eb85f61f + # 存储配置，解决 AccessToken 的跨节点的共享 + config-storage: + type: RedisTemplate # 采用 RedisTemplate 操作 Redis，会自动从 Spring 中获取 + key-prefix: wx # Redis Key 的前缀 + http-client-type: HttpClient # 采用 HttpClient 请求微信公众号平台 + miniapp: # 小程序配置（必填），参见 https://github.com/Wechat-Group/WxJava/blob/develop/spring-boot-starters/wx-java-miniapp-spring-boot-starter/README.md 文档 + # appid: wx62056c0d5e8db250 + # secret: 333ae72f41552af1e998fe1f54e1584a + appid: wx63c280fe3248a3e7 # wenhualian的接口测试号 + secret: 6f270509224a7ae1296bbf1c8cb97aed + config-storage: + type: RedisTemplate # 采用 RedisTemplate 操作 Redis，会自动从 Spring 中获取 + key-prefix: wa # Redis Key 的前缀 + http-client-type: HttpClient # 采用 HttpClient 请求微信公众号平台 + +--- #################### 芋道相关配置 #################### + +# 芋道配置项，设置当前项目所有自定义的配置 +yudao: + demo: true # 开启演示模式 + +justauth: + enabled: true + type: + DINGTALK: # 钉钉 + client-id: dingvrnreaje3yqvzhxg + client-secret: i8E6iZyDvZj51JIb0tYsYfVQYOks9Cq1lgryEjFRqC79P3iJcrxEwT6Qk2QvLrLI + ignore-check-redirect-uri: true + WECHAT_ENTERPRISE: # 企业微信 + client-id: wwd411c69a39ad2e54 + client-secret: 1wTb7hYxnpT2TUbIeHGXGo7T0odav1ic10mLdyyATOw + agent-id: 1000004 + ignore-check-redirect-uri: true + # noinspection SpringBootApplicationYaml + WECHAT_MINI_APP: # 微信小程序 + client-id: ${wx.miniapp.appid} + client-secret: ${wx.miniapp.secret} + ignore-check-redirect-uri: true + ignore-check-state: true # 微信小程序，不会使用到 state，所以不进行校验 + WECHAT_MP: # 微信公众号 + client-id: ${wx.mp.app-id} + client-secret: ${wx.mp.secret} + ignore-check-redirect-uri: true + cache: + type: REDIS + prefix: 'social_auth_state:' # 缓存前缀，目前只对 Redis 缓存生效，默认 JUSTAUTH::STATE:: + timeout: 24h # 超时时长，目前只对 Redis 缓存生效，默认 3 分钟 diff --git a/yudao-module-system/yudao-module-system-biz/src/main/resources/application.yaml b/yudao-module-system/yudao-module-system-biz/src/main/resources/application.yaml index 533c34162..4b4f92f64 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/resources/application.yaml +++ b/yudao-module-system/yudao-module-system-biz/src/main/resources/application.yaml @@ -3,7 +3,7 @@ spring: name: system-server profiles: - active: local + active: kolt main: allow-circular-references: true # 允许循环依赖，因为项目是三层架构，无法避免这个情况。