Merge pull request #2342 from SSPanel-UIM/dev

Dev 20240123-1

config/settings.json

@@ -1191,57 +1191,57 @@
     },
     {
         "id": null,
-        "item": "sign_up_for_free_traffic",
+        "item": "reg_traffic",
         "value": "0",
         "class": "reg",
         "is_public": 0,
         "type": "int",
         "default": "0",
-        "mark": "注册时赠送的流量（GB）"
+        "mark": "注册流量（GB）"
     },
     {
         "id": null,
-        "item": "connection_ip_limit",
+        "item": "reg_ip_limit",
         "value": "0",
         "class": "reg",
         "is_public": 0,
         "type": "int",
         "default": "0",
-        "mark": "注册时设定的连接 IP 限制"
+        "mark": "注册连接 IP 限制"
     },
     {
         "id": null,
-        "item": "connection_rate_limit",
+        "item": "reg_speed_limit",
         "value": "0",
         "class": "reg",
         "is_public": 0,
         "type": "int",
         "default": "0",
-        "mark": "注册时设定的使用速率限制"
+        "mark": "注册速率限制"
     },
     {
         "id": null,
-        "item": "sign_up_for_class",
+        "item": "reg_class",
         "value": "0",
         "class": "reg",
         "is_public": 0,
         "type": "int",
         "default": "0",
-        "mark": "注册时设定的等级"
+        "mark": "注册等级"
     },
     {
         "id": null,
-        "item": "sign_up_for_class_time",
-        "value": "7",
+        "item": "reg_class_time",
+        "value": "0",
         "class": "reg",
         "is_public": 0,
         "type": "int",
-        "default": "7",
-        "mark": "注册时设定的等级过期时间（天）"
+        "default": "0",
+        "mark": "注册等级过期时间（天）"
     },
     {
         "id": null,
-        "item": "sign_up_for_method",
+        "item": "reg_method",
         "value": "aes-128-gcm",
         "class": "reg",
         "is_public": 0,
@@ -1251,23 +1251,13 @@
     },
     {
         "id": null,
-        "item": "sign_up_for_daily_report",
+        "item": "reg_daily_report",
         "value": "0",
         "class": "reg",
         "is_public": 0,
         "type": "bool",
         "default": "0",
-        "mark": "注册后是否默认接收每日用量邮件推送"
-    },
-    {
-        "id": null,
-        "item": "sign_up_for_invitation_codes",
-        "value": "10",
-        "class": "reg",
-        "is_public": 0,
-        "type": "int",
-        "default": "10",
-        "mark": "初始邀请注册链接使用次数限制"
+        "mark": "是否默认接收每日用量邮件推送"
     },
     {
         "id": null,

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

@@ -80,13 +80,13 @@
                                         <div class="form-group mb-3 row">
                                             <label class="form-label col-3 col-form-label">默认接收每日用量邮件推送</label>
                                             <div class="col">
-                                                <select id="sign_up_for_daily_report" class="col form-select"
-                                                        value="{$settings['sign_up_for_daily_report']}">
+                                                <select id="reg_daily_report" class="col form-select"
+                                                        value="{$settings['reg_daily_report']}">
                                                     <option value="0"
-                                                            {if ! $settings['sign_up_for_daily_report']}selected{/if}>关闭
+                                                            {if ! $settings['reg_daily_report']}selected{/if}>关闭
                                                     </option>
                                                     <option value="1"
-                                                            {if $settings['sign_up_for_daily_report']}selected{/if}>开启
+                                                            {if $settings['reg_daily_report']}selected{/if}>开启
                                                     </option>
                                                 </select>
                                             </div>
@@ -121,8 +121,8 @@
                                         <div class="form-group mb-3 row">
                                             <label class="form-label col-3 col-form-label">注册时赠送的流量（GB）</label>
                                             <div class="col">
-                                                <input id="sign_up_for_free_traffic" type="text" class="form-control"
-                                                       value="{$settings['sign_up_for_free_traffic']}">
+                                                <input id="reg_traffic" type="text" class="form-control"
+                                                       value="{$settings['reg_traffic']}">
                                             </div>
                                         </div>
                                         <div class="form-group mb-3 row">
@@ -142,50 +142,42 @@
                                             </div>
                                         </div>
                                         <div class="form-group mb-3 row">
-                                            <label class="form-label col-3 col-form-label">注册时设定的等级</label>
+                                            <label class="form-label col-3 col-form-label">注册等级</label>
                                             <div class="col">
-                                                <input id="sign_up_for_class" type="text" class="form-control"
-                                                       value="{$settings['sign_up_for_class']}">
+                                                <input id="reg_class" type="text" class="form-control"
+                                                       value="{$settings['reg_class']}">
                                             </div>
                                         </div>
                                         <div class="form-group mb-3 row">
-                                            <label class="form-label col-3 col-form-label">注册时设定的等级过期时间（天）</label>
+                                            <label class="form-label col-3 col-form-label">注册等级过期时间（天）</label>
                                             <div class="col">
-                                                <input id="sign_up_for_class_time" type="text" class="form-control"
-                                                       value="{$settings['sign_up_for_class_time']}">
+                                                <input id="reg_class_time" type="text" class="form-control"
+                                                       value="{$settings['reg_class_time']}">
                                             </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_method" type="text" class="form-control"
-                                                       value="{$settings['sign_up_for_method']}">
+                                                <input id="reg_method" type="text" class="form-control"
+                                                       value="{$settings['reg_method']}">
                                             </div>
                                         </div>
                                     </div>
                                 </div>
                                 <div class="tab-pane" id="limit">
                                     <div class="card-body">
-                                        <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_invitation_codes" type="text"
-                                                       class="form-control"
-                                                       value="{$settings['sign_up_for_invitation_codes']}">
-                                            </div>
-                                        </div>
                                         <div class="form-group mb-3 row">
                                             <label class="form-label col-3 col-form-label">连接 IP 限制</label>
                                             <div class="col">
-                                                <input id="connection_ip_limit" type="text" class="form-control"
-                                                       value="{$settings['connection_ip_limit']}">
+                                                <input id="reg_ip_limit" type="text" class="form-control"
+                                                       value="{$settings['reg_ip_limit']}">
                                             </div>
                                         </div>
                                         <div class="form-group mb-3 row">
                                             <label class="form-label col-3 col-form-label">使用速率限制</label>
                                             <div class="col">
-                                                <input id="connection_rate_limit" type="text" class="form-control"
-                                                       value="{$settings['connection_rate_limit']}">
+                                                <input id="reg_speed_limit" type="text" class="form-control"
+                                                       value="{$settings['reg_speed_limit']}">
                                             </div>
                                         </div>
                                         <div class="form-group mb-3 row">

resources/views/tabler/user/invite.tpl

@@ -25,8 +25,7 @@
                                 <div class="card-body">
                                     <h3 class="card-title">邀请规则</h3>
                                     <ul>
-                                        <li>邀请注册的用户在账单确认后，你可获得其账单金额的 <code>{$rebate_ratio_per}
-                                                %</code>
+                                        <li>邀请注册的用户在账单确认后，你可获得其账单金额的 <code>{$invite_reward_rate}%</code>
                                             作为返利
                                         </li>
                                         <li>部分商品的返利比例可能不遵循上面的比例</li>

src/Controllers/Admin/Setting/RegController.php

@@ -13,19 +13,18 @@ final class RegController extends BaseController
     private static array $update_field = [
         'reg_mode',
         'reg_email_verify',
-        'sign_up_for_daily_report',
+        'reg_daily_report',
         'random_group',
         'min_port',
         'max_port',
-        'sign_up_for_free_traffic',
+        'reg_traffic',
         'free_user_reset_day',
         'free_user_reset_bandwidth',
-        'sign_up_for_class',
-        'sign_up_for_class_time',
-        'sign_up_for_method',
-        'sign_up_for_invitation_codes',
-        'connection_ip_limit',
-        'connection_rate_limit',
+        'reg_class',
+        'reg_class_time',
+        'reg_method',
+        'reg_ip_limit',
+        'reg_speed_limit',
         'reg_forbidden_ip',
         'reg_forbidden_port',
     ];

src/Controllers/AuthController.php

@@ -239,15 +239,15 @@ final class AuthController extends BaseController
         $user->port = Tools::getSsPort();
         $user->u = 0;
         $user->d = 0;
-        $user->method = $configs['sign_up_for_method'];
+        $user->method = $configs['reg_method'];
         $user->forbidden_ip = Config::obtain('reg_forbidden_ip');
         $user->forbidden_port = Config::obtain('reg_forbidden_port');
         $user->im_type = $imtype;
         $user->im_value = $imvalue;
-        $user->transfer_enable = Tools::toGB($configs['sign_up_for_free_traffic']);
+        $user->transfer_enable = Tools::toGB($configs['reg_traffic']);
         $user->auto_reset_day = Config::obtain('free_user_reset_day');
         $user->auto_reset_bandwidth = Config::obtain('free_user_reset_bandwidth');
-        $user->daily_mail_enable = $configs['sign_up_for_daily_report'];
+        $user->daily_mail_enable = $configs['reg_daily_report'];
 
         if ($money > 0) {
             $user->money = $money;
@@ -267,10 +267,10 @@ final class AuthController extends BaseController
 
         $user->ga_token = MFA::generateGaToken();
         $user->ga_enable = 0;
-        $user->class_expire = date('Y-m-d H:i:s', time() + (int) $configs['sign_up_for_class_time'] * 86400);
-        $user->class = $configs['sign_up_for_class'];
-        $user->node_iplimit = $configs['connection_ip_limit'];
-        $user->node_speedlimit = $configs['connection_rate_limit'];
+        $user->class = $configs['reg_class'];
+        $user->class_expire = date('Y-m-d H:i:s', time() + (int) $configs['reg_class_time'] * 86400);
+        $user->node_iplimit = $configs['reg_ip_limit'];
+        $user->node_speedlimit = $configs['reg_speed_limit'];
         $user->reg_date = date('Y-m-d H:i:s');
         $user->reg_ip = $_SERVER['REMOTE_ADDR'];
         $user->theme = $_ENV['theme'];

src/Controllers/UserController.php

@@ -125,14 +125,16 @@ final class UserController extends BaseController
         }
 
         $invite_url = $_ENV['baseUrl'] . '/auth/register?code=' . $code;
-        $rebate_ratio_per = Config::obtain('rebate_ratio') * 100;
-
-        return $response->write($this->view()
-            ->assign('paybacks', $paybacks)
-            ->assign('invite_url', $invite_url)
-            ->assign('paybacks_sum', $paybacks_sum)
-            ->assign('rebate_ratio_per', $rebate_ratio_per)
-            ->fetch('user/invite.tpl'));
+        $invite_reward_rate = Config::obtain('invite_reward_rate') * 100;
+
+        return $response->write(
+            $this->view()
+                ->assign('paybacks', $paybacks)
+                ->assign('invite_url', $invite_url)
+                ->assign('paybacks_sum', $paybacks_sum)
+                ->assign('invite_reward_rate', $invite_reward_rate)
+                ->fetch('user/invite.tpl')
+        );
     }
 
     public function checkin(ServerRequest $request, Response $response, array $args): Response|ResponseInterface
