Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev

疯狂的狮子li

2021-05-11 c33c3de43afabebbc685f0738843a7ac53ae50c5

 ruoyi-admin/src/main/resources/application-dev.yml

@@ -8,7 +8,7 @@
            master:
                url: jdbc:mysql://192.168.0.222:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
                username: root
                password: c6142b27f1385bc163ffe7f4ebfc52ac
                password: root
            # 从库数据源
            slave:
                # 从数据源开关/默认关闭
@@ -43,8 +43,8 @@
                allow:
                url-pattern: /druid/*
                # 控制台管理用户名和密码
                login-username: 
                login-password: 
                login-username: ruoyi
                login-password: 123456
            filter:
                stat:
                    enabled: true
@@ -61,6 +61,8 @@
        host: 192.168.0.222
        # 端口，默认为6379
        port: 6379
        # 数据库索引
        database: 0
        # 密码
        password:
        # 连接超时时间