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

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "acb636fcb8774558a04bd674f9f95f55",
+    "content-hash": "30cc3cbb162022972a21efed9b69d1e1",
     "packages": [
         {
             "name": "aliyuncs/oss-sdk-php",
@@ -6155,26 +6155,23 @@
         },
         {
             "name": "webman/redis-queue",
-            "version": "v1.3.1",
+            "version": "v2.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/webman-php/redis-queue.git",
-                "reference": "6fd491b19acb006d60931724aa2577a046ccb612"
+                "reference": "12e1c9915ec64c91c0c9c255606bd0c7de27334c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/webman-php/redis-queue/zipball/6fd491b19acb006d60931724aa2577a046ccb612",
-                "reference": "6fd491b19acb006d60931724aa2577a046ccb612",
-                "shasum": "",
-                "mirrors": [
-                    {
-                        "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%",
-                        "preferred": true
-                    }
-                ]
+                "url": "https://api.github.com/repos/webman-php/redis-queue/zipball/12e1c9915ec64c91c0c9c255606bd0c7de27334c",
+                "reference": "12e1c9915ec64c91c0c9c255606bd0c7de27334c",
+                "shasum": ""
             },
             "require": {
-                "workerman/redis-queue": "^1.0"
+                "ext-redis": "*",
+                "php": ">=8.1",
+                "workerman/redis-queue": "^1.2",
+                "workerman/webman-framework": "^2.1 || dev-master"
             },
             "type": "library",
             "autoload": {
@@ -6186,9 +6183,9 @@
             "description": "Redis message queue plugin for webman.",
             "support": {
                 "issues": "https://github.com/webman-php/redis-queue/issues",
-                "source": "https://github.com/webman-php/redis-queue/tree/v1.3.1"
+                "source": "https://github.com/webman-php/redis-queue/tree/v2.1.0"
             },
-            "time": "2024-02-28T07:21:52+00:00"
+            "time": "2025-01-24T12:56:01+00:00"
         },
         {
             "name": "workerman/coroutine",