Changes

app/Components/Helpers.php

@@ -69,19 +69,19 @@ class Helpers
      */
     public static function addUser(string $email, string $password, int $transfer_enable, int $date = null, int $inviter_id = null, string $username = null): User
     {
-//        //判断端口是否重复
-        while (true){
-            $port = self::getPort();
-            if ($port == 37886){
-                continue;
-            }
-            $retcount = User::where('port', $port)->count();
-            if ($retcount > 0){
-                continue;
-            } else {
-                break;
-            }
-        }
+////        //判断端口是否重复
+//        while (true){
+//            $port = self::getPort();
+//            if ($port == 37886){
+//                continue;
+//            }
+//            $retcount = User::where('port', $port)->count();
+//            if ($retcount > 0){
+//                continue;
+//            } else {
+//                break;
+//            }
+//        }
 
         return User::create([
             'username'        => $username ?? $email,

app/Components/IP.php

@@ -19,12 +19,12 @@ class IP
     {
         // IPv6 推荐使用ip.sb
         if (filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) {
-            Log::info('识别到IPv6，尝试解析：'.$ip);
+//            Log::info('识别到IPv6，尝试解析：'.$ip);
             $ipInfo = self::IPSB($ip);
         } else {
             $ipInfo = self::ip2Region($ip);
             if (! $ipInfo) {
-                Log::info('无法识别，尝试使用【IPIP库】库解析：'.$ip);
+//                Log::info('无法识别，尝试使用【IPIP库】库解析：'.$ip);
                 $ipInfo = self::ip2Location($ip);
             }
         }
@@ -41,7 +41,7 @@ class IP
             return $response->json();
         }
 
-        Log::warning('解析IPv6异常：'.$ip);
+       // Log::warning('解析IPv6异常：'.$ip);
 
         return false;
     }

app/Console/Commands/AutoJob.php

@@ -25,33 +25,33 @@ class AutoJob extends Command
     {
         $jobStartTime = microtime(true);
 
-        // 关闭超时未支付本地订单
-        Order::query()->recentUnPay()->update(['status' => -1]);
-
-        //过期验证码、优惠券、邀请码无效化
-        $this->expireCode();
-
-        // 封禁访问异常的订阅链接
-        $this->blockSubscribe();
-
-        // 封禁账号
+//        // 关闭超时未支付本地订单
+          Order::query()->recentUnPay()->update(['status' => -1]);
+//
+//        //过期验证码、优惠券、邀请码无效化
+         //$this->expireCode();
+//
+//        // 封禁访问异常的订阅链接
+//        $this->blockSubscribe();
+//
+//        // 封禁账号
         $this->blockUsers();
-
-        // 解封被封禁的账号
+//
+//        // 解封被封禁的账号
         $this->unblockUsers();
-
-       // $this->checkNodeWeihu();
-
-        // 端口回收与分配
+//
+//       // $this->checkNodeWeihu();
+//
+//        // 端口回收与分配
         if (sysConfig('auto_release_port')) {
             $this->dispatchPort();
         }
-
-        // 检查维护模式
-        if (sysConfig('maintenance_mode') && sysConfig('maintenance_time') && sysConfig('maintenance_time') <= date('c')) {
-            Config::whereIn('name', ['maintenance_mode', 'maintenance_content', 'maintenance_time'])->update(['value' => null]);
-        }
-
+//
+//        // 检查维护模式
+//        if (sysConfig('maintenance_mode') && sysConfig('maintenance_time') && sysConfig('maintenance_time') <= date('c')) {
+//            Config::whereIn('name', ['maintenance_mode', 'maintenance_content', 'maintenance_time'])->update(['value' => null]);
+//        }
+//
         $jobEndTime = microtime(true);
         $jobUsedTime = round(($jobEndTime - $jobStartTime), 4);
 
@@ -151,6 +151,9 @@ class AutoJob extends Command
             ->where('expired_at', '>=', date('Y-m-d H:i:s'))
             ->whereRaw('u + d < transfer_enable')
             ->get();
+        Log::info('--------------');
+        Log::info('查询数据封禁的账号--------：'.var_export($userList,true));
+        Log::info('--------------');
         foreach ($userList as $user) {
             $user->update(['enable' => 1]);
 
@@ -163,9 +166,9 @@ class AutoJob extends Command
     private function dispatchPort(): void
     {
         // 自动分配端口
-        User::activeUser()->wherePort(0)->get()->each(function ($user) {
-            $user->update(['port' => Helpers::getPort()]);
-        });
+//        User::activeUser()->wherePort(0)->get()->each(function ($user) {
+//            $user->update(['port' => Helpers::getPort()]);
+//        });
 
         // 被封禁 / 过期一个月 的账号自动释放端口
         User::where('port', '<>', 0)
@@ -174,21 +177,4 @@ class AutoJob extends Command
             ->update(['port' => 0]);
     }
 
-
-    private  function checkNodeWeihu(): void{
-        $query = Node::with(['onlineLogs', 'dailyDataFlows']);
-        $nodeList = $query->where("country_code","=","hk");
-        foreach ($nodeList as $node) {
-            // 在线人数
-            $online_log = $node->onlineLogs()->where('log_time', '>=', strtotime('-5 minutes'))->latest('log_time')->first();
-            $node->online_users = $online_log->online_user ?? 0;
-            if ($online_log->online_user < 10){
-
-            } else {
-
-            }
-        }
-
-
-    }
 }

app/Console/Kernel.php

@@ -54,7 +54,7 @@ class Kernel extends ConsoleKernel
         $schedule->command('autoJob')->everyMinute();
         $schedule->command('serviceTimer')->everyTenMinutes();
         $schedule->command('autoClearLog')->everyThirtyMinutes();
-        $schedule->command('nodeStatusDetection')->everyTenMinutes();
+//        $schedule->command('nodeStatusDetection')->everyTenMinutes();
         $schedule->command('autoStatisticsNodeHourlyTraffic')->hourly();
         $schedule->command('autoStatisticsUserHourlyTraffic')->hourly();
         $schedule->command('userTrafficAbnormalAutoWarning')->hourly();

app/Exceptions/Handler.php

@@ -114,8 +114,8 @@ class Handler extends ExceptionHandler
                    // Log::info('异常请求：'.$exception->getMessage());
                     return Response::json(['status' => 'fail', 'message' => $exception->getMessage()], 408);
                 case $exception instanceof NotFoundHttpException: // 捕获访问异常
-                    Log::info('异常请求：'.$request->fullUrl().'，IP：'.IP::getClientIp());
-                    Log::info('异常请求 route：'.$request->route());
+//                    Log::info('异常请求：'.$request->fullUrl().'，IP：'.IP::getClientIp());
+//                    Log::info('异常请求 route：'.$request->route());
 
                     if (strpos($request->fullUrl(),"client/v1") != false || strpos($request->fullUrl(),"client/v2") != false || strpos($request->fullUrl(),"client/v3") != false ){
                         return Response::json([

app/Services/OrderService.php

@@ -132,8 +132,15 @@ class OrderService
         if ($nextResetTime >= self::$user->expired_at) {
             $nextResetTime = null;
         }
+        //用户的 剩余流量
+        $totalTransfer = self::$user->transfer_enable;
+        $usedTransfer = self::$user->u + self::$user->d;
+        $unusedTraffic = max($totalTransfer - $usedTransfer, 0);
+        $googstraffic = self::$goods->traffic * MB;
+        // 套餐流量加上剩余流量
+        $countt = $googstraffic + $unusedTraffic;
 
-        $countt = self::$goods->traffic * MB;
+        Log::info('用户购买'.self::$user->email.'到期时间'.self::$user->expired_at."流量".flowAutoShow($countt)."剩余流量".flowAutoShow($unusedTraffic));
 
         $updateData = [
             'invite_num' => self::$user->invite_num + (self::$goods->invite_num ?: 0),
@@ -148,7 +155,7 @@ class OrderService
 
         // 无端口用户 添加端口
         if (self::$user->port === null || self::$user->port === 0) {
-            $updateData['port'] = Helpers::getPort();
+            $updateData['port'] = 0;
         }
 
         $ret = self::$user->update($updateData);