Merge branch 'A-dev' into merge_upstream
# Conflicts:
# app/Command/Job.php
# app/Controllers/Admin/UserController.php
# app/Controllers/Client/ClientApiController.php
# app/Controllers/HomeController.php
# app/Controllers/LinkController.php
# app/Controllers/UserController.php
# app/Middleware/Mod_Mu.php
# app/Models/User.php
# app/Services/Config.php
# app/Services/Gateway/TomatoPay.php
# app/Services/Gateway/TrimePay.php
# app/Services/Payment.php
# app/Utils/TelegramProcess.php
# app/Utils/Tools.php
# app/Utils/URL.php
# composer.json
# config/.config.example.php
# resources/clients/ss-win/使用注意.txt
# resources/clients/ssd-win/使用注意.txt
# resources/clients/ssr-win/使用注意.txt
# resources/views/material/user/index.tpl
# sql/glzjin_all.sql
|