sentinel demo

script/sentinel/infra-server/infra-server-degrade-rules.json

@@ -0,0 +1,11 @@
+[
+  {
+    "resource": "/admin-api/infra/sentinel/demo/degrade",
+    "grade": 0,
+    "count": 100,
+    "slowRatioThreshold": 0.1,
+    "minRequestAmount":  10,
+    "timeWindow": 10,
+    "statIntervalMs": 1
+  }
+]

script/sentinel/infra-server/infra-server-flow-rules.json

@@ -0,0 +1,26 @@
+[
+  {
+    "resource": "/admin-api/infra/sentinel/demo/flow",
+    "limitApp": "default",
+    "grade": 1,
+    "count": 1,
+    "clusterMode": false,
+    "controlBehavior": 0,
+    "strategy": 0,
+    "warmUpPeriodSec": 10,
+    "maxQueueingTimeMs": 500,
+    "refResource": "/admin-api/infra/sentinel/demo/flow-ref"
+  },
+  {
+    "resource": "getOrderNoResource",
+    "limitApp": "default",
+    "grade": 1,
+    "count": 1,
+    "clusterMode": false,
+    "controlBehavior": 0,
+    "strategy": 0,
+    "warmUpPeriodSec": 10,
+    "maxQueueingTimeMs": 500,
+    "refResource": ""
+  }
+]

yudao-framework/yudao-spring-boot-starter-sentinel/pom.xml

@@ -33,14 +33,15 @@
         <dependency>
             <groupId>cn.iocoder.cloud</groupId>
             <artifactId>yudao-common</artifactId>
+            <scope>provided</scope>
         </dependency>
 
-        <!-- Web 相关 -->
         <dependency>
             <groupId>cn.iocoder.cloud</groupId>
             <artifactId>yudao-spring-boot-starter-web</artifactId>
             <scope>provided</scope>
         </dependency>
+
     </dependencies>
 
 </project>

yudao-framework/yudao-spring-boot-starter-sentinel/src/main/java/cn/iocoder/yudao/framework/sentinel/config/SentinelExceptionHandlerAutoConfiguration.java

@@ -1,11 +1,13 @@
 package cn.iocoder.yudao.framework.sentinel.config;
 
 import cn.iocoder.yudao.framework.sentinel.core.handler.SentinelExceptionHandler;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.context.annotation.Bean;
 
 @AutoConfiguration
+@Slf4j
 public class SentinelExceptionHandlerAutoConfiguration {
   
     @Bean

yudao-framework/yudao-spring-boot-starter-sentinel/src/main/java/cn/iocoder/yudao/framework/sentinel/core/handler/SentinelExceptionHandler.java

@@ -7,6 +7,7 @@ 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.csp.sentinel.slots.system.SystemBlockException;
 import com.alibaba.fastjson.JSON;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
@@ -28,10 +29,12 @@ public class SentinelExceptionHandler implements BlockExceptionHandler {
         } else if (e instanceof AuthorityException) {
             msg = "没有权限访问";
             status = HttpStatus.UNAUTHORIZED.value();
+        }else if (e instanceof SystemBlockException) {
+            msg = "系统规则限流或降级";
         }
 
         response.setContentType(MediaType.APPLICATION_JSON_UTF8_VALUE);
         response.setStatus(status);
-        response.getWriter().println(JSON.toJSONString(CommonResult.error(status,msg)));
+        response.getOutputStream().println(JSON.toJSONString(CommonResult.error(status,msg)));
     }
 }

yudao-gateway/pom.xml

@@ -81,9 +81,16 @@
             <artifactId>spring-cloud-alibaba-sentinel-gateway</artifactId>
         </dependency>
 
+        <!-- SpringCloud Alibaba Sentinel -->
         <dependency>
-            <groupId>cn.iocoder.cloud</groupId>
+            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>yudao-spring-boot-starter-sentinel</artifactId>
+            <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
+        </dependency>
+
+        <!-- Sentinel Datasource Nacos -->
+        <dependency>
+            <groupId>com.alibaba.csp</groupId>
+            <artifactId>sentinel-datasource-nacos</artifactId>
         </dependency>
 
     </dependencies>

yudao-gateway/src/main/resources/application-kolt.yaml

@@ -1,62 +0,0 @@
---- #################### 注册中心 + 配置中心相关配置 ####################
-
-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 提示

yudao-gateway/src/main/resources/application-local.yaml

