From c33c3de43afabebbc685f0738843a7ac53ae50c5 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期二, 11 五月 2021 17:14:53 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev

---
 ruoyi-admin/src/main/resources/application-dev.yml |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/application-dev.yml b/ruoyi-admin/src/main/resources/application-dev.yml
index 37d4e89..65f8805 100644
--- a/ruoyi-admin/src/main/resources/application-dev.yml
+++ b/ruoyi-admin/src/main/resources/application-dev.yml
@@ -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:
         # 杩炴帴瓒呮椂鏃堕棿

--
Gitblit v1.9.3