Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev 20240127 #2344

Merged
merged 4 commits into from
Jan 26, 2024
Merged

Dev 20240127 #2344

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c87bc4f
fix: config val name in gateway service
AutisticShark Jan 24, 2024
5be98c3
fix: incorrect return value for alipay f2f
AutisticShark Jan 24, 2024
70faa07
refactor: hourly traffic log
AutisticShark Jan 26, 2024
a735ef8
refactor: checkin reward
AutisticShark Jan 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions app/routes.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,8 @@
$group->post('/switch_theme_mode', App\Controllers\UserController::class . ':switchThemeMode');
// 订阅记录
$group->get('/subscribe', App\Controllers\User\SubLogController::class . ':index');
// 流量记录
$group->get('/traffic', App\Controllers\User\TrafficLogController::class . ':index');
// 账户余额
$group->get('/money', App\Controllers\User\MoneyController::class . ':index');
$group->post('/giftcard', App\Controllers\User\MoneyController::class . ':applyGiftCard');
Expand Down Expand Up @@ -216,9 +218,6 @@
// 返利日志
$group->get('/payback', App\Controllers\Admin\PaybackController::class . ':index');
$group->post('/payback/ajax', App\Controllers\Admin\PaybackController::class . ':ajax');
// 流量日志
$group->get('/traffic', App\Controllers\Admin\TrafficLogController::class . ':index');
$group->post('/traffic/ajax', App\Controllers\Admin\TrafficLogController::class . ':ajax');
// 用户余额日志
$group->get('/money', App\Controllers\Admin\MoneyLogController::class . ':index');
$group->post('/money/ajax', App\Controllers\Admin\MoneyLogController::class . ':ajax');
Expand Down
116 changes: 58 additions & 58 deletions composer.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 0 additions & 5 deletions config/.config.example.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,6 @@
$_ENV['mail_filter_list'] = [];

//已注册用户设置---------------------------------------------------------------------------------------
#基础
$_ENV['enable_checkin'] = true; //是否啓用簽到功能
$_ENV['checkinMin'] = 1; //用户签到最少流量 单位MB
$_ENV['checkinMax'] = 50; //用户签到最多流量

#高级
$_ENV['class_expire_reset_traffic'] = 0; //等级到期时重置为的流量值，单位GB，小于0时不重置
$_ENV['enable_kill'] = true; //是否允许用户注销账户
Expand Down
Loading
Loading