From 5c072f8eb1b05b54d6ef682c3eb42b076d861885 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?= <15040126243@163.com> Date: Tue, 9 Jul 2024 14:49:40 +0800 Subject: [PATCH 1/3] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20kafka=20strea?= =?UTF-8?q?m=20=E9=BB=98=E8=AE=A4=E5=BC=80=E5=90=AF=E9=81=BF=E5=85=8D?= =?UTF-8?q?=E5=B0=8F=E7=99=BD=E6=90=9E=E4=B8=8D=E6=87=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/org/dromara/stream/config/KafkaStreamsConfig.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ruoyi-example/ruoyi-test-mq/src/main/java/org/dromara/stream/config/KafkaStreamsConfig.java b/ruoyi-example/ruoyi-test-mq/src/main/java/org/dromara/stream/config/KafkaStreamsConfig.java index 02e441a8..a73cb420 100644 --- a/ruoyi-example/ruoyi-test-mq/src/main/java/org/dromara/stream/config/KafkaStreamsConfig.java +++ b/ruoyi-example/ruoyi-test-mq/src/main/java/org/dromara/stream/config/KafkaStreamsConfig.java @@ -4,6 +4,7 @@ import org.apache.kafka.streams.StreamsBuilder; import org.apache.kafka.streams.kstream.KStream; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.kafka.annotation.EnableKafkaStreams; /** * kafka stream 配置 @@ -11,6 +12,7 @@ import org.springframework.context.annotation.Configuration; * @author LionLi */ @Configuration +@EnableKafkaStreams public class KafkaStreamsConfig { @Bean From a24e095e9e4664187bb192faed330a2bf843b351 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?= <15040126243@163.com> Date: Tue, 9 Jul 2024 15:13:52 +0800 Subject: [PATCH 2/3] =?UTF-8?q?update=20redis=206.2.7=20=3D>=206.2.12=20?= =?UTF-8?q?=E8=A7=A3=E5=86=B3=E8=AE=A2=E9=98=85key=E6=8A=A5=E9=94=99?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 8b2adada..66bc2dd6 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -46,7 +46,7 @@ services: network_mode: "host" redis: - image: redis:6.2.7 + image: redis:6.2.12 container_name: redis ports: - "6379:6379" From 4a4e2c380f58d4c9f1659b4bdd7a09127b3ece53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?= <15040126243@163.com> Date: Tue, 9 Jul 2024 16:37:15 +0800 Subject: [PATCH 3/3] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20=E6=9B=B4?= =?UTF-8?q?=E6=8D=A2docker=E9=95=9C=E5=83=8F=E5=BA=95=E5=B1=82=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=20=E9=81=BF=E5=85=8D=E6=97=A0=E5=AD=97=E4=BD=93?= =?UTF-8?q?=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-auth/Dockerfile | 4 ++-- ruoyi-gateway/Dockerfile | 4 ++-- ruoyi-modules/ruoyi-gen/Dockerfile | 4 ++-- ruoyi-modules/ruoyi-job/Dockerfile | 4 ++-- ruoyi-modules/ruoyi-resource/Dockerfile | 4 ++-- ruoyi-modules/ruoyi-system/Dockerfile | 4 ++-- ruoyi-modules/ruoyi-workflow/Dockerfile | 4 ++-- ruoyi-visual/ruoyi-monitor/Dockerfile | 4 ++-- ruoyi-visual/ruoyi-nacos/Dockerfile | 4 ++-- ruoyi-visual/ruoyi-seata-server/Dockerfile | 4 ++-- ruoyi-visual/ruoyi-sentinel-dashboard/Dockerfile | 4 ++-- ruoyi-visual/ruoyi-snailjob-server/Dockerfile | 4 ++-- 12 files changed, 24 insertions(+), 24 deletions(-) diff --git a/ruoyi-auth/Dockerfile b/ruoyi-auth/Dockerfile index 393ab9e5..71e290f1 100644 --- a/ruoyi-auth/Dockerfile +++ b/ruoyi-auth/Dockerfile @@ -1,6 +1,6 @@ # 贝尔实验室 Spring 官方推荐镜像 JDK下载地址 https://bell-sw.com/pages/downloads/ -FROM bellsoft/liberica-openjdk-alpine:17.0.11-cds -#FROM bellsoft/liberica-openjdk-alpine:21.0.3-cds +FROM bellsoft/liberica-openjdk-debian:17.0.11-cds +#FROM bellsoft/liberica-openjdk-debian:21.0.3-cds #FROM findepi/graalvm:java17-native LABEL maintainer="Lion Li" diff --git a/ruoyi-gateway/Dockerfile b/ruoyi-gateway/Dockerfile index ae82e1f6..72898567 100644 --- a/ruoyi-gateway/Dockerfile +++ b/ruoyi-gateway/Dockerfile @@ -1,6 +1,6 @@ # 贝尔实验室 Spring 官方推荐镜像 JDK下载地址 https://bell-sw.com/pages/downloads/ -FROM bellsoft/liberica-openjdk-alpine:17.0.11-cds -#FROM bellsoft/liberica-openjdk-alpine:21.0.3-cds +FROM bellsoft/liberica-openjdk-debian:17.0.11-cds +#FROM bellsoft/liberica-openjdk-debian:21.0.3-cds #FROM findepi/graalvm:java17-native LABEL maintainer="Lion Li" diff --git a/ruoyi-modules/ruoyi-gen/Dockerfile b/ruoyi-modules/ruoyi-gen/Dockerfile index 82454309..6afad086 100644 --- a/ruoyi-modules/ruoyi-gen/Dockerfile +++ b/ruoyi-modules/ruoyi-gen/Dockerfile @@ -1,6 +1,6 @@ # 贝尔实验室 Spring 官方推荐镜像 JDK下载地址 https://bell-sw.com/pages/downloads/ -FROM bellsoft/liberica-openjdk-alpine:17.0.11-cds -#FROM bellsoft/liberica-openjdk-alpine:21.0.3-cds +FROM bellsoft/liberica-openjdk-debian:17.0.11-cds +#FROM bellsoft/liberica-openjdk-debian:21.0.3-cds #FROM findepi/graalvm:java17-native LABEL maintainer="Lion Li" diff --git a/ruoyi-modules/ruoyi-job/Dockerfile b/ruoyi-modules/ruoyi-job/Dockerfile index 4c9c194f..cdfe40e9 100644 --- a/ruoyi-modules/ruoyi-job/Dockerfile +++ b/ruoyi-modules/ruoyi-job/Dockerfile @@ -1,6 +1,6 @@ # 贝尔实验室 Spring 官方推荐镜像 JDK下载地址 https://bell-sw.com/pages/downloads/ -FROM bellsoft/liberica-openjdk-alpine:17.0.11-cds -#FROM bellsoft/liberica-openjdk-alpine:21.0.3-cds +FROM bellsoft/liberica-openjdk-debian:17.0.11-cds +#FROM bellsoft/liberica-openjdk-debian:21.0.3-cds #FROM findepi/graalvm:java17-native LABEL maintainer="Lion Li" diff --git a/ruoyi-modules/ruoyi-resource/Dockerfile b/ruoyi-modules/ruoyi-resource/Dockerfile index 05991dbe..2f3ca581 100644 --- a/ruoyi-modules/ruoyi-resource/Dockerfile +++ b/ruoyi-modules/ruoyi-resource/Dockerfile @@ -1,6 +1,6 @@ # 贝尔实验室 Spring 官方推荐镜像 JDK下载地址 https://bell-sw.com/pages/downloads/ -FROM bellsoft/liberica-openjdk-alpine:17.0.11-cds -#FROM bellsoft/liberica-openjdk-alpine:21.0.3-cds +FROM bellsoft/liberica-openjdk-debian:17.0.11-cds +#FROM bellsoft/liberica-openjdk-debian:21.0.3-cds #FROM findepi/graalvm:java17-native LABEL maintainer="Lion Li" diff --git a/ruoyi-modules/ruoyi-system/Dockerfile b/ruoyi-modules/ruoyi-system/Dockerfile index 9414ea04..0b721bfd 100644 --- a/ruoyi-modules/ruoyi-system/Dockerfile +++ b/ruoyi-modules/ruoyi-system/Dockerfile @@ -1,6 +1,6 @@ # 贝尔实验室 Spring 官方推荐镜像 JDK下载地址 https://bell-sw.com/pages/downloads/ -FROM bellsoft/liberica-openjdk-alpine:17.0.11-cds -#FROM bellsoft/liberica-openjdk-alpine:21.0.3-cds +FROM bellsoft/liberica-openjdk-debian:17.0.11-cds +#FROM bellsoft/liberica-openjdk-debian:21.0.3-cds #FROM findepi/graalvm:java17-native LABEL maintainer="Lion Li" diff --git a/ruoyi-modules/ruoyi-workflow/Dockerfile b/ruoyi-modules/ruoyi-workflow/Dockerfile index c312b820..947c6e18 100644 --- a/ruoyi-modules/ruoyi-workflow/Dockerfile +++ b/ruoyi-modules/ruoyi-workflow/Dockerfile @@ -1,6 +1,6 @@ # 贝尔实验室 Spring 官方推荐镜像 JDK下载地址 https://bell-sw.com/pages/downloads/ -FROM bellsoft/liberica-openjdk-alpine:17.0.11-cds -#FROM bellsoft/liberica-openjdk-alpine:21.0.3-cds +FROM bellsoft/liberica-openjdk-debian:17.0.11-cds +#FROM bellsoft/liberica-openjdk-debian:21.0.3-cds #FROM findepi/graalvm:java17-native LABEL maintainer="Lion Li" diff --git a/ruoyi-visual/ruoyi-monitor/Dockerfile b/ruoyi-visual/ruoyi-monitor/Dockerfile index e7bfe956..43a3ce6c 100644 --- a/ruoyi-visual/ruoyi-monitor/Dockerfile +++ b/ruoyi-visual/ruoyi-monitor/Dockerfile @@ -1,6 +1,6 @@ # 贝尔实验室 Spring 官方推荐镜像 JDK下载地址 https://bell-sw.com/pages/downloads/ -FROM bellsoft/liberica-openjdk-alpine:17.0.11-cds -#FROM bellsoft/liberica-openjdk-alpine:21.0.3-cds +FROM bellsoft/liberica-openjdk-debian:17.0.11-cds +#FROM bellsoft/liberica-openjdk-debian:21.0.3-cds #FROM findepi/graalvm:java17-native LABEL maintainer="Lion Li" diff --git a/ruoyi-visual/ruoyi-nacos/Dockerfile b/ruoyi-visual/ruoyi-nacos/Dockerfile index 95ffe431..526e5474 100644 --- a/ruoyi-visual/ruoyi-nacos/Dockerfile +++ b/ruoyi-visual/ruoyi-nacos/Dockerfile @@ -1,6 +1,6 @@ # 贝尔实验室 Spring 官方推荐镜像 JDK下载地址 https://bell-sw.com/pages/downloads/ -FROM bellsoft/liberica-openjdk-alpine:17.0.11-cds -#FROM bellsoft/liberica-openjdk-alpine:21.0.3-cds +FROM bellsoft/liberica-openjdk-debian:17.0.11-cds +#FROM bellsoft/liberica-openjdk-debian:21.0.3-cds #FROM findepi/graalvm:java17-native LABEL maintainer="Lion Li" diff --git a/ruoyi-visual/ruoyi-seata-server/Dockerfile b/ruoyi-visual/ruoyi-seata-server/Dockerfile index 903a5f25..be9fb62a 100644 --- a/ruoyi-visual/ruoyi-seata-server/Dockerfile +++ b/ruoyi-visual/ruoyi-seata-server/Dockerfile @@ -1,6 +1,6 @@ # 贝尔实验室 Spring 官方推荐镜像 JDK下载地址 https://bell-sw.com/pages/downloads/ -FROM bellsoft/liberica-openjdk-alpine:17.0.11-cds -#FROM bellsoft/liberica-openjdk-alpine:21.0.3-cds +FROM bellsoft/liberica-openjdk-debian:17.0.11-cds +#FROM bellsoft/liberica-openjdk-debian:21.0.3-cds #FROM findepi/graalvm:java17-native LABEL maintainer="Lion Li" diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/Dockerfile b/ruoyi-visual/ruoyi-sentinel-dashboard/Dockerfile index 9129d08d..50e944e1 100644 --- a/ruoyi-visual/ruoyi-sentinel-dashboard/Dockerfile +++ b/ruoyi-visual/ruoyi-sentinel-dashboard/Dockerfile @@ -1,6 +1,6 @@ # 贝尔实验室 Spring 官方推荐镜像 JDK下载地址 https://bell-sw.com/pages/downloads/ -FROM bellsoft/liberica-openjdk-alpine:17.0.11-cds -#FROM bellsoft/liberica-openjdk-alpine:21.0.3-cds +FROM bellsoft/liberica-openjdk-debian:17.0.11-cds +#FROM bellsoft/liberica-openjdk-debian:21.0.3-cds #FROM findepi/graalvm:java17-native LABEL maintainer="Lion Li" diff --git a/ruoyi-visual/ruoyi-snailjob-server/Dockerfile b/ruoyi-visual/ruoyi-snailjob-server/Dockerfile index 8200c6f3..a66ca66e 100644 --- a/ruoyi-visual/ruoyi-snailjob-server/Dockerfile +++ b/ruoyi-visual/ruoyi-snailjob-server/Dockerfile @@ -1,6 +1,6 @@ # 贝尔实验室 Spring 官方推荐镜像 JDK下载地址 https://bell-sw.com/pages/downloads/ -FROM bellsoft/liberica-openjdk-alpine:17.0.11-cds -#FROM bellsoft/liberica-openjdk-alpine:21.0.3-cds +FROM bellsoft/liberica-openjdk-debian:17.0.11-cds +#FROM bellsoft/liberica-openjdk-debian:21.0.3-cds #FROM findepi/graalvm:java17-native LABEL maintainer="Lion Li"