From 25959ccf6595d95307ff6420f181b10d55358ef9 Mon Sep 17 00:00:00 2001 From: hewenqiang <1527468660@qq.com> Date: Fri, 24 Dec 2021 11:04:19 +0800 Subject: [PATCH] =?UTF-8?q?fix=20--=20=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 20 +++++++++---------- ruoyi-admin/pom.xml | 8 +++++++- .../src/main/resources/application-dev.yml | 2 +- .../src/main/resources/application.yml | 6 +++--- ruoyi-admin/src/main/resources/banner.txt | 15 +++++++------- ruoyi-common/pom.xml | 2 +- ruoyi-demo/pom.xml | 2 +- ruoyi-extend/pom.xml | 2 +- .../src/main/resources/banner.txt | 15 +++++++------- .../src/main/resources/banner.txt | 15 +++++++------- ruoyi-framework/pom.xml | 2 +- ruoyi-generator/pom.xml | 2 +- ruoyi-job/pom.xml | 2 +- ruoyi-oss/pom.xml | 2 +- ruoyi-system/pom.xml | 6 ++---- 15 files changed, 51 insertions(+), 50 deletions(-) diff --git a/pom.xml b/pom.xml index 4dd51662..f3086cb2 100644 --- a/pom.xml +++ b/pom.xml @@ -5,15 +5,15 @@ 4.0.0 com.ruoyi - ruoyi-vue-plus + ruoyi-flowable-plus 3.4.0 - RuoYi-Vue-Plus + RuoYi-Flowable-Plus https://gitee.com/JavaLionLi/RuoYi-Vue-Plus - RuoYi-Vue-Plus后台管理系统 + RuoYi-Flowable-Plus后台管理系统 - 3.4.0 + 3.4.0 2.5.7 UTF-8 UTF-8 @@ -234,28 +234,28 @@ com.ruoyi ruoyi-job - ${ruoyi-vue-plus.version} + ${ruoyi-flowable-plus.version} com.ruoyi ruoyi-generator - ${ruoyi-vue-plus.version} + ${ruoyi-flowable-plus.version} com.ruoyi ruoyi-framework - ${ruoyi-vue-plus.version} + ${ruoyi-flowable-plus.version} com.ruoyi ruoyi-system - ${ruoyi-vue-plus.version} + ${ruoyi-flowable-plus.version} @@ -269,14 +269,14 @@ com.ruoyi ruoyi-oss - ${ruoyi-vue-plus.version} + ${ruoyi-flowable-plus.version} com.ruoyi ruoyi-demo - ${ruoyi-vue-plus.version} + ${ruoyi-flowable-plus.version} diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml index 91aa0133..92c35163 100644 --- a/ruoyi-admin/pom.xml +++ b/ruoyi-admin/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - ruoyi-vue-plus + ruoyi-flowable-plus com.ruoyi 3.4.0 @@ -63,6 +63,12 @@ ruoyi-demo + + + com.ruoyi + ruoyi-flowable + + diff --git a/ruoyi-admin/src/main/resources/application-dev.yml b/ruoyi-admin/src/main/resources/application-dev.yml index 9bc5a770..cfee961d 100644 --- a/ruoyi-admin/src/main/resources/application-dev.yml +++ b/ruoyi-admin/src/main/resources/application-dev.yml @@ -51,7 +51,7 @@ spring: # 主库数据源 master: driverClassName: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://localhost:3306/ry-flowable-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true + url: jdbc:mysql://localhost:3306/ry-flowable-plus?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&nullCatalogMeansCurrent=true username: root password: 123456 # 从库数据源 diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index f7ef6339..213bf99d 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -1,9 +1,9 @@ # 项目相关配置 ruoyi: # 名称 - name: RuoYi-Vue-Plus + name: RuoYi-Flowable-Plus # 版本 - version: ${ruoyi-vue-plus.version} + version: ${ruoyi-flowable-plus.version} # 版权年份 copyrightYear: 2021 # 实例演示开关 @@ -202,7 +202,7 @@ swagger: # 描述 description: '描述：用于管理集团旗下公司的人员信息,具体包括XXX,XXX模块...' # 版本 - version: '版本号: ${ruoyi-vue-plus.version}' + version: '版本号: ${ruoyi-flowable-plus.version}' # 作者信息 contact: name: Lion Li diff --git a/ruoyi-admin/src/main/resources/banner.txt b/ruoyi-admin/src/main/resources/banner.txt index f592dbe1..f0428467 100644 --- a/ruoyi-admin/src/main/resources/banner.txt +++ b/ruoyi-admin/src/main/resources/banner.txt @@ -1,8 +1,7 @@ -Application Version: ${ruoyi-vue-plus.version} -Spring Boot Version: ${spring-boot.version} -__________ _____.___.__ ____ ____ __________.__ -\______ \__ __ ____\__ | |__| \ \ / /_ __ ____ \______ \ | __ __ ______ - | _/ | \/ _ \/ | | | ______ \ Y / | \_/ __ \ ______ | ___/ | | | \/ ___/ - | | \ | ( <_> )____ | | /_____/ \ /| | /\ ___/ /_____/ | | | |_| | /\___ \ - |____|_ /____/ \____// ______|__| \___/ |____/ \___ > |____| |____/____//____ > - \/ \/ \/ \/ + ____ __ __ _ _____ _ _ _ ____ _ + | _ \ _ _ ___\ \ / /(_) | ___|| | ___ __ __ __ _ | |__ | | ___ | _ \ | | _ _ ___ + | |_) || | | | / _ \\ V / | | | |_ | | / _ \\ \ /\ / // _` || '_ \ | | / _ \ | |_) || || | | |/ __| + | _ < | |_| || (_) || | | | | _| | || (_) |\ V V /| (_| || |_) || || __/ | __/ | || |_| |\__ \ + |_| \_\ \__,_| \___/ |_| |_| |_| |_| \___/ \_/\_/ \__,_||_.__/ |_| \___| |_| |_| \__,_||___/ + +${AnsiColor.GREEN} :: RuoYi :: ${AnsiColor.BLUE} RuoYi-Flowable-Plus:${AnsiColor.RED}${spring.profiles.active}${AnsiColor.BRIGHT_WHITE} :: Application Version: ${ruoyi-flowable-plus.version} ${spring-boot.formatted-version} diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml index 4a0e1a86..e56c9ad1 100644 --- a/ruoyi-common/pom.xml +++ b/ruoyi-common/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - ruoyi-vue-plus + ruoyi-flowable-plus com.ruoyi 3.4.0 diff --git a/ruoyi-demo/pom.xml b/ruoyi-demo/pom.xml index 1ca6d92b..aa69ac20 100644 --- a/ruoyi-demo/pom.xml +++ b/ruoyi-demo/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - ruoyi-vue-plus + ruoyi-flowable-plus com.ruoyi 3.4.0 diff --git a/ruoyi-extend/pom.xml b/ruoyi-extend/pom.xml index ccd525ce..030f52ee 100644 --- a/ruoyi-extend/pom.xml +++ b/ruoyi-extend/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - ruoyi-vue-plus + ruoyi-flowable-plus com.ruoyi 3.4.0 diff --git a/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/banner.txt b/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/banner.txt index abb124d8..8feb0830 100644 --- a/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/banner.txt +++ b/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/banner.txt @@ -1,8 +1,7 @@ -Application Version: ${ruoyi-vue-plus.version} -Spring Boot Version: ${spring-boot.version} - __ __ _ _ _ _ -| \/ | (_) | /\ | | (_) -| \ / | ___ _ __ _| |_ ___ _ __ ______ / \ __| |_ __ ___ _ _ __ -| |\/| |/ _ \| '_ \| | __/ _ \| '__|______/ /\ \ / _` | '_ ` _ \| | '_ \ -| | | | (_) | | | | | || (_) | | / ____ \ (_| | | | | | | | | | | -|_| |_|\___/|_| |_|_|\__\___/|_| /_/ \_\__,_|_| |_| |_|_|_| |_| + __ __ _ _ _ _ _ + | \/ | ___ _ __ (_)| |_ ___ _ __ / \ __| | _ __ ___ (_) _ __ + | |\/| | / _ \ | '_ \ | || __|/ _ \ | '__| / _ \ / _` || '_ ` _ \ | || '_ \ + | | | || (_) || | | || || |_| (_) || | / ___ \| (_| || | | | | || || | | | + |_| |_| \___/ |_| |_||_| \__|\___/ |_| /_/ \_\\__,_||_| |_| |_||_||_| |_| + +${AnsiColor.GREEN} :: RuoYi :: ${AnsiColor.BLUE} RuoYi-Flowable-Plus:${AnsiColor.RED}${spring.profiles.active}${AnsiColor.BRIGHT_WHITE} :: Application Version: ${ruoyi-flowable-plus.version} ${spring-boot.formatted-version} diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/banner.txt b/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/banner.txt index a9179c6a..8a56afb7 100644 --- a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/banner.txt +++ b/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/banner.txt @@ -1,8 +1,7 @@ -Application Version: ${ruoyi-vue-plus.version} -Spring Boot Version: ${spring-boot.version} -__ __ _ _ _ _ _ -\ \ / / | | | | | | /\ | | (_) - \ V / __ _| |______ | | ___ | |__ ______ / \ __| |_ __ ___ _ _ __ - > < \ \/ / |______| | |/ _ \| '_ \______/ /\ \ / _` | '_ ` _ \| | '_ \ - / . \ > <| | | |__| | (_) | |_) | / ____ \ (_| | | | | | | | | | | -/_/ \_\/_/\_\_| \____/ \___/|_.__/ /_/ \_\__,_|_| |_| |_|_|_| |_| + __ __ _ _ _ _ _ _ + \ \/ /__ __| | | | ___ | |__ / \ __| | _ __ ___ (_) _ __ + \ / \ \/ /| | _ | | / _ \ | '_ \ / _ \ / _` || '_ ` _ \ | || '_ \ + / \ > < | | | |_| || (_) || |_) | / ___ \| (_| || | | | | || || | | | + /_/\_\/_/\_\|_| \___/ \___/ |_.__/ /_/ \_\\__,_||_| |_| |_||_||_| |_| + +${AnsiColor.GREEN} :: RuoYi :: ${AnsiColor.BLUE} RuoYi-Flowable-Plus:${AnsiColor.RED}${spring.profiles.active}${AnsiColor.BRIGHT_WHITE} :: Application Version: ${ruoyi-flowable-plus.version} ${spring-boot.formatted-version} diff --git a/ruoyi-framework/pom.xml b/ruoyi-framework/pom.xml index d5466af2..558992ad 100644 --- a/ruoyi-framework/pom.xml +++ b/ruoyi-framework/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - ruoyi-vue-plus + ruoyi-flowable-plus com.ruoyi 3.4.0 diff --git a/ruoyi-generator/pom.xml b/ruoyi-generator/pom.xml index 4b61ea61..c5690836 100644 --- a/ruoyi-generator/pom.xml +++ b/ruoyi-generator/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - ruoyi-vue-plus + ruoyi-flowable-plus com.ruoyi 3.4.0 diff --git a/ruoyi-job/pom.xml b/ruoyi-job/pom.xml index a87b3efe..d71a9add 100644 --- a/ruoyi-job/pom.xml +++ b/ruoyi-job/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - ruoyi-vue-plus + ruoyi-flowable-plus com.ruoyi 3.4.0 diff --git a/ruoyi-oss/pom.xml b/ruoyi-oss/pom.xml index 8aaf3e44..9cbc38c6 100644 --- a/ruoyi-oss/pom.xml +++ b/ruoyi-oss/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - ruoyi-vue-plus + ruoyi-flowable-plus com.ruoyi 3.4.0 diff --git a/ruoyi-system/pom.xml b/ruoyi-system/pom.xml index a436dfcd..cb595460 100644 --- a/ruoyi-system/pom.xml +++ b/ruoyi-system/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - ruoyi-vue-plus + ruoyi-flowable-plus com.ruoyi 3.4.0 @@ -11,9 +11,7 @@ ruoyi-system - - system系统模块 - + system系统模块