@@ -13,6 +13,52 @@ spring:
         namespace: dev # 命名空间。这里使用 dev 开发环境
         group: DEFAULT_GROUP # 使用的 Nacos 配置分组，默认为 DEFAULT_GROUP
 
+--- #################### Sentinel相关配置 ####################
+spring:
+  cloud:
+    sentinel:
+      enabled: true # 是否开启。默认为 true 开启
+      eager: true # 是否饥饿加载。默认为 false 关闭
+      transport:
+        dashboard: localhost:8080 # Sentinel 控制台地址
+      filter:
+        url-patterns: /** # 拦截请求的地址。默认为 /*
+      #自定义流控降级异常信息
+      scg:
+        fallback:
+          mode: response
+          response-body: '{"code": 429, "msg":"服务压力过大，请稍后重试!"}'
+      # sentinel用nacos作为数据源的配置 (可导入/yudao-cloud/script/sentinel/system-server下对应规则，使用时需去掉注释)
+      datasource:
+        # 流控规则
+        flow:
+          nacos:
+            server-addr: ${spring.cloud.nacos.server-addr}
+            namespace: ${spring.cloud.nacos.discovery.namespace}
+            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: ${spring.cloud.nacos.discovery.namespace}
+            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: ${spring.cloud.nacos.discovery.namespace}
+            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:

yudao-gateway/src/main/resources/application.yaml

@@ -3,7 +3,7 @@ spring:
     name: gateway-server
 
   profiles:
-    active: kolt
+    active: local
 
   main:
     allow-circular-references: true # 允许循环依赖，因为项目是三层架构，无法避免这个情况。

yudao-module-infra/yudao-module-infra-biz/pom.xml

@@ -147,6 +147,12 @@
             <artifactId>tika-core</artifactId> <!-- 文件客户端：文件类型的识别 -->
         </dependency>
 
+        <!-- sentinel相关 -->
+        <dependency>
+            <groupId>cn.iocoder.cloud</groupId>
+            <artifactId>yudao-spring-boot-starter-sentinel</artifactId>
+        </dependency>
+
     </dependencies>
     <build>
         <!-- 设置构建的 jar 包名 -->

yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/demo/sentinel/SentinelDemoController.java

@@ -0,0 +1,65 @@
+package cn.iocoder.yudao.module.infra.controller.admin.demo.sentinel;
+
+
+import com.alibaba.csp.sentinel.annotation.SentinelResource;
+import com.alibaba.csp.sentinel.slots.block.BlockException;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.security.PermitAll;
+import javax.servlet.http.HttpServletRequest;
+import java.util.UUID;
+
+@Tag(name = "管理后台 - sentinel")
+@RestController
+@RequestMapping("/infra/sentinel/demo")
+@Validated
+public class SentinelDemoController {
+
+    @GetMapping("flow")
+    @PermitAll
+    public String flow(String userName){
+        return "hello "+userName;
+    }
+
+    /**
+     * 关联资源
+     */
+    @GetMapping("flow-ref")
+    @PermitAll
+    public String flowRef(){
+        return "hello flowRef";
+    }
+
+    @GetMapping("degrade")
+    @PermitAll
+    public String degrade(String userName){
+        return "hello "+userName;
+    }
+
+    /**
+     * 按照资源名称的方式限流，并对限流流进行友好处理
+     * @param request
+     * @return
+     */
+    @GetMapping("getOrderNo")
+    @SentinelResource(value = "getOrderNoResource",blockHandler = "getOrderNoBlockHandler",blockHandlerClass = SentinelDemoController.class)
+    @PermitAll
+    public String getOrderNo(HttpServletRequest request){
+        return UUID.randomUUID().toString();
+    }
+
+    /**
+     * 限流后续操作方法
+     * @param e
+     * @return
+     */
+    public static String getOrderNoBlockHandler(HttpServletRequest request, BlockException e){
+        return "不好意思，前方拥挤，请您稍后再试";
+    }
+
+
+}

yudao-module-infra/yudao-module-infra-biz/src/main/resources/application-dev.yaml

@@ -15,6 +15,66 @@ spring:
         namespace: dev # 命名空间。这里使用 dev 开发环境
         group: DEFAULT_GROUP # 使用的 Nacos 配置分组，默认为 DEFAULT_GROUP
 
