diff --git a/pom.xml b/pom.xml index 6ff8e1bc8..f1ea268a5 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ - 6.0.0-BETA + 6.0.0 UTF-8 UTF-8 21 diff --git a/ruoyi-admin/Dockerfile b/ruoyi-admin/Dockerfile index fc1cb356e..8923d2a67 100644 --- a/ruoyi-admin/Dockerfile +++ b/ruoyi-admin/Dockerfile @@ -1,6 +1,6 @@ # 贝尔实验室 Spring 官方推荐镜像 JDK下载地址 https://bell-sw.com/pages/downloads/ -FROM bellsoft/liberica-openjdk-rocky:21.0.11-cds -# FROM bellsoft/liberica-openjdk-rocky:25.0.3-cds +FROM bellsoft/liberica-openjdk-rocky:21.0.12-cds +# FROM bellsoft/liberica-openjdk-rocky:25.0.4-cds # FROM findepi/graalvm:java21-native LABEL maintainer="Lion Li" diff --git a/ruoyi-admin/src/main/resources/application-dev.yml b/ruoyi-admin/src/main/resources/application-dev.yml index 5d7ea2869..ae9b6ff9e 100644 --- a/ruoyi-admin/src/main/resources/application-dev.yml +++ b/ruoyi-admin/src/main/resources/application-dev.yml @@ -43,7 +43,7 @@ snail-ai: app-id: 1 # 认证令牌(在 Server「应用管理」页面创建时自动生成) token: SAI_566a6bfbc26e4998b4841cc927d50c5d - port: 18889 + port: 3${server.port} # Skill 文件临时目录 skill-temp-dir: /tmp/snail-ai-agent/skills # ==================== Chat 嵌入模式配置 ==================== diff --git a/ruoyi-admin/src/main/resources/application-prod.yml b/ruoyi-admin/src/main/resources/application-prod.yml index e034d2754..e581b182c 100644 --- a/ruoyi-admin/src/main/resources/application-prod.yml +++ b/ruoyi-admin/src/main/resources/application-prod.yml @@ -46,7 +46,7 @@ snail-ai: app-id: 1 # 认证令牌(在 Server「应用管理」页面创建时自动生成) token: SAI_566a6bfbc26e4998b4841cc927d50c5d - port: 18889 + port: 3${server.port} # Skill 文件临时目录 skill-temp-dir: /tmp/snail-ai-agent/skills # ==================== Chat 嵌入模式配置 ==================== diff --git a/ruoyi-common/ruoyi-common-bom/pom.xml b/ruoyi-common/ruoyi-common-bom/pom.xml index d111ab800..8d8b12dca 100644 --- a/ruoyi-common/ruoyi-common-bom/pom.xml +++ b/ruoyi-common/ruoyi-common-bom/pom.xml @@ -14,7 +14,7 @@ - 6.0.0-BETA + 6.0.0 diff --git a/ruoyi-extend/ruoyi-monitor-admin/Dockerfile b/ruoyi-extend/ruoyi-monitor-admin/Dockerfile index 52b602ce9..2adc8f18c 100644 --- a/ruoyi-extend/ruoyi-monitor-admin/Dockerfile +++ b/ruoyi-extend/ruoyi-monitor-admin/Dockerfile @@ -1,6 +1,6 @@ # 贝尔实验室 Spring 官方推荐镜像 JDK下载地址 https://bell-sw.com/pages/downloads/ -FROM bellsoft/liberica-openjdk-rocky:21.0.11-cds -# FROM bellsoft/liberica-openjdk-rocky:25.0.3-cds +FROM bellsoft/liberica-openjdk-rocky:21.0.12-cds +# FROM bellsoft/liberica-openjdk-rocky:25.0.4-cds # FROM findepi/graalvm:java21-native LABEL maintainer="Lion Li" diff --git a/ruoyi-extend/ruoyi-snailai-server/Dockerfile b/ruoyi-extend/ruoyi-snailai-server/Dockerfile index f85a9c3eb..e3b4dc261 100644 --- a/ruoyi-extend/ruoyi-snailai-server/Dockerfile +++ b/ruoyi-extend/ruoyi-snailai-server/Dockerfile @@ -1,6 +1,6 @@ # 贝尔实验室 Spring 官方推荐镜像 JDK下载地址 https://bell-sw.com/pages/downloads/ -FROM bellsoft/liberica-openjdk-rocky:21.0.11-cds -# FROM bellsoft/liberica-openjdk-rocky:25.0.3-cds +FROM bellsoft/liberica-openjdk-rocky:21.0.12-cds +# FROM bellsoft/liberica-openjdk-rocky:25.0.4-cds # FROM findepi/graalvm:java21-native LABEL maintainer="Lion Li" diff --git a/ruoyi-extend/ruoyi-snailjob-server/Dockerfile b/ruoyi-extend/ruoyi-snailjob-server/Dockerfile index de5e8a895..266edb4c6 100644 --- a/ruoyi-extend/ruoyi-snailjob-server/Dockerfile +++ b/ruoyi-extend/ruoyi-snailjob-server/Dockerfile @@ -1,6 +1,6 @@ # 贝尔实验室 Spring 官方推荐镜像 JDK下载地址 https://bell-sw.com/pages/downloads/ -FROM bellsoft/liberica-openjdk-rocky:21.0.11-cds -# FROM bellsoft/liberica-openjdk-rocky:25.0.3-cds +FROM bellsoft/liberica-openjdk-rocky:21.0.12-cds +# FROM bellsoft/liberica-openjdk-rocky:25.0.4-cds # FROM findepi/graalvm:java21-native LABEL maintainer="Lion Li"