From b8ff47e832fc9e27e8a7d228b63370b1d8d71cd4 Mon Sep 17 00:00:00 2001
From: zhujiqian <924931408@qq.com>
Date: Sun, 5 Sep 2021 22:57:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=85=8D=E7=BD=AE=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yudao-admin-server/src/main/resources/application-local.yaml | 5 +++--
 yudao-framework/yudao-spring-boot-starter-activiti/pom.xml   | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/yudao-admin-server/src/main/resources/application-local.yaml b/yudao-admin-server/src/main/resources/application-local.yaml
index ef485e083..9676da09c 100644
--- a/yudao-admin-server/src/main/resources/application-local.yaml
+++ b/yudao-admin-server/src/main/resources/application-local.yaml
@@ -43,13 +43,13 @@ spring:
       primary: master
       datasource:
         master:
-          name: ruoyi_vue_pro
+          name: ruoyi-vue-pro
           url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.master.name}?useSSL=false&useUnicode=true&characterEncoding=UTF-8&serverTimezone=CTT
           driver-class-name: com.mysql.jdbc.Driver
           username: root
           password: root
         slave: # 模拟从库，可根据自己需要修改
-          name: ruoyi_vue_pro
+          name: ruoyi-vue-pro
           url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.slave.name}?useSSL=false&useUnicode=true&characterEncoding=UTF-8&serverTimezone=CTT
           driver-class-name: com.mysql.jdbc.Driver
           username: root
@@ -65,6 +65,7 @@ spring:
     #activiti7默认不生成历史信息表，需手动设置开启
     db-history-used: true
     check-process-definitions: true
+    #full：保存历史数据的最高级别，可保存全部流程相关细节，包括流程流转各节点参数
     history-level: full
 
 
diff --git a/yudao-framework/yudao-spring-boot-starter-activiti/pom.xml b/yudao-framework/yudao-spring-boot-starter-activiti/pom.xml
index f3acec5e2..e9cee07f1 100644
--- a/yudao-framework/yudao-spring-boot-starter-activiti/pom.xml
+++ b/yudao-framework/yudao-spring-boot-starter-activiti/pom.xml
@@ -33,7 +33,7 @@
             <version>${activiti.version}</version>
             <type>pom</type>
         </dependency>
-
+        <!--使用mybatis plus需排除掉mybatis-->
         <dependency>
             <groupId>org.activiti</groupId>
             <artifactId>activiti-spring-boot-starter</artifactId>