Skip to content

Commit 2b436ef

Browse files
author
zhangjiangbin
committed
可以对账号、节点、分组自定义等级
1 parent 5ff123b commit 2b436ef

File tree

13 files changed

+183
-169
lines changed

13 files changed

+183
-169
lines changed

‎.gitattributes

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
* text=auto
2-
*.css linguist-vendored
3-
*.scss linguist-vendored
4-
*.js linguist-vendored
1+
*.js linguist-language=php
2+
*.css linguist-language=php
3+
*.scss linguist-language=php
4+
*.html linguist-language=php
55
CHANGELOG.md export-ignore

‎app/Http/Controllers/AdminController.php

Lines changed: 65 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,10 @@
2020
use App\Http\Models\UserSubscribe;
2121
use App\Http\Models\UserSubscribeLog;
2222
use App\Http\Models\UserTrafficLog;
23-
use function GuzzleHttp\Psr7\_parse_message;
2423
use Illuminate\Http\Request;
25-
use Mockery\Exception;
2624
use Redirect;
2725
use Response;
26+
use Log;
2827

2928
class AdminController extends BaseController
3029
{
@@ -202,11 +201,12 @@ public function addUser(Request $request)
202201
$last_user = User::orderBy('id', 'desc')->first();
203202
$view['last_port'] = self::$config['is_rand_port'] ? $this->getRandPort() : $last_user->port + 1;
204203

205-
// 加密方式、协议、混淆
204+
// 加密方式、协议、混淆、等级
206205
$view['method_list'] = $this->methodList();
207206
$view['protocol_list'] = $this->protocolList();
208207
$view['obfs_list'] = $this->obfsList();
209-
$view['level_list'] = Level::get()->sortBy('level');
208+
$view['level_list'] = $this->levelList();
209+
210210
return Response::view('admin/addUser', $view);
211211
}
212212
}
@@ -291,11 +291,12 @@ public function editUser(Request $request)
291291

292292
$view['user'] = $user;
293293

294-
// 加密方式、协议、混淆
294+
// 加密方式、协议、混淆、等级
295295
$view['method_list'] = $this->methodList();
296296
$view['protocol_list'] = $this->protocolList();
297297
$view['obfs_list'] = $this->obfsList();
298-
$view['level_list'] = Level::get()->sortBy('level');
298+
$view['level_list'] = $this->levelList();
299+
299300
return Response::view('admin/editUser', $view);
300301
}
301302
}
@@ -395,6 +396,7 @@ public function addNode(Request $request)
395396
$view['method_list'] = $this->methodList();
396397
$view['protocol_list'] = $this->protocolList();
397398
$view['obfs_list'] = $this->obfsList();
399+
$view['level_list'] = $this->levelList();
398400
$view['group_list'] = SsGroup::get();
399401

400402
return Response::view('admin/addNode', $view);
@@ -466,6 +468,7 @@ public function editNode(Request $request)
466468
$view['method_list'] = $this->methodList();
467469
$view['protocol_list'] = $this->protocolList();
468470
$view['obfs_list'] = $this->obfsList();
471+
$view['level_list'] = $this->levelList();
469472
$view['group_list'] = SsGroup::get();
470473

471474
return Response::view('admin/editNode', $view);
@@ -565,13 +568,14 @@ public function delArticle(Request $request)
565568
public function groupList(Request $request)
566569
{
567570
$view['groupList'] = SsGroup::paginate(10)->appends($request->except('page'));
568-
$level_list = Level::get()->sortBy('level');
571+
$level_list = $this->levelList();
569572

570-
$level_dict=array();
571-
foreach ($level_list as $ele){
572-
$level_dict[$ele['level']]=$ele['level_name'];
573+
$level_dict = array();
574+
foreach ($level_list as $level) {
575+
$level_dict[$level['level']] = $level['level_name'];
573576
}
574577
$view['level_dict'] = $level_dict;
578+
575579
return Response::view('admin/groupList', $view);
576580
}
577581

@@ -589,8 +593,9 @@ public function addGroup(Request $request)
589593

590594
return Response::json(['status' => 'success', 'data' => '', 'message' => '添加成功']);
591595
} else {
592-
$view['level_list'] = Level::get()->sortBy('level');
593-
return Response::view('admin/addGroup',$view);
596+
$view['level_list'] = $this->levelList();
597+
598+
return Response::view('admin/addGroup', $view);
594599
}
595600
}
596601

@@ -615,7 +620,8 @@ public function editGroup(Request $request)
615620
}
616621
} else {
617622
$view['group'] = SsGroup::where('id', $id)->first();
618-
$view['level_list'] = Level::get()->sortBy('level');
623+
$view['level_list'] = $this->levelList();
624+
619625
return Response::view('admin/editGroup', $view);
620626
}
621627
}
@@ -1041,7 +1047,7 @@ public function makePasswd(Request $request)
10411047
exit($this->makeRandStr());
10421048
}
10431049

