diff --git a/pom.xml b/pom.xml index 27889472a..9f1963baf 100644 --- a/pom.xml +++ b/pom.xml @@ -6,14 +6,14 @@ com.ruoyi ruoyi-vue-plus - 4.2.0-beta1 + 4.2.0 RuoYi-Vue-Plus https://gitee.com/JavaLionLi/RuoYi-Vue-Plus RuoYi-Vue-Plus后台管理系统 - 4.2.0-beta1 + 4.2.0 2.6.9 UTF-8 UTF-8 diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml index d58861472..a3d2da6f1 100644 --- a/ruoyi-admin/pom.xml +++ b/ruoyi-admin/pom.xml @@ -5,7 +5,7 @@ ruoyi-vue-plus com.ruoyi - 4.2.0-beta1 + 4.2.0 4.0.0 jar diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml index d27f34dfb..10fec546f 100644 --- a/ruoyi-common/pom.xml +++ b/ruoyi-common/pom.xml @@ -5,7 +5,7 @@ ruoyi-vue-plus com.ruoyi - 4.2.0-beta1 + 4.2.0 4.0.0 diff --git a/ruoyi-demo/pom.xml b/ruoyi-demo/pom.xml index b7518255d..bbcf0fe2b 100644 --- a/ruoyi-demo/pom.xml +++ b/ruoyi-demo/pom.xml @@ -5,7 +5,7 @@ ruoyi-vue-plus com.ruoyi - 4.2.0-beta1 + 4.2.0 4.0.0 diff --git a/ruoyi-extend/pom.xml b/ruoyi-extend/pom.xml index 85b171b65..2be8693e4 100644 --- a/ruoyi-extend/pom.xml +++ b/ruoyi-extend/pom.xml @@ -5,7 +5,7 @@ ruoyi-vue-plus com.ruoyi - 4.2.0-beta1 + 4.2.0 4.0.0 ruoyi-extend diff --git a/ruoyi-extend/ruoyi-monitor-admin/pom.xml b/ruoyi-extend/ruoyi-monitor-admin/pom.xml index b57a61e15..e42e8e0f4 100644 --- a/ruoyi-extend/ruoyi-monitor-admin/pom.xml +++ b/ruoyi-extend/ruoyi-monitor-admin/pom.xml @@ -5,7 +5,7 @@ ruoyi-extend com.ruoyi - 4.2.0-beta1 + 4.2.0 4.0.0 jar diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/pom.xml b/ruoyi-extend/ruoyi-xxl-job-admin/pom.xml index 3e745cb2f..b9954beac 100644 --- a/ruoyi-extend/ruoyi-xxl-job-admin/pom.xml +++ b/ruoyi-extend/ruoyi-xxl-job-admin/pom.xml @@ -4,7 +4,7 @@ ruoyi-extend com.ruoyi - 4.2.0-beta1 + 4.2.0 ruoyi-xxl-job-admin jar diff --git a/ruoyi-framework/pom.xml b/ruoyi-framework/pom.xml index eae8eca9d..c6837bec0 100644 --- a/ruoyi-framework/pom.xml +++ b/ruoyi-framework/pom.xml @@ -5,7 +5,7 @@ ruoyi-vue-plus com.ruoyi - 4.2.0-beta1 + 4.2.0 4.0.0 diff --git a/ruoyi-generator/pom.xml b/ruoyi-generator/pom.xml index 816c02661..b45858da3 100644 --- a/ruoyi-generator/pom.xml +++ b/ruoyi-generator/pom.xml @@ -5,7 +5,7 @@ ruoyi-vue-plus com.ruoyi - 4.2.0-beta1 + 4.2.0 4.0.0 diff --git a/ruoyi-job/pom.xml b/ruoyi-job/pom.xml index 6aa86cbc8..af6ae960d 100644 --- a/ruoyi-job/pom.xml +++ b/ruoyi-job/pom.xml @@ -5,7 +5,7 @@ ruoyi-vue-plus com.ruoyi - 4.2.0-beta1 + 4.2.0 4.0.0 jar diff --git a/ruoyi-oss/pom.xml b/ruoyi-oss/pom.xml index 9d59a7047..b339e7b4d 100644 --- a/ruoyi-oss/pom.xml +++ b/ruoyi-oss/pom.xml @@ -5,7 +5,7 @@ ruoyi-vue-plus com.ruoyi - 4.2.0-beta1 + 4.2.0 4.0.0 diff --git a/ruoyi-sms/pom.xml b/ruoyi-sms/pom.xml index 5d528c0d0..b2a6cf5cc 100644 --- a/ruoyi-sms/pom.xml +++ b/ruoyi-sms/pom.xml @@ -5,7 +5,7 @@ ruoyi-vue-plus com.ruoyi - 4.2.0-beta1 + 4.2.0 4.0.0 diff --git a/ruoyi-system/pom.xml b/ruoyi-system/pom.xml index 5e21cb1ff..9e49b71ad 100644 --- a/ruoyi-system/pom.xml +++ b/ruoyi-system/pom.xml @@ -5,7 +5,7 @@ ruoyi-vue-plus com.ruoyi - 4.2.0-beta1 + 4.2.0 4.0.0 diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json index 2a9a4b99a..c9486724f 100644 --- a/ruoyi-ui/package.json +++ b/ruoyi-ui/package.json @@ -1,6 +1,6 @@ { "name": "ruoyi-vue-plus", - "version": "4.2.0-beta1", + "version": "4.2.0", "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 4aa39dffd..1576cbd75 100644 --- a/ruoyi-ui/src/views/index.vue +++ b/ruoyi-ui/src/views/index.vue @@ -114,7 +114,7 @@ export default { data() { return { // 版本号 - version: "4.2.0-beta1", + version: "4.2.0", }; }, methods: { diff --git a/script/docker/docker-compose.yml b/script/docker/docker-compose.yml index a02fe5d83..3dcdf32c6 100644 --- a/script/docker/docker-compose.yml +++ b/script/docker/docker-compose.yml @@ -110,7 +110,7 @@ services: ipv4_address: 172.30.0.54 ruoyi-server1: - image: ruoyi/ruoyi-server:4.2.0-beta1 + image: ruoyi/ruoyi-server:4.2.0 container_name: ruoyi-server1 environment: # 时区上海 @@ -125,7 +125,7 @@ services: ipv4_address: 172.30.0.60 ruoyi-server2: - image: "ruoyi/ruoyi-server:4.2.0-beta1" + image: "ruoyi/ruoyi-server:4.2.0" container_name: ruoyi-server2 environment: # 时区上海 @@ -140,7 +140,7 @@ services: ipv4_address: 172.30.0.61 ruoyi-monitor-admin: - image: ruoyi/ruoyi-monitor-admin:4.2.0-beta1 + image: ruoyi/ruoyi-monitor-admin:4.2.0 container_name: ruoyi-monitor-admin environment: # 时区上海 @@ -155,7 +155,7 @@ services: ipv4_address: 172.30.0.90 ruoyi-xxl-job-admin: - image: ruoyi/ruoyi-xxl-job-admin:4.2.0-beta1 + image: ruoyi/ruoyi-xxl-job-admin:4.2.0 container_name: ruoyi-xxl-job-admin environment: # 时区上海