diff --git a/.run/ruoyi-sentinel-dashboard.run.xml b/.run/ruoyi-sentinel-dashboard.run.xml deleted file mode 100644 index 4c08241b8..000000000 --- a/.run/ruoyi-sentinel-dashboard.run.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - diff --git a/ruoyi-auth/pom.xml b/ruoyi-auth/pom.xml index 86bf0b99d..89085a0df 100644 --- a/ruoyi-auth/pom.xml +++ b/ruoyi-auth/pom.xml @@ -26,11 +26,6 @@ hutool-captcha - - org.dromara - ruoyi-common-sentinel - - org.dromara diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml index a17a0914d..29222e0be 100644 --- a/ruoyi-common/pom.xml +++ b/ruoyi-common/pom.xml @@ -32,7 +32,6 @@ ruoyi-common-sms ruoyi-common-logstash ruoyi-common-elasticsearch - ruoyi-common-sentinel ruoyi-common-skylog ruoyi-common-prometheus ruoyi-common-translation diff --git a/ruoyi-common/ruoyi-common-alibaba-bom/pom.xml b/ruoyi-common/ruoyi-common-alibaba-bom/pom.xml index 51a935abb..c119eb77a 100644 --- a/ruoyi-common/ruoyi-common-alibaba-bom/pom.xml +++ b/ruoyi-common/ruoyi-common-alibaba-bom/pom.xml @@ -16,7 +16,6 @@ 2.4.1 2023.0.3.3 - 1.8.8 2.4.0 2.5.1 3.3.5 @@ -36,111 +35,6 @@ nacos-client ${nacos.client.version} - - com.alibaba.csp - sentinel-core - ${sentinel.version} - - - com.alibaba.csp - sentinel-parameter-flow-control - ${sentinel.version} - - - com.alibaba.csp - sentinel-datasource-extension - ${sentinel.version} - - - com.alibaba.csp - sentinel-datasource-apollo - ${sentinel.version} - - - com.alibaba.csp - sentinel-datasource-zookeeper - ${sentinel.version} - - - com.alibaba.csp - sentinel-datasource-nacos - ${sentinel.version} - - - com.alibaba.csp - sentinel-datasource-redis - ${sentinel.version} - - - com.alibaba.csp - sentinel-datasource-consul - ${sentinel.version} - - - com.alibaba.csp - sentinel-web-servlet - ${sentinel.version} - - - com.alibaba.csp - sentinel-spring-cloud-gateway-adapter - ${sentinel.version} - - - com.alibaba.csp - sentinel-transport-simple-http - ${sentinel.version} - - - com.alibaba.csp - sentinel-annotation-aspectj - ${sentinel.version} - - - com.alibaba.csp - sentinel-reactor-adapter - ${sentinel.version} - - - com.alibaba.csp - sentinel-cluster-server-default - ${sentinel.version} - - - com.alibaba.csp - sentinel-cluster-client-default - ${sentinel.version} - - - com.alibaba.csp - sentinel-spring-webflux-adapter - ${sentinel.version} - - - com.alibaba.csp - sentinel-api-gateway-adapter-common - ${sentinel.version} - - - com.alibaba.csp - sentinel-spring-webmvc-v6x-adapter - ${sentinel.version} - - - com.alibaba.csp - sentinel-dubbo-adapter - ${sentinel.version} - - - com.alibaba.csp - sentinel-apache-dubbo-adapter - ${sentinel.version} - - - com.alibaba.csp - sentinel-apache-dubbo3-adapter - ${sentinel.version} - org.apache.seata seata-spring-boot-starter diff --git a/ruoyi-common/ruoyi-common-bom/pom.xml b/ruoyi-common/ruoyi-common-bom/pom.xml index 449a1a7f4..1a57de621 100644 --- a/ruoyi-common/ruoyi-common-bom/pom.xml +++ b/ruoyi-common/ruoyi-common-bom/pom.xml @@ -166,13 +166,6 @@ ${revision} - - - org.dromara - ruoyi-common-sentinel - ${revision} - - org.dromara diff --git a/ruoyi-common/ruoyi-common-sentinel/pom.xml b/ruoyi-common/ruoyi-common-sentinel/pom.xml deleted file mode 100644 index 3185baf7a..000000000 --- a/ruoyi-common/ruoyi-common-sentinel/pom.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - org.dromara - ruoyi-common - ${revision} - - 4.0.0 - - ruoyi-common-sentinel - - - ruoyi-common-sentinel 限流模块 - - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-sentinel - - - - - com.alibaba.csp - sentinel-datasource-nacos - - - com.alibaba.csp - sentinel-apache-dubbo3-adapter - - - - com.fasterxml.jackson.dataformat - jackson-dataformat-xml - true - - - - org.dromara - ruoyi-common-core - - - - org.springframework.boot - spring-boot-autoconfigure - - - - diff --git a/ruoyi-common/ruoyi-common-sentinel/src/main/java/org/dromara/common/sentinel/config/SentinelCustomAutoConfiguration.java b/ruoyi-common/ruoyi-common-sentinel/src/main/java/org/dromara/common/sentinel/config/SentinelCustomAutoConfiguration.java deleted file mode 100644 index ad48924ae..000000000 --- a/ruoyi-common/ruoyi-common-sentinel/src/main/java/org/dromara/common/sentinel/config/SentinelCustomAutoConfiguration.java +++ /dev/null @@ -1,52 +0,0 @@ -package org.dromara.common.sentinel.config; - -import com.alibaba.cloud.commons.lang.StringUtils; -import com.alibaba.cloud.sentinel.SentinelProperties; -import com.alibaba.cloud.sentinel.custom.SentinelAutoConfiguration; -import com.alibaba.csp.sentinel.init.InitExecutor; -import com.alibaba.csp.sentinel.transport.config.TransportConfig; -import org.dromara.common.core.utils.StreamUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.autoconfigure.AutoConfiguration; -import org.springframework.boot.context.properties.EnableConfigurationProperties; -import org.springframework.cloud.client.ServiceInstance; -import org.springframework.cloud.client.discovery.DiscoveryClient; -import org.springframework.context.annotation.Bean; - -import java.util.List; - -/** - * @author Lion Li - */ -@AutoConfiguration(before = SentinelAutoConfiguration.class) -@EnableConfigurationProperties({SentinelProperties.class, SentinelCustomProperties.class}) -public class SentinelCustomAutoConfiguration { - - @Autowired - private SentinelProperties properties; - @Autowired - private SentinelCustomProperties customProperties; - @Autowired - private DiscoveryClient discoveryClient; - - @Bean - public Object sentinelInit() { - if (StringUtils.isNotBlank(customProperties.getServerName())) { - List instances = discoveryClient.getInstances(customProperties.getServerName()); - String serverList = StreamUtils.join(instances, instance -> - String.format("http://%s:%s", instance.getHost(), instance.getPort())); - System.setProperty(TransportConfig.CONSOLE_SERVER, serverList); - } else { - if (StringUtils.isEmpty(System.getProperty(TransportConfig.CONSOLE_SERVER)) - && StringUtils.isNotBlank(properties.getTransport().getDashboard())) { - System.setProperty(TransportConfig.CONSOLE_SERVER, - properties.getTransport().getDashboard()); - } - } - // 手动初始化 sentinel - InitExecutor.doInit(); - return new Object(); - } - - -} diff --git a/ruoyi-common/ruoyi-common-sentinel/src/main/java/org/dromara/common/sentinel/config/SentinelCustomProperties.java b/ruoyi-common/ruoyi-common-sentinel/src/main/java/org/dromara/common/sentinel/config/SentinelCustomProperties.java deleted file mode 100644 index 0cd3982c4..000000000 --- a/ruoyi-common/ruoyi-common-sentinel/src/main/java/org/dromara/common/sentinel/config/SentinelCustomProperties.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.dromara.common.sentinel.config; - -import lombok.Data; -import org.springframework.boot.context.properties.ConfigurationProperties; - -/** - * sentinel自定义配置类 - * - * @author Lion Li - */ -@Data -@ConfigurationProperties(prefix = "spring.cloud.sentinel.transport") -public class SentinelCustomProperties { - - private String serverName; - -} diff --git a/ruoyi-common/ruoyi-common-sentinel/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-common/ruoyi-common-sentinel/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index 68693d427..000000000 --- a/ruoyi-common/ruoyi-common-sentinel/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1 +0,0 @@ -org.dromara.common.sentinel.config.SentinelCustomAutoConfiguration diff --git a/ruoyi-example/ruoyi-demo/pom.xml b/ruoyi-example/ruoyi-demo/pom.xml index 9fca13693..d6ed90eff 100644 --- a/ruoyi-example/ruoyi-demo/pom.xml +++ b/ruoyi-example/ruoyi-demo/pom.xml @@ -22,11 +22,6 @@ ruoyi-common-nacos - - org.dromara - ruoyi-common-sentinel - - org.dromara ruoyi-common-log diff --git a/ruoyi-example/ruoyi-test-mq/pom.xml b/ruoyi-example/ruoyi-test-mq/pom.xml index dc29d327d..98d7ebc2a 100644 --- a/ruoyi-example/ruoyi-test-mq/pom.xml +++ b/ruoyi-example/ruoyi-test-mq/pom.xml @@ -34,11 +34,6 @@ spring-kafka - - org.dromara - ruoyi-common-sentinel - - org.dromara ruoyi-common-security diff --git a/ruoyi-gateway/pom.xml b/ruoyi-gateway/pom.xml index 0f287d857..bd51d9311 100644 --- a/ruoyi-gateway/pom.xml +++ b/ruoyi-gateway/pom.xml @@ -37,12 +37,6 @@ ruoyi-common-nacos - - - com.alibaba.cloud - spring-cloud-alibaba-sentinel-gateway - - org.springframework.boot @@ -61,17 +55,6 @@ ${satoken.version} - - org.dromara - ruoyi-common-sentinel - - - com.alibaba.csp - sentinel-apache-dubbo3-adapter - - - - org.dromara ruoyi-common-satoken diff --git a/ruoyi-gateway/src/main/java/com/alibaba/csp/sentinel/adapter/gateway/sc/callback/DefaultBlockRequestHandler.java b/ruoyi-gateway/src/main/java/com/alibaba/csp/sentinel/adapter/gateway/sc/callback/DefaultBlockRequestHandler.java deleted file mode 100644 index 409d4f00e..000000000 --- a/ruoyi-gateway/src/main/java/com/alibaba/csp/sentinel/adapter/gateway/sc/callback/DefaultBlockRequestHandler.java +++ /dev/null @@ -1,96 +0,0 @@ -/* - * Copyright 1999-2019 Alibaba Group Holding Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.alibaba.csp.sentinel.adapter.gateway.sc.callback; - -import org.springframework.http.HttpStatus; -import org.springframework.http.InvalidMediaTypeException; -import org.springframework.http.MediaType; -import org.springframework.util.MimeTypeUtils; -import org.springframework.web.reactive.function.server.ServerResponse; -import org.springframework.web.server.ServerWebExchange; -import reactor.core.publisher.Mono; - -import java.util.List; - -import static org.springframework.web.reactive.function.BodyInserters.fromObject; - -// https://github.com/alibaba/Sentinel/issues/3298 -// 临时解决 sentinel 限流插件 jdk17 报错问题 -/** - * The default implementation of {@link BlockRequestHandler}. - * Compatible with Spring WebFlux and Spring Cloud Gateway. - * - * @author Eric Zhao - */ -public class DefaultBlockRequestHandler implements BlockRequestHandler { - - private static final String DEFAULT_BLOCK_MSG_PREFIX = "Blocked by Sentinel: "; - - @Override - public Mono handleRequest(ServerWebExchange exchange, Throwable ex) { - if (acceptsHtml(exchange)) { - return htmlErrorResponse(ex); - } - // JSON result by default. - return ServerResponse.status(HttpStatus.TOO_MANY_REQUESTS) - .contentType(MediaType.APPLICATION_JSON_UTF8) - .body(fromObject(buildErrorResult(ex))); - } - - private Mono htmlErrorResponse(Throwable ex) { - return ServerResponse.status(HttpStatus.TOO_MANY_REQUESTS) - .contentType(MediaType.TEXT_PLAIN) - .syncBody(DEFAULT_BLOCK_MSG_PREFIX + ex.getClass().getSimpleName()); - } - - private ErrorResult buildErrorResult(Throwable ex) { - return new ErrorResult(HttpStatus.TOO_MANY_REQUESTS.value(), - DEFAULT_BLOCK_MSG_PREFIX + ex.getClass().getSimpleName()); - } - - /** - * Reference from {@code DefaultErrorWebExceptionHandler} of Spring Boot. - */ - private boolean acceptsHtml(ServerWebExchange exchange) { - try { - List acceptedMediaTypes = exchange.getRequest().getHeaders().getAccept(); - acceptedMediaTypes.remove(MediaType.ALL); - MimeTypeUtils. sortBySpecificity(acceptedMediaTypes); - return acceptedMediaTypes.stream() - .anyMatch(MediaType.TEXT_HTML::isCompatibleWith); - } catch (InvalidMediaTypeException ex) { - return false; - } - } - - private static class ErrorResult { - private final int code; - private final String message; - - ErrorResult(int code, String message) { - this.code = code; - this.message = message; - } - - public int getCode() { - return code; - } - - public String getMessage() { - return message; - } - } -} diff --git a/ruoyi-gateway/src/main/java/org/dromara/gateway/RuoYiGatewayApplication.java b/ruoyi-gateway/src/main/java/org/dromara/gateway/RuoYiGatewayApplication.java index 4f644533d..a20dfe450 100644 --- a/ruoyi-gateway/src/main/java/org/dromara/gateway/RuoYiGatewayApplication.java +++ b/ruoyi-gateway/src/main/java/org/dromara/gateway/RuoYiGatewayApplication.java @@ -13,8 +13,6 @@ import org.springframework.boot.context.metrics.buffering.BufferingApplicationSt @SpringBootApplication(exclude = {DataSourceAutoConfiguration.class}) public class RuoYiGatewayApplication { public static void main(String[] args) { - // 标记 sentinel 类型为 网关 - System.setProperty("csp.sentinel.app.type", "1"); SpringApplication application = new SpringApplication(RuoYiGatewayApplication.class); application.setApplicationStartup(new BufferingApplicationStartup(2048)); application.run(args); diff --git a/ruoyi-gateway/src/main/java/org/dromara/gateway/config/GatewayConfig.java b/ruoyi-gateway/src/main/java/org/dromara/gateway/config/GatewayConfig.java index d3b40dd4d..99211d9a2 100644 --- a/ruoyi-gateway/src/main/java/org/dromara/gateway/config/GatewayConfig.java +++ b/ruoyi-gateway/src/main/java/org/dromara/gateway/config/GatewayConfig.java @@ -1,10 +1,6 @@ package org.dromara.gateway.config; -import org.dromara.gateway.handler.SentinelFallbackHandler; -import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.core.Ordered; -import org.springframework.core.annotation.Order; /** * 网关限流配置 @@ -13,9 +9,5 @@ import org.springframework.core.annotation.Order; */ @Configuration public class GatewayConfig { - @Bean - @Order(Ordered.HIGHEST_PRECEDENCE) - public SentinelFallbackHandler sentinelGatewayExceptionHandler() { - return new SentinelFallbackHandler(); - } + } diff --git a/ruoyi-gateway/src/main/java/org/dromara/gateway/handler/SentinelFallbackHandler.java b/ruoyi-gateway/src/main/java/org/dromara/gateway/handler/SentinelFallbackHandler.java deleted file mode 100644 index 0aec08826..000000000 --- a/ruoyi-gateway/src/main/java/org/dromara/gateway/handler/SentinelFallbackHandler.java +++ /dev/null @@ -1,36 +0,0 @@ -package org.dromara.gateway.handler; - -import com.alibaba.csp.sentinel.adapter.gateway.sc.callback.GatewayCallbackManager; -import com.alibaba.csp.sentinel.slots.block.BlockException; -import org.dromara.gateway.utils.WebFluxUtils; -import org.springframework.web.reactive.function.server.ServerResponse; -import org.springframework.web.server.ServerWebExchange; -import org.springframework.web.server.WebExceptionHandler; -import reactor.core.publisher.Mono; - -/** - * 自定义限流异常处理 - * - * @author ruoyi - */ -public class SentinelFallbackHandler implements WebExceptionHandler { - private Mono writeResponse(ServerResponse response, ServerWebExchange exchange) { - return WebFluxUtils.webFluxResponseWriter(exchange.getResponse(), "请求超过最大数，请稍候再试"); - } - - @Override - public Mono handle(ServerWebExchange exchange, Throwable ex) { - ex.printStackTrace(); - if (exchange.getResponse().isCommitted()) { - return Mono.error(ex); - } - if (!BlockException.isBlockException(ex)) { - return Mono.error(ex); - } - return handleBlockedRequest(exchange, ex).flatMap(response -> writeResponse(response, exchange)); - } - - private Mono handleBlockedRequest(ServerWebExchange exchange, Throwable throwable) { - return GatewayCallbackManager.getBlockHandler().handleRequest(exchange, throwable); - } -} diff --git a/ruoyi-modules/ruoyi-resource/pom.xml b/ruoyi-modules/ruoyi-resource/pom.xml index 245de01ca..dac64e73a 100644 --- a/ruoyi-modules/ruoyi-resource/pom.xml +++ b/ruoyi-modules/ruoyi-resource/pom.xml @@ -22,11 +22,6 @@ ruoyi-common-nacos - - org.dromara - ruoyi-common-sentinel - - org.dromara ruoyi-common-doc diff --git a/ruoyi-modules/ruoyi-system/pom.xml b/ruoyi-modules/ruoyi-system/pom.xml index 55c3547bf..44730eaca 100644 --- a/ruoyi-modules/ruoyi-system/pom.xml +++ b/ruoyi-modules/ruoyi-system/pom.xml @@ -22,11 +22,6 @@ ruoyi-common-nacos - - org.dromara - ruoyi-common-sentinel - - org.dromara diff --git a/ruoyi-visual/pom.xml b/ruoyi-visual/pom.xml index b3335573a..f5894c1e8 100644 --- a/ruoyi-visual/pom.xml +++ b/ruoyi-visual/pom.xml @@ -10,7 +10,6 @@ ruoyi-monitor - ruoyi-sentinel-dashboard ruoyi-seata-server ruoyi-nacos ruoyi-snailjob-server diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/Dockerfile b/ruoyi-visual/ruoyi-sentinel-dashboard/Dockerfile deleted file mode 100644 index e5707f9f9..000000000 --- a/ruoyi-visual/ruoyi-sentinel-dashboard/Dockerfile +++ /dev/null @@ -1,24 +0,0 @@ -# 贝尔实验室 Spring 官方推荐镜像 JDK下载地址 https://bell-sw.com/pages/downloads/ -FROM bellsoft/liberica-openjdk-rocky:17.0.15-cds -#FROM bellsoft/liberica-openjdk-rocky:21.0.7-cds -#FROM findepi/graalvm:java17-native - -LABEL maintainer="Lion Li" - -RUN mkdir -p /ruoyi/sentinel-dashboard/logs \ - /ruoyi/skywalking/agent - -WORKDIR /ruoyi/sentinel-dashboard - -ENV LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS="" - -EXPOSE 8718 - -ADD ./target/ruoyi-sentinel-dashboard.jar ./app.jar - -SHELL ["/bin/bash", "-c"] - -ENTRYPOINT java -Djava.security.egd=file:/dev/./urandom \ - #-Dskywalking.agent.service_name=ruoyi-sentinel-dashboard \ - #-javaagent:/ruoyi/skywalking/agent/skywalking-agent.jar \ - ${JAVA_OPTS} -jar app.jar diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/pom.xml b/ruoyi-visual/ruoyi-sentinel-dashboard/pom.xml deleted file mode 100644 index 007751da1..000000000 --- a/ruoyi-visual/ruoyi-sentinel-dashboard/pom.xml +++ /dev/null @@ -1,186 +0,0 @@ - - - 4.0.0 - - - org.dromara - ruoyi-visual - ${revision} - - - ruoyi-sentinel-dashboard - jar - - - 1.8.8 - 4.0.1 - 2.7.18 - 2021.0.7 - 2021.0.4.0 - 7.2 - - - - - - org.springframework.boot - spring-boot-dependencies - ${spring-boot.version} - pom - import - - - org.springframework.cloud - spring-cloud-dependencies - ${spring-cloud.version} - pom - import - - - com.alibaba.cloud - spring-cloud-alibaba-dependencies - ${spring-cloud-alibaba.version} - pom - import - - - - - - - - org.dromara - ruoyi-common-nacos - - - - com.alibaba.csp - sentinel-dashboard - ${sentinel.version} - system - ${project.basedir}/src/main/resources/lib/sentinel-dashboard-${sentinel.version}.jar - - - - com.alibaba.csp - sentinel-core - - - com.alibaba.csp - sentinel-web-servlet - - - com.alibaba.csp - sentinel-transport-simple-http - - - com.alibaba.csp - sentinel-parameter-flow-control - - - com.alibaba.csp - sentinel-api-gateway-adapter-common - - - - - org.springframework.boot - spring-boot-starter-web - - - * - org.apache.logging.log4j - - - - - - - org.apache.tomcat.embed - tomcat-embed-websocket - 9.0.105 - - - org.apache.tomcat.embed - tomcat-embed-core - 9.0.105 - - - org.apache.tomcat.embed - tomcat-embed-el - 9.0.105 - - - - - org.springframework.boot - spring-boot-starter-actuator - - - - commons-lang - commons-lang - 2.6 - - - - org.apache.httpcomponents - httpclient - - - org.apache.httpcomponents - httpcore - - - org.apache.httpcomponents - httpasyncclient - - - org.apache.httpcomponents - httpcore-nio - - - com.alibaba - fastjson - - - - ch.qos.logback - logback-classic - - - ch.qos.logback - logback-core - - - - net.logstash.logback - logstash-logback-encoder - ${logstash-logback-encoder.version} - - - - - ${project.artifactId} - - - org.springframework.boot - spring-boot-maven-plugin - ${spring-boot.version} - - - - repackage - - - - - - true - - - - - - diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/DashboardApplication.java b/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/DashboardApplication.java deleted file mode 100644 index be4492170..000000000 --- a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/DashboardApplication.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright 1999-2018 Alibaba Group Holding Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.alibaba.csp.sentinel.dashboard; - -import com.alibaba.csp.sentinel.init.InitExecutor; -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; - -/** - * Sentinel dashboard application. - * - * @author Carpenter Lee - */ -@SpringBootApplication -public class DashboardApplication { - - public static void main(String[] args) { - triggerSentinelInit(); - SpringApplication.run(DashboardApplication.class, args); - } - - private static void triggerSentinelInit() { - new Thread(() -> InitExecutor.doInit()).start(); - } -} diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/filter/ActuatorAuthFilter.java b/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/filter/ActuatorAuthFilter.java deleted file mode 100644 index c423be9a5..000000000 --- a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/filter/ActuatorAuthFilter.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.alibaba.csp.sentinel.dashboard.filter; - -import javax.servlet.*; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.nio.charset.StandardCharsets; -import java.util.Base64; - -public class ActuatorAuthFilter implements Filter { - - private final String username; - private final String password; - - public ActuatorAuthFilter(String username, String password) { - this.username = username; - this.password = password; - } - - @Override - public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException { - HttpServletRequest request = (HttpServletRequest) servletRequest; - HttpServletResponse response = (HttpServletResponse) servletResponse; - - // 获取 Authorization 头 - String authHeader = request.getHeader("Authorization"); - - if (authHeader == null || !authHeader.startsWith("Basic ")) { - // 如果没有提供 Authorization 或者格式不对，则返回 401 - response.setHeader("WWW-Authenticate", "Basic realm=\"realm\""); - response.sendError(HttpServletResponse.SC_UNAUTHORIZED, "Unauthorized"); - return; - } - - // 解码 Base64 编码的用户名和密码 - String base64Credentials = authHeader.substring("Basic ".length()); - byte[] credDecoded = Base64.getDecoder().decode(base64Credentials); - String credentials = new String(credDecoded, StandardCharsets.UTF_8); - String[] split = credentials.split(":"); - if (split.length != 2) { - response.setHeader("WWW-Authenticate", "Basic realm=\"realm\""); - response.sendError(HttpServletResponse.SC_UNAUTHORIZED, "Unauthorized"); - return; - } - // 验证用户名和密码 - if (!username.equals(split[0]) || !password.equals(split[1])) { - response.setHeader("WWW-Authenticate", "Basic realm=\"realm\""); - response.sendError(HttpServletResponse.SC_UNAUTHORIZED, "Unauthorized"); - return; - } - // 如果认证成功，继续处理请求 - filterChain.doFilter(request, response); - } - - @Override - public void init(FilterConfig filterConfig) { - } - - @Override - public void destroy() { - } - -} diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/filter/SecurityConfig.java b/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/filter/SecurityConfig.java deleted file mode 100644 index 8d01fbbd7..000000000 --- a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/filter/SecurityConfig.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.alibaba.csp.sentinel.dashboard.filter; - -import org.springframework.beans.factory.annotation.Value; -import org.springframework.boot.web.servlet.FilterRegistrationBean; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -/** - * 权限安全配置 - * - * @author Lion Li - */ -@Configuration -public class SecurityConfig { - - @Value("${spring.cloud.nacos.discovery.metadata.username}") - private String username; - @Value("${spring.cloud.nacos.discovery.metadata.userpassword}") - private String password; - - @Bean - public FilterRegistrationBean actuatorFilterRegistrationBean() { - FilterRegistrationBean registrationBean = new FilterRegistrationBean<>(); - registrationBean.setFilter(new ActuatorAuthFilter(username, password)); - registrationBean.addUrlPatterns("/actuator", "/actuator/*"); - return registrationBean; - } - -} diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/resources/application.properties b/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/resources/application.properties deleted file mode 100644 index b12af6be2..000000000 --- a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/resources/application.properties +++ /dev/null @@ -1 +0,0 @@ -# 覆盖sentinel内置配置 不可删除 diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/resources/application.yml b/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/resources/application.yml deleted file mode 100644 index 9ae2e0036..000000000 --- a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/resources/application.yml +++ /dev/null @@ -1,37 +0,0 @@ -# Tomcat -server: - port: 8718 - -# Spring -spring: - application: - # 应用名称 - name: ruoyi-sentinel-dashboard - profiles: - # 环境配置 - active: @profiles.active@ - -sentinel: - dashboard: - version: @sentinel.version@ - ---- # nacos 配置 -spring: - cloud: - nacos: - # nacos 服务地址 - server-addr: @nacos.server@ - username: @nacos.username@ - password: @nacos.password@ - discovery: - # 注册组 - group: @nacos.discovery.group@ - namespace: ${spring.profiles.active} - config: - # 配置组 - group: @nacos.config.group@ - namespace: ${spring.profiles.active} - config: - import: - - optional:nacos:application-common.yml - - optional:nacos:${spring.application.name}.yml diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/resources/banner.txt b/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/resources/banner.txt deleted file mode 100644 index e081fef6f..000000000 --- a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/resources/banner.txt +++ /dev/null @@ -1,8 +0,0 @@ -Spring Boot Version: ${spring-boot.version} -Spring Application Name: ${spring.application.name} - _ _ _ _ _ _ _ - | | (_) | | | | | | | | | | - ___ ___ _ __ | |_ _ _ __ ___| |______ __| | __ _ ___| |__ | |__ ___ __ _ _ __ __| | -/ __|/ _ \ '_ \| __| | '_ \ / _ \ |______/ _` |/ _` / __| '_ \| '_ \ / _ \ / _` | '__/ _` | -\__ \ __/ | | | |_| | | | | __/ | | (_| | (_| \__ \ | | | |_) | (_) | (_| | | | (_| | -|___/\___|_| |_|\__|_|_| |_|\___|_| \__,_|\__,_|___/_| |_|_.__/ \___/ \__,_|_| \__,_| diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/resources/lib/sentinel-dashboard-1.8.8.jar b/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/resources/lib/sentinel-dashboard-1.8.8.jar deleted file mode 100644 index 18122a0f4..000000000 Binary files a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/resources/lib/sentinel-dashboard-1.8.8.jar and /dev/null differ diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/resources/logback-common.xml b/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/resources/logback-common.xml deleted file mode 100644 index 89eaa97ec..000000000 --- a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/resources/logback-common.xml +++ /dev/null @@ -1,97 +0,0 @@ - - - - - - - - - ${log.path}/console.log - - - ${log.path}/console.%d{yyyy-MM-dd}.log - - 1 - - - ${log.pattern} - utf-8 - - - - INFO - - - - - - ${log.path}/info.log - - - - ${log.path}/info.%d{yyyy-MM-dd}.log - - 60 - - - ${log.pattern} - - - - INFO - - ACCEPT - - DENY - - - - - ${log.path}/error.log - - - - ${log.path}/error.%d{yyyy-MM-dd}.log - - 60 - - - ${log.pattern} - - - - ERROR - - ACCEPT - - DENY - - - - - - - 0 - - 512 - - - - - - - - 0 - - 512 - - - - - - - - - - - diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/resources/logback-plus.xml b/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/resources/logback-plus.xml deleted file mode 100644 index 680b0afd4..000000000 --- a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/resources/logback-plus.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - ${console.log.pattern} - utf-8 - - - - - - - - - - - - - - - diff --git a/script/config/nacos/application-common.yml b/script/config/nacos/application-common.yml index 52d1dbf42..ce19fa86a 100644 --- a/script/config/nacos/application-common.yml +++ b/script/config/nacos/application-common.yml @@ -83,19 +83,6 @@ spring: # admin 监控账号密码 username: ruoyi userpassword: 123456 - # sentinel 配置 - sentinel: - # sentinel 开关 - enabled: false - transport: - # dashboard控制台服务名 用于服务发现 - # 如无此配置将默认使用下方 dashboard 配置直接注册 - server-name: ruoyi-sentinel-dashboard - # 客户端指定注册的ip 用于多网卡ip不稳点使用 - # client-ip: - # 控制台地址 从1.3.0开始使用 server-name 注册 - # dashboard: localhost:8718 - bus: id: ${spring.application.name} base-packages: org.dromara.**.event @@ -166,7 +153,6 @@ logging: org.springframework: warn org.apache.dubbo: warn com.alibaba.nacos: warn - com.alibaba.cloud.sentinel: warn org.mybatis.spring.mapper: error org.apache.dubbo.config: error org.apache.fury: warn diff --git a/script/config/nacos/ruoyi-gateway.yml b/script/config/nacos/ruoyi-gateway.yml index d9c8b16e4..038e98c5d 100644 --- a/script/config/nacos/ruoyi-gateway.yml +++ b/script/config/nacos/ruoyi-gateway.yml @@ -81,20 +81,3 @@ spring: - Path=/test-mq/** filters: - StripPrefix=1 - - # sentinel 配置 - sentinel: - filter: - enabled: false - # nacos配置持久化 - datasource: - ds1: - nacos: - server-addr: ${spring.cloud.nacos.server-addr} - dataId: sentinel-${spring.application.name}.json - groupId: ${spring.cloud.nacos.config.group} - username: ${spring.cloud.nacos.username} - password: ${spring.cloud.nacos.password} - namespace: ${spring.profiles.active} - data-type: json - rule-type: gw-flow diff --git a/script/config/nacos/ruoyi-sentinel-dashboard.yml b/script/config/nacos/ruoyi-sentinel-dashboard.yml deleted file mode 100644 index 0ff14a280..000000000 --- a/script/config/nacos/ruoyi-sentinel-dashboard.yml +++ /dev/null @@ -1,27 +0,0 @@ -spring: - mvc: - pathmatch: - # 修复 sentinel 控制台未适配 springboot 2.6 新路由方式 - matching-strategy: ANT_PATH_MATCHER - -server: - servlet: - encoding: - force: true - charset: UTF-8 - enabled: true - session: - cookie: - name: sentinel_dashboard_cookie - -logging: - level: - org.springframework.web: INFO - -auth: - enabled: true - filter: - exclude-urls: /,/auth/login,/auth/logout,/registry/machine,/version,/actuator,/actuator/** - exclude-url-suffixes: htm,html,js,css,map,ico,ttf,woff,png - username: sentinel - password: sentinel diff --git a/script/config/nacos/sentinel-ruoyi-gateway.json b/script/config/nacos/sentinel-ruoyi-gateway.json deleted file mode 100644 index 667faac24..000000000 --- a/script/config/nacos/sentinel-ruoyi-gateway.json +++ /dev/null @@ -1,26 +0,0 @@ -[ - { - "resource": "ruoyi-auth", - "count": 500, - "grade": 1, - "limitApp": "default", - "strategy": 0, - "controlBehavior": 0 - }, - { - "resource": "ruoyi-system", - "count": 1000, - "grade": 1, - "limitApp": "default", - "strategy": 0, - "controlBehavior": 0 - }, - { - "resource": "ruoyi-resource", - "count": 500, - "grade": 1, - "limitApp": "default", - "strategy": 0, - "controlBehavior": 0 - } -] diff --git a/script/docker/docker-compose.yml b/script/docker/docker-compose.yml index 399aac8dd..4b982766b 100644 --- a/script/docker/docker-compose.yml +++ b/script/docker/docker-compose.yml @@ -133,21 +133,6 @@ services: privileged: true network_mode: "host" - sentinel: - image: ruoyi/ruoyi-sentinel-dashboard:2.4.1 - container_name: sentinel - environment: - TZ: Asia/Shanghai - ports: - - "8718:8718" - volumes: - # 配置文件 - - /docker/ruoyi-sentinel-dashboard/logs/:/ruoyi/sentinel-dashboard/logs - # skywalking 探针 - - /docker/skywalking/agent/:/ruoyi/skywalking/agent - restart: always - network_mode: "host" - ruoyi-monitor: image: ruoyi/ruoyi-monitor:2.4.1 container_name: ruoyi-monitor diff --git a/script/sql/oracle/oracle_ry_cloud.sql b/script/sql/oracle/oracle_ry_cloud.sql index 42ae012ca..e83d75fd2 100644 --- a/script/sql/oracle/oracle_ry_cloud.sql +++ b/script/sql/oracle/oracle_ry_cloud.sql @@ -445,7 +445,6 @@ insert into sys_menu values('108', '日志管理', '1', '9', 'log', insert into sys_menu values('109', '在线用户', '2', '1', 'online', 'monitor/online/index', '', 1, 0, 'C', '0', '0', 'monitor:online:list', 'online', 103, 1, sysdate, null, null, '在线用户菜单'); insert into sys_menu values('124', '缓存监控', '2', '1', 'cache', 'monitor/cache/index', '', 1, 0, 'C', '0', '0', 'monitor:cache:list', 'redis', 103, 1, sysdate, null, null, '缓存监控'); insert into sys_menu values('110', 'SnailJob控制台', '2', '2', 'http://localhost:8800/snail-job', '', '', 0, 0, 'C', '0', '0', 'monitor:job:list', 'job', 103, 1, sysdate, null, null, '定时任务菜单'); -insert into sys_menu values('111', 'Sentinel控制台','2', '3', 'http://localhost:8718', '', '', 0, 0, 'C', '0', '0', 'monitor:sentinel:list', 'sentinel', 103, 1, sysdate, null, null, '流量控制菜单'); insert into sys_menu values('112', 'Nacos控制台', '2', '4', 'http://localhost:8848/nacos', '', '', 0, 0, 'C', '0', '0', 'monitor:nacos:list', 'nacos', 103, 1, sysdate, null, null, '服务治理菜单'); insert into sys_menu values('113', 'Admin控制台', '2', '5', 'http://localhost:9100/login', '', '', 0, 0, 'C', '0', '0', 'monitor:server:list', 'server', 103, 1, sysdate, null, null, '服务监控菜单'); insert into sys_menu values('115', '代码生成', '3', '2', 'gen', 'tool/gen/index', '', 1, 0, 'C', '0', '0', 'tool:gen:list', 'code', 103, 1, sysdate, null, null, '代码生成菜单'); diff --git a/script/sql/postgres/postgres_ry_cloud.sql b/script/sql/postgres/postgres_ry_cloud.sql index 04b53d94f..52077f413 100644 --- a/script/sql/postgres/postgres_ry_cloud.sql +++ b/script/sql/postgres/postgres_ry_cloud.sql @@ -447,7 +447,6 @@ insert into sys_menu values('108', '日志管理', '1', '9', 'log', insert into sys_menu values('109', '在线用户', '2', '1', 'online', 'monitor/online/index', '', '1', '0', 'C', '0', '0', 'monitor:online:list', 'online', 103, 1, now(), null, null, '在线用户菜单'); insert into sys_menu values('124', '缓存监控', '2', '1', 'cache', 'monitor/cache/index', '', '1', '0', 'C', '0', '0', 'monitor:cache:list', 'redis', 103, 1, now(), null, null, '缓存监控'); insert into sys_menu values('110', 'SnailJob控制台', '2', '2', 'http://localhost:8800/snail-job', '', '', '0', '0', 'C', '0', '0', 'monitor:job:list', 'job', 103, 1, now(), null, null, 'SJ定时任务菜单'); -insert into sys_menu values('111', 'Sentinel控制台','2', '3', 'http://localhost:8718', '', '', '0', '0', 'C', '0', '0', 'monitor:sentinel:list', 'sentinel', 103, 1, now(), null, null, '流量控制菜单'); insert into sys_menu values('112', 'Nacos控制台', '2', '4', 'http://localhost:8848/nacos', '', '', '0', '0', 'C', '0', '0', 'monitor:nacos:list', 'nacos', 103, 1, now(), null, null, '服务治理菜单'); insert into sys_menu values('113', 'Admin控制台', '2', '5', 'http://localhost:9100/login', '', '', '0', '0', 'C', '0', '0', 'monitor:server:list', 'server', 103, 1, now(), null, null, '服务监控菜单'); insert into sys_menu values('115', '代码生成', '3', '2', 'gen', 'tool/gen/index', '', '1', '0', 'C', '0', '0', 'tool:gen:list', 'code', 103, 1, now(), null, null, '代码生成菜单'); diff --git a/script/sql/ry-cloud.sql b/script/sql/ry-cloud.sql index 802e9d30a..e83122f87 100644 --- a/script/sql/ry-cloud.sql +++ b/script/sql/ry-cloud.sql @@ -281,7 +281,6 @@ insert into sys_menu values('108', '日志管理', '1', '9', 'log', insert into sys_menu values('109', '在线用户', '2', '1', 'online', 'monitor/online/index', '', 1, 0, 'C', '0', '0', 'monitor:online:list', 'online', 103, 1, sysdate(), null, null, '在线用户菜单'); insert into sys_menu values('124', '缓存监控', '2', '1', 'cache', 'monitor/cache/index', '', 1, 0, 'C', '0', '0', 'monitor:cache:list', 'redis', 103, 1, sysdate(), null, null, '缓存监控'); insert into sys_menu values('110', 'SnailJob控制台', '2', '2', 'http://localhost:8800/snail-job', '', '', 0, 0, 'C', '0', '0', 'monitor:job:list', 'job', 103, 1, sysdate(), null, null, 'SJ定时任务菜单'); -insert into sys_menu values('111', 'Sentinel控制台','2', '3', 'http://localhost:8718', '', '', 0, 0, 'C', '0', '0', 'monitor:sentinel:list', 'sentinel', 103, 1, sysdate(), null, null, '流量控制菜单'); insert into sys_menu values('112', 'Nacos控制台', '2', '4', 'http://localhost:8848/nacos', '', '', 0, 0, 'C', '0', '0', 'monitor:nacos:list', 'nacos', 103, 1, sysdate(), null, null, '服务治理菜单'); insert into sys_menu values('113', 'Admin控制台', '2', '5', 'http://localhost:9100/login', '', '', 0, 0, 'C', '0', '0', 'monitor:server:list', 'server', 103, 1, sysdate(), null, null, '服务监控菜单'); insert into sys_menu values('115', '代码生成', '3', '2', 'gen', 'tool/gen/index', '', 1, 0, 'C', '0', '0', 'tool:gen:list', 'code', 103, 1, sysdate(), null, null, '代码生成菜单'); diff --git a/script/sql/ry-config.sql b/script/sql/ry-config.sql index 21a5c9a1d..a217a8086 100644 --- a/script/sql/ry-config.sql +++ b/script/sql/ry-config.sql @@ -35,9 +35,7 @@ insert into config_info(id, data_id, group_id, content, md5, gmt_create, gmt_mod (8, 'ruoyi-job.yml', 'DEFAULT_GROUP', '# 将项目路径：config/下对应文件中内容复制到此处', '2944a25cb97926efcaa43b3ad7a64cf0', '2022-01-09 15:20:18', '2022-01-09 15:21:36', NULL, '0:0:0:0:0:0:0:1', '', 'dev', '定时任务', NULL, NULL, 'yaml', NULL, ''), (9, 'ruoyi-resource.yml', 'DEFAULT_GROUP', '# 将项目路径：config/下对应文件中内容复制到此处', '2944a25cb97926efcaa43b3ad7a64cf0', '2022-01-09 15:20:35', '2022-01-09 15:21:21', NULL, '0:0:0:0:0:0:0:1', '', 'dev', '文件服务', NULL, NULL, 'yaml', NULL, ''), (10, 'ruoyi-workflow.yml', 'DEFAULT_GROUP', '# 将项目路径：config/下对应文件中内容复制到此处', '2944a25cb97926efcaa43b3ad7a64cf0', '2022-01-09 15:20:35', '2022-01-09 15:21:21', NULL, '0:0:0:0:0:0:0:1', '', 'dev', '工作流服务', NULL, NULL, 'yaml', NULL, ''), -(11, 'sentinel-ruoyi-gateway.json', 'DEFAULT_GROUP', '# 将项目路径：config/下对应文件中内容复制到此处', '2944a25cb97926efcaa43b3ad7a64cf0', '2022-01-09 15:21:02', '2022-01-09 15:21:02', NULL, '0:0:0:0:0:0:0:1', '', 'dev', '限流策略', NULL, NULL, 'json', NULL, ''), (12, 'seata-server.properties', 'DEFAULT_GROUP', '# 将项目路径：config/下对应文件中内容复制到此处', '2944a25cb97926efcaa43b3ad7a64cf0', '2022-01-09 15:21:02', '2022-01-09 15:21:02', NULL, '0:0:0:0:0:0:0:1', '', 'dev', 'seata配置文件', NULL, NULL, 'properties', NULL, ''), -(13, 'ruoyi-sentinel-dashboard.yml', 'DEFAULT_GROUP', '# 将项目路径：config/下对应文件中内容复制到此处', '2944a25cb97926efcaa43b3ad7a64cf0', '2022-01-09 15:21:02', '2022-01-09 15:21:02', NULL, '0:0:0:0:0:0:0:1', '', 'dev', 'sentinel控制台配置文件', NULL, NULL, 'yaml', NULL, ''), (14, 'ruoyi-snailjob-server.yml', 'DEFAULT_GROUP', '# 将项目路径：config/下对应文件中内容复制到此处', '2944a25cb97926efcaa43b3ad7a64cf0', '2022-01-09 15:21:02', '2022-01-09 15:21:02', NULL, '0:0:0:0:0:0:0:1', '', 'dev', 'SJ定时任务控制台', NULL, NULL, 'yaml', NULL, ''), (101, 'application-common.yml', 'DEFAULT_GROUP', '# 将项目路径：config/下对应文件中内容复制到此处', '2944a25cb97926efcaa43b3ad7a64cf0', '2022-01-09 15:23:00', '2022-01-09 15:23:00', NULL, '0:0:0:0:0:0:0:1', '', 'prod', '通用配置基础配置', NULL, NULL, 'yaml', NULL, ''), @@ -50,9 +48,7 @@ insert into config_info(id, data_id, group_id, content, md5, gmt_create, gmt_mod (108, 'ruoyi-job.yml', 'DEFAULT_GROUP', '# 将项目路径：config/下对应文件中内容复制到此处', '2944a25cb97926efcaa43b3ad7a64cf0', '2022-01-09 15:23:00', '2022-01-09 15:23:00', NULL, '0:0:0:0:0:0:0:1', '', 'prod', '定时任务', NULL, NULL, 'yaml', NULL, ''), (109, 'ruoyi-resource.yml', 'DEFAULT_GROUP', '# 将项目路径：config/下对应文件中内容复制到此处', '2944a25cb97926efcaa43b3ad7a64cf0', '2022-01-09 15:23:00', '2022-01-09 15:23:00', NULL, '0:0:0:0:0:0:0:1', '', 'prod', '文件服务', NULL, NULL, 'yaml', NULL, ''), (110, 'ruoyi-workflow.yml', 'DEFAULT_GROUP', '# 将项目路径：config/下对应文件中内容复制到此处', '2944a25cb97926efcaa43b3ad7a64cf0', '2022-01-09 15:23:00', '2022-01-09 15:23:00', NULL, '0:0:0:0:0:0:0:1', '', 'prod', '工作流服务', NULL, NULL, 'yaml', NULL, ''), -(111, 'sentinel-ruoyi-gateway.json', 'DEFAULT_GROUP', '# 将项目路径：config/下对应文件中内容复制到此处', '2944a25cb97926efcaa43b3ad7a64cf0', '2022-01-09 15:23:00', '2022-01-09 15:23:00', NULL, '0:0:0:0:0:0:0:1', '', 'prod', '限流策略', NULL, NULL, 'json', NULL, ''), (112, 'seata-server.properties', 'DEFAULT_GROUP', '# 将项目路径：config/下对应文件中内容复制到此处', '2944a25cb97926efcaa43b3ad7a64cf0', '2022-01-09 15:21:02', '2022-01-09 15:21:02', NULL, '0:0:0:0:0:0:0:1', '', 'prod', 'seata配置文件', NULL, NULL, 'properties', NULL, ''), -(113, 'ruoyi-sentinel-dashboard.yml', 'DEFAULT_GROUP', '# 将项目路径：config/下对应文件中内容复制到此处', '2944a25cb97926efcaa43b3ad7a64cf0', '2022-01-09 15:21:02', '2022-01-09 15:21:02', NULL, '0:0:0:0:0:0:0:1', '', 'prod', 'sentinel控制台配置文件', NULL, NULL, 'yaml', NULL, ''), (114, 'ruoyi-snailjob-server.yml', 'DEFAULT_GROUP', '# 将项目路径：config/下对应文件中内容复制到此处', '2944a25cb97926efcaa43b3ad7a64cf0', '2022-01-09 15:21:02', '2022-01-09 15:21:02', NULL, '0:0:0:0:0:0:0:1', '', 'prod', 'SJ定时任务控制台', NULL, NULL, 'yaml', NULL, ''); /******************************************/