From d20921838ee32f47400e449f2a1c7297727cea43 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: Wed, 16 Feb 2022 16:50:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E5=B8=83=200.7.0=20=E5=AE=8C=E6=88=90?=
=?UTF-8?q?=20=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=20=E4=B8=8E=20docker=20?=
=?UTF-8?q?=E9=83=A8=E7=BD=B2=20=E9=9B=86=E6=88=90=20sentinel=20=E6=8E=A7?=
=?UTF-8?q?=E5=88=B6=E5=8F=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
README.md | 2 +-
docker/docker-compose.yml | 14 +++++++-------
pom.xml | 4 ++--
ruoyi-api/pom.xml | 2 +-
ruoyi-api/ruoyi-api-bom/pom.xml | 2 +-
ruoyi-api/ruoyi-api-resource/pom.xml | 2 +-
ruoyi-api/ruoyi-api-system/pom.xml | 2 +-
ruoyi-auth/pom.xml | 2 +-
ruoyi-common/pom.xml | 2 +-
ruoyi-common/ruoyi-common-alibaba-bom/pom.xml | 2 +-
ruoyi-common/ruoyi-common-bom/pom.xml | 2 +-
ruoyi-common/ruoyi-common-core/pom.xml | 2 +-
ruoyi-common/ruoyi-common-dict/pom.xml | 2 +-
ruoyi-common/ruoyi-common-dubbo/pom.xml | 2 +-
ruoyi-common/ruoyi-common-excel/pom.xml | 2 +-
ruoyi-common/ruoyi-common-job/pom.xml | 2 +-
ruoyi-common/ruoyi-common-loadbalancer/pom.xml | 2 +-
ruoyi-common/ruoyi-common-log/pom.xml | 2 +-
ruoyi-common/ruoyi-common-mybatis/pom.xml | 2 +-
ruoyi-common/ruoyi-common-oss/pom.xml | 2 +-
ruoyi-common/ruoyi-common-redis/pom.xml | 2 +-
ruoyi-common/ruoyi-common-satoken/pom.xml | 2 +-
ruoyi-common/ruoyi-common-seata/pom.xml | 2 +-
ruoyi-common/ruoyi-common-security/pom.xml | 2 +-
ruoyi-common/ruoyi-common-swagger/pom.xml | 2 +-
ruoyi-common/ruoyi-common-web/pom.xml | 2 +-
ruoyi-gateway/pom.xml | 2 +-
ruoyi-modules/pom.xml | 2 +-
ruoyi-modules/ruoyi-gen/pom.xml | 2 +-
ruoyi-modules/ruoyi-resource/pom.xml | 2 +-
ruoyi-modules/ruoyi-system/pom.xml | 2 +-
ruoyi-ui/package.json | 2 +-
ruoyi-ui/src/views/index.vue | 2 +-
ruoyi-visual/pom.xml | 2 +-
ruoyi-visual/ruoyi-doc/pom.xml | 2 +-
ruoyi-visual/ruoyi-monitor/pom.xml | 2 +-
ruoyi-visual/ruoyi-sentinel-dashboard/pom.xml | 2 +-
ruoyi-visual/ruoyi-xxl-job-admin/pom.xml | 2 +-
38 files changed, 45 insertions(+), 45 deletions(-)
diff --git a/README.md b/README.md
index 479211960..7b47b2eb9 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@
[](https://gitee.com/JavaLionLi/RuoYi-Cloud-Plus/blob/master/LICENSE)
[](https://www.jetbrains.com/?from=RuoYi-Cloud-Plus)
-[](https://gitee.com/JavaLionLi/RuoYi-Cloud-Plus)
+[](https://gitee.com/JavaLionLi/RuoYi-Cloud-Plus)
[]()
[]()
[]()
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index f3e233bc1..dc0b4de3e 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -148,7 +148,7 @@ services:
- ruoyi_net
sentinel:
- image: ruoyi/ruoyi-sentinel-dashboard:0.6.0
+ image: ruoyi/ruoyi-sentinel-dashboard:0.7.0
container_name: sentinel
environment:
TZ: Asia/Shanghai
@@ -163,7 +163,7 @@ services:
ipv4_address: 172.30.0.68
ruoyi-monitor-admin:
- image: ruoyi/ruoyi-monitor:0.6.0
+ image: ruoyi/ruoyi-monitor:0.7.0
container_name: ruoyi-monitor
environment:
# 时区上海
@@ -180,7 +180,7 @@ services:
ipv4_address: 172.30.0.90
ruoyi-xxl-job-admin:
- image: ruoyi/ruoyi-xxl-job-admin:0.6.0
+ image: ruoyi/ruoyi-xxl-job-admin:0.7.0
container_name: ruoyi-xxl-job-admin
environment:
# 时区上海
@@ -197,7 +197,7 @@ services:
ipv4_address: 172.30.0.92
ruoyi-gateway:
- image: ruoyi/ruoyi-gateway:0.6.0
+ image: ruoyi/ruoyi-gateway:0.7.0
container_name: ruoyi-gateway
environment:
# 时区上海
@@ -214,7 +214,7 @@ services:
ipv4_address: 172.30.0.100
ruoyi-auth:
- image: ruoyi/ruoyi-auth:0.6.0
+ image: ruoyi/ruoyi-auth:0.7.0
container_name: ruoyi-auth
environment:
# 时区上海
@@ -231,7 +231,7 @@ services:
ipv4_address: 172.30.0.110
ruoyi-system:
- image: ruoyi/ruoyi-system:0.6.0
+ image: ruoyi/ruoyi-system:0.7.0
container_name: ruoyi-system
environment:
# 时区上海
@@ -247,7 +247,7 @@ services:
- ruoyi_net
ruoyi-resource:
- image: ruoyi/ruoyi-resource:0.6.0
+ image: ruoyi/ruoyi-resource:0.7.0
container_name: ruoyi-resource
environment:
# 时区上海
diff --git a/pom.xml b/pom.xml
index e1715d282..0653d1a25 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,14 +6,14 @@
com.ruoyi
ruoyi-cloud-plus
- 0.6.0
+ 0.7.0
RuoYi-Cloud-Plus
https://gitee.com/JavaLionLi/RuoYi-Cloud-Plus
RuoYi-Cloud-Plus微服务系统
- 0.6.0
+ 0.7.0
UTF-8
UTF-8
1.8
diff --git a/ruoyi-api/pom.xml b/ruoyi-api/pom.xml
index f135f3a02..40337e24d 100644
--- a/ruoyi-api/pom.xml
+++ b/ruoyi-api/pom.xml
@@ -4,7 +4,7 @@
com.ruoyi
ruoyi-cloud-plus
- 0.6.0
+ 0.7.0
4.0.0
diff --git a/ruoyi-api/ruoyi-api-bom/pom.xml b/ruoyi-api/ruoyi-api-bom/pom.xml
index de538e258..a62aaaac9 100644
--- a/ruoyi-api/ruoyi-api-bom/pom.xml
+++ b/ruoyi-api/ruoyi-api-bom/pom.xml
@@ -8,7 +8,7 @@
com.ruoyi
ruoyi-api-bom
pom
- 0.6.0
+ 0.7.0
ruoyi-api-bom api依赖项
diff --git a/ruoyi-api/ruoyi-api-resource/pom.xml b/ruoyi-api/ruoyi-api-resource/pom.xml
index 231a41fb7..a5a18141d 100644
--- a/ruoyi-api/ruoyi-api-resource/pom.xml
+++ b/ruoyi-api/ruoyi-api-resource/pom.xml
@@ -5,7 +5,7 @@
com.ruoyi
ruoyi-api
- 0.6.0
+ 0.7.0
4.0.0
diff --git a/ruoyi-api/ruoyi-api-system/pom.xml b/ruoyi-api/ruoyi-api-system/pom.xml
index 40bf4340f..b32834969 100644
--- a/ruoyi-api/ruoyi-api-system/pom.xml
+++ b/ruoyi-api/ruoyi-api-system/pom.xml
@@ -5,7 +5,7 @@
com.ruoyi
ruoyi-api
- 0.6.0
+ 0.7.0
4.0.0
diff --git a/ruoyi-auth/pom.xml b/ruoyi-auth/pom.xml
index 4b4ccadd5..9e2ccbecb 100644
--- a/ruoyi-auth/pom.xml
+++ b/ruoyi-auth/pom.xml
@@ -4,7 +4,7 @@
com.ruoyi
ruoyi-cloud-plus
- 0.6.0
+ 0.7.0
4.0.0
diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml
index 43c09ea93..e214ae402 100644
--- a/ruoyi-common/pom.xml
+++ b/ruoyi-common/pom.xml
@@ -4,7 +4,7 @@
com.ruoyi
ruoyi-cloud-plus
- 0.6.0
+ 0.7.0
4.0.0
diff --git a/ruoyi-common/ruoyi-common-alibaba-bom/pom.xml b/ruoyi-common/ruoyi-common-alibaba-bom/pom.xml
index 4993c5a9a..79f7615aa 100644
--- a/ruoyi-common/ruoyi-common-alibaba-bom/pom.xml
+++ b/ruoyi-common/ruoyi-common-alibaba-bom/pom.xml
@@ -6,7 +6,7 @@
com.ruoyi
ruoyi-common-alibaba-bom
- 0.6.0
+ 0.7.0
pom
diff --git a/ruoyi-common/ruoyi-common-bom/pom.xml b/ruoyi-common/ruoyi-common-bom/pom.xml
index 60bb5cc8e..8ed4be9eb 100644
--- a/ruoyi-common/ruoyi-common-bom/pom.xml
+++ b/ruoyi-common/ruoyi-common-bom/pom.xml
@@ -6,7 +6,7 @@
com.ruoyi
ruoyi-common-bom
- 0.6.0
+ 0.7.0
pom
diff --git a/ruoyi-common/ruoyi-common-core/pom.xml b/ruoyi-common/ruoyi-common-core/pom.xml
index 625d86348..1b69e5f94 100644
--- a/ruoyi-common/ruoyi-common-core/pom.xml
+++ b/ruoyi-common/ruoyi-common-core/pom.xml
@@ -5,7 +5,7 @@
com.ruoyi
ruoyi-common
- 0.6.0
+ 0.7.0
4.0.0
diff --git a/ruoyi-common/ruoyi-common-dict/pom.xml b/ruoyi-common/ruoyi-common-dict/pom.xml
index 422ac5fb2..e067ea187 100644
--- a/ruoyi-common/ruoyi-common-dict/pom.xml
+++ b/ruoyi-common/ruoyi-common-dict/pom.xml
@@ -5,7 +5,7 @@
com.ruoyi
ruoyi-common
- 0.6.0
+ 0.7.0
4.0.0
diff --git a/ruoyi-common/ruoyi-common-dubbo/pom.xml b/ruoyi-common/ruoyi-common-dubbo/pom.xml
index 0808b8ba0..abdc0644b 100644
--- a/ruoyi-common/ruoyi-common-dubbo/pom.xml
+++ b/ruoyi-common/ruoyi-common-dubbo/pom.xml
@@ -5,7 +5,7 @@
com.ruoyi
ruoyi-common
- 0.6.0
+ 0.7.0
4.0.0
diff --git a/ruoyi-common/ruoyi-common-excel/pom.xml b/ruoyi-common/ruoyi-common-excel/pom.xml
index a985759c8..861110f40 100644
--- a/ruoyi-common/ruoyi-common-excel/pom.xml
+++ b/ruoyi-common/ruoyi-common-excel/pom.xml
@@ -5,7 +5,7 @@
com.ruoyi
ruoyi-common
- 0.6.0
+ 0.7.0
4.0.0
diff --git a/ruoyi-common/ruoyi-common-job/pom.xml b/ruoyi-common/ruoyi-common-job/pom.xml
index 72bd94149..c93cf60ac 100644
--- a/ruoyi-common/ruoyi-common-job/pom.xml
+++ b/ruoyi-common/ruoyi-common-job/pom.xml
@@ -5,7 +5,7 @@
com.ruoyi
ruoyi-common
- 0.6.0
+ 0.7.0
4.0.0
diff --git a/ruoyi-common/ruoyi-common-loadbalancer/pom.xml b/ruoyi-common/ruoyi-common-loadbalancer/pom.xml
index aca8e6caa..20e78afe4 100644
--- a/ruoyi-common/ruoyi-common-loadbalancer/pom.xml
+++ b/ruoyi-common/ruoyi-common-loadbalancer/pom.xml
@@ -5,7 +5,7 @@
com.ruoyi
ruoyi-common
- 0.6.0
+ 0.7.0
4.0.0
diff --git a/ruoyi-common/ruoyi-common-log/pom.xml b/ruoyi-common/ruoyi-common-log/pom.xml
index 796ef3df0..dda9c0929 100644
--- a/ruoyi-common/ruoyi-common-log/pom.xml
+++ b/ruoyi-common/ruoyi-common-log/pom.xml
@@ -5,7 +5,7 @@
com.ruoyi
ruoyi-common
- 0.6.0
+ 0.7.0
4.0.0
diff --git a/ruoyi-common/ruoyi-common-mybatis/pom.xml b/ruoyi-common/ruoyi-common-mybatis/pom.xml
index 194e4867d..ec6063b27 100644
--- a/ruoyi-common/ruoyi-common-mybatis/pom.xml
+++ b/ruoyi-common/ruoyi-common-mybatis/pom.xml
@@ -5,7 +5,7 @@
com.ruoyi
ruoyi-common
- 0.6.0
+ 0.7.0
4.0.0
diff --git a/ruoyi-common/ruoyi-common-oss/pom.xml b/ruoyi-common/ruoyi-common-oss/pom.xml
index 2310e11d1..792c503ff 100644
--- a/ruoyi-common/ruoyi-common-oss/pom.xml
+++ b/ruoyi-common/ruoyi-common-oss/pom.xml
@@ -5,7 +5,7 @@
com.ruoyi
ruoyi-common
- 0.6.0
+ 0.7.0
4.0.0
diff --git a/ruoyi-common/ruoyi-common-redis/pom.xml b/ruoyi-common/ruoyi-common-redis/pom.xml
index b881c868b..8e44421e8 100644
--- a/ruoyi-common/ruoyi-common-redis/pom.xml
+++ b/ruoyi-common/ruoyi-common-redis/pom.xml
@@ -5,7 +5,7 @@
com.ruoyi
ruoyi-common
- 0.6.0
+ 0.7.0
4.0.0
diff --git a/ruoyi-common/ruoyi-common-satoken/pom.xml b/ruoyi-common/ruoyi-common-satoken/pom.xml
index 5f02242b1..8059e0e3c 100644
--- a/ruoyi-common/ruoyi-common-satoken/pom.xml
+++ b/ruoyi-common/ruoyi-common-satoken/pom.xml
@@ -4,7 +4,7 @@
com.ruoyi
ruoyi-common
- 0.6.0
+ 0.7.0
4.0.0
diff --git a/ruoyi-common/ruoyi-common-seata/pom.xml b/ruoyi-common/ruoyi-common-seata/pom.xml
index bbe8cf311..439b5795f 100644
--- a/ruoyi-common/ruoyi-common-seata/pom.xml
+++ b/ruoyi-common/ruoyi-common-seata/pom.xml
@@ -5,7 +5,7 @@
com.ruoyi
ruoyi-common
- 0.6.0
+ 0.7.0
4.0.0
diff --git a/ruoyi-common/ruoyi-common-security/pom.xml b/ruoyi-common/ruoyi-common-security/pom.xml
index 3d45a8d1c..904cf6a5b 100644
--- a/ruoyi-common/ruoyi-common-security/pom.xml
+++ b/ruoyi-common/ruoyi-common-security/pom.xml
@@ -4,7 +4,7 @@
com.ruoyi
ruoyi-common
- 0.6.0
+ 0.7.0
4.0.0
diff --git a/ruoyi-common/ruoyi-common-swagger/pom.xml b/ruoyi-common/ruoyi-common-swagger/pom.xml
index a13811aef..0c8db759d 100644
--- a/ruoyi-common/ruoyi-common-swagger/pom.xml
+++ b/ruoyi-common/ruoyi-common-swagger/pom.xml
@@ -5,7 +5,7 @@
com.ruoyi
ruoyi-common
- 0.6.0
+ 0.7.0
4.0.0
diff --git a/ruoyi-common/ruoyi-common-web/pom.xml b/ruoyi-common/ruoyi-common-web/pom.xml
index 63b9df317..2e8c53d8b 100644
--- a/ruoyi-common/ruoyi-common-web/pom.xml
+++ b/ruoyi-common/ruoyi-common-web/pom.xml
@@ -5,7 +5,7 @@
com.ruoyi
ruoyi-common
- 0.6.0
+ 0.7.0
4.0.0
diff --git a/ruoyi-gateway/pom.xml b/ruoyi-gateway/pom.xml
index 93b6cfc6b..65e364aee 100644
--- a/ruoyi-gateway/pom.xml
+++ b/ruoyi-gateway/pom.xml
@@ -4,7 +4,7 @@
com.ruoyi
ruoyi-cloud-plus
- 0.6.0
+ 0.7.0
4.0.0
diff --git a/ruoyi-modules/pom.xml b/ruoyi-modules/pom.xml
index 593a5812c..940f954db 100644
--- a/ruoyi-modules/pom.xml
+++ b/ruoyi-modules/pom.xml
@@ -4,7 +4,7 @@
com.ruoyi
ruoyi-cloud-plus
- 0.6.0
+ 0.7.0
4.0.0
diff --git a/ruoyi-modules/ruoyi-gen/pom.xml b/ruoyi-modules/ruoyi-gen/pom.xml
index a542e9815..894d2d48c 100644
--- a/ruoyi-modules/ruoyi-gen/pom.xml
+++ b/ruoyi-modules/ruoyi-gen/pom.xml
@@ -5,7 +5,7 @@
com.ruoyi
ruoyi-modules
- 0.6.0
+ 0.7.0
4.0.0
diff --git a/ruoyi-modules/ruoyi-resource/pom.xml b/ruoyi-modules/ruoyi-resource/pom.xml
index ce1830aac..7f756511f 100644
--- a/ruoyi-modules/ruoyi-resource/pom.xml
+++ b/ruoyi-modules/ruoyi-resource/pom.xml
@@ -5,7 +5,7 @@
com.ruoyi
ruoyi-modules
- 0.6.0
+ 0.7.0
4.0.0
diff --git a/ruoyi-modules/ruoyi-system/pom.xml b/ruoyi-modules/ruoyi-system/pom.xml
index 688b6f0ca..7f6dd127a 100644
--- a/ruoyi-modules/ruoyi-system/pom.xml
+++ b/ruoyi-modules/ruoyi-system/pom.xml
@@ -5,7 +5,7 @@
com.ruoyi
ruoyi-modules
- 0.6.0
+ 0.7.0
4.0.0
diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json
index 763bb2468..9f894d9ff 100644
--- a/ruoyi-ui/package.json
+++ b/ruoyi-ui/package.json
@@ -1,6 +1,6 @@
{
"name": "ruoyi-cloud-plus",
- "version": "0.6.0",
+ "version": "0.7.0",
"description": "RuoYi-Cloud-Plus后台管理系统",
"author": "Lion Li",
"license": "MIT",
diff --git a/ruoyi-ui/src/views/index.vue b/ruoyi-ui/src/views/index.vue
index 6bb947993..c386cfe9e 100644
--- a/ruoyi-ui/src/views/index.vue
+++ b/ruoyi-ui/src/views/index.vue
@@ -102,7 +102,7 @@ export default {
data() {
return {
// 版本号
- version: "0.6.0",
+ version: "0.7.0",
};
},
methods: {
diff --git a/ruoyi-visual/pom.xml b/ruoyi-visual/pom.xml
index e428f275e..ede04ba2d 100644
--- a/ruoyi-visual/pom.xml
+++ b/ruoyi-visual/pom.xml
@@ -4,7 +4,7 @@
com.ruoyi
ruoyi-cloud-plus
- 0.6.0
+ 0.7.0
4.0.0
diff --git a/ruoyi-visual/ruoyi-doc/pom.xml b/ruoyi-visual/ruoyi-doc/pom.xml
index fd07777a0..4b396cc0a 100644
--- a/ruoyi-visual/ruoyi-doc/pom.xml
+++ b/ruoyi-visual/ruoyi-doc/pom.xml
@@ -5,7 +5,7 @@
com.ruoyi
ruoyi-visual
- 0.6.0
+ 0.7.0
ruoyi-doc
jar
diff --git a/ruoyi-visual/ruoyi-monitor/pom.xml b/ruoyi-visual/ruoyi-monitor/pom.xml
index eb692af65..722dc31ab 100644
--- a/ruoyi-visual/ruoyi-monitor/pom.xml
+++ b/ruoyi-visual/ruoyi-monitor/pom.xml
@@ -4,7 +4,7 @@
com.ruoyi
ruoyi-visual
- 0.6.0
+ 0.7.0
4.0.0
diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/pom.xml b/ruoyi-visual/ruoyi-sentinel-dashboard/pom.xml
index c6e311cb3..dcc69a277 100644
--- a/ruoyi-visual/ruoyi-sentinel-dashboard/pom.xml
+++ b/ruoyi-visual/ruoyi-sentinel-dashboard/pom.xml
@@ -6,7 +6,7 @@
com.ruoyi
ruoyi-visual
- 0.6.0
+ 0.7.0
ruoyi-sentinel-dashboard
diff --git a/ruoyi-visual/ruoyi-xxl-job-admin/pom.xml b/ruoyi-visual/ruoyi-xxl-job-admin/pom.xml
index 73517eefc..0badf2834 100644
--- a/ruoyi-visual/ruoyi-xxl-job-admin/pom.xml
+++ b/ruoyi-visual/ruoyi-xxl-job-admin/pom.xml
@@ -4,7 +4,7 @@
com.ruoyi
ruoyi-visual
- 0.6.0
+ 0.7.0
ruoyi-xxl-job-admin
jar