diff --git a/README.md b/README.md
index 556b39a35..d72bd4057 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 b50553681..baf824122 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -101,7 +101,7 @@ services:
network_mode: "host"
seata-server:
- image: ruoyi/ruoyi-seata-server:1.1.0
+ image: ruoyi/ruoyi-seata-server:1.2.0
container_name: seata-server
ports:
- "7091:7091"
@@ -138,7 +138,7 @@ services:
network_mode: "host"
sentinel:
- image: ruoyi/ruoyi-sentinel-dashboard:1.1.0
+ image: ruoyi/ruoyi-sentinel-dashboard:1.2.0
container_name: sentinel
environment:
TZ: Asia/Shanghai
@@ -151,7 +151,7 @@ services:
network_mode: "host"
ruoyi-monitor-admin:
- image: ruoyi/ruoyi-monitor:1.1.0
+ image: ruoyi/ruoyi-monitor:1.2.0
container_name: ruoyi-monitor
environment:
# 时区上海
@@ -165,7 +165,7 @@ services:
network_mode: "host"
ruoyi-xxl-job-admin:
- image: ruoyi/ruoyi-xxl-job-admin:1.1.0
+ image: ruoyi/ruoyi-xxl-job-admin:1.2.0
container_name: ruoyi-xxl-job-admin
environment:
# 时区上海
@@ -179,7 +179,7 @@ services:
network_mode: "host"
ruoyi-gateway:
- image: ruoyi/ruoyi-gateway:1.1.0
+ image: ruoyi/ruoyi-gateway:1.2.0
container_name: ruoyi-gateway
environment:
# 时区上海
@@ -193,7 +193,7 @@ services:
network_mode: "host"
ruoyi-auth:
- image: ruoyi/ruoyi-auth:1.1.0
+ image: ruoyi/ruoyi-auth:1.2.0
container_name: ruoyi-auth
environment:
# 时区上海
@@ -207,7 +207,7 @@ services:
network_mode: "host"
ruoyi-system:
- image: ruoyi/ruoyi-system:1.1.0
+ image: ruoyi/ruoyi-system:1.2.0
container_name: ruoyi-system
environment:
# 时区上海
@@ -221,7 +221,7 @@ services:
network_mode: "host"
ruoyi-gen:
- image: ruoyi/ruoyi-gen:1.1.0
+ image: ruoyi/ruoyi-gen:1.2.0
container_name: ruoyi-gen
environment:
# 时区上海
@@ -235,7 +235,7 @@ services:
network_mode: "host"
ruoyi-job:
- image: ruoyi/ruoyi-job:1.1.0
+ image: ruoyi/ruoyi-job:1.2.0
container_name: ruoyi-job
environment:
# 时区上海
@@ -249,7 +249,7 @@ services:
network_mode: "host"
ruoyi-resource:
- image: ruoyi/ruoyi-resource:1.1.0
+ image: ruoyi/ruoyi-resource:1.2.0
container_name: ruoyi-resource
environment:
# 时区上海
diff --git a/pom.xml b/pom.xml
index 890635e89..afe357c86 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,14 +6,14 @@
com.ruoyi
ruoyi-cloud-plus
- 1.1.0
+ 1.2.0
RuoYi-Cloud-Plus
https://gitee.com/JavaLionLi/RuoYi-Cloud-Plus
RuoYi-Cloud-Plus微服务系统
- 1.1.0
+ 1.2.0
UTF-8
UTF-8
1.8
diff --git a/ruoyi-api/pom.xml b/ruoyi-api/pom.xml
index a62e5e38b..7692970f4 100644
--- a/ruoyi-api/pom.xml
+++ b/ruoyi-api/pom.xml
@@ -4,7 +4,7 @@
com.ruoyi
ruoyi-cloud-plus
- 1.1.0
+ 1.2.0
4.0.0
diff --git a/ruoyi-api/ruoyi-api-bom/pom.xml b/ruoyi-api/ruoyi-api-bom/pom.xml
index e3d094ade..de9d74527 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
- 1.1.0
+ 1.2.0
ruoyi-api-bom api依赖项
diff --git a/ruoyi-api/ruoyi-api-resource/pom.xml b/ruoyi-api/ruoyi-api-resource/pom.xml
index b65e17a22..020fe4584 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
- 1.1.0
+ 1.2.0
4.0.0
diff --git a/ruoyi-api/ruoyi-api-system/pom.xml b/ruoyi-api/ruoyi-api-system/pom.xml
index 1fb9562bc..da7621608 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
- 1.1.0
+ 1.2.0
4.0.0
diff --git a/ruoyi-auth/pom.xml b/ruoyi-auth/pom.xml
index e29d8556e..21227906c 100644
--- a/ruoyi-auth/pom.xml
+++ b/ruoyi-auth/pom.xml
@@ -4,7 +4,7 @@
com.ruoyi
ruoyi-cloud-plus
- 1.1.0
+ 1.2.0
4.0.0
diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml
index 6aeb2abde..c5909b864 100644
--- a/ruoyi-common/pom.xml
+++ b/ruoyi-common/pom.xml
@@ -4,7 +4,7 @@
com.ruoyi
ruoyi-cloud-plus
- 1.1.0
+ 1.2.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 041395155..d5c86cdb5 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
- 1.1.0
+ 1.2.0
pom
diff --git a/ruoyi-common/ruoyi-common-bom/pom.xml b/ruoyi-common/ruoyi-common-bom/pom.xml
index 0d580796d..ca97d4f73 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
- 1.1.0
+ 1.2.0
pom
diff --git a/ruoyi-common/ruoyi-common-core/pom.xml b/ruoyi-common/ruoyi-common-core/pom.xml
index 12fc1537c..9b9450c7c 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
- 1.1.0
+ 1.2.0
4.0.0
diff --git a/ruoyi-common/ruoyi-common-dict/pom.xml b/ruoyi-common/ruoyi-common-dict/pom.xml
index dd72439bf..570735630 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
- 1.1.0
+ 1.2.0
4.0.0
diff --git a/ruoyi-common/ruoyi-common-doc/pom.xml b/ruoyi-common/ruoyi-common-doc/pom.xml
index d1455329c..187923117 100644
--- a/ruoyi-common/ruoyi-common-doc/pom.xml
+++ b/ruoyi-common/ruoyi-common-doc/pom.xml
@@ -5,7 +5,7 @@
com.ruoyi
ruoyi-common
- 1.1.0
+ 1.2.0
4.0.0
diff --git a/ruoyi-common/ruoyi-common-dubbo/pom.xml b/ruoyi-common/ruoyi-common-dubbo/pom.xml
index fbf49661d..fa7a8d20a 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
- 1.1.0
+ 1.2.0
4.0.0
diff --git a/ruoyi-common/ruoyi-common-elasticsearch/pom.xml b/ruoyi-common/ruoyi-common-elasticsearch/pom.xml
index 6f1d240ab..19f867142 100644
--- a/ruoyi-common/ruoyi-common-elasticsearch/pom.xml
+++ b/ruoyi-common/ruoyi-common-elasticsearch/pom.xml
@@ -5,7 +5,7 @@
com.ruoyi
ruoyi-common
- 1.1.0
+ 1.2.0
4.0.0
diff --git a/ruoyi-common/ruoyi-common-excel/pom.xml b/ruoyi-common/ruoyi-common-excel/pom.xml
index e4493a584..34cb8166b 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
- 1.1.0
+ 1.2.0
4.0.0
diff --git a/ruoyi-common/ruoyi-common-idempotent/pom.xml b/ruoyi-common/ruoyi-common-idempotent/pom.xml
index 7d8390147..7c549e0df 100644
--- a/ruoyi-common/ruoyi-common-idempotent/pom.xml
+++ b/ruoyi-common/ruoyi-common-idempotent/pom.xml
@@ -5,7 +5,7 @@
com.ruoyi
ruoyi-common
- 1.1.0
+ 1.2.0
4.0.0
diff --git a/ruoyi-common/ruoyi-common-job/pom.xml b/ruoyi-common/ruoyi-common-job/pom.xml
index ba01ba42c..e63930e60 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
- 1.1.0
+ 1.2.0
4.0.0
diff --git a/ruoyi-common/ruoyi-common-loadbalancer/pom.xml b/ruoyi-common/ruoyi-common-loadbalancer/pom.xml
index 2b8f2cd55..60c0da44c 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
- 1.1.0
+ 1.2.0
4.0.0
diff --git a/ruoyi-common/ruoyi-common-log/pom.xml b/ruoyi-common/ruoyi-common-log/pom.xml
index 2ae4a53e7..11ad587c2 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
- 1.1.0
+ 1.2.0
4.0.0
diff --git a/ruoyi-common/ruoyi-common-logstash/pom.xml b/ruoyi-common/ruoyi-common-logstash/pom.xml
index bb1a0100f..41963aee4 100644
--- a/ruoyi-common/ruoyi-common-logstash/pom.xml
+++ b/ruoyi-common/ruoyi-common-logstash/pom.xml
@@ -5,7 +5,7 @@
com.ruoyi
ruoyi-common
- 1.1.0
+ 1.2.0
4.0.0
diff --git a/ruoyi-common/ruoyi-common-mail/pom.xml b/ruoyi-common/ruoyi-common-mail/pom.xml
index edee5f629..ac93c70ed 100644
--- a/ruoyi-common/ruoyi-common-mail/pom.xml
+++ b/ruoyi-common/ruoyi-common-mail/pom.xml
@@ -5,7 +5,7 @@
com.ruoyi
ruoyi-common
- 1.1.0
+ 1.2.0
4.0.0
diff --git a/ruoyi-common/ruoyi-common-mybatis/pom.xml b/ruoyi-common/ruoyi-common-mybatis/pom.xml
index 571f26f8e..92c09c915 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
- 1.1.0
+ 1.2.0
4.0.0
diff --git a/ruoyi-common/ruoyi-common-oss/pom.xml b/ruoyi-common/ruoyi-common-oss/pom.xml
index a0c371e0d..9fbfe942f 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
- 1.1.0
+ 1.2.0
4.0.0
diff --git a/ruoyi-common/ruoyi-common-redis/pom.xml b/ruoyi-common/ruoyi-common-redis/pom.xml
index d5a77b64c..93cf4970a 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
- 1.1.0
+ 1.2.0
4.0.0
diff --git a/ruoyi-common/ruoyi-common-satoken/pom.xml b/ruoyi-common/ruoyi-common-satoken/pom.xml
index 575ad2c4d..104288a2c 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
- 1.1.0
+ 1.2.0
4.0.0
diff --git a/ruoyi-common/ruoyi-common-seata/pom.xml b/ruoyi-common/ruoyi-common-seata/pom.xml
index 2d0f83df2..89b8be40e 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
- 1.1.0
+ 1.2.0
4.0.0
diff --git a/ruoyi-common/ruoyi-common-security/pom.xml b/ruoyi-common/ruoyi-common-security/pom.xml
index 1cbac92be..5c0e0badf 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
- 1.1.0
+ 1.2.0
4.0.0
diff --git a/ruoyi-common/ruoyi-common-sms/pom.xml b/ruoyi-common/ruoyi-common-sms/pom.xml
index c4b030612..a5db897ec 100644
--- a/ruoyi-common/ruoyi-common-sms/pom.xml
+++ b/ruoyi-common/ruoyi-common-sms/pom.xml
@@ -5,7 +5,7 @@
com.ruoyi
ruoyi-common
- 1.1.0
+ 1.2.0
4.0.0
diff --git a/ruoyi-common/ruoyi-common-web/pom.xml b/ruoyi-common/ruoyi-common-web/pom.xml
index ad152ee67..02d5dd215 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
- 1.1.0
+ 1.2.0
4.0.0
diff --git a/ruoyi-example/pom.xml b/ruoyi-example/pom.xml
index 2789bf974..9438f0d0e 100644
--- a/ruoyi-example/pom.xml
+++ b/ruoyi-example/pom.xml
@@ -4,7 +4,7 @@
com.ruoyi
ruoyi-cloud-plus
- 1.1.0
+ 1.2.0
4.0.0
diff --git a/ruoyi-example/ruoyi-demo/pom.xml b/ruoyi-example/ruoyi-demo/pom.xml
index eff6ec3e4..8fe395cef 100644
--- a/ruoyi-example/ruoyi-demo/pom.xml
+++ b/ruoyi-example/ruoyi-demo/pom.xml
@@ -5,7 +5,7 @@
com.ruoyi
ruoyi-example
- 1.1.0
+ 1.2.0
4.0.0
diff --git a/ruoyi-example/ruoyi-stream-mq/pom.xml b/ruoyi-example/ruoyi-stream-mq/pom.xml
index d9bed52b4..553117087 100644
--- a/ruoyi-example/ruoyi-stream-mq/pom.xml
+++ b/ruoyi-example/ruoyi-stream-mq/pom.xml
@@ -5,7 +5,7 @@
com.ruoyi
ruoyi-example
- 1.1.0
+ 1.2.0
4.0.0
diff --git a/ruoyi-gateway/pom.xml b/ruoyi-gateway/pom.xml
index 34999ba44..d737639b9 100644
--- a/ruoyi-gateway/pom.xml
+++ b/ruoyi-gateway/pom.xml
@@ -4,7 +4,7 @@
com.ruoyi
ruoyi-cloud-plus
- 1.1.0
+ 1.2.0
4.0.0
diff --git a/ruoyi-modules/pom.xml b/ruoyi-modules/pom.xml
index b306ea6f4..2a8425978 100644
--- a/ruoyi-modules/pom.xml
+++ b/ruoyi-modules/pom.xml
@@ -4,7 +4,7 @@
com.ruoyi
ruoyi-cloud-plus
- 1.1.0
+ 1.2.0
4.0.0
diff --git a/ruoyi-modules/ruoyi-gen/pom.xml b/ruoyi-modules/ruoyi-gen/pom.xml
index e381cc681..356ce756c 100644
--- a/ruoyi-modules/ruoyi-gen/pom.xml
+++ b/ruoyi-modules/ruoyi-gen/pom.xml
@@ -5,7 +5,7 @@
com.ruoyi
ruoyi-modules
- 1.1.0
+ 1.2.0
4.0.0
diff --git a/ruoyi-modules/ruoyi-job/pom.xml b/ruoyi-modules/ruoyi-job/pom.xml
index 48dbb4d03..5b3ec55ea 100644
--- a/ruoyi-modules/ruoyi-job/pom.xml
+++ b/ruoyi-modules/ruoyi-job/pom.xml
@@ -5,7 +5,7 @@
com.ruoyi
ruoyi-modules
- 1.1.0
+ 1.2.0
4.0.0
diff --git a/ruoyi-modules/ruoyi-resource/pom.xml b/ruoyi-modules/ruoyi-resource/pom.xml
index 840861a8c..cef0c08e2 100644
--- a/ruoyi-modules/ruoyi-resource/pom.xml
+++ b/ruoyi-modules/ruoyi-resource/pom.xml
@@ -5,7 +5,7 @@
com.ruoyi
ruoyi-modules
- 1.1.0
+ 1.2.0
4.0.0
diff --git a/ruoyi-modules/ruoyi-system/pom.xml b/ruoyi-modules/ruoyi-system/pom.xml
index 639aa3b19..7870e4d91 100644
--- a/ruoyi-modules/ruoyi-system/pom.xml
+++ b/ruoyi-modules/ruoyi-system/pom.xml
@@ -5,7 +5,7 @@
com.ruoyi
ruoyi-modules
- 1.1.0
+ 1.2.0
4.0.0
diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json
index 75c20fe32..2a1d71692 100644
--- a/ruoyi-ui/package.json
+++ b/ruoyi-ui/package.json
@@ -1,6 +1,6 @@
{
"name": "ruoyi-cloud-plus",
- "version": "1.1.0",
+ "version": "1.2.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 2325f6022..e351d8c3e 100644
--- a/ruoyi-ui/src/views/index.vue
+++ b/ruoyi-ui/src/views/index.vue
@@ -154,7 +154,7 @@ export default {
data() {
return {
// 版本号
- version: "1.1.0",
+ version: "1.2.0",
};
},
methods: {
diff --git a/ruoyi-visual/pom.xml b/ruoyi-visual/pom.xml
index ce8fbd531..6862dcb37 100644
--- a/ruoyi-visual/pom.xml
+++ b/ruoyi-visual/pom.xml
@@ -4,7 +4,7 @@
com.ruoyi
ruoyi-cloud-plus
- 1.1.0
+ 1.2.0
4.0.0
diff --git a/ruoyi-visual/ruoyi-monitor/pom.xml b/ruoyi-visual/ruoyi-monitor/pom.xml
index b056e0f8d..f92c7315c 100644
--- a/ruoyi-visual/ruoyi-monitor/pom.xml
+++ b/ruoyi-visual/ruoyi-monitor/pom.xml
@@ -4,7 +4,7 @@
com.ruoyi
ruoyi-visual
- 1.1.0
+ 1.2.0
4.0.0
diff --git a/ruoyi-visual/ruoyi-seata-server/pom.xml b/ruoyi-visual/ruoyi-seata-server/pom.xml
index 770c642d3..10b8839c8 100644
--- a/ruoyi-visual/ruoyi-seata-server/pom.xml
+++ b/ruoyi-visual/ruoyi-seata-server/pom.xml
@@ -20,7 +20,7 @@
com.ruoyi
ruoyi-visual
- 1.1.0
+ 1.2.0
4.0.0
ruoyi-seata-server
diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/pom.xml b/ruoyi-visual/ruoyi-sentinel-dashboard/pom.xml
index 2b704349f..825151d9b 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
- 1.1.0
+ 1.2.0
ruoyi-sentinel-dashboard
diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/package.json b/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/package.json
index 9c9b7fef6..b62fb328f 100644
--- a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/package.json
+++ b/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/package.json
@@ -1,6 +1,6 @@
{
"name": "sentinel-dashboard",
- "version": "1.1.0",
+ "version": "1.0.0",
"description": "",
"main": "index.js",
"scripts": {
diff --git a/ruoyi-visual/ruoyi-xxl-job-admin/pom.xml b/ruoyi-visual/ruoyi-xxl-job-admin/pom.xml
index a587797e0..178116e45 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
- 1.1.0
+ 1.2.0
ruoyi-xxl-job-admin
jar