| {$value} | - {/foreach} -
|---|
签到可领取
- {if $config['checkinMin'] !== $config['checkinMax']}
+ {if $public_setting['checkin_min'] !== $public_setting['checkin_max']}
- {$config['checkinMin']} MB
+ {$public_setting['checkin_min']} MB
至
- {$config['checkinMax']} MB
+ {$public_setting['checkin_max']} MB
范围内的流量
{else}
- {$config['checkinMin']} MB
+ {$public_setting['checkin_min']} MB
{/if}
diff --git a/resources/views/tabler/user/traffic_log.tpl b/resources/views/tabler/user/traffic_log.tpl new file mode 100644 index 0000000000..925988c336 --- /dev/null +++ b/resources/views/tabler/user/traffic_log.tpl @@ -0,0 +1,132 @@ +{include file='user/header.tpl'} + +
1 位用户注册：',
'',
- '- 你会获得 ' . Config::obtain('invite_reg_money_reward') . 'G 流量奖励。',
- '- 对方将获得 ' . Config::obtain('invite_reg_traffic_reward') . '元 初始账户余额。',
+ '- 你会获得 ' . Config::obtain('invite_reg_traffic_reward') . 'G 流量奖励。',
+ '- 对方将获得 ' . Config::obtain('invite_reg_money_reward') . '元 初始账户余额。',
'- 对方支付账单时你会获得对方账单金额的 ' . Config::obtain('invite_reward_rate') * 100 . '% 的返利。',
'',
'已获得返利：' . $paybacks_sum . ' 元。',
@@ -981,10 +982,20 @@ public function userInvite(): void
*/
public function userCheckin(): void
{
- $checkin = $this->user->checkin();
+ if ($this->user->isAbleToCheckin()) {
+ $traffic = Reward::issueCheckinReward($this->user->id);
+
+ if (! $traffic) {
+ $msg = '签到失败';
+ } else {
+ $msg = '获得了 ' . $traffic . 'MB 流量.';
+ }
+ } else {
+ $msg = '你今天已经签到过了';
+ }
$this->answerCallbackQuery([
- 'text' => $checkin['msg'],
+ 'text' => $msg,
'show_alert' => true,
]);
// 回送信息
@@ -1006,7 +1017,7 @@ public function userCheckin(): void
}
$this->replyWithMessage([
- 'text' => $temp['text'] . PHP_EOL . PHP_EOL . $checkin['msg'],
+ 'text' => $temp['text'] . PHP_EOL . PHP_EOL . $msg,
'reply_to_message_id' => $this->message_id,
'parse_mode' => 'Markdown',
'reply_markup' => json_encode(
diff --git a/src/Services/Bot/Telegram/Commands/CheckinCommand.php b/src/Services/Bot/Telegram/Commands/CheckinCommand.php
index b107aafee7..239f23f2ab 100644
--- a/src/Services/Bot/Telegram/Commands/CheckinCommand.php
+++ b/src/Services/Bot/Telegram/Commands/CheckinCommand.php
@@ -6,6 +6,7 @@
use App\Models\Config;
use App\Services\Bot\Telegram\Message;
+use App\Services\Reward;
use Telegram\Bot\Actions;
use Telegram\Bot\Commands\Command;
@@ -64,11 +65,21 @@ public function handle()
]
);
} else {
- $checkin = $user->checkin();
+ if ($user->isAbleToCheckin()) {
+ $traffic = Reward::issueCheckinReward($this->user->id);
+
+ if (! $traffic) {
+ $msg = '签到失败';
+ } else {
+ $msg = '获得了 ' . $traffic . 'MB 流量.';
+ }
+ } else {
+ $msg = '你今天已经签到过了';
+ }
// 回送信息
$response = $this->replyWithMessage(
[
- 'text' => $checkin['msg'],
+ 'text' => $msg,
'parse_mode' => 'Markdown',
'reply_to_message_id' => $message->getMessageId(),
]
diff --git a/src/Services/Cron.php b/src/Services/Cron.php
index 35f7702bc6..37374ea23b 100644
--- a/src/Services/Cron.php
+++ b/src/Services/Cron.php
@@ -8,6 +8,7 @@
use App\Models\Config;
use App\Models\DetectLog;
use App\Models\EmailQueue;
+use App\Models\HourlyUsage;
use App\Models\Invoice;
use App\Models\Node;
use App\Models\OnlineLog;
@@ -15,7 +16,6 @@
use App\Models\Paylist;
use App\Models\SubscribeLog;
use App\Models\User;
-use App\Models\UserHourlyUsage;
use App\Services\IM\Telegram;
use App\Utils\Tools;
use DateTime;
@@ -34,31 +34,6 @@
final class Cron
{
- public static function addTrafficLog(): void
- {
- $users = User::all();
-
- foreach ($users as $user) {
- $transfer_total = $user->transfer_total;
- $transfer_total_last = (new UserHourlyUsage())->where('user_id', $user->id)->orderBy('id', 'desc')->first();
-
- if ($transfer_total_last === null) {
- $transfer_total_last = 0;
- } else {
- $transfer_total_last = $transfer_total_last->traffic;
- }
-
- $trafficlog = new UserHourlyUsage();
- $trafficlog->user_id = $user->id;
- $trafficlog->traffic = $transfer_total;
- $trafficlog->hourly_usage = $transfer_total - $transfer_total_last;
- $trafficlog->datetime = time();
- $trafficlog->save();
- }
-
- echo Tools::toDateTime(time()) . ' 流量记录处理完成' . PHP_EOL;
- }
-
public static function cleanDb(): void
{
(new SubscribeLog())->where(
@@ -66,7 +41,11 @@ public static function cleanDb(): void
'<',
time() - 86400 * Config::obtain('subscribe_log_retention_days')
)->delete();
- (new UserHourlyUsage())->where('datetime', '<', time() - 86400 * Config::obtain('traffic_log_retention_days'))->delete();
+ (new HourlyUsage())->where(
+ 'date',
+ '<',
+ date('Y-m-d', time() - 86400 * Config::obtain('traffic_log_retention_days'))
+ )->delete();
(new DetectLog())->where('datetime', '<', time() - 86400 * 3)->delete();
(new EmailQueue())->where('time', '<', time() - 86400)->delete();
(new OnlineLog())->where('last_time', '<', time() - 86400)->delete();
@@ -430,7 +409,8 @@ public static function resetTodayTraffic(): void
public static function resetFreeUserTraffic(): void
{
- $freeUsers = (new User())->where('class', 0)->where('auto_reset_day', date('d'))->get();
+ $freeUsers = (new User())->where('class', 0)
+ ->where('auto_reset_day', date('d'))->get();
foreach ($freeUsers as $user) {
try {
@@ -455,7 +435,8 @@ public static function resetFreeUserTraffic(): void
public static function sendDailyFinanceMail(): void
{
$today = strtotime('00:00:00');
- $paylists = (new Paylist())->where('status', 1)->whereBetween('datetime', [strtotime('-1 day', $today), $today])->get();
+ $paylists = (new Paylist())->where('status', 1)
+ ->whereBetween('datetime', [strtotime('-1 day', $today), $today])->get();
$text_html = '| 金额 | 用户ID | 用户名 | 充值时间 | '; foreach ($paylists as $paylist) { diff --git a/src/Services/Gateway/AopF2F.php b/src/Services/Gateway/AopF2F.php index 734cc21a15..fef069984b 100644 --- a/src/Services/Gateway/AopF2F.php +++ b/src/Services/Gateway/AopF2F.php @@ -98,17 +98,11 @@ public function notify($request, $response, $args): ResponseInterface if ($aliResponse->isPaid()) { $this->postPayment($pid); - - return $response->withJson([ - 'ret' => 1, - 'msg' => '支付成功', - ]); + // https://opendocs.alipay.com/open/194/103296#%E5%BC%82%E6%AD%A5%E9%80%9A%E7%9F%A5%E7%89%B9%E6%80%A7 + return $response->write('success'); } - return $response->withJson([ - 'ret' => 0, - 'msg' => '支付失败', - ]); + return $response->write('failed'); } /** diff --git a/src/Services/Gateway/Base.php b/src/Services/Gateway/Base.php index 78acc26f53..dcf740aba7 100644 --- a/src/Services/Gateway/Base.php +++ b/src/Services/Gateway/Base.php @@ -80,7 +80,7 @@ public function postPayment($trade_no): void $user = (new User())->find($paylist?->userid); // 返利 - if ($user !== null && $user->ref_by > 0 && Config::obtain('invitation_mode') === 'reward') { + if ($user !== null && $user->ref_by > 0 && Config::obtain('invite_mode') === 'reward') { Reward::issuePaybackReward($user->id, $user->ref_by, $paylist->total, $paylist->invoice_id); } } @@ -104,9 +104,11 @@ protected static function getActiveGateway($key): bool { $payment_gateways = (new Config())->where('item', 'payment_gateway')->first(); $active_gateways = json_decode($payment_gateways->value); + if (in_array($key, $active_gateways)) { return true; } + return false; } } diff --git a/src/Services/Reward.php b/src/Services/Reward.php index c8994411b6..110fde884d 100644 --- a/src/Services/Reward.php +++ b/src/Services/Reward.php @@ -9,6 +9,9 @@ use App\Models\User; use App\Models\UserMoneyLog; use App\Utils\Tools; +use Exception; +use function random_int; +use function time; final class Reward { @@ -114,4 +117,34 @@ public static function issueRegReward($user_id, $ref_user_id): void } } } + + public static function issueCheckinReward($user_id): int|false + { + $user = (new User())->where('id', $user_id)->first(); + + if ($user === null) { + return false; + } + + $checkin_min = Config::obtain('checkin_min'); + $checkin_max = Config::obtain('checkin_max'); + + if ($checkin_min === $checkin_max) { + $traffic = $checkin_min; + } else { + try { + $traffic = random_int($checkin_min, $checkin_max); + } catch (Exception $e) { + $traffic = 0; + } + } + + if ($traffic !== 0) { + $user->transfer_enable += Tools::toMB($traffic); + $user->last_check_in_time = time(); + $user->save(); + } + + return $traffic; + } } diff --git a/src/Services/View.php b/src/Services/View.php index 89a9521169..283b319c76 100755 --- a/src/Services/View.php +++ b/src/Services/View.php @@ -63,10 +63,6 @@ public static function getConfig(): array 'appName' => $_ENV['appName'], 'baseUrl' => $_ENV['baseUrl'], - 'enable_checkin' => $_ENV['enable_checkin'], - 'checkinMin' => $_ENV['checkinMin'], - 'checkinMax' => $_ENV['checkinMax'], - 'jump_delay' => $_ENV['jump_delay'], 'enable_kill' => $_ENV['enable_kill'], diff --git a/src/Utils/Tools.php b/src/Utils/Tools.php index 6d715b473b..ce34c30f15 100644 --- a/src/Utils/Tools.php +++ b/src/Utils/Tools.php @@ -189,9 +189,9 @@ public static function toGB($traffic): int * * @return float */ - public static function flowToGB($traffic): float + public static function flowToMB($traffic): float { - return round($traffic / 1073741824, 2); + return round($traffic / 1048576, 2); } /** @@ -199,9 +199,9 @@ public static function flowToGB($traffic): float * * @return float */ - public static function flowToMB($traffic): float + public static function flowToGB($traffic): float { - return round($traffic / 1048576, 2); + return round($traffic / 1073741824, 2); } public static function genSubToken(): string