1044-
// 加密方式、混淆、协议、用户等级列表
1050+
// 加密方式、混淆、协议、等级
10451051
public function config(Request $request)
10461052
{
10471053
if ($request->method() == 'POST') {
@@ -1072,7 +1078,7 @@ public function config(Request $request)
10721078
$view['method_list'] = SsConfig::where('type', 1)->get();
10731079
$view['protocol_list'] = SsConfig::where('type', 2)->get();
10741080
$view['obfs_list'] = SsConfig::where('type', 3)->get();
1075-
$view['level_list'] = Level::get()->sortBy('level');
1081+
$view['level_list'] = $this->levelList();
10761082

10771083
return Response::view('admin/config', $view);
10781084
}
@@ -1145,73 +1151,87 @@ public function analysis(Request $request)
11451151
return Response::view('admin/analysis', $view);
11461152
}
11471153

1148-
//用户等级设置
1149-
public function updateLevel(Request $request){
1154+
// 等级设置
1155+
public function updateLevel(Request $request)
1156+
{
11501157
$id = $request->get('id');
11511158
$level = $request->get('level');
11521159
$level_name = $request->get('level_name');
11531160

11541161
if (empty($id)) {
11551162
return Response::json(['status' => 'fail', 'data' => '', 'message' => 'ID不能为空']);
11561163
}
1164+
11571165
if (empty($level)) {
1158-
return Response::json(['status' => 'fail', 'data' => '', 'message' => 'level不能为空']);
1166+
return Response::json(['status' => 'fail', 'data' => '', 'message' => '等级不能为空']);
11591167
}
1168+
11601169
if (empty($level_name)) {
1161-
return Response::json(['status' => 'fail', 'data' => '', 'message' => 'levelname不能为空']);
1170+
return Response::json(['status' => 'fail', 'data' => '', 'message' => '等级名称不能为空']);
11621171
}
1163-
try{
1164-
Level::where('id',$id)->update(["level"=>$level,"level_name"=>$level_name]);
1172+
1173+
try {
1174+
Level::where('id', $id)->update(["level" => $level, "level_name" => $level_name]);
1175+
11651176
return Response::json(['status' => 'success', 'data' => '', 'message' => '操作成功']);
1166-
}catch (\Exception $e){
1177+
} catch (\Exception $e) {
1178+
Log::error($e->getMessage());
1179+
11671180
return Response::json(['status' => 'fail', 'data' => '', 'message' => '操作失败']);
11681181
}
1169-
11701182
}
1171-
public function delLevel(Request $request){
1183+
1184+
// 删除等级
1185+
public function delLevel(Request $request)
1186+
{
11721187
$id = $request->get('id');
1188+
11731189
if (empty($id)) {
11741190
return Response::json(['status' => 'fail', 'data' => '', 'message' => 'ID不能为空']);
11751191
}
1176-
try{
1177-
Level::where('id',$id)->delete();
1192+
1193+
try {
1194+
Level::where('id', $id)->delete();
1195+
11781196
return Response::json(['status' => 'success', 'data' => '', 'message' => '操作成功']);
1179-
}catch (\Exception $e){
1197+
} catch (\Exception $e) {
1198+
Log::error($e->getMessage());
1199+
11801200
return Response::json(['status' => 'fail', 'data' => '', 'message' => '操作失败']);
11811201
}
1182-
11831202
}
1184-
public function addLevel(Request $request){
1203+
1204+
// 添加等级
1205+
public function addLevel(Request $request)
1206+
{
11851207
$level = $request->get('level');
11861208
$level_name = $request->get('level_name');
1209+
11871210
if (empty($level)) {
1188-
return Response::json(['status' => 'fail', 'data' => '', 'message' => 'level不能为空']);
1211+
return Response::json(['status' => 'fail', 'data' => '', 'message' => '等级不能为空']);
11891212
}
1213+
11901214
if (empty($level_name)) {
1191-
return Response::json(['status' => 'fail', 'data' => '', 'message' => 'levelname不能为空']);
1215+
return Response::json(['status' => 'fail', 'data' => '', 'message' => '等级名称不能为空']);
11921216
}
11931217

1194-
try{
1195-
1196-
$level_re = Level::where('level',$level)->first();
1197-
1198-
if($level_re){
1199-
return Response::json(['status' => 'fail', 'data' => '', 'message' => '等级已经存在，请勿重复添加']);
1218+
try {
1219+
$exists = Level::where('level', $level)->first();
1220+
if ($exists) {
1221+
return Response::json(['status' => 'fail', 'data' => '', 'message' => '该等级已存在，请勿重复添加']);
12001222
}
12011223

12021224
Level::create([
1203-
'level'=>$level,
1204-
'level_name'=>$level_name,
1205-
'created_at'=>date('Y-m-d H:i:s'),
1206-
'updated_at'=>date('Y-m-d H:i:s')
1225+
'level' => $level,
1226+
'level_name' => $level_name
12071227
]);
1228+
12081229
return Response::json(['status' => 'success', 'data' => '', 'message' => '提交成功']);
1209-
}catch (\Exception $e){
1210-
throw $e;
1211-
return Response::json(['status' => 'fail', 'data' => '', 'message' => '操作失败']);
1230+
} catch (\Exception $e) {
1231+
Log::error($e->getMessage());
12121232

1233+
return Response::json(['status' => 'fail', 'data' => '', 'message' => '操作失败']);
12131234
}
1214-
12151235
}
12161236

12171237
// 系统设置

‎app/Http/Controllers/BaseController.php

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
use App\Http\Models\Config;
66
use App\Http\Models\EmailLog;
7+
use App\Http\Models\Level;
78
use App\Http\Models\SsConfig;
89
use App\Http\Models\User;
910

@@ -98,6 +99,12 @@ public function obfsList()
9899
return SsConfig::where('type', 3)->get();
99100
}
100101

102+
// 等级
103+
public function levelList()
104+
{
105+
return Level::get()->sortBy('level');
106+
}
107+
101108
// 系统配置
102109
public function systemConfig()
103110
{
@@ -110,20 +117,6 @@ public function systemConfig()
110117
return $data;
111118
}
112119

113-
// 账号等级对应名称
114-
public function userLevelConfig()
115-
{
116-
return [
117-
1 => '倔强青铜',
118-
2 => '秩序白银',
119-
3 => '荣耀黄金',
120-
4 => '尊贵铂金',
121-
5 => '永恒钻石',
122-
6 => '至尊黑曜',
123-
7 => '最强王者'
124-
];
125-
}
126-
127120
// 获取一个随机端口
128121
public function getRandPort()
129122
{

‎app/Http/Controllers/UserController.php

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ class UserController extends BaseController
4040
function __construct()
4141
{
4242
self::$config = $this->systemConfig();
43-
self::$userLevel = $this->userLevelConfig();
4443
}
4544

4645
public function index(Request $request)
@@ -50,12 +49,11 @@ public function index(Request $request)
5049
$user->totalTransfer = $this->flowAutoShow($user->transfer_enable - $user->u - $user->d);
5150
$user->usedTransfer = $this->flowAutoShow($user->u + $user->d);
5251
$user->usedPercent = $user->transfer_enable > 0 ? round(($user->u + $user->d) / $user->transfer_enable, 2) : 1;
53-
$user->level_name=Level::where('level',$user['level'])->first()['level_name'];
52+
$user->levelName = Level::where('level', $user['level'])->first()['level_name'];
5453
$view['info'] = $user->toArray();
5554
$view['articleList'] = Article::where('is_del', 0)->orderBy('sort', 'desc')->orderBy('id', 'desc')->paginate(5);
5655
$view['wechat_qrcode'] = self::$config['wechat_qrcode'];
5756
$view['alipay_qrcode'] = self::$config['alipay_qrcode'];
58-
$view['user_level'] = self::$userLevel;
5957

6058
// 推广返利是否可见
6159
if (!$request->session()->has('referral_status')) {
@@ -690,8 +688,8 @@ public function redeemCoupon(Request $request)
690688
}
691689

692690
$data = [
693-
'type' => $coupon->type,
694-
'amount' => $coupon->amount,
691+
'type' => $coupon->type,
692+
'amount' => $coupon->amount,
695693
'discount' => $coupon->discount
696694
];
697695

@@ -898,7 +896,7 @@ public function extractMoney(Request $request)
898896
$user = $request->session()->get('user');
899897

900898
// 判断是否已存在申请
901-
$referralApply = ReferralApply::where('user_id', $user['id'])->whereIn('status', [0,1])->first();
899+
$referralApply = ReferralApply::where('user_id', $user['id'])->whereIn('status', [0, 1])->first();
902900
if ($referralApply) {
903901
return Response::json(['status' => 'fail', 'data' => '', 'message' => '申请失败：已存在申请，请等待之前的申请处理完']);
904902
}

‎resources/views/admin/addGroup.blade.php

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,11 @@
5454
<label class="control-label col-md-3">可见级别</label>
5555
<div class="col-md-6">
5656
<select class="form-control" name="level" id="level" required>
57-
@foreach($level_list as $ele)
58-
<option value="{{$ele['level']}}">{{$ele['level_name']}}</option>
59-
@endforeach
57+
@if(!$level_list->isEmpty())
58+
@foreach($level_list as $level)
59+
<option value="{{$level['level']}}">{{$level['level_name']}}</option>
60+
@endforeach
61+
@endif
6062
</select>
6163
<span class="help-block">对应账号级别可见该分组下的节点（向下兼容）</span>
6264
</div>

‎resources/views/admin/addUser.blade.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -98,11 +98,11 @@
9898
<label for="balance" class="col-md-3 control-label">级别</label>
9999
<div class="col-md-8">
100100
<select class="form-control" name="level" id="level">
101-
102-
@foreach($level_list as $ele)
103-
<option value="{{$ele['level']}}">{{$ele['level_name']}}</option>
104-
@endforeach
105-
101+
@if(!$level_list->isEmpty())
102+
@foreach($level_list as $ele)
103+
<option value="{{$ele['level']}}">{{$ele['level_name']}}</option>
104+
@endforeach
105+
@endif
106106
</select>
107107
</div>
108108
</div>

0 commit comments

Comments
 (0)