Commit b8ff47e832fc9e27e8a7d228b63370b1d8d71cd4
1 parent
00e15a5c
增加配置参数注释
Showing
2 changed files
with
4 additions
and
3 deletions
yudao-admin-server/src/main/resources/application-local.yaml
| @@ -43,13 +43,13 @@ spring: | @@ -43,13 +43,13 @@ spring: | ||
| 43 | primary: master | 43 | primary: master |
| 44 | datasource: | 44 | datasource: |
| 45 | master: | 45 | master: |
| 46 | - name: ruoyi_vue_pro | 46 | + name: ruoyi-vue-pro |
| 47 | url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.master.name}?useSSL=false&useUnicode=true&characterEncoding=UTF-8&serverTimezone=CTT | 47 | url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.master.name}?useSSL=false&useUnicode=true&characterEncoding=UTF-8&serverTimezone=CTT |
| 48 | driver-class-name: com.mysql.jdbc.Driver | 48 | driver-class-name: com.mysql.jdbc.Driver |
| 49 | username: root | 49 | username: root |
| 50 | password: root | 50 | password: root |
| 51 | slave: # 模拟从库,可根据自己需要修改 | 51 | slave: # 模拟从库,可根据自己需要修改 |
| 52 | - name: ruoyi_vue_pro | 52 | + name: ruoyi-vue-pro |
| 53 | url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.slave.name}?useSSL=false&useUnicode=true&characterEncoding=UTF-8&serverTimezone=CTT | 53 | url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.slave.name}?useSSL=false&useUnicode=true&characterEncoding=UTF-8&serverTimezone=CTT |
| 54 | driver-class-name: com.mysql.jdbc.Driver | 54 | driver-class-name: com.mysql.jdbc.Driver |
| 55 | username: root | 55 | username: root |
| @@ -65,6 +65,7 @@ spring: | @@ -65,6 +65,7 @@ spring: | ||
| 65 | #activiti7默认不生成历史信息表,需手动设置开启 | 65 | #activiti7默认不生成历史信息表,需手动设置开启 |
| 66 | db-history-used: true | 66 | db-history-used: true |
| 67 | check-process-definitions: true | 67 | check-process-definitions: true |
| 68 | + #full:保存历史数据的最高级别,可保存全部流程相关细节,包括流程流转各节点参数 | ||
| 68 | history-level: full | 69 | history-level: full |
| 69 | 70 | ||
| 70 | 71 |
yudao-framework/yudao-spring-boot-starter-activiti/pom.xml
| @@ -33,7 +33,7 @@ | @@ -33,7 +33,7 @@ | ||
| 33 | <version>${activiti.version}</version> | 33 | <version>${activiti.version}</version> |
| 34 | <type>pom</type> | 34 | <type>pom</type> |
| 35 | </dependency> | 35 | </dependency> |
| 36 | - | 36 | + <!--使用mybatis plus需排除掉mybatis--> |
| 37 | <dependency> | 37 | <dependency> |
| 38 | <groupId>org.activiti</groupId> | 38 | <groupId>org.activiti</groupId> |
| 39 | <artifactId>activiti-spring-boot-starter</artifactId> | 39 | <artifactId>activiti-spring-boot-starter</artifactId> |