Commit Graph

12 Commits (merge_upstream)

Author SHA1 Message Date
Rico 5ddb11226f 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
7 years ago
Rico d3c1ae3f20 改成布朗 7 years ago
Rico 3c84838193 明确问题 7 years ago
Rico aded91b730 增加开关是否验证node ip 7 years ago
SakuraSa233 8d7e1f9293
refactor(middleware): refactor ModMu for better perf(?) 7 years ago
SakuraSa233 082f7c5a00
fix(middleware): correct comment 7 years ago
SakuraSa233 d06ebb83c4
refactor(middleware): style refactor and optimize 7 years ago
Anankke 1a7045f2a4 refractor: rearrange search to top for further use 8 years ago
Anankke 824a96e458 perf: refactor helper 8 years ago
Anankke 246ab2f392
儿童节更新 (#668)
Master 儿童节更新

注意加入新的 config 选项
8 years ago
NimaQu 2e877c4a9e
在 webapi ip 鉴权失败的时候 json 带当前 IP 8 years ago
钱半仙 2461adcb14 Initial Commit 9 years ago