From 426aeb0a7f14c62da224d51615903f746e56b9dd Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期二, 07 六月 2022 11:04:43 +0800
Subject: [PATCH] 发布 4.2.0-beta1 公测版

---
 ruoyi-extend/ruoyi-monitor-admin/pom.xml |    2 +-
 ruoyi-extend/ruoyi-xxl-job-admin/pom.xml |    2 +-
 ruoyi-framework/pom.xml                  |    2 +-
 ruoyi-admin/pom.xml                      |    2 +-
 ruoyi-system/pom.xml                     |    2 +-
 script/docker/docker-compose.yml         |    8 ++++----
 ruoyi-ui/src/views/index.vue             |    2 +-
 ruoyi-generator/pom.xml                  |    2 +-
 pom.xml                                  |    4 ++--
 ruoyi-common/pom.xml                     |    2 +-
 README.md                                |    2 +-
 ruoyi-extend/pom.xml                     |    2 +-
 ruoyi-demo/pom.xml                       |    2 +-
 ruoyi-oss/pom.xml                        |    2 +-
 ruoyi-ui/package.json                    |    2 +-
 ruoyi-job/pom.xml                        |    2 +-
 ruoyi-sms/pom.xml                        |    2 +-
 17 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/README.md b/README.md
index ee0f24a..53b9d9f 100644
--- 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-4.1.0-success.svg)](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus)
+[![RuoYi-Vue-Plus](https://img.shields.io/badge/RuoYi_Vue_Plus-4.2.0-beta1-success.svg)](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus)
 [![Spring Boot](https://img.shields.io/badge/Spring%20Boot-2.6-blue.svg)]()
 [![JDK-8+](https://img.shields.io/badge/JDK-8-green.svg)]()
 [![JDK-11](https://img.shields.io/badge/JDK-11-green.svg)]()
diff --git a/pom.xml b/pom.xml
index 182eae2..0b9cfd5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,14 +6,14 @@
 
     <groupId>com.ruoyi</groupId>
     <artifactId>ruoyi-vue-plus</artifactId>
-    <version>4.1.0</version>
+    <version>4.2.0-beta1</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>4.1.0</ruoyi-vue-plus.version>
+        <ruoyi-vue-plus.version>4.2.0-beta1</ruoyi-vue-plus.version>
         <spring-boot.version>2.6.8</spring-boot.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml
index 411d3b9..d588614 100644
--- 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>4.1.0</version>
+        <version>4.2.0-beta1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>
diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml
index d89f454..d27f34d 100644
--- 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>4.1.0</version>
+        <version>4.2.0-beta1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/ruoyi-demo/pom.xml b/ruoyi-demo/pom.xml
index 0ddbdb9..b751825 100644
--- 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>4.1.0</version>
+        <version>4.2.0-beta1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/ruoyi-extend/pom.xml b/ruoyi-extend/pom.xml
index 5e3725e..85b171b 100644
--- 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>4.1.0</version>
+        <version>4.2.0-beta1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>ruoyi-extend</artifactId>
diff --git a/ruoyi-extend/ruoyi-monitor-admin/pom.xml b/ruoyi-extend/ruoyi-monitor-admin/pom.xml
index 8fed38a..b57a61e 100644
--- 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>4.1.0</version>
+        <version>4.2.0-beta1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>
diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/pom.xml b/ruoyi-extend/ruoyi-xxl-job-admin/pom.xml
index d61f79d..3e745cb 100644
--- 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>4.1.0</version>
+        <version>4.2.0-beta1</version>
     </parent>
     <artifactId>ruoyi-xxl-job-admin</artifactId>
     <packaging>jar</packaging>
diff --git a/ruoyi-framework/pom.xml b/ruoyi-framework/pom.xml
index 6d7f410..eae8eca 100644
--- 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>4.1.0</version>
+        <version>4.2.0-beta1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/ruoyi-generator/pom.xml b/ruoyi-generator/pom.xml
index bed61d9..816c026 100644
--- 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>4.1.0</version>
+        <version>4.2.0-beta1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/ruoyi-job/pom.xml b/ruoyi-job/pom.xml
index b4593d7..6aa86cb 100644
--- 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>4.1.0</version>
+        <version>4.2.0-beta1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>
diff --git a/ruoyi-oss/pom.xml b/ruoyi-oss/pom.xml
index 9698650..9d59a70 100644
--- 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>4.1.0</version>
+        <version>4.2.0-beta1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/ruoyi-sms/pom.xml b/ruoyi-sms/pom.xml
index 8550e8c..5d528c0 100644
--- a/ruoyi-sms/pom.xml
+++ b/ruoyi-sms/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ruoyi-vue-plus</artifactId>
         <groupId>com.ruoyi</groupId>
-        <version>4.1.0</version>
+        <version>4.2.0-beta1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/ruoyi-system/pom.xml b/ruoyi-system/pom.xml
index 5e243aa..5e21cb1 100644
--- 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>4.1.0</version>
+        <version>4.2.0-beta1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json
index c7f0b73..2a9a4b9 100644
--- a/ruoyi-ui/package.json
+++ b/ruoyi-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ruoyi-vue-plus",
-  "version": "4.1.0",
+  "version": "4.2.0-beta1",
   "description": "RuoYi-Vue-Plus鍚庡彴绠＄悊绯荤粺",
   "author": "LionLi",
   "license": "MIT",
diff --git a/ruoyi-ui/src/views/index.vue b/ruoyi-ui/src/views/index.vue
index 5a13cc4..4aa39df 100644
--- a/ruoyi-ui/src/views/index.vue
+++ b/ruoyi-ui/src/views/index.vue
@@ -114,7 +114,7 @@
   data() {
     return {
       // 鐗堟湰鍙�
-      version: "4.1.0",
+      version: "4.2.0-beta1",
     };
   },
   methods: {
diff --git a/script/docker/docker-compose.yml b/script/docker/docker-compose.yml
index 1181e7b..a02fe5d 100644
--- a/script/docker/docker-compose.yml
+++ b/script/docker/docker-compose.yml
@@ -110,7 +110,7 @@
         ipv4_address: 172.30.0.54
 
   ruoyi-server1:
-    image: ruoyi/ruoyi-server:4.1.0
+    image: ruoyi/ruoyi-server:4.2.0-beta1
     container_name: ruoyi-server1
     environment:
       # 鏃跺尯涓婃捣
@@ -125,7 +125,7 @@
         ipv4_address: 172.30.0.60
 
   ruoyi-server2:
-    image: "ruoyi/ruoyi-server:4.1.0"
+    image: "ruoyi/ruoyi-server:4.2.0-beta1"
     container_name: ruoyi-server2
     environment:
       # 鏃跺尯涓婃捣
@@ -140,7 +140,7 @@
         ipv4_address: 172.30.0.61
 
   ruoyi-monitor-admin:
-    image: ruoyi/ruoyi-monitor-admin:4.1.0
+    image: ruoyi/ruoyi-monitor-admin:4.2.0-beta1
     container_name: ruoyi-monitor-admin
     environment:
       # 鏃跺尯涓婃捣
@@ -155,7 +155,7 @@
         ipv4_address: 172.30.0.90
 
   ruoyi-xxl-job-admin:
-    image: ruoyi/ruoyi-xxl-job-admin:4.1.0
+    image: ruoyi/ruoyi-xxl-job-admin:4.2.0-beta1
     container_name: ruoyi-xxl-job-admin
     environment:
       # 鏃跺尯涓婃捣

--
Gitblit v1.9.3