+--- #################### Sentinel相关配置 ####################
+spring:
+  cloud:
+    sentinel:
+      enabled: true # 是否开启。默认为 true 开启
+      eager: true # 是否饥饿加载。默认为 false 关闭
+      transport:
+        dashboard: localhost:8080 # Sentinel 控制台地址
+      filter:
+        url-patterns: /** # 拦截请求的地址。默认为 /*
+      # sentinel用nacos作为数据源的配置 (可导入/yudao-cloud/script/sentinel/gateway-server下对应规则，使用时需去掉注释)
+      datasource:
+        # 流控规则
+        flow:
+          nacos:
+            server-addr: ${spring.cloud.nacos.server-addr}
+            namespace: ${spring.cloud.nacos.discovery.namespace}
+            username: ${spring.cloud.nacos.username}
+            password: ${spring.cloud.nacos.password}
+            data-id:  ${spring.application.name}-flow-rules # 在修改的sentinel 源码中定义的规则名
+            rule-type: flow
+        # 降级规则
+        degrade:
+          nacos:
+            server-addr: ${spring.cloud.nacos.server-addr}
+            namespace: ${spring.cloud.nacos.discovery.namespace}
+            username: ${spring.cloud.nacos.username}
+            password: ${spring.cloud.nacos.password}
+            dataId: ${spring.application.name}-degrade-rules
+            rule-type: degrade
+        # 授权规则
+#        authority:
+#          nacos:
+#            server-addr: ${spring.cloud.nacos.server-addr}
+#            namespace: ${spring.cloud.nacos.discovery.namespace}
+#            username: ${spring.cloud.nacos.username}
+#            password: ${spring.cloud.nacos.password}
+#            dataId: ${spring.application.name}-authority-rules
+#            rule-type: authority
+#        # 热点规则
+#        param-flow:
+#          nacos:
+#            server-addr: ${spring.cloud.nacos.server-addr}
+#            namespace: ${spring.cloud.nacos.discovery.namespace}
+#            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: ${spring.cloud.nacos.discovery.namespace}
+#            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:
   # 数据源配置项

yudao-module-infra/yudao-module-infra-biz/src/main/resources/application-local.yaml

@@ -15,6 +15,66 @@ spring:
         namespace: dev # 命名空间。这里使用 dev 开发环境
         group: DEFAULT_GROUP # 使用的 Nacos 配置分组，默认为 DEFAULT_GROUP
 
+--- #################### Sentinel相关配置 ####################
+spring:
+  cloud:
+    sentinel:
+      enabled: true # 是否开启。默认为 true 开启
+      eager: true # 是否饥饿加载。默认为 false 关闭
+      transport:
+        dashboard: localhost:8080 # Sentinel 控制台地址
+      filter:
+        url-patterns: /** # 拦截请求的地址。默认为 /*
+      # sentinel用nacos作为数据源的配置 (可导入/yudao-cloud/script/sentinel/gateway-server下对应规则，使用时需去掉注释)
+      datasource:
+        # 流控规则
+        flow:
+          nacos:
+            server-addr: ${spring.cloud.nacos.server-addr}
+            namespace: ${spring.cloud.nacos.discovery.namespace}
+            username: ${spring.cloud.nacos.username}
+            password: ${spring.cloud.nacos.password}
+            data-id:  ${spring.application.name}-flow-rules # 在修改的sentinel 源码中定义的规则名
+            rule-type: flow
+        # 降级规则
+        degrade:
+          nacos:
+            server-addr: ${spring.cloud.nacos.server-addr}
+            namespace: ${spring.cloud.nacos.discovery.namespace}
+            username: ${spring.cloud.nacos.username}
+            password: ${spring.cloud.nacos.password}
+            dataId: ${spring.application.name}-degrade-rules
+            rule-type: degrade
+        # 授权规则
+#        authority:
+#          nacos:
+#            server-addr: ${spring.cloud.nacos.server-addr}
+#            namespace: ${spring.cloud.nacos.discovery.namespace}
+#            username: ${spring.cloud.nacos.username}
+#            password: ${spring.cloud.nacos.password}
+#            dataId: ${spring.application.name}-authority-rules
+#            rule-type: authority
+#        # 热点规则
+#        param-flow:
+#          nacos:
+#            server-addr: ${spring.cloud.nacos.server-addr}
+#            namespace: ${spring.cloud.nacos.discovery.namespace}
+#            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: ${spring.cloud.nacos.discovery.namespace}
+#            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:
 

yudao-module-infra/yudao-module-infra-biz/src/main/resources/application.yaml

@@ -165,6 +165,7 @@ yudao:
     enable: true
     ignore-urls:
       - /admin-api/infra/file/*/get/** # 获取图片，和租户无关
+      - /admin-api/infra/sentinel/demo/** # sentinel demo
     ignore-tables:
       - infra_codegen_column
       - infra_codegen_table

yudao-module-system/yudao-module-system-biz/pom.xml

@@ -146,7 +146,7 @@
             <groupId>com.xingyuv</groupId>
             <artifactId>spring-boot-starter-captcha-plus</artifactId> <!-- 验证码，一般用于登录使用 -->
         </dependency>
-
+        <!-- sentinel相关 -->
         <dependency>
             <groupId>cn.iocoder.cloud</groupId>
             <artifactId>yudao-spring-boot-starter-sentinel</artifactId>

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/SystemServerApplication.java

@@ -19,7 +19,6 @@ public class SystemServerApplication {
         // 如果你碰到启动的问题，请认真阅读 https://cloud.iocoder.cn/quick-start/ 文章
         // 如果你碰到 启动的问题，请认真阅读 https://cloud.iocoder.cn/quick-start/ 文章
         // 如果你碰到启动的问题，请认真阅读 https://cloud.iocoder.cn/quick-start/ 文章
-
         SpringApplication.run(SystemServerApplication.class, args);
 
         // 如果你碰到启动的问题，请认真阅读 https://cloud.iocoder.cn/quick-start/ 文章

yudao-module-system/yudao-module-system-biz/src/main/resources/application-dev.yaml

@@ -15,6 +15,66 @@ spring:
         namespace: dev # 命名空间。这里使用 dev 开发环境
         group: DEFAULT_GROUP # 使用的 Nacos 配置分组，默认为 DEFAULT_GROUP
 
+--- #################### Sentinel相关配置 ####################
+spring:
+  cloud:
+    sentinel:
+      enabled: true # 是否开启。默认为 true 开启
+      eager: true # 是否饥饿加载。默认为 false 关闭
+      transport:
+        dashboard: localhost:8080 # Sentinel 控制台地址
+      filter:
+        url-patterns: /** # 拦截请求的地址。默认为 /*
+      # sentinel用nacos作为数据源的配置 (可导入/yudao-cloud/script/sentinel/system-server下对应规则，使用时需去掉注释)
+      datasource:
+        # 流控规则
+        flow:
+          nacos:
+            server-addr: ${spring.cloud.nacos.server-addr}
+            namespace: ${spring.cloud.nacos.discovery.namespace}
+            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: ${spring.cloud.nacos.discovery.namespace}
+            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: ${spring.cloud.nacos.discovery.namespace}
+            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: ${spring.cloud.nacos.discovery.namespace}
+            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: ${spring.cloud.nacos.discovery.namespace}
+            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:
   # 数据源配置项

yudao-module-system/yudao-module-system-biz/src/main/resources/application-kolt.yaml

@@ -1,241 +0,0 @@
---- #################### 注册中心 + 配置中心相关配置 ####################
-
-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 分钟

yudao-module-system/yudao-module-system-biz/src/main/resources/application-local.yaml

@@ -15,6 +15,66 @@ spring:
         namespace: dev # 命名空间。这里使用 dev 开发环境
         group: DEFAULT_GROUP # 使用的 Nacos 配置分组，默认为 DEFAULT_GROUP
 
+--- #################### Sentinel相关配置 ####################
+spring:
+  cloud:
+    sentinel:
+      enabled: true # 是否开启。默认为 true 开启
+      eager: true # 是否饥饿加载。默认为 false 关闭
+      transport:
+        dashboard: localhost:8080 # Sentinel 控制台地址
+      filter:
+        url-patterns: /** # 拦截请求的地址。默认为 /*
+      # sentinel用nacos作为数据源的配置 (可导入/yudao-cloud/script/sentinel/gateway-server下对应规则，使用时需去掉注释)
+      datasource:
+        # 流控规则
+        flow:
+          nacos:
+            server-addr: ${spring.cloud.nacos.server-addr}
+            namespace: ${spring.cloud.nacos.discovery.namespace}
+            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: ${spring.cloud.nacos.discovery.namespace}
+            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: ${spring.cloud.nacos.discovery.namespace}
+            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: ${spring.cloud.nacos.discovery.namespace}
+            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: ${spring.cloud.nacos.discovery.namespace}
+            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:
   # 数据源配置项

yudao-module-system/yudao-module-system-biz/src/main/resources/application.yaml

@@ -3,7 +3,7 @@ spring:
     name: system-server
 
   profiles:
-    active: kolt
+    active: local
 
   main:
     allow-circular-references: true # 允许循环依赖，因为项目是三层架构，无法避免这个情况。