Merge branch 'feature/mzl_dev' into feature/crmAdmin

# Conflicts:
#	app/functions.php
#	config/constants/Constants.php
#	config/middleware.php

config/middleware.php

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

config/route.php

@@ -28,8 +28,14 @@ use Webman\Route;
 
 Route::group('/common', function () {
     Route::group('/auth', function () {
-        Route::post('/login', [app\common\controller\AuthController::class, 'login']);
-        Route::post('/register', [app\common\controller\AuthController::class, 'register']);
+        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('/feishu/auth', [app\common\controller\AuthController::class, 'feishuAuth']);
     });
 });
 

config/whitelist.php

@@ -0,0 +1,9 @@
+<?php
+
+return [
+    'basi_cdata' => [
+        '/',
+        '/index/index',
+        // '/index/view'
+    ]
+];