disconnect_ip table clean up

sql/glzjin_all.sql

@@ -367,15 +367,7 @@ ALTER TABLE `ss_node`
 ALTER TABLE `user`
   ADD `protocol` VARCHAR(128) NOT NULL DEFAULT 'origin' AFTER `relay_info`, ADD `protocol_param` VARCHAR(128) NULL DEFAULT NULL AFTER `protocol`, ADD `obfs` VARCHAR(128) NOT NULL DEFAULT 'plain' AFTER `protocol_param`, ADD `obfs_param` VARCHAR(128) NULL DEFAULT NULL AFTER `obfs`;
 ALTER TABLE `user`
-  ADD `forbidden_ip` varchar(182) NULL DEFAULT '' AFTER `obfs_param`, ADD `forbidden_port` LONGTEXT NULL DEFAULT '' AFTER `forbidden_ip`, ADD `disconnect_ip` varchar(182) NULL DEFAULT '' AFTER `forbidden_port`;
-
-CREATE TABLE IF NOT EXISTS `disconnect_ip` (
-  `id`       BIGINT       NOT NULL AUTO_INCREMENT,
-  `userid`   BIGINT       NOT NULL,
-  `ip`       varchar(182) NOT NULL,
-  `datetime` BIGINT       NOT NULL,
-  PRIMARY KEY (`id`)
-) ENGINE = InnoDB CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+  ADD `forbidden_ip` varchar(182) NULL DEFAULT '' AFTER `obfs_param`, ADD `forbidden_port` LONGTEXT NULL DEFAULT '' AFTER `forbidden_ip`;
 
 ALTER TABLE `user`
   CHANGE `node_speedlimit` `node_speedlimit` DECIMAL(12,2) NOT NULL DEFAULT '0.00';
@@ -397,7 +389,7 @@ CREATE TABLE IF NOT EXISTS `email_verify` (
 ) ENGINE = InnoDB CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
 
 ALTER TABLE `user`
-  ADD `is_hide` INT NOT NULL DEFAULT '0' AFTER `disconnect_ip`;
+  ADD `is_hide` INT NOT NULL DEFAULT '0' AFTER `obfs_param`;
 
 CREATE TABLE IF NOT EXISTS `detect_list` (
   `id`    BIGINT   NOT NULL AUTO_INCREMENT,

src/Command/Backup.php

@@ -43,7 +43,7 @@ class Backup extends Command
             system('mysqldump --user=' . $_ENV['db_username'] . ' --password=' . $_ENV['db_password'] . ' --host=' . $db_address_array[0] . ' ' . (isset($db_address_array[1]) ? '-P ' . $db_address_array[1] : '') . ' ' . $_ENV['db_database'] . ' > /tmp/ssmodbackup/mod.sql');
         } else {
             system(
-                'mysqldump --user=' . $_ENV['db_username'] . ' --password=' . $_ENV['db_password'] . ' --host=' . $db_address_array[0] . ' ' . (isset($db_address_array[1]) ? '-P ' . $db_address_array[1] : '') . ' ' . $_ENV['db_database'] . ' announcement auto blockip bought code coupon disconnect_ip link login_ip payback shop speedtest ss_invite_code ss_node ss_password_reset ticket unblockip user user_token email_verify detect_list relay paylist> /tmp/ssmodbackup/mod.sql',
+                'mysqldump --user=' . $_ENV['db_username'] . ' --password=' . $_ENV['db_password'] . ' --host=' . $db_address_array[0] . ' ' . (isset($db_address_array[1]) ? '-P ' . $db_address_array[1] : '') . ' ' . $_ENV['db_database'] . ' announcement auto blockip bought code coupon link login_ip payback shop speedtest ss_invite_code ss_node ss_password_reset ticket unblockip user user_token email_verify detect_list relay paylist> /tmp/ssmodbackup/mod.sql',
                 $ret
             );
             system(

src/Controllers/Mod_Mu/UserController.php

@@ -97,7 +97,9 @@ class UserController extends BaseController
         );
 
         foreach ($users_raw as $user_raw) {
-            $user_raw->alive_ip = (new \App\Models\Ip)->getUserAliveIpCount($user_raw->id);
+            if ($user_raw->node_connector != 0) {
+                $user_raw->alive_ip = (new \App\Models\Ip)->getUserAliveIpCount($user_raw->id);
+            }
             if ($user_raw->transfer_enable <= $user_raw->u + $user_raw->d) {
                 if ($_ENV['keep_connect'] === true) {
                     // 流量耗尽用户限速至 1Mbps

src/Models/Disconnect.php

@@ -1,12 +0,0 @@
-<?php
-
-namespace App\Models;
-
-/**
- * Disconnect Model
- */
-class Disconnect extends Model
-{
-    protected $connection = 'default';
-    protected $table = 'disconnect_ip';
-}