@@ -186,9 +188,11 @@ final class UserController extends BaseController
     {
         $user = $this->user;
 
-        return $response->write($this->view()
-            ->assign('banned_reason', $user->banned_reason)
-            ->fetch('user/banned.tpl'));
+        return $response->write(
+            $this->view()
+                ->assign('banned_reason', $user->banned_reason)
+                ->fetch('user/banned.tpl')
+        );
     }
 
     public function logout(ServerRequest $request, Response $response, array $args): Response

src/Services/Bot/Telegram/Callback.php

@@ -893,7 +893,7 @@ final class Callback
             '<strong>你每邀请 <code>1</code> 位用户注册：</strong>',
             '',
             '- 你会获得 <code>' . Config::obtain('invite_reg_money_reward') . 'G</code> 流量奖励。',
-            '- 对方将获得 <code>' . Config::obtain('invite_reg_traffic_reward') . ' 元</code> 初始账户余额。',
+            '- 对方将获得 <code>' . Config::obtain('invite_reg_traffic_reward') . '元</code> 初始账户余额。',
             '- 对方支付账单时你会获得对方账单金额的 <code>' . Config::obtain('invite_reward_rate') * 100 . '%</code> 的返利。',
             '',
             '已获得返利：' . $paybacks_sum . ' 元。',

src/Services/Reward.php

@@ -8,6 +8,7 @@ use App\Models\Config;
 use App\Models\Payback;
 use App\Models\User;
 use App\Models\UserMoneyLog;
+use App\Utils\Tools;
 
 final class Reward
 {