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

app/common/controller/UserController.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace app\common\controller;
+
+use support\Request;
+use app\common\service\UserService;
+
+class UserController extends BaseController
+{
+
+    /**
+     * 用户信息
+     */
+    public function info(Request $request)
+    {
+        try {
+            $uid = $request->user->uid;
+            $result = (new UserService())->getUserInfo($uid);
+            return $this->success($result, '获取用户信息');
+        } catch (\Throwable $e) {
+            return $this->error($e->getMessage());
+        }
+    }
+
+}