Browse Source

feat: add new type node

Indexyz 7 years ago
parent
commit
e302e5e201

+ 3 - 1
app/Controllers/Mod_Mu/UserController.php

@@ -10,6 +10,7 @@ use App\Models\Ip;
 use App\Models\DetectLog;
 use App\Controllers\BaseController;
 use App\Utils\Tools;
+use Ramsey\Uuid\Uuid;
 
 class UserController extends BaseController
 {
@@ -67,13 +68,14 @@ class UserController extends BaseController
 
         $users = array();
 
-        $key_list = array('method', 'obfs', 'obfs_param', 'protocol', 'protocol_param',
+        $key_list = array('email', 'method', 'obfs', 'obfs_param', 'protocol', 'protocol_param',
                 'forbidden_ip', 'forbidden_port', 'node_speedlimit', 'disconnect_ip',
                 'is_multi_user', 'id', 'port', 'passwd', 'u', 'd');
 
         foreach ($users_raw as $user_raw) {
             if ($user_raw->transfer_enable > $user_raw->u + $user_raw->d) {
                 $user_raw = Tools::keyFilter($user_raw, $key_list);
+                $user_raw->uuid = Uuid::uuid3(Uuid::NAMESPACE_DNS, $user_raw->passwd);
                 array_push($users, $user_raw);
             }
         }

+ 1 - 1
app/Controllers/UserController.php

@@ -196,7 +196,7 @@ class UserController extends BaseController
                 }
 
 
-                if ($node->sort==0||$node->sort==7||$node->sort==8||$node->sort==10) {
+                if ($node->sort==0||$node->sort==7||$node->sort==8||$node->sort==10||$node->sort==11) {
                     $node_tempalive=$node->getOnlineUserCount();
                     $node_prealive[$node->id]=$node_tempalive;
                     if ($node->isNodeOnline() !== null) {

+ 1 - 1
app/Models/Node.php

@@ -116,7 +116,7 @@ class Node extends Model
         $node_heartbeat = $this->attributes['node_heartbeat'];
         $sort = $this->attributes['sort'];
 
-        if (!($sort == 0 || $sort == 7 || $sort == 8 || $sort==10)) {
+        if (!($sort == 0 || $sort == 7 || $sort == 8 || $sort==10 || $sort==11)) {
             return null;
         }
 

+ 1 - 0
resources/views/material/admin/node/create.tpl

@@ -110,6 +110,7 @@
 													<option value="8">PAC PLUS PLUS(HTTPS 代理生成 PAC文件)</option>
 													<option value="9">Shadowsocks 单端口多用户</option>
 													<option value="10">Shadowsocks 中转</option>
+													<option value="11">V2Ray</option>
 												</select>
 											</div>
 									</div>

+ 1 - 0
resources/views/material/admin/node/edit.tpl

@@ -112,6 +112,7 @@
 													<option value="8" {if $node->sort==8}selected{/if}>PAC PLUS PLUS(HTTPS 代理生成 PAC文件)</option>
 													<option value="9" {if $node->sort==9}selected{/if}>Shadowsocks 单端口多用户</option>
 													<option value="10" {if $node->sort==10}selected{/if}>Shadowsocks 中转</option>
+													<option value="11" {if $node->sort==11}selected{/if}>V2Ray</option>
 												</select>
 											</div>
 									</div>