Merge branch 'feature/mzl_dev' into develop

# Conflicts:
#	composer.json
#	composer.lock
#	config/route.php

config/cache.php

@@ -0,0 +1,31 @@
+<?php
+
+/**
+ * This file is part of webman.
+ *
+ * Licensed under The MIT License
+ * For full copyright and license information, please see the MIT-LICENSE.txt
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @author    walkor<walkor@workerman.net>
+ * @copyright walkor<walkor@workerman.net>
+ * @link      http://www.workerman.net/
+ * @license   http://www.opensource.org/licenses/mit-license.php MIT License
+ */
+
+return [
+    'default' => 'file',
+    'stores' => [
+        'file' => [
+            'driver' => 'file',
+            'path' => runtime_path('cache')
+        ],
+        'redis' => [
+            'driver' => 'redis',
+            'connection' => 'default'
+        ],
+        'array' => [
+            'driver' => 'array'
+        ]
+    ]
+];

config/feishu.php

@@ -0,0 +1,20 @@
+<?php
+
+return [
+    'xinyouhe' => [
+        'appId'     => "cli_a73e1e6406fa501c",
+        'appSecret' => "9cMfxujjGG9JPmNfNcOwUdCoIXqaM1wY",
+        'rUrl'      => "http://219.157.255.213:25321/feishu/auth",
+        'scope'     => "contact:user.base:readonly contact:contact.base:readonly contact:user.employee_id:readonly im:message:send_as_bot",
+        'state'     => "xinyouhe",
+        'baseUri'   => "https://open.feishu.cn/open-apis/"
+    ],
+    'mbaf' =>  [
+        'appId'     => "cli_a75839fb4ff85028",
+        'appSecret' => "VsqLvwsRzpmisBVbrTIuKdNCvRCO447d",
+        'rUrl'      => "http://219.157.255.213:25321/feishu/auth",
+        'scope'     => "contact:user.base:readonly contact:contact.base:readonly contact:user.employee_id:readonly im:message:send_as_bot",
+        'state'     => "mbaf",
+        'baseUri'   => "https://open.larksuite.com/open-apis/"
+    ]
+];

config/route.php

@@ -27,7 +27,7 @@ Route::any('/login', [app\controller\UserController::class, 'login'])->middlewar
 Route::any('/upload', [app\controller\UploadController::class, 'uploadImage'])->middleware([app\middleware\CrossDomain::class]);
 
 
-
-
-
-
+// 飞书
+Route::post('/feishu/auth', [app\controller\FeishuController::class, 'auth']);
+Route::post('/feishu/show', [app\controller\FeishuController::class, 'show']);
+Route::post('/feishu/send', [app\controller\FeishuController::class, 'send']);