Merge branch 'feature/mzl_dev' into develop

# Conflicts:
#	app/common/controller/AuthController.php
#	app/common/logic/AuthLogic.php
#	app/common/model/User.php
#	app/controller/IndexController.php
#	app/functions.php
#	app/middleware/AuthCheck.php
#	app/view/index/qrcode.html
#	composer.json
#	composer.lock
#	config/middleware.php
#	config/route.php
#	config/whitelist.php

config/middleware.php

@@ -16,6 +16,7 @@
 return [
     '' => [
         \app\middleware\AccessControl::class,
-        \app\middleware\BasicData::class
+        \app\middleware\BasicData::class,
+        \app\middleware\AuthCheck::class
     ]
 ];

config/route.php

@@ -31,12 +31,26 @@ Route::group('/common', function () {
         Route::any('/login', [app\common\controller\AuthController::class, 'login']);
         Route::any('/register', [app\common\controller\AuthController::class, 'register']);
         Route::any('/feishu/scope', [app\common\controller\AuthController::class, 'feishuScope']);
+        Route::any('/refresh/token', [app\common\controller\AuthController::class, 'refresh']);
 
 
-
-        // 调试
+        // // 调试
         Route::any('/feishu/auth', [app\common\controller\AuthController::class, 'feishuAuth']);
     });
+    
+    Route::group('/user', function () {
+        Route::any('/info', [app\common\controller\UserController::class, 'info']);
+    });
+});
+
+Route::group('/admin', function () {
+    Route::group('/role', function () {
+        Route::any('/list', [app\admin\controller\RoleController::class, 'list']);
+        Route::any('/detail', [app\admin\controller\RoleController::class, 'detail']);
+        Route::any('/create', [app\admin\controller\RoleController::class, 'create']);
+        Route::any('/update', [app\admin\controller\RoleController::class, 'update']);
+        Route::any('/delete', [app\admin\controller\RoleController::class, 'delete']);
+    });
 });
 
 

config/whitelist.php

@@ -4,6 +4,6 @@ return [
     'basi_cdata' => [
         '/',
         '/index/index',
-        // '/index/view'
+        '/index/view'
     ]
 ];