Merge remote-tracking branch 'origin/dev'

2025-11-04 16:23:42 +08:00 · 2021-11-29 13:59:15 +08:00
parent 36fd16562e 52673152cc
commit 65eb873f9a
15 changed files with 19 additions and 19 deletions
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 [![License](https://img.shields.io/badge/License-MIT-blue.svg)](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus/blob/master/LICENSE)
 [![使用IntelliJ IDEA开发维护](https://img.shields.io/badge/IntelliJ%20IDEA-提供支持-blue.svg)](https://www.jetbrains.com/?from=RuoYi-Vue-Plus)
 <br>
-[![RuoYi-Vue-Plus](https://img.shields.io/badge/RuoYi_Vue_Plus-3.3.0-success.svg)](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus)
+[![RuoYi-Vue-Plus](https://img.shields.io/badge/RuoYi_Vue_Plus-3.4.0-success.svg)](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus)
 [![Spring Boot](https://img.shields.io/badge/Spring%20Boot-2.5-blue.svg)]()
 [![JDK-8+](https://img.shields.io/badge/JDK-8-green.svg)]()
 [![JDK-11](https://img.shields.io/badge/JDK-11-green.svg)]()
--- a/pom.xml
+++ b/pom.xml
@@ -6,14 +6,14 @@

    <groupId>com.ruoyi</groupId>
    <artifactId>ruoyi-vue-plus</artifactId>
-    <version>3.3.0</version>
+    <version>3.4.0</version>

    <name>RuoYi-Vue-Plus</name>
    <url>https://gitee.com/JavaLionLi/RuoYi-Vue-Plus</url>
    <description>RuoYi-Vue-Plus后台管理系统</description>

    <properties>
-        <ruoyi-vue-plus.version>3.3.0</ruoyi-vue-plus.version>
+        <ruoyi-vue-plus.version>3.4.0</ruoyi-vue-plus.version>
        <spring-boot.version>2.5.7</spring-boot.version>
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
--- a/ruoyi-admin/pom.xml
+++ b/ruoyi-admin/pom.xml
@@ -5,7 +5,7 @@
    <parent>
        <artifactId>ruoyi-vue-plus</artifactId>
        <groupId>com.ruoyi</groupId>
-        <version>3.3.0</version>
+        <version>3.4.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <packaging>jar</packaging>
--- a/ruoyi-common/pom.xml
+++ b/ruoyi-common/pom.xml
@@ -5,7 +5,7 @@
    <parent>
        <artifactId>ruoyi-vue-plus</artifactId>
        <groupId>com.ruoyi</groupId>
-        <version>3.3.0</version>
+        <version>3.4.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/ruoyi-demo/pom.xml
+++ b/ruoyi-demo/pom.xml
@@ -5,7 +5,7 @@
    <parent>
        <artifactId>ruoyi-vue-plus</artifactId>
        <groupId>com.ruoyi</groupId>
-        <version>3.3.0</version>
+        <version>3.4.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/ruoyi-extend/pom.xml
+++ b/ruoyi-extend/pom.xml
@@ -5,7 +5,7 @@
    <parent>
        <artifactId>ruoyi-vue-plus</artifactId>
        <groupId>com.ruoyi</groupId>
-        <version>3.3.0</version>
+        <version>3.4.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <artifactId>ruoyi-extend</artifactId>
--- a/ruoyi-extend/ruoyi-monitor-admin/pom.xml
+++ b/ruoyi-extend/ruoyi-monitor-admin/pom.xml
@@ -5,7 +5,7 @@
    <parent>
        <artifactId>ruoyi-extend</artifactId>
        <groupId>com.ruoyi</groupId>
-        <version>3.3.0</version>
+        <version>3.4.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <packaging>jar</packaging>
--- a/ruoyi-extend/ruoyi-xxl-job-admin/pom.xml
+++ b/ruoyi-extend/ruoyi-xxl-job-admin/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
        <artifactId>ruoyi-extend</artifactId>
        <groupId>com.ruoyi</groupId>
-        <version>3.3.0</version>
+        <version>3.4.0</version>
 	</parent>
 	<artifactId>ruoyi-xxl-job-admin</artifactId>
 	<packaging>jar</packaging>
--- a/ruoyi-framework/pom.xml
+++ b/ruoyi-framework/pom.xml
@@ -5,7 +5,7 @@
    <parent>
        <artifactId>ruoyi-vue-plus</artifactId>
        <groupId>com.ruoyi</groupId>
-        <version>3.3.0</version>
+        <version>3.4.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/ruoyi-generator/pom.xml
+++ b/ruoyi-generator/pom.xml
@@ -5,7 +5,7 @@
    <parent>
        <artifactId>ruoyi-vue-plus</artifactId>
        <groupId>com.ruoyi</groupId>
-        <version>3.3.0</version>
+        <version>3.4.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/ruoyi-job/pom.xml
+++ b/ruoyi-job/pom.xml
@@ -5,7 +5,7 @@
    <parent>
        <artifactId>ruoyi-vue-plus</artifactId>
        <groupId>com.ruoyi</groupId>
-        <version>3.3.0</version>
+        <version>3.4.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <packaging>jar</packaging>
--- a/ruoyi-oss/pom.xml
+++ b/ruoyi-oss/pom.xml
@@ -5,7 +5,7 @@
    <parent>
        <artifactId>ruoyi-vue-plus</artifactId>
        <groupId>com.ruoyi</groupId>
-        <version>3.3.0</version>
+        <version>3.4.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/ruoyi-system/pom.xml
+++ b/ruoyi-system/pom.xml
@@ -5,7 +5,7 @@
    <parent>
        <artifactId>ruoyi-vue-plus</artifactId>
        <groupId>com.ruoyi</groupId>
-        <version>3.3.0</version>
+        <version>3.4.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/ruoyi-ui/src/views/index.vue
+++ b/ruoyi-ui/src/views/index.vue
@@ -533,7 +533,7 @@ export default {
  data() {
    return {
      // 版本号
-      version: "3.3.0",
+      version: "3.4.0",
    };
  },
  methods: {
--- a/script/docker/docker-compose.yml
+++ b/script/docker/docker-compose.yml
@@ -102,7 +102,7 @@ services:
        ipv4_address: 172.30.0.54

  ruoyi-server1:
-    image: "ruoyi/ruoyi-server:3.3.0"
+    image: "ruoyi/ruoyi-server:3.4.0"
    container_name: ruoyi-server1
    environment:
      # 时区上海
@@ -117,7 +117,7 @@ services:
        ipv4_address: 172.30.0.60

  ruoyi-server2:
-    image: "ruoyi/ruoyi-server:3.3.0"
+    image: "ruoyi/ruoyi-server:3.4.0"
    container_name: ruoyi-server2
    environment:
      # 时区上海
@@ -132,7 +132,7 @@ services:
        ipv4_address: 172.30.0.61

  ruoyi-monitor-admin:
-    image: "ruoyi/ruoyi-monitor-admin:3.3.0"
+    image: "ruoyi/ruoyi-monitor-admin:3.4.0"
    container_name: ruoyi-monitor-admin
    environment:
      # 时区上海
@@ -147,7 +147,7 @@ services:
        ipv4_address: 172.30.0.90

  ruoyi-xxl-job-admin:
-    image: "ruoyi/ruoyi-xxl-job-admin:3.3.0"
+    image: "ruoyi/ruoyi-xxl-job-admin:3.4.0"
    container_name: ruoyi-xxl-job-admin
    environment:
      # 时区上海