From 55dcfa75395800b03a2d74f026b9924eacddf95c Mon Sep 17 00:00:00 2001
From: changzhenlin <chang1051169769@126.com>
Date: Mon, 14 Oct 2019 13:02:42 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E9=98=BF=E4=B8=89=E5=A4=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 test | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 test

diff --git a/test b/test
new file mode 100644
index 000000000..dfdd17f31
--- /dev/null
+++ b/test
@@ -0,0 +1 @@
+阿三大

From d01922f3fca4b363a4acff9cce3140abf54ab0e0 Mon Sep 17 00:00:00 2001
From: changzhenlin <chang1051169769@126.com>
Date: Mon, 14 Oct 2019 13:16:13 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi/src/main/resources/application-druid.yml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/ruoyi/src/main/resources/application-druid.yml b/ruoyi/src/main/resources/application-druid.yml
index cdfb3390b..3d0821eea 100644
--- a/ruoyi/src/main/resources/application-druid.yml
+++ b/ruoyi/src/main/resources/application-druid.yml
@@ -6,16 +6,16 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                url: jdbc:mysql://localhost:3306/ry_20191008?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: root
-                password: password
+                password: 123
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭
                 enabled: false
-                url: 
-                username: 
-                password: 
+                url:
+                username:
+                password:
             # 初始连接数
             initialSize: 5
             # 最小连接池数量
@@ -35,7 +35,7 @@ spring:
             testWhileIdle: true
             testOnBorrow: false
             testOnReturn: false
-            webStatFilter: 
+            webStatFilter:
                 enabled: true
             statViewServlet:
                 enabled: true
@@ -43,8 +43,8 @@ spring:
                 allow:
                 url-pattern: /druid/*
                 # 控制台管理用户名和密码
-                login-username: 
-                login-password: 
+                login-username:
+                login-password:
             filter:
                 stat:
                     enabled: true
@@ -54,4 +54,4 @@ spring:
                     merge-sql: true
                 wall:
                     config:
-                        multi-statement-allow: true
\ No newline at end of file
+                        multi-statement-allow: true

From 726fe3767925d3ef2c67e21355032a957992f20a Mon Sep 17 00:00:00 2001
From: changzhenlin <chang1051169769@126.com>
Date: Mon, 14 Oct 2019 13:19:58 +0800
Subject: [PATCH 3/5] sda

---
 ruoyi-ui/src/views/error/401.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ruoyi-ui/src/views/error/401.vue b/ruoyi-ui/src/views/error/401.vue
index 856115088..d5eecbc48 100644
--- a/ruoyi-ui/src/views/error/401.vue
+++ b/ruoyi-ui/src/views/error/401.vue
@@ -9,7 +9,7 @@
           Oops!
         </h1>
         gif来源<a href="https://zh.airbnb.com/" target="_blank">airbnb</a> 页面
-        <h2>你没有权限去该页面</h2>
+        <h2>你没有权限去该页面1</h2>
         <h6>如有不满请联系你领导</h6>
         <ul class="list-unstyled">
           <li>或者你可以去:</li>

From a374982e3ae7616a5815c3d0b4d3ce5c06e5a502 Mon Sep 17 00:00:00 2001
From: changzhenlin <chang1051169769@126.com>
Date: Tue, 15 Oct 2019 13:27:10 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E6=98=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/tt.txt | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 ruoyi-ui/tt.txt

diff --git a/ruoyi-ui/tt.txt b/ruoyi-ui/tt.txt
new file mode 100644
index 000000000..e69de29bb

From 7060707870d92fe666d1c088608904fcf5bdc240 Mon Sep 17 00:00:00 2001
From: changzhenlin <chang1051169769@126.com>
Date: Tue, 15 Oct 2019 13:54:14 +0800
Subject: [PATCH 5/5] as

---
 ruoyi-ui/tt.txt | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 ruoyi-ui/tt.txt

diff --git a/ruoyi-ui/tt.txt b/ruoyi-ui/tt.txt
deleted file mode 100644
index e69de29bb..000000000