feat: remove user account expire_in

composer.lock

@@ -123,16 +123,16 @@
         },
         {
             "name": "aws/aws-sdk-php",
-            "version": "3.279.1",
+            "version": "3.279.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "73ca831b1311945e96594b3cdf2b973bc733d57a"
+                "reference": "ebd5e47c5be0425bb5cf4f80737850ed74767107"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/73ca831b1311945e96594b3cdf2b973bc733d57a",
-                "reference": "73ca831b1311945e96594b3cdf2b973bc733d57a",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/ebd5e47c5be0425bb5cf4f80737850ed74767107",
+                "reference": "ebd5e47c5be0425bb5cf4f80737850ed74767107",
                 "shasum": ""
             },
             "require": {
@@ -212,9 +212,9 @@
             "support": {
                 "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80",
                 "issues": "https://github.com/aws/aws-sdk-php/issues",
-                "source": "https://github.com/aws/aws-sdk-php/tree/3.279.1"
+                "source": "https://github.com/aws/aws-sdk-php/tree/3.279.2"
             },
-            "time": "2023-08-17T18:14:41+00:00"
+            "time": "2023-08-18T18:13:09+00:00"
         },
         {
             "name": "bacon/bacon-qr-code",

config/settings.json

@@ -1202,23 +1202,13 @@
     {
         "id": null,
         "item": "sign_up_for_free_traffic",
-        "value": "20",
+        "value": "0",
         "class": "register",
         "is_public": 0,
         "type": "int",
-        "default": "20",
+        "default": "0",
         "mark": "注册时赠送的流量（GB）"
     },
-    {
-        "id": null,
-        "item": "sign_up_for_free_time",
-        "value": "365",
-        "class": "register",
-        "is_public": 0,
-        "type": "int",
-        "default": "365",
-        "mark": "注册时设定的账户有效期（天）"
-    },
     {
         "id": null,
         "item": "connection_ip_limit",

db/migrations/2023020100-init.php

@@ -291,7 +291,6 @@ return new class() implements MigrationInterface {
                 `daily_mail_enable` tinyint(1) NOT NULL DEFAULT 0 COMMENT '每日报告开关',
                 `class` smallint(5) unsigned NOT NULL DEFAULT 0 COMMENT '等级',
                 `class_expire` datetime NOT NULL DEFAULT '1989-06-04 00:05:00' COMMENT '等级过期时间',
-                `expire_in` datetime NOT NULL DEFAULT '2199-01-01 00:00:00' COMMENT '账户过期时间',
                 `theme` varchar(255) NOT NULL DEFAULT 'tabler' COMMENT '网站主题',
                 `ga_token` varchar(255) NOT NULL DEFAULT '' COMMENT 'GA密钥',
                 `ga_enable` tinyint(1) unsigned NOT NULL DEFAULT 0 COMMENT 'GA开关',
@@ -300,7 +299,6 @@ return new class() implements MigrationInterface {
                 `is_banned` tinyint(1) unsigned NOT NULL DEFAULT 0 COMMENT '是否封禁',
                 `banned_reason` varchar(255) NOT NULL DEFAULT '' COMMENT '封禁理由',
                 `is_shadow_banned` tinyint(1) unsigned NOT NULL DEFAULT 0 COMMENT '是否处于账户异常状态',
-                `telegram_id` bigint(20) unsigned NOT NULL DEFAULT 0 COMMENT 'Telegram ID',
                 `expire_notified` tinyint(1) unsigned NOT NULL DEFAULT 0 COMMENT '过期提醒',
                 `traffic_notified` tinyint(1) unsigned NOT NULL DEFAULT 0 COMMENT '流量提醒',
                 `forbidden_ip` varchar(255) NOT NULL DEFAULT '' COMMENT '禁止访问IP',

db/migrations/2023060300-add_user_locale_and_update_data_type.php

@@ -34,7 +34,6 @@ return new class() implements MigrationInterface {
         ALTER TABLE user MODIFY COLUMN `im_value` varchar(255) NOT NULL DEFAULT '' COMMENT '联系方式';
         ALTER TABLE user MODIFY COLUMN `class` smallint(6) unsigned NOT NULL DEFAULT 0 COMMENT '等级';
         ALTER TABLE user MODIFY COLUMN `class_expire` datetime NOT NULL DEFAULT '1989-06-04 00:05:00' COMMENT '等级过期时间';
-        ALTER TABLE user MODIFY COLUMN `expire_in` datetime NOT NULL DEFAULT '2199-01-01 00:00:00' COMMENT '账户过期时间';
         ALTER TABLE user MODIFY COLUMN `theme` varchar(255) NOT NULL DEFAULT 'tabler' COMMENT '网站主题';
         ALTER TABLE user MODIFY COLUMN `ga_token` varchar(255) NOT NULL DEFAULT '' COMMENT 'GA密钥';
         ALTER TABLE user MODIFY COLUMN `ga_enable` tinyint(1) unsigned NOT NULL DEFAULT 0 COMMENT 'GA开关';
@@ -42,7 +41,6 @@ return new class() implements MigrationInterface {
         ALTER TABLE user MODIFY COLUMN `node_group` smallint(6) unsigned NOT NULL DEFAULT 0 COMMENT '节点分组';
         ALTER TABLE user MODIFY COLUMN `is_banned` tinyint(1) unsigned NOT NULL DEFAULT 0 COMMENT '是否封禁';
         ALTER TABLE user MODIFY COLUMN `banned_reason` varchar(255) NOT NULL DEFAULT '' COMMENT '封禁理由';
-        UPDATE user SET telegram_id = 0 WHERE telegram_id IS NULL;
         ALTER TABLE user MODIFY COLUMN `telegram_id` bigint(20) unsigned NOT NULL DEFAULT 0 COMMENT 'Telegram ID';
         ALTER TABLE user MODIFY COLUMN `expire_notified` tinyint(1) unsigned NOT NULL DEFAULT 0 COMMENT '过期提醒';
         ALTER TABLE user MODIFY COLUMN `traffic_notified` tinyint(1) unsigned NOT NULL DEFAULT 0 COMMENT '流量提醒';

db/migrations/2023082000-remove_user_expire_in.php

@@ -0,0 +1,28 @@
+<?php
+
+declare(strict_types=1);
+
+use App\Interfaces\MigrationInterface;
+use App\Services\DB;
+
+return new class() implements MigrationInterface {
+    public function up(): int
+    {
+        DB::getPdo()->exec("
+            ALTER TABLE user DROP COLUMN IF EXISTS `expire_in`;
+            ALTER TABLE user DROP COLUMN IF EXISTS `telegram_id`;
+        ");
+
+        return 2023082000;
+    }
+
+    public function down(): int
+    {
+        DB::getPdo()->exec("
+            ALTER TABLE user ADD COLUMN IF NOT EXISTS `expire_in` datetime NOT NULL DEFAULT '2199-01-01 00:00:00' COMMENT '账户过期时间';
+            ALTER TABLE user ADD COLUMN IF NOT EXISTS `telegram_id` bigint(20) unsigned NOT NULL DEFAULT 0 COMMENT 'Telegram ID';
+        ");
+
+        return 2023081800;
+    }
+};

resources/views/tabler/admin/setting/reg.tpl

@@ -113,12 +113,6 @@
                                         <input id="free_user_reset_bandwidth" type="text" class="form-control" value="{$settings['free_user_reset_bandwidth']}">
                                     </div>
                                 </div>
-                                <div class="form-group mb-3 row">
-                                    <label class="form-label col-3 col-form-label">注册时设定的账户有效期（天）</label>
-                                    <div class="col">
-                                        <input id="sign_up_for_free_time" type="text" class="form-control" value="{$settings['sign_up_for_free_time']}">
-                                    </div>
-                                </div>
                                 <div class="form-group mb-3 row">
                                     <label class="form-label col-3 col-form-label">注册时设定的等级</label>
                                     <div class="col">

resources/views/tabler/admin/user/edit.tpl

@@ -76,13 +76,6 @@
                                         value="{$edit_user->class_expire}">
                                 </div>
                             </div>
-                            <div class="form-group mb-3 row">
-                                <label class="form-label col-4 col-form-label">账户过期时间</label>
-                                <div class="col">
-                                    <input id="expire_in" type="text" class="form-control"
-                                        value="{$edit_user->expire_in}">
-                                </div>
-                            </div>
                             <div class="form-group mb-3 row">
                                 <label class="form-label col-4 col-form-label">免费用户流量重置日</label>
                                 <div class="col">

resources/views/tabler/live_chat.tpl

@@ -30,7 +30,6 @@
                   ["user_id","{$user->id}"],
                   ["user_class","{$user->class}"],
                   ["reg_email","{$user->email}"],
-                  ["expire_in","{$user->expire_in}"],
                   ["class_expire_time","{$user->class_expire}"],
                   ["available_traffic","{$user->unusedTraffic()}"],
                   ["balance","{$user->money}"]
@@ -47,7 +46,6 @@ window.__lc.params = [
     { name: '用户编号', value: '{$user->id}' },
     { name: '用户类别', value: '{$user->class}' },
     { name: '注册邮箱', value: '{$user->email}' },
-    { name: '到期时间', value: '{$user->expire_in}' },
     { name: '等级时间', value: '{$user->class_expire}' },
     { name: '剩余流量', value: '{$user->unusedTraffic()}' },
     { name: '账户余额', value: '{$user->money}' }
@@ -101,4 +99,4 @@ window.__lc.params = [
         ct.parentNode.insertBefore(nt, ct);
     })();
 </script>
-{/if}
+{/if}

src/Command/Tool.php

@@ -330,7 +330,6 @@ EOL;
             $user->invite_num = 0;
             $user->ref_by = 0;
             $user->is_admin = 1;
-            $user->expire_in = date('Y-m-d H:i:s');
             $user->reg_date = date('Y-m-d H:i:s');
             $user->money = 0;
             $user->im_type = 0;

src/Controllers/Admin/Setting/RegController.php

@@ -21,7 +21,6 @@ final class RegController extends BaseController
         'sign_up_for_free_traffic',
         'free_user_reset_day',
         'free_user_reset_bandwidth',
-        'sign_up_for_free_time',
         'sign_up_for_class',
         'sign_up_for_class_time',
         'sign_up_for_method',

src/Controllers/Admin/UserController.php

@@ -79,7 +79,6 @@ final class UserController extends BaseController
         'invite_num',
         'ref_by',
         'class_expire',
-        'expire_in',
         'node_group',
         'class',
         'auto_reset_day',
@@ -197,7 +196,6 @@ final class UserController extends BaseController
         $user->invite_num = $request->getParam('invite_num');
         $user->ref_by = $request->getParam('ref_by');
         $user->class_expire = $request->getParam('class_expire');
-        $user->expire_in = $request->getParam('expire_in');
         $user->node_group = $request->getParam('node_group');
         $user->class = $request->getParam('class');
         $user->auto_reset_day = $request->getParam('auto_reset_day');

src/Controllers/AuthController.php

@@ -287,7 +287,6 @@ final class AuthController extends BaseController
         $user->class = $configs['sign_up_for_class'];
         $user->node_iplimit = $configs['connection_ip_limit'];
         $user->node_speedlimit = $configs['connection_rate_limit'];
-        $user->expire_in = date('Y-m-d H:i:s', time() + (int) $configs['sign_up_for_free_time'] * 86400);
         $user->reg_date = date('Y-m-d H:i:s');
         $user->reg_ip = $_SERVER['REMOTE_ADDR'];
         $user->theme = $_ENV['theme'];

src/Controllers/UserController.php

@@ -152,10 +152,6 @@ final class UserController extends BaseController
             }
         }
 
-        if (strtotime($this->user->expire_in) < time()) {
-            return ResponseHelper::error($response, '没有过期的账户才可以签到');
-        }
-
         $checkin = $this->user->checkin();
 
         if (! $checkin['ok']) {

src/Controllers/WebAPI/UserController.php

@@ -76,7 +76,6 @@ final class UserController extends BaseController
                 ) AS online_log ON online_log.user_id = user.id
             WHERE
                 user.is_banned = 0
-                AND user.expire_in > CURRENT_TIMESTAMP()
                 AND user.class_expire > CURRENT_TIMESTAMP()
                 AND (
                     (

src/Services/Cron.php

@@ -280,10 +280,7 @@ final class Cron
                 $user->transfer_today = 0;
                 $user->transfer_enable = Tools::toGB($content->bandwidth);
                 $user->class = $content->class;
-                $old_expire_in = new DateTime();
                 $old_class_expire = new DateTime();
-                $user->expire_in = $old_expire_in
-                    ->modify('+' . $content->time . ' days')->format('Y-m-d H:i:s');
                 $user->class_expire = $old_class_expire
                     ->modify('+' . $content->class_time . ' days')->format('Y-m-d H:i:s');
                 $user->node_group = $content->node_group;
@@ -365,10 +362,7 @@ final class Cron
                 }
                 // 激活时间包
                 $user->class = $content->class;
-                $old_expire_in = new DateTime($user->expire_in);
                 $old_class_expire = new DateTime($user->class_expire);
-                $user->expire_in = $old_expire_in
-                    ->modify('+' . $content->time . ' days')->format('Y-m-d H:i:s');
                 $user->class_expire = $old_class_expire
                     ->modify('+' . $content->class_time . ' days')->format('Y-m-d H:i:s');
                 $user->node_group = $content->node_group;