From ac38036f8e03daa4ea6d79d878327860027746f8 Mon Sep 17 00:00:00 2001 From: wyx2685 Date: Sat, 14 Oct 2023 18:32:15 +0900 Subject: [PATCH 1/4] =?UTF-8?q?=E6=B5=8B=E8=AF=95=EF=BC=9A=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E8=AE=BE=E5=A4=87=E6=95=B0=E9=99=90=E5=88=B6=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/V1/Admin/PlanController.php | 1 + .../Controllers/V1/Admin/UserController.php | 7 ++- .../V1/Passport/AuthController.php | 1 + .../V1/Server/UniProxyController.php | 49 +++++++++++++++++++ .../Controllers/V1/User/UserController.php | 2 + app/Http/Requests/Admin/PlanSave.php | 2 + app/Http/Requests/Admin/UserFetch.php | 2 +- app/Http/Requests/Admin/UserUpdate.php | 2 + app/Http/Requests/Staff/UserUpdate.php | 2 + app/Services/OrderService.php | 2 + app/Services/ServerService.php | 3 +- database/install.sql | 2 + database/update.sql | 5 ++ public/assets/admin/umi.js | 37 ++++++++++++++ 14 files changed, 113 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/V1/Admin/PlanController.php b/app/Http/Controllers/V1/Admin/PlanController.php index 9d39d683..ce88f784 100755 --- a/app/Http/Controllers/V1/Admin/PlanController.php +++ b/app/Http/Controllers/V1/Admin/PlanController.php @@ -45,6 +45,7 @@ class PlanController extends Controller User::where('plan_id', $plan->id)->update([ 'group_id' => $params['group_id'], 'transfer_enable' => $params['transfer_enable'] * 1073741824, + 'device_limit' => $params['device_limit'], 'speed_limit' => $params['speed_limit'] ]); } diff --git a/app/Http/Controllers/V1/Admin/UserController.php b/app/Http/Controllers/V1/Admin/UserController.php index c5c3e866..1081aaf3 100644 --- a/app/Http/Controllers/V1/Admin/UserController.php +++ b/app/Http/Controllers/V1/Admin/UserController.php @@ -157,16 +157,17 @@ class UserController extends Controller } } - $data = "邮箱,余额,推广佣金,总流量,剩余流量,套餐到期时间,订阅计划,订阅地址\r\n"; + $data = "邮箱,余额,推广佣金,总流量,设备数限制,剩余流量,套餐到期时间,订阅计划,订阅地址\r\n"; foreach($res as $user) { $expireDate = $user['expired_at'] === NULL ? '长期有效' : date('Y-m-d H:i:s', $user['expired_at']); $balance = $user['balance'] / 100; $commissionBalance = $user['commission_balance'] / 100; $transferEnable = $user['transfer_enable'] ? $user['transfer_enable'] / 1073741824 : 0; + $deviceLimit = $user['devce_limit'] ? $user['devce_limit'] : NULL; $notUseFlow = (($user['transfer_enable'] - ($user['u'] + $user['d'])) / 1073741824) ?? 0; $planName = $user['plan_name'] ?? '无订阅'; $subscribeUrl = Helper::getSubscribeUrl('/api/v1/client/subscribe?token=' . $user['token']); - $data .= "{$user['email']},{$balance},{$commissionBalance},{$transferEnable},{$notUseFlow},{$expireDate},{$planName},{$subscribeUrl}\r\n"; + $data .= "{$user['email']},{$balance},{$commissionBalance},{$transferEnable}, {$deviceLimit}, {$notUseFlow},{$expireDate},{$planName},{$subscribeUrl}\r\n"; } echo "\xEF\xBB\xBF" . $data; } @@ -185,6 +186,7 @@ class UserController extends Controller 'plan_id' => isset($plan->id) ? $plan->id : NULL, 'group_id' => isset($plan->group_id) ? $plan->group_id : NULL, 'transfer_enable' => isset($plan->transfer_enable) ? $plan->transfer_enable * 1073741824 : 0, + 'device_limit' => isset($plan->device_limit) ? $plan->device_limit : NULL, 'expired_at' => $request->input('expired_at') ?? NULL, 'uuid' => Helper::guid(true), 'token' => Helper::guid() @@ -220,6 +222,7 @@ class UserController extends Controller 'plan_id' => isset($plan->id) ? $plan->id : NULL, 'group_id' => isset($plan->group_id) ? $plan->group_id : NULL, 'transfer_enable' => isset($plan->transfer_enable) ? $plan->transfer_enable * 1073741824 : 0, + 'device_limit' => isset($plan->device_limit) ? $plan->device_limit : NULL, 'expired_at' => $request->input('expired_at') ?? NULL, 'uuid' => Helper::guid(true), 'token' => Helper::guid(), diff --git a/app/Http/Controllers/V1/Passport/AuthController.php b/app/Http/Controllers/V1/Passport/AuthController.php index 050be737..4e0b4e08 100644 --- a/app/Http/Controllers/V1/Passport/AuthController.php +++ b/app/Http/Controllers/V1/Passport/AuthController.php @@ -153,6 +153,7 @@ class AuthController extends Controller $plan = Plan::find(config('v2board.try_out_plan_id')); if ($plan) { $user->transfer_enable = $plan->transfer_enable * 1073741824; + $user->device_limit = $plan->device_limit; $user->plan_id = $plan->id; $user->group_id = $plan->group_id; $user->expired_at = time() + (config('v2board.try_out_hour', 1) * 3600); diff --git a/app/Http/Controllers/V1/Server/UniProxyController.php b/app/Http/Controllers/V1/Server/UniProxyController.php index 031a9e50..31afc0a4 100644 --- a/app/Http/Controllers/V1/Server/UniProxyController.php +++ b/app/Http/Controllers/V1/Server/UniProxyController.php @@ -43,6 +43,20 @@ class UniProxyController extends Controller $users = $this->serverService->getAvailableUsers($this->nodeInfo->group_id); $users = $users->toArray(); + $users = array_map(function ($user) { + $count =0; + $ips_array = Cache::get('ALIVE_IP_USER_'. $user['id']); + if ($ips_array) { + foreach ($ips_array as $nodeid => $ip_array) { + foreach ($ip_array['aliveips'] as $ip) { + $count++; + } + } + } + $user['alive_ip'] = $count; + return $user; + }, $users); + $response['users'] = $users; $eTag = sha1(json_encode($response)); @@ -68,6 +82,41 @@ class UniProxyController extends Controller ]); } + // 后端提交在线数据 + public function alive(Request $request) + { + $data = file_get_contents('php://input'); + $data = json_decode($data, true); + if ($data === null && json_last_error() !== JSON_ERROR_NONE) { + // JSON decoding error + return response([ + 'error' => 'Invalid online data' + ], 400); + } + + foreach ($data as $k => $v) { + $updateAt = time(); + $oldips_array = Cache::get('ALIVE_IP_USER_'. $k) ?? []; + + // 更新节点数据 + $oldips_array[$this->nodeId] = ['aliveips' => $v, 'lastupdateAt' => $updateAt]; + //删除过期节点在线数据 + $expired_array = []; + foreach($oldips_array as $nodeid => $oldips) { + if ($updateAt - $oldips['lastupdateAt'] > 300){ + $expired_array[$nodeid] = ''; + } + } + // 清理过期数据并存回缓存 + $new_array = array_diff_key($oldips_array, $expired_array); + Cache::put('ALIVE_IP_USER_'. $k, $new_array, 120); + } + + return response([ + 'data' => true + ]); + } + // 后端获取配置 public function config(Request $request) { diff --git a/app/Http/Controllers/V1/User/UserController.php b/app/Http/Controllers/V1/User/UserController.php index 2f827011..e66ef76c 100755 --- a/app/Http/Controllers/V1/User/UserController.php +++ b/app/Http/Controllers/V1/User/UserController.php @@ -87,6 +87,7 @@ class UserController extends Controller ->select([ 'email', 'transfer_enable', + 'device_limit', 'last_login_at', 'created_at', 'banned', @@ -138,6 +139,7 @@ class UserController extends Controller 'u', 'd', 'transfer_enable', + 'device_limit', 'email', 'uuid' ]) diff --git a/app/Http/Requests/Admin/PlanSave.php b/app/Http/Requests/Admin/PlanSave.php index 2aa4583a..7e9eb158 100755 --- a/app/Http/Requests/Admin/PlanSave.php +++ b/app/Http/Requests/Admin/PlanSave.php @@ -18,6 +18,7 @@ class PlanSave extends FormRequest 'content' => '', 'group_id' => 'required', 'transfer_enable' => 'required', + 'device_limit' => 'nullable|integer', 'month_price' => 'nullable|integer', 'quarter_price' => 'nullable|integer', 'half_year_price' => 'nullable|integer', @@ -40,6 +41,7 @@ class PlanSave extends FormRequest 'type.in' => '套餐类型格式有误', 'group_id.required' => '权限组不能为空', 'transfer_enable.required' => '流量不能为空', + 'device_limit.integer' => '设备数限制格式有误', 'month_price.integer' => '月付金额格式有误', 'quarter_price.integer' => '季付金额格式有误', 'half_year_price.integer' => '半年付金额格式有误', diff --git a/app/Http/Requests/Admin/UserFetch.php b/app/Http/Requests/Admin/UserFetch.php index 899c6a9f..3f30e505 100644 --- a/app/Http/Requests/Admin/UserFetch.php +++ b/app/Http/Requests/Admin/UserFetch.php @@ -14,7 +14,7 @@ class UserFetch extends FormRequest public function rules() { return [ - 'filter.*.key' => 'required|in:id,email,transfer_enable,d,expired_at,uuid,token,invite_by_email,invite_user_id,plan_id,banned,remarks,is_admin', + 'filter.*.key' => 'required|in:id,email,transfer_enable,device_limit,d,expired_at,uuid,token,invite_by_email,invite_user_id,plan_id,banned,remarks,is_admin', 'filter.*.condition' => 'required|in:>,<,=,>=,<=,模糊,!=', 'filter.*.value' => 'required' ]; diff --git a/app/Http/Requests/Admin/UserUpdate.php b/app/Http/Requests/Admin/UserUpdate.php index c175f33a..91325cb8 100644 --- a/app/Http/Requests/Admin/UserUpdate.php +++ b/app/Http/Requests/Admin/UserUpdate.php @@ -17,6 +17,7 @@ class UserUpdate extends FormRequest 'email' => 'required|email:strict', 'password' => 'nullable|min:8', 'transfer_enable' => 'numeric', + 'device_limit' => 'nullable|integer', 'expired_at' => 'nullable|integer', 'banned' => 'required|in:0,1', 'plan_id' => 'nullable|integer', @@ -40,6 +41,7 @@ class UserUpdate extends FormRequest 'email.required' => '邮箱不能为空', 'email.email' => '邮箱格式不正确', 'transfer_enable.numeric' => '流量格式不正确', + 'device_limit.integer' => '设备数限制格式不正确', 'expired_at.integer' => '到期时间格式不正确', 'banned.required' => '是否封禁不能为空', 'banned.in' => '是否封禁格式不正确', diff --git a/app/Http/Requests/Staff/UserUpdate.php b/app/Http/Requests/Staff/UserUpdate.php index be221443..0597bfe7 100644 --- a/app/Http/Requests/Staff/UserUpdate.php +++ b/app/Http/Requests/Staff/UserUpdate.php @@ -17,6 +17,7 @@ class UserUpdate extends FormRequest 'email' => 'required|email:strict', 'password' => 'nullable', 'transfer_enable' => 'numeric', + 'device_limit' => 'nullable|integer', 'expired_at' => 'nullable|integer', 'banned' => 'required|in:0,1', 'plan_id' => 'nullable|integer', @@ -35,6 +36,7 @@ class UserUpdate extends FormRequest 'email.required' => '邮箱不能为空', 'email.email' => '邮箱格式不正确', 'transfer_enable.numeric' => '流量格式不正确', + 'device_limit.integer' => '设备数限制格式不正确', 'expired_at.integer' => '到期时间格式不正确', 'banned.required' => '是否封禁不能为空', 'banned.in' => '是否封禁格式不正确', diff --git a/app/Services/OrderService.php b/app/Services/OrderService.php index 0133222e..6964a6f3 100644 --- a/app/Services/OrderService.php +++ b/app/Services/OrderService.php @@ -269,6 +269,7 @@ class OrderService $this->user->expired_at = time(); } $this->user->transfer_enable = $plan->transfer_enable * 1073741824; + $this->user->device_limit = $plan->device_limit; // 从一次性转换到循环 if ($this->user->expired_at === NULL) $this->buyByResetTraffic(); // 新购 @@ -282,6 +283,7 @@ class OrderService { $this->buyByResetTraffic(); $this->user->transfer_enable = $plan->transfer_enable * 1073741824; + $this->user->device_limit = $plan->device_limit; $this->user->plan_id = $plan->id; $this->user->group_id = $plan->group_id; $this->user->expired_at = NULL; diff --git a/app/Services/ServerService.php b/app/Services/ServerService.php index c1e2d84c..5615e2be 100755 --- a/app/Services/ServerService.php +++ b/app/Services/ServerService.php @@ -167,7 +167,8 @@ class ServerService ->select([ 'id', 'uuid', - 'speed_limit' + 'speed_limit', + 'device_limit' ]) ->get(); } diff --git a/database/install.sql b/database/install.sql index 59f25813..e84e1494 100644 --- a/database/install.sql +++ b/database/install.sql @@ -180,6 +180,7 @@ CREATE TABLE `v2_plan` ( `id` int(11) NOT NULL AUTO_INCREMENT, `group_id` int(11) NOT NULL, `transfer_enable` int(11) NOT NULL, + `device_limit` int(11) DEFAULT NULL, `name` varchar(255) NOT NULL, `speed_limit` int(11) DEFAULT NULL, `show` tinyint(1) NOT NULL DEFAULT '0', @@ -451,6 +452,7 @@ CREATE TABLE `v2_user` ( `u` bigint(20) NOT NULL DEFAULT '0', `d` bigint(20) NOT NULL DEFAULT '0', `transfer_enable` bigint(20) NOT NULL DEFAULT '0', + `device_limit` int(11) DEFAULT NULL, `banned` tinyint(1) NOT NULL DEFAULT '0', `is_admin` tinyint(1) NOT NULL DEFAULT '0', `last_login_at` int(11) DEFAULT NULL, diff --git a/database/update.sql b/database/update.sql index fa834057..0d4218a3 100644 --- a/database/update.sql +++ b/database/update.sql @@ -723,3 +723,8 @@ ALTER TABLE `v2_server_hysteria` UPDATE v2_server_vless SET tls_settings = REPLACE(tls_settings, 'shortId', 'short_id'); +ALTER TABLE `v2_plan` + ADD `device_limit` int(11) NULL AFTER `transfer_enable`; + +ALTER TABLE `v2_user` + ADD `device_limit` int(11) NULL AFTER `transfer_enable`; diff --git a/public/assets/admin/umi.js b/public/assets/admin/umi.js index 834be795..57b8f577 100644 --- a/public/assets/admin/umi.js +++ b/public/assets/admin/umi.js @@ -22201,6 +22201,14 @@ className: "form-group" }, p.a.createElement("label", { for: "example-text-input-alt" + }, "\u8bbe\u5907\u6570\u9650\u5236"), p.a.createElement(u["a"], { + placeholder: "\u7559\u7a7a\u5219\u4e0d\u9650\u5236", + defaultValue: t.device_limit, + onChange: e=>this.formChange("device_limit", e.target.value) + })), p.a.createElement("div", { + className: "form-group" + }, p.a.createElement("label", { + for: "example-text-input-alt" }, "\u5230\u671f\u65f6\u95f4"), p.a.createElement("div", null, p.a.createElement(c["a"], { placeholder: "\u957f\u671f\u6709\u6548", defaultValue: null !== t.expired_at && v()(1e3 * t.expired_at), @@ -70664,6 +70672,14 @@ render: (e,t)=>{ return e } + }, { + title: "\u8bbe\u5907\u6570\u9650\u5236", + dataIndex: "device_limit", + key: "device_limit", + sorter: !0, + render: (e,t)=>{ + return null !== e ? e : "-" + } }, { title: "\u5230\u671f\u65f6\u95f4", dataIndex: "expired_at", @@ -80496,6 +80512,20 @@ className: "form-group" }, m.a.createElement("label", { for: "example-text-input-alt" + }, "\u8bbe\u5907\u6570\u9650\u5236"), m.a.createElement(C["a"], { + placeholder: "\u7559\u7a7a\u5219\u4e0d\u9650\u5236", + value: this.state.record.device_limit, + onChange: e=>{ + this.setState({ + record: d()({}, this.state.record, { + device_limit: e.target.value + }) + }) + } + })), m.a.createElement("div", { + className: "form-group" + }, m.a.createElement("label", { + for: "example-text-input-alt" }, "\u6743\u9650\u7ec4 ", m.a.createElement(O["a"], null, m.a.createElement("a", { href: "javascript:(0);" }, "\u6dfb\u52a0\u6743\u9650\u7ec4"))), m.a.createElement(_["a"], { @@ -80737,6 +80767,13 @@ render: e=>{ return m.a.createElement(m.a.Fragment, null, e, " GB") } + }, { + title: "\u8bbe\u5907\u6570\u9650\u5236", + dataIndex: "device_limit", + key: "device_limit", + render: e=>{ + return null !== e ? e : "-" + } }, { title: "\u6708\u4ed8", dataIndex: "month_price", From 7fca538a468a843a3a42f4139472f72adf3ad3c9 Mon Sep 17 00:00:00 2001 From: wyx2685 Date: Sun, 15 Oct 2023 17:49:47 +0900 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=EF=BC=9A=E4=B8=8D?= =?UTF-8?q?=E5=90=8C=E8=8A=82=E7=82=B9=E7=B1=BB=E5=9E=8B=E5=8F=AF=E8=83=BD?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/V1/Server/UniProxyController.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/V1/Server/UniProxyController.php b/app/Http/Controllers/V1/Server/UniProxyController.php index 31afc0a4..4da2565e 100644 --- a/app/Http/Controllers/V1/Server/UniProxyController.php +++ b/app/Http/Controllers/V1/Server/UniProxyController.php @@ -47,7 +47,7 @@ class UniProxyController extends Controller $count =0; $ips_array = Cache::get('ALIVE_IP_USER_'. $user['id']); if ($ips_array) { - foreach ($ips_array as $nodeid => $ip_array) { + foreach ($ips_array as $nodetypeid => $ip_array) { foreach ($ip_array['aliveips'] as $ip) { $count++; } @@ -99,10 +99,10 @@ class UniProxyController extends Controller $oldips_array = Cache::get('ALIVE_IP_USER_'. $k) ?? []; // 更新节点数据 - $oldips_array[$this->nodeId] = ['aliveips' => $v, 'lastupdateAt' => $updateAt]; + $oldips_array[$this->nodeType . $this->nodeId] = ['aliveips' => $v, 'lastupdateAt' => $updateAt]; //删除过期节点在线数据 $expired_array = []; - foreach($oldips_array as $nodeid => $oldips) { + foreach($oldips_array as $nodetypeid => $oldips) { if ($updateAt - $oldips['lastupdateAt'] > 300){ $expired_array[$nodeid] = ''; } From 24209b8ac105f141b8637b1be09c9925cdaf5576 Mon Sep 17 00:00:00 2001 From: wyx2685 Date: Sun, 15 Oct 2023 18:51:41 +0900 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/V1/Server/UniProxyController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/V1/Server/UniProxyController.php b/app/Http/Controllers/V1/Server/UniProxyController.php index 4da2565e..775285ca 100644 --- a/app/Http/Controllers/V1/Server/UniProxyController.php +++ b/app/Http/Controllers/V1/Server/UniProxyController.php @@ -104,7 +104,7 @@ class UniProxyController extends Controller $expired_array = []; foreach($oldips_array as $nodetypeid => $oldips) { if ($updateAt - $oldips['lastupdateAt'] > 300){ - $expired_array[$nodeid] = ''; + $expired_array[$nodetypeid] = ''; } } // 清理过期数据并存回缓存 From 0c9aab22364e8468203873fb7c726bffa764dfcd Mon Sep 17 00:00:00 2001 From: wyx2685 Date: Thu, 19 Oct 2023 02:38:16 +0900 Subject: [PATCH 4/4] =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BB=AA=E8=A1=A8?= =?UTF-8?q?=E7=9B=98=E6=98=BE=E7=A4=BA=E8=AE=BE=E5=A4=87=E5=9C=A8=E7=BA=BF?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/V1/User/UserController.php | 13 +++++++++++++ public/theme/v2board/assets/i18n/en-US.js | 3 ++- public/theme/v2board/assets/i18n/ja-JP.js | 3 ++- public/theme/v2board/assets/i18n/zh-CN.js | 3 ++- public/theme/v2board/assets/i18n/zh-TW.js | 3 ++- public/theme/v2board/assets/umi.js | 9 +++++++++ 6 files changed, 30 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/V1/User/UserController.php b/app/Http/Controllers/V1/User/UserController.php index e66ef76c..8a8e9d40 100755 --- a/app/Http/Controllers/V1/User/UserController.php +++ b/app/Http/Controllers/V1/User/UserController.php @@ -153,6 +153,19 @@ class UserController extends Controller abort(500, __('Subscription plan does not exist')); } } + + //统计在线设备 + $countalive = 0; + $ips_array = Cache::get('ALIVE_IP_USER_'. $request->user['id']); + if ($ips_array) { + foreach ($ips_array as $nodetypeid => $ip_array) { + foreach ($ip_array['aliveips'] as $ip) { + $countalive++; + } + } + } + $user['alive_ip'] = $countalive; + $user['subscribe_url'] = Helper::getSubscribeUrl("/api/v1/client/subscribe?token={$user['token']}"); $userService = new UserService(); $user['reset_day'] = $userService->getResetDay($user); diff --git a/public/theme/v2board/assets/i18n/en-US.js b/public/theme/v2board/assets/i18n/en-US.js index 2a4092f2..3e586d96 100644 --- a/public/theme/v2board/assets/i18n/en-US.js +++ b/public/theme/v2board/assets/i18n/en-US.js @@ -144,6 +144,7 @@ window.settings.i18n['en-US'] = { '该订阅长期有效': 'The subscription is valid for an unlimited time', '已过期': 'Expired', '已用 {used} / 总计 {total}': '{used} Used / Total {total}', + '在线设备 {alive_ip}/{device_limit}': 'Online {alive_ip}/{device_limit} Device', '重置订阅信息': 'Reset Subscription', '没有可用节点，如果您未订阅或已过期请': 'No access points are available. If you have not subscribed or the subscription has expired, please', '订阅': 'Subscription', @@ -274,4 +275,4 @@ window.settings.i18n['en-US'] = { '三级分销比例': 'Three-level Distribution Ratio', '累计获得佣金': 'Cumulative commission earned', '您邀请的用户再次邀请用户将按照订单金额乘以分销等级的比例进行分成。': 'The users you invite to re-invite users will be divided according to the order amount multiplied by the distribution level.' -}; \ No newline at end of file +}; diff --git a/public/theme/v2board/assets/i18n/ja-JP.js b/public/theme/v2board/assets/i18n/ja-JP.js index 10dd4eef..28757af9 100644 --- a/public/theme/v2board/assets/i18n/ja-JP.js +++ b/public/theme/v2board/assets/i18n/ja-JP.js @@ -38,6 +38,7 @@ window.settings.i18n['ja-JP'] = { '该订阅长期有效': '時間制限なし', '已过期': '期限切れ', '已用 {used} / 总计 {total}': '使用済み {used} / 合計 {total}', + '在线设备 {alive_ip}/{device_limit}': 'オンラインデバイス {alive_ip}/{device_limit}', '查看订阅': 'プランを表示', '邮箱': 'E-mail アドレス', '邮箱验证码': '確認コード', @@ -274,4 +275,4 @@ window.settings.i18n['ja-JP'] = { '三级分销比例': '3ティア比率', '累计获得佣金': '累計獲得コミッション金額', '您邀请的用户再次邀请用户将按照订单金额乘以分销等级的比例进行分成。': 'お客様に招待された方が更に別の方を招待された場合、お客様は支払われるオーダーからティア分配分の比率分を受け取ることができます。' -}; \ No newline at end of file +}; diff --git a/public/theme/v2board/assets/i18n/zh-CN.js b/public/theme/v2board/assets/i18n/zh-CN.js index ed78cc1d..68ba77f6 100644 --- a/public/theme/v2board/assets/i18n/zh-CN.js +++ b/public/theme/v2board/assets/i18n/zh-CN.js @@ -144,6 +144,7 @@ window.settings.i18n['zh-CN'] = { '该订阅长期有效': '该订阅长期有效', '已过期': '已过期', '已用 {used} / 总计 {total}': '已用 {used} / 总计 {total}', + '在线设备 {alive_ip}/{device_limit}' : '在线设备 {alive_ip}/{device_limit}', '重置订阅信息': '重置订阅信息', '没有可用节点，如果您未订阅或已过期请': '没有可用节点，如果您未订阅或已过期请', '订阅': '订阅', @@ -274,4 +275,4 @@ window.settings.i18n['zh-CN'] = { '三级分销比例': '三级分销比例', '累计获得佣金': '累计获得佣金', '您邀请的用户再次邀请用户将按照订单金额乘以分销等级的比例进行分成。': '您邀请的用户再次邀请用户将按照订单金额乘以分销等级的比例进行分成。' -}; \ No newline at end of file +}; diff --git a/public/theme/v2board/assets/i18n/zh-TW.js b/public/theme/v2board/assets/i18n/zh-TW.js index 52c32e5e..764a568d 100644 --- a/public/theme/v2board/assets/i18n/zh-TW.js +++ b/public/theme/v2board/assets/i18n/zh-TW.js @@ -38,6 +38,7 @@ window.settings.i18n['zh-TW'] = { '该订阅长期有效': '該訂閱長期有效', '已过期': '已過期', '已用 {used} / 总计 {total}': '已用 {used} / 總計 {total}', + '在线设备 {alive_ip}/{device_limit}': '在線設備 {alive_ip}/{device_limit}', '查看订阅': '查看訂閱', '邮箱': '郵箱', '邮箱验证码': '郵箱驗證碼', @@ -274,4 +275,4 @@ window.settings.i18n['zh-TW'] = { '三级分销比例': '三级分销比例', '累计获得佣金': '累计获得佣金', '您邀请的用户再次邀请用户将按照订单金额乘以分销等级的比例进行分成。': '您邀请的用户再次邀请用户将按照订单金额乘以分销等级的比例进行分成。' -}; \ No newline at end of file +}; diff --git a/public/theme/v2board/assets/umi.js b/public/theme/v2board/assets/umi.js index 9d7996e7..144f9930 100644 --- a/public/theme/v2board/assets/umi.js +++ b/public/theme/v2board/assets/umi.js @@ -30872,6 +30872,15 @@ }, { used: Object(p["b"])(d.u + d.d), total: Object(p["b"])(d.transfer_enable) + })),l.a.createElement("span",{ + className: "font-w700" + }," "), l.a.createElement("span", { + className: "font-w700" + }, Object(b["formatMessage"])({ + id: "\u5728\u7ebf\u8bbe\u5907 {alive_ip}/{device_limit}" + }, { + alive_ip: d.alive_ip, + device_limit: d.device_limit == null ? "-" : d.device_limit })))), y >= 80 && !Object(p["h"])(d.expired_at) && (null === d || void 0 === d ? void 0 : null === (e = d.plan) || void 0 === e ? void 0 : e.reset_price) && l.a.createElement("div", { className: "mb-4" }, l.a.createElement(i["a"], {