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
2025-07-11 15:21:00 +08:00
parent 3d8d9f841a
commit a6f2284f51
30 changed files with 1185 additions and 365 deletions
@@ -40,7 +40,7 @@
    "topthink/think-validate": "^3.0",
    "shopwwi/webman-filesystem": "1.1",
    "shopwwi/filesystem-oss": "^1.0",
-    "webman/redis-queue": "^1.3",
+    "webman/redis-queue": "^2.1",
    "symfony/translation": "^7.3"
  },
  "suggest": {