用户与节点通过标签进行分组关联

zhangjiangbin · zhangjiangbin · commit a30271bccd90 · 2018-02-11T14:25:51.000+08:00
diff --git a/app/Http/Controllers/SubscribeController.php b/app/Http/Controllers/SubscribeController.php
@@ -2,14 +2,13 @@
 
 namespace App\Http\Controllers;
 
-use App\Http\Models\SsGroup;
-use App\Http\Models\SsGroupNode;
-use App\Http\Models\SsNode;
 use App\Http\Models\User;
+use App\Http\Models\UserLabel;
 use App\Http\Models\UserSubscribe;
 use App\Http\Models\UserSubscribeLog;
 use Illuminate\Http\Request;
 use Redirect;
+use DB;
 
 /**
  * 订阅控制器
@@ -33,14 +32,14 @@ public function index(Request $request, $code)
         }
 
         // 校验合法性
-        $subscribe = UserSubscribe::query()->where('code', $code)->where('status', 1)->with('user')->first();
+        $subscribe = UserSubscribe::query()->with('user')->where('code', $code)->where('status', 1)->first();
         if (empty($subscribe)) {
-            exit('非法请求或已被封禁，请联系管理员');
+            exit('订阅地址不存在或被封禁，请联系管理员');
         }
 
         $user = User::query()->where('id', $subscribe->user_id)->whereIn('status', [0, 1])->where('enable', 1)->first();
         if (empty($user)) {
-            exit('非法请求或已被封禁，请联系管理员');
+            exit('您的账号已被封禁，请联系管理员');
         }
 
         // 更新访问次数
@@ -55,13 +54,18 @@ public function index(Request $request, $code)
         $log->save();
 
         // 获取这个账号可用节点
-        $group_ids = SsGroup::query()->where('level', '<=', $user->level)->select(['id'])->get();
-        if (empty($group_ids)) {
-            exit();
+        $userLabelIds = UserLabel::query()->where('user_id', $user->id)->pluck(['label_id']);
+        $nodeList = DB::table('ss_node')
+            ->leftJoin('ss_node_label', 'ss_node.id', '=', 'ss_node_label.node_id')
+            ->whereIn('ss_node_label.label_id', $userLabelIds)
+            ->where('ss_node.status', 1)
+            ->groupBy('ss_node.id')
+            ->get();
+
+        if ($nodeList->isEmpty()) {
+            exit('没有可用节点');
         }
 
-        $node_ids = SsGroupNode::query()->whereIn('group_id', $group_ids)->select(['node_id'])->get();
-        $nodeList = SsNode::query()->where('status', 1)->whereIn('id', $node_ids)->get();
         $scheme = self::$config['subscribe_max'] > 0 ? 'MAX=' . self::$config['subscribe_max'] . "\n" : '';
         foreach ($nodeList as $node) {
             $obfs_param = $node->single ? '' : $user->obfs_param;
diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
@@ -16,6 +16,7 @@
 use App\Http\Models\TicketReply;
 use App\Http\Models\User;
 use App\Http\Models\UserBalanceLog;
+use App\Http\Models\UserLabel;
 use App\Http\Models\UserScoreLog;
 use App\Http\Models\UserSubscribe;
 use App\Http\Models\UserTrafficDaily;
@@ -63,12 +64,12 @@ public function index(Request $request)
         }
 
         // 节点列表
-        $nodeList = DB::table('ss_group_node')
-            ->leftJoin('ss_group', 'ss_group.id', '=', 'ss_group_node.group_id')
-            ->leftJoin('ss_node', 'ss_node.id', '=', 'ss_group_node.node_id')
-            ->where('ss_group.level', '<=', $user->level)
+        $userLabelIds = UserLabel::query()->where('user_id', $user['id'])->pluck(['label_id']);
+        $nodeList = DB::table('ss_node')
+            ->leftJoin('ss_node_label', 'ss_node.id', '=', 'ss_node_label.node_id')
+            ->whereIn('ss_node_label.label_id', $userLabelIds)
             ->where('ss_node.status', 1)
-            ->orderBy('ss_node.sort', 'desc')
+            ->groupBy('ss_node.id')
             ->get();
 
         foreach ($nodeList as &$node) {
