Skip to content

Commit 1b14f7a

Browse files
JavaLionLiJavaLionLi
committed
Merge remote-tracking branch 'origin/dev' into 2.X
2 parents 71b6b04 + 4a4e2c3 commit 1b14f7a

File tree

14 files changed

+27
-25
lines changed

14 files changed

+27
-25
lines changed

‎docker/docker-compose.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ services:
4646
network_mode: "host"
4747

4848
redis:
49-
image: redis:6.2.7
49+
image: redis:6.2.12
5050
container_name: redis
5151
ports:
5252
- "6379:6379"

‎ruoyi-auth/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# 贝尔实验室 Spring 官方推荐镜像 JDK下载地址 https://bell-sw.com/pages/downloads/
2-
FROM bellsoft/liberica-openjdk-alpine:17.0.11-cds
3-
#FROM bellsoft/liberica-openjdk-alpine:21.0.3-cds
2+
FROM bellsoft/liberica-openjdk-debian:17.0.11-cds
3+
#FROM bellsoft/liberica-openjdk-debian:21.0.3-cds
44
#FROM findepi/graalvm:java17-native
55

66
LABEL maintainer="Lion Li"

‎ruoyi-example/ruoyi-test-mq/src/main/java/org/dromara/stream/config/KafkaStreamsConfig.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,15 @@
44
import org.apache.kafka.streams.kstream.KStream;
55
import org.springframework.context.annotation.Bean;
66
import org.springframework.context.annotation.Configuration;
7+
import org.springframework.kafka.annotation.EnableKafkaStreams;
78

89
/**
910
* kafka stream 配置
1011
*
1112
* @author LionLi
1213
*/
1314
@Configuration
15+
@EnableKafkaStreams
1416
public class KafkaStreamsConfig {
1517

1618
@Bean

‎ruoyi-gateway/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# 贝尔实验室 Spring 官方推荐镜像 JDK下载地址 https://bell-sw.com/pages/downloads/
2-
FROM bellsoft/liberica-openjdk-alpine:17.0.11-cds
3-
#FROM bellsoft/liberica-openjdk-alpine:21.0.3-cds
2+
FROM bellsoft/liberica-openjdk-debian:17.0.11-cds
3+
#FROM bellsoft/liberica-openjdk-debian:21.0.3-cds
44
#FROM findepi/graalvm:java17-native
55

66
LABEL maintainer="Lion Li"

‎ruoyi-modules/ruoyi-gen/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# 贝尔实验室 Spring 官方推荐镜像 JDK下载地址 https://bell-sw.com/pages/downloads/
2-
FROM bellsoft/liberica-openjdk-alpine:17.0.11-cds
3-
#FROM bellsoft/liberica-openjdk-alpine:21.0.3-cds
2+
FROM bellsoft/liberica-openjdk-debian:17.0.11-cds
3+
#FROM bellsoft/liberica-openjdk-debian:21.0.3-cds
44
#FROM findepi/graalvm:java17-native
55

66
LABEL maintainer="Lion Li"

‎ruoyi-modules/ruoyi-job/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# 贝尔实验室 Spring 官方推荐镜像 JDK下载地址 https://bell-sw.com/pages/downloads/
2-
FROM bellsoft/liberica-openjdk-alpine:17.0.11-cds
3-
#FROM bellsoft/liberica-openjdk-alpine:21.0.3-cds
2+
FROM bellsoft/liberica-openjdk-debian:17.0.11-cds
3+
#FROM bellsoft/liberica-openjdk-debian:21.0.3-cds
44
#FROM findepi/graalvm:java17-native
55

66
LABEL maintainer="Lion Li"

‎ruoyi-modules/ruoyi-resource/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# 贝尔实验室 Spring 官方推荐镜像 JDK下载地址 https://bell-sw.com/pages/downloads/
2-
FROM bellsoft/liberica-openjdk-alpine:17.0.11-cds
3-
#FROM bellsoft/liberica-openjdk-alpine:21.0.3-cds
2+
FROM bellsoft/liberica-openjdk-debian:17.0.11-cds
3+
#FROM bellsoft/liberica-openjdk-debian:21.0.3-cds
44
#FROM findepi/graalvm:java17-native
55

66
LABEL maintainer="Lion Li"

‎ruoyi-modules/ruoyi-system/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# 贝尔实验室 Spring 官方推荐镜像 JDK下载地址 https://bell-sw.com/pages/downloads/
2-
FROM bellsoft/liberica-openjdk-alpine:17.0.11-cds
3-
#FROM bellsoft/liberica-openjdk-alpine:21.0.3-cds
2+
FROM bellsoft/liberica-openjdk-debian:17.0.11-cds
3+
#FROM bellsoft/liberica-openjdk-debian:21.0.3-cds
44
#FROM findepi/graalvm:java17-native
55

66
LABEL maintainer="Lion Li"

‎ruoyi-modules/ruoyi-workflow/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# 贝尔实验室 Spring 官方推荐镜像 JDK下载地址 https://bell-sw.com/pages/downloads/
2-
FROM bellsoft/liberica-openjdk-alpine:17.0.11-cds
3-
#FROM bellsoft/liberica-openjdk-alpine:21.0.3-cds
2+
FROM bellsoft/liberica-openjdk-debian:17.0.11-cds
3+
#FROM bellsoft/liberica-openjdk-debian:21.0.3-cds
44
#FROM findepi/graalvm:java17-native
55

66
LABEL maintainer="Lion Li"

‎ruoyi-visual/ruoyi-monitor/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# 贝尔实验室 Spring 官方推荐镜像 JDK下载地址 https://bell-sw.com/pages/downloads/
2-
FROM bellsoft/liberica-openjdk-alpine:17.0.11-cds
3-
#FROM bellsoft/liberica-openjdk-alpine:21.0.3-cds
2+
FROM bellsoft/liberica-openjdk-debian:17.0.11-cds
3+
#FROM bellsoft/liberica-openjdk-debian:21.0.3-cds
44
#FROM findepi/graalvm:java17-native
55

66
LABEL maintainer="Lion Li"

0 commit comments

Comments
 (0)