Merge remote-tracking branch 'origin/develop' into develop

3 years ago · f02bd34865
parent 93fb61c79b a333643d77
commit f02bd34865
1 changed files with 1 additions and 1 deletions
--- a/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/ruoyi-admin/src/main/resources/application-druid.yml
@ -7,7 +7,7 @@ spring:
        druid:
            # 主库数据源
            master:
-                url: jdbc:p6spy:mysql://${address}:3306/${user}?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
+                url: jdbc:p6spy:mysql://${address}:3306/flowable?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
                username: ${user}
                password: ${mypass}
            # 从库数据源