Commit e5b711409c559c13965bcc8b5cb293d35ee64027
1 parent
69b93ca7
修改版本号为 1.6.0,准备 Flowable 工作流发版!
Showing
6 changed files
with
9 additions
and
7 deletions
pom.xml
| @@ -26,7 +26,7 @@ | @@ -26,7 +26,7 @@ | ||
| 26 | <url>https://github.com/YunaiV/ruoyi-vue-pro</url> | 26 | <url>https://github.com/YunaiV/ruoyi-vue-pro</url> |
| 27 | 27 | ||
| 28 | <properties> | 28 | <properties> |
| 29 | - <revision>1.5.1-snapshot</revision> | 29 | + <revision>1.6.0-snapshot</revision> |
| 30 | <!-- Maven 相关 --> | 30 | <!-- Maven 相关 --> |
| 31 | <java.version>1.8</java.version> | 31 | <java.version>1.8</java.version> |
| 32 | <maven.compiler.source>${java.version}</maven.compiler.source> | 32 | <maven.compiler.source>${java.version}</maven.compiler.source> |
yudao-dependencies/pom.xml
| @@ -14,7 +14,7 @@ | @@ -14,7 +14,7 @@ | ||
| 14 | <url>https://github.com/YunaiV/ruoyi-vue-pro</url> | 14 | <url>https://github.com/YunaiV/ruoyi-vue-pro</url> |
| 15 | 15 | ||
| 16 | <properties> | 16 | <properties> |
| 17 | - <revision>1.5.1-snapshot</revision> | 17 | + <revision>1.6.0-snapshot</revision> |
| 18 | <!-- 统一依赖管理 --> | 18 | <!-- 统一依赖管理 --> |
| 19 | <spring.boot.version>2.5.10</spring.boot.version> | 19 | <spring.boot.version>2.5.10</spring.boot.version> |
| 20 | <!-- Web 相关 --> | 20 | <!-- Web 相关 --> |
yudao-module-bpm/yudao-module-bpm-impl-activiti/pom.xml
| @@ -9,6 +9,7 @@ | @@ -9,6 +9,7 @@ | ||
| 9 | </parent> | 9 | </parent> |
| 10 | <modelVersion>4.0.0</modelVersion> | 10 | <modelVersion>4.0.0</modelVersion> |
| 11 | <artifactId>yudao-module-bpm-impl-activiti</artifactId> | 11 | <artifactId>yudao-module-bpm-impl-activiti</artifactId> |
| 12 | + <packaging>jar</packaging> | ||
| 12 | 13 | ||
| 13 | <name>${project.artifactId}</name> | 14 | <name>${project.artifactId}</name> |
| 14 | <description> | 15 | <description> |
yudao-module-bpm/yudao-module-bpm-impl-flowable/pom.xml
| @@ -9,6 +9,7 @@ | @@ -9,6 +9,7 @@ | ||
| 9 | </parent> | 9 | </parent> |
| 10 | <modelVersion>4.0.0</modelVersion> | 10 | <modelVersion>4.0.0</modelVersion> |
| 11 | <artifactId>yudao-module-bpm-impl-flowable</artifactId> | 11 | <artifactId>yudao-module-bpm-impl-flowable</artifactId> |
| 12 | + <packaging>jar</packaging> | ||
| 12 | 13 | ||
| 13 | <name>${project.artifactId}</name> | 14 | <name>${project.artifactId}</name> |
| 14 | <description> | 15 | <description> |
yudao-server/src/main/resources/application-local.yaml
| @@ -43,15 +43,15 @@ spring: | @@ -43,15 +43,15 @@ spring: | ||
| 43 | primary: master | 43 | primary: master |
| 44 | datasource: | 44 | datasource: |
| 45 | master: | 45 | master: |
| 46 | -# name: ruoyi-vue-pro俺吧 | ||
| 47 | - name: ruoyi-vue-pro-flowable | 46 | + name: ruoyi-vue-pro |
| 47 | +# name: ruoyi-vue-pro-flowable | ||
| 48 | 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 | 48 | 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 |
| 49 | driver-class-name: com.mysql.jdbc.Driver | 49 | driver-class-name: com.mysql.jdbc.Driver |
| 50 | username: root | 50 | username: root |
| 51 | password: 123456 | 51 | password: 123456 |
| 52 | slave: # 模拟从库,可根据自己需要修改 | 52 | slave: # 模拟从库,可根据自己需要修改 |
| 53 | -# name: ruoyi-vue-pro | ||
| 54 | - name: ruoyi-vue-pro-flowable | 53 | + name: ruoyi-vue-pro |
| 54 | +# name: ruoyi-vue-pro-flowable | ||
| 55 | 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 | 55 | 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 |
| 56 | driver-class-name: com.mysql.jdbc.Driver | 56 | driver-class-name: com.mysql.jdbc.Driver |
| 57 | username: root | 57 | username: root |
yudao-ui-admin/package.json