From e5b711409c559c13965bcc8b5cb293d35ee64027 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sun, 6 Mar 2022 09:46:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=89=88=E6=9C=AC=E5=8F=B7?=
 =?UTF-8?q?=E4=B8=BA=201.6.0=EF=BC=8C=E5=87=86=E5=A4=87=20Flowable=20?=
 =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E6=B5=81=E5=8F=91=E7=89=88=EF=BC=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                                 | 2 +-
 yudao-dependencies/pom.xml                              | 2 +-
 yudao-module-bpm/yudao-module-bpm-impl-activiti/pom.xml | 1 +
 yudao-module-bpm/yudao-module-bpm-impl-flowable/pom.xml | 1 +
 yudao-server/src/main/resources/application-local.yaml  | 8 ++++----
 yudao-ui-admin/package.json                             | 2 +-
 6 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index 791e4564d..2208ad23f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
     <url>https://github.com/YunaiV/ruoyi-vue-pro</url>
 
     <properties>
-        <revision>1.5.1-snapshot</revision>
+        <revision>1.6.0-snapshot</revision>
         <!-- Maven 相关 -->
         <java.version>1.8</java.version>
         <maven.compiler.source>${java.version}</maven.compiler.source>
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 @@
     <url>https://github.com/YunaiV/ruoyi-vue-pro</url>
 
     <properties>
-        <revision>1.5.1-snapshot</revision>
+        <revision>1.6.0-snapshot</revision>
         <!-- 统一依赖管理 -->
         <spring.boot.version>2.5.10</spring.boot.version>
         <!-- Web 相关 -->
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 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>yudao-module-bpm-impl-activiti</artifactId>
+    <packaging>jar</packaging>
 
     <name>${project.artifactId}</name>
     <description>
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 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>yudao-module-bpm-impl-flowable</artifactId>
+    <packaging>jar</packaging>
 
     <name>${project.artifactId}</name>
     <description>
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",