diff --git a/pom.xml b/pom.xml index 791e4564d..2208ad23f 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ https://github.com/YunaiV/ruoyi-vue-pro - 1.5.1-snapshot + 1.6.0-snapshot 1.8 ${java.version} diff --git a/yudao-dependencies/pom.xml b/yudao-dependencies/pom.xml index d42256024..e47ee45e5 100644 --- a/yudao-dependencies/pom.xml +++ b/yudao-dependencies/pom.xml @@ -14,7 +14,7 @@ https://github.com/YunaiV/ruoyi-vue-pro - 1.5.1-snapshot + 1.6.0-snapshot 2.5.10 diff --git a/yudao-module-bpm/yudao-module-bpm-impl-activiti/pom.xml b/yudao-module-bpm/yudao-module-bpm-impl-activiti/pom.xml index 56ec7f55f..839150b3f 100644 --- a/yudao-module-bpm/yudao-module-bpm-impl-activiti/pom.xml +++ b/yudao-module-bpm/yudao-module-bpm-impl-activiti/pom.xml @@ -9,6 +9,7 @@ 4.0.0 yudao-module-bpm-impl-activiti + jar ${project.artifactId} diff --git a/yudao-module-bpm/yudao-module-bpm-impl-flowable/pom.xml b/yudao-module-bpm/yudao-module-bpm-impl-flowable/pom.xml index bf4626d05..1b039b8cc 100644 --- a/yudao-module-bpm/yudao-module-bpm-impl-flowable/pom.xml +++ b/yudao-module-bpm/yudao-module-bpm-impl-flowable/pom.xml @@ -9,6 +9,7 @@ 4.0.0 yudao-module-bpm-impl-flowable + jar ${project.artifactId} diff --git a/yudao-server/src/main/resources/application-local.yaml b/yudao-server/src/main/resources/application-local.yaml index 3e8b3b636..0bfdeb501 100644 --- a/yudao-server/src/main/resources/application-local.yaml +++ b/yudao-server/src/main/resources/application-local.yaml @@ -43,15 +43,15 @@ spring: primary: master datasource: master: -# name: ruoyi-vue-pro俺吧 - name: ruoyi-vue-pro-flowable + name: ruoyi-vue-pro +# name: ruoyi-vue-pro-flowable url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.master.name}?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=CTT driver-class-name: com.mysql.jdbc.Driver username: root password: 123456 slave: # 模拟从库,可根据自己需要修改 -# name: ruoyi-vue-pro - name: ruoyi-vue-pro-flowable + name: ruoyi-vue-pro +# name: ruoyi-vue-pro-flowable url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.slave.name}?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=CTT driver-class-name: com.mysql.jdbc.Driver username: root diff --git a/yudao-ui-admin/package.json b/yudao-ui-admin/package.json index 65a10326a..776f550af 100644 --- a/yudao-ui-admin/package.json +++ b/yudao-ui-admin/package.json @@ -1,6 +1,6 @@ { "name": "yudao-ui-admin", - "version": "1.5.1-snapshot", + "version": "1.6.0-snapshot", "description": "芋道管理系统", "author": "芋道", "license": "MIT",