From 99ad98f79bfabd4ed3934cd3d7eba514db7bc10c Mon Sep 17 00:00:00 2001
From: zx <756958008@qq.com>
Date: Thu, 28 Jun 2018 12:27:47 +0800
Subject: [PATCH 1/7] =?UTF-8?q?fixed=20=E6=96=B0=E8=B7=AF=E7=94=B1?=
 =?UTF-8?q?=E5=AF=BC=E8=87=B4=E7=9A=84after=5Fbehavior=E5=A4=B1=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/adminRoute.php | 41 ++++++++++++++++++++++----------------
 1 file changed, 24 insertions(+), 17 deletions(-)

diff --git a/application/adminRoute.php b/application/adminRoute.php
index 8fa8daa..2b72bb0 100644
--- a/application/adminRoute.php
+++ b/application/adminRoute.php
@@ -11,27 +11,35 @@ $afterBehavior = [
 
 //一些带有特殊参数的路由写到这里
 Route::rule([
-    'admin/Login/index'          => [
+    'admin/Login/index'  => [
         'admin/Login/index',
         ['method' => 'post']
     ],
-    'admin/Index/upload'         => [
+    'admin/Index/upload' => [
         'admin/Index/upload',
         [
-            'method' => 'post', 'after_behavior' => ['\app\admin\behavior\ApiAuth', '\app\admin\behavior\AdminLog']
+            'method'         => 'post',
+            'after_behavior' => [
+                '\app\admin\behavior\ApiAuth',
+                '\app\admin\behavior\AdminLog'
+            ]
         ]
     ],
-    'admin/Login/logout'         => [
+    'admin/Login/logout' => [
         'admin/Login/logout',
         [
-            'method' => 'get', 'after_behavior' => ['\app\admin\behavior\ApiAuth', '\app\admin\behavior\AdminLog']
+            'method'         => 'get',
+            'after_behavior' => [
+                '\app\admin\behavior\ApiAuth',
+                '\app\admin\behavior\AdminLog'
+            ]
         ]
     ]
 ]);
 
 
 //大部分控制器的路由都以分组的形式写到这里
-Route::group('admin', function() {
+Route::group('admin', function () use ($afterBehavior) {
     Route::group('Menu', [
         'index'        => [
             'admin/Menu/index',
@@ -53,7 +61,7 @@ Route::group('admin', function() {
             'admin/Menu/del',
             ['method' => 'get']
         ]
-    ]);
+    ], ['after_behavior' => $afterBehavior]);
     Route::group('User', [
         'index'        => [
             'admin/User/index',
@@ -83,7 +91,7 @@ Route::group('admin', function() {
             'admin/User/del',
             ['method' => 'get']
         ],
-    ]);
+    ], ['after_behavior' => $afterBehavior]);
     Route::group('Auth', [
         'index'        => [
             'admin/Auth/index',
@@ -117,7 +125,7 @@ Route::group('admin', function() {
             'admin/Auth/getRuleList',
             ['method' => 'get']
         ]
-    ]);
+    ], ['after_behavior' => $afterBehavior]);
     Route::group('App', [
         'index'            => [
             'admin/App/index',
@@ -147,7 +155,7 @@ Route::group('admin', function() {
             'admin/App/del',
             ['method' => 'get']
         ]
-    ]);
+    ], ['after_behavior' => $afterBehavior]);
     Route::group('InterfaceList', [
         'index'        => [
             'admin/InterfaceList/index',
@@ -177,7 +185,7 @@ Route::group('admin', function() {
             'admin/InterfaceList/getHash',
             ['method' => 'get']
         ]
-    ]);
+    ], ['after_behavior' => $afterBehavior]);
     Route::group('Fields', [
         'index'    => [
             'admin/Fields/index',
@@ -207,7 +215,7 @@ Route::group('admin', function() {
             'admin/Fields/upload',
             ['method' => 'post']
         ]
-    ]);
+    ], ['after_behavior' => $afterBehavior]);
     Route::group('InterfaceGroup', [
         'index'        => [
             'admin/InterfaceGroup/index',
@@ -233,7 +241,7 @@ Route::group('admin', function() {
             'admin/InterfaceGroup/del',
             ['method' => 'get']
         ]
-    ]);
+    ], ['after_behavior' => $afterBehavior]);
     Route::group('AppGroup', [
         'index'        => [
             'admin/AppGroup/index',
@@ -259,7 +267,7 @@ Route::group('admin', function() {
             'admin/AppGroup/del',
             ['method' => 'get']
         ]
-    ]);
+    ], ['after_behavior' => $afterBehavior]);
     Route::group('Log', [
         'index' => [
             'admin/Log/index',
@@ -269,7 +277,6 @@ Route::group('admin', function() {
             'admin/Log/del',
             ['method' => 'get']
         ]
-    ]);
+    ], ['after_behavior' => $afterBehavior]);
     Route::miss('admin/Miss/index');
-}, ['after_behavior' => $afterBehavior]
-);
+});

From 9a865e360eeae972220ce8e5b69d4d4866a08295 Mon Sep 17 00:00:00 2001
From: zx <756958008@qq.com>
Date: Thu, 28 Jun 2018 12:41:42 +0800
Subject: [PATCH 2/7] =?UTF-8?q?fixed=20=E4=BC=98=E5=8C=96=E5=89=8D?=
 =?UTF-8?q?=E7=AB=AFMISS=E8=B7=AF=E7=94=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/adminRoute.php | 59 ++++++++++++++++++--------------------
 application/apiRoute.php   | 11 +++++--
 data/apiRoute.tpl          | 11 +++++--
 3 files changed, 46 insertions(+), 35 deletions(-)

diff --git a/application/adminRoute.php b/application/adminRoute.php
index 2b72bb0..edf05c7 100644
--- a/application/adminRoute.php
+++ b/application/adminRoute.php
@@ -8,38 +8,35 @@ $afterBehavior = [
     '\app\admin\behavior\AdminLog'
 ];
 
-
-//一些带有特殊参数的路由写到这里
-Route::rule([
-    'admin/Login/index'  => [
-        'admin/Login/index',
-        ['method' => 'post']
-    ],
-    'admin/Index/upload' => [
-        'admin/Index/upload',
-        [
-            'method'         => 'post',
-            'after_behavior' => [
-                '\app\admin\behavior\ApiAuth',
-                '\app\admin\behavior\AdminLog'
-            ]
-        ]
-    ],
-    'admin/Login/logout' => [
-        'admin/Login/logout',
-        [
-            'method'         => 'get',
-            'after_behavior' => [
-                '\app\admin\behavior\ApiAuth',
-                '\app\admin\behavior\AdminLog'
-            ]
-        ]
-    ]
-]);
-
-
-//大部分控制器的路由都以分组的形式写到这里
 Route::group('admin', function () use ($afterBehavior) {
+    //一些带有特殊参数的路由写到这里
+    Route::rule([
+        'admin/Login/index'  => [
+            'admin/Login/index',
+            ['method' => 'post']
+        ],
+        'admin/Index/upload' => [
+            'admin/Index/upload',
+            [
+                'method'         => 'post',
+                'after_behavior' => [
+                    '\app\admin\behavior\ApiAuth',
+                    '\app\admin\behavior\AdminLog'
+                ]
+            ]
+        ],
+        'admin/Login/logout' => [
+            'admin/Login/logout',
+            [
+                'method'         => 'get',
+                'after_behavior' => [
+                    '\app\admin\behavior\ApiAuth',
+                    '\app\admin\behavior\AdminLog'
+                ]
+            ]
+        ]
+    ]);
+    //大部分控制器的路由都以分组的形式写到这里
     Route::group('Menu', [
         'index'        => [
             'admin/Menu/index',
diff --git a/application/apiRoute.php b/application/apiRoute.php
index 6f97d7f..00992ed 100644
--- a/application/apiRoute.php
+++ b/application/apiRoute.php
@@ -2,7 +2,14 @@
 /**
  * Api路由
  */
+
 use think\Route;
 
-Route::miss('api/Index/index');
-$afterBehavior = ['\app\api\behavior\ApiAuth', '\app\api\behavior\ApiPermission', '\app\api\behavior\RequestFilter'];
+Route::group('api', function () {
+    Route::miss('api/Index/index');
+});
+$afterBehavior = [
+    '\app\api\behavior\ApiAuth',
+    '\app\api\behavior\ApiPermission',
+    '\app\api\behavior\RequestFilter'
+];
\ No newline at end of file
diff --git a/data/apiRoute.tpl b/data/apiRoute.tpl
index 6f97d7f..00992ed 100644
--- a/data/apiRoute.tpl
+++ b/data/apiRoute.tpl
@@ -2,7 +2,14 @@
 /**
  * Api路由
  */
+
 use think\Route;
 
-Route::miss('api/Index/index');
-$afterBehavior = ['\app\api\behavior\ApiAuth', '\app\api\behavior\ApiPermission', '\app\api\behavior\RequestFilter'];
+Route::group('api', function () {
+    Route::miss('api/Index/index');
+});
+$afterBehavior = [
+    '\app\api\behavior\ApiAuth',
+    '\app\api\behavior\ApiPermission',
+    '\app\api\behavior\RequestFilter'
+];
\ No newline at end of file

From b07a5952b748c0786c8519ba5c6d6fda750a510f Mon Sep 17 00:00:00 2001
From: Zhao <756958008@qq.com>
Date: Mon, 2 Jul 2018 16:39:44 +0800
Subject: [PATCH 3/7] =?UTF-8?q?fixed=20=E4=BF=AE=E5=A4=8D=E8=B7=AF?=
 =?UTF-8?q?=E7=94=B1BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/adminRoute.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/application/adminRoute.php b/application/adminRoute.php
index edf05c7..86046e5 100644
--- a/application/adminRoute.php
+++ b/application/adminRoute.php
@@ -11,11 +11,11 @@ $afterBehavior = [
 Route::group('admin', function () use ($afterBehavior) {
     //一些带有特殊参数的路由写到这里
     Route::rule([
-        'admin/Login/index'  => [
+        'Login/index'  => [
             'admin/Login/index',
             ['method' => 'post']
         ],
-        'admin/Index/upload' => [
+        'Index/upload' => [
             'admin/Index/upload',
             [
                 'method'         => 'post',
@@ -25,7 +25,7 @@ Route::group('admin', function () use ($afterBehavior) {
                 ]
             ]
         ],
-        'admin/Login/logout' => [
+        'Login/logout' => [
             'admin/Login/logout',
             [
                 'method'         => 'get',

From 8cdcf09214093014a248c2d39ff7d493d265a978 Mon Sep 17 00:00:00 2001
From: zx <756958008@qq.com>
Date: Tue, 3 Jul 2018 11:18:58 +0800
Subject: [PATCH 4/7] =?UTF-8?q?fixed=20=E4=BF=AE=E5=A4=8D=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E6=9D=83=E9=99=90=E4=B8=8D=E6=98=BE=E7=A4=BA=E7=9A=84?=
 =?UTF-8?q?BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/controller/Auth.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/application/admin/controller/Auth.php b/application/admin/controller/Auth.php
index b5f3ea8..8e577d4 100644
--- a/application/admin/controller/Auth.php
+++ b/application/admin/controller/Auth.php
@@ -80,6 +80,7 @@ class Auth extends Base {
         $rules = [];
         if ($groupId) {
             $rules = (new AdminAuthRule())->where(['groupId' => $groupId])->select();
+            $rules = Tools::buildArrFromObj($rules);
             $rules = array_column($rules, 'url');
         }
         $newList = $this->buildList($list, $rules);

From 6e3118143ba857a3a5c0b129714c4c9390cb5f4e Mon Sep 17 00:00:00 2001
From: zx <756958008@qq.com>
Date: Tue, 3 Jul 2018 12:40:19 +0800
Subject: [PATCH 5/7] =?UTF-8?q?fixed=20=E4=BC=98=E5=8C=96=E5=89=8D?=
 =?UTF-8?q?=E7=AB=AF=E8=B7=AF=E7=94=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/apiRoute.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/application/apiRoute.php b/application/apiRoute.php
index 00992ed..d82bfa2 100644
--- a/application/apiRoute.php
+++ b/application/apiRoute.php
@@ -5,9 +5,7 @@
 
 use think\Route;
 
-Route::group('api', function () {
-    Route::miss('api/Index/index');
-});
+Route::miss('api/Index/index');
 $afterBehavior = [
     '\app\api\behavior\ApiAuth',
     '\app\api\behavior\ApiPermission',

From 1793600bd11a48d8cd46c79c330ce0d52d4cb75d Mon Sep 17 00:00:00 2001
From: zx <756958008@qq.com>
Date: Fri, 13 Jul 2018 18:19:05 +0800
Subject: [PATCH 6/7] =?UTF-8?q?fixed=20=E5=9B=BA=E5=8C=96=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=BA=93=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/api/behavior/ApiPermission.php | 2 +-
 application/database.php                   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/api/behavior/ApiPermission.php b/application/api/behavior/ApiPermission.php
index 1aa227f..826b939 100644
--- a/application/api/behavior/ApiPermission.php
+++ b/application/api/behavior/ApiPermission.php
@@ -33,7 +33,7 @@ class ApiPermission {
                 $appInfo = cache('AccessToken:' . $access_token);
                 $allRules = explode(',', $appInfo['app_api']);
                 if (!in_array($hash, $allRules)) {
-                    $data = ['code' => ReturnCode::INVALID, 'msg' => '非常抱歉，您没有权限怎么做！', 'data' => []];
+                    $data = ['code' => ReturnCode::INVALID, 'msg' => '非常抱歉，您没有权限这么做！', 'data' => []];
 
                     return json($data);
                 }
diff --git a/application/database.php b/application/database.php
index e65bbca..32e9f1d 100755
--- a/application/database.php
+++ b/application/database.php
@@ -15,7 +15,7 @@ return [
     // 服务器地址
     'hostname'        => '127.0.0.1',
     // 数据库名
-    'database'        => 'apiadmin',
+    'database'        => 'crm',
     // 用户名
     'username'        => 'root',
     // 密码

From 7a2d2608e063cb6e235f7a131e45b1ed9f8c4545 Mon Sep 17 00:00:00 2001
From: zx <756958008@qq.com>
Date: Fri, 13 Jul 2018 18:20:28 +0800
Subject: [PATCH 7/7] =?UTF-8?q?modified=20=E7=BB=86=E8=8A=82=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/database.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/database.php b/application/database.php
index 32e9f1d..e65bbca 100755
--- a/application/database.php
+++ b/application/database.php
@@ -15,7 +15,7 @@ return [
     // 服务器地址
     'hostname'        => '127.0.0.1',
     // 数据库名
-    'database'        => 'crm',
+    'database'        => 'apiadmin',
     // 用户名
     'username'        => 'root',
     // 密码