Skip to content

Commit 723d6f9

Browse files
author
zhangjiangbin
committed
1.修正面包屑
2.优化通用配置的默认值设置操作
1 parent d79713d commit 723d6f9

20 files changed

Lines changed: 139 additions & 337 deletions

‎app/Http/Controllers/AdminController.php‎

Lines changed: 34 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ public function index(Request $request)
2020
return Redirect::to('login');
2121
}
2222

23-
$past = strtotime(date('Y-m-d', strtotime("-3 days")));
24-
$online = time() - 3600;
23+
$past = strtotime(date('Y-m-d', strtotime("-7 days")));
24+
$online = time() - 1800;
2525

2626
$view['userCount'] = User::count();
2727
$view['activeUserCount'] = User::where('t', '>=', $past)->count();
@@ -259,6 +259,10 @@ public function delUser(Request $request)
259259
}
260260

261261
$id = $request->get('id');
262+
if ($id == 1) {
263+
return Response::json(['status' => 'fail', 'data' => '', 'message' => '系统管理员不可删除']);
264+
}
265+
262266
$user = User::where('id', $id)->delete();
263267
if ($user) {
264268
return Response::json(['status' => 'success', 'data' => '', 'message' => '删除成功']);
@@ -823,4 +827,32 @@ public function delConfig(Request $request)
823827
return Response::json(['status' => 'fail', 'data' => '', 'message' => '删除失败']);
824828
}
825829
}
830+
831+
// 设置默认配置
832+
public function setDefaultConfig(Request $request)
833+
{
834+
if (!$request->session()->has('user')) {
835+
return Redirect::to('login');
836+
}
837+
838+
$id = $request->get('id');
839+
if (empty($id)) {
840+
return Response::json(['status' => 'fail', 'data' => '', 'message' => '非法请求']);
841+
}
842+
843+
$config = SsConfig::where('id', $id)->first();
844+
if (empty($config)) {
845+
return Response::json(['status' => 'fail', 'data' => '', 'message' => '配置不存在']);
846+
}
847+
848+
// 去除该配置所属类型的默认值
849+
SsConfig::where('type', $config->type)->update(['is_default' => 0]);
850+
851+
// 将该ID对应记录值置为默认值
852+
SsConfig::where('id', $id)->update(['is_default' => 1]);
853+
854+
return Response::json(['status' => 'success', 'data' => '', 'message' => '操作成功']);
855+
}
856+
857+
826858
}

‎public/assets/images/donate.jpeg‎

68.4 KB
Loading

‎readme.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,8 @@ service nginx reload
7878
3.没有用户端
7979
4.支持SS多用户json文件一键转换成SSR多用户json文件
8080
5.支持SSR多用户json文件一键导入数据库
81-
6.3天内使用过的都算活跃账号
82-
7.60分钟内使用过的都算在账号
81+
6.7天内使用过的都算活跃账号
82+
7.30分钟内使用过的都算在账号
8383
````
8484

8585
![Markdown](http://i4.bvimg.com/1949/aac73bf589fbd785.png)

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

Lines changed: 0 additions & 223 deletions
This file was deleted.

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

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,6 @@
99
<div class="page-content">
1010
<!-- BEGIN PAGE BREADCRUMB -->
1111
<ul class="page-breadcrumb breadcrumb">
12-
<li>
13-
<a href="{{url('admin')}}">管理中心</a>
14-
<i class="fa fa-circle"></i>
15-
</li>
1612
<li>
1713
<a href="{{url('admin/nodeList')}}">节点管理</a>
1814
<i class="fa fa-circle"></i>
@@ -32,7 +28,7 @@
3228
<div class="form-group">
3329
<label for="name" class="col-md-4 control-label"> 节点名称 </label>
3430
<div class="col-md-4">
35-
<input type="text" class="form-control" name="name" id="name" placeholder="" required>
31+
<input type="text" class="form-control" name="name" id="name" placeholder="" autofocus required>
3632
<input type="hidden" name="_token" value="{{csrf_token()}}">
3733
</div>
3834
</div>
@@ -104,7 +100,7 @@
104100
<label for="bandwidth" class="col-md-4 control-label">出口带宽</label>
105101
<div class="col-md-4">
106102
<div class="input-group">
107-
<input type="text" class="form-control" name="bandwidth" id="bandwidth" placeholder="">
103+
<input type="text" class="form-control" name="bandwidth" id="bandwidth" placeholder="" required>
108104
<span class="input-group-addon">M</span>
109105
</div>
110106
</div>
@@ -113,7 +109,7 @@
113109
<label for="traffic" class="col-md-4 control-label">每月可用流量</label>
114110
<div class="col-md-4">
115111
<div class="input-group">
116-
<input type="text" class="form-control right" name="traffic" id="traffic" placeholder="">
112+
<input type="text" class="form-control right" name="traffic" id="traffic" placeholder="" required>
117113
<span class="input-group-addon">G</span>
118114
</div>
119115
</div>

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,6 @@
99
<div class="page-content">
1010
<!-- BEGIN PAGE BREADCRUMB -->
1111
<ul class="page-breadcrumb breadcrumb">
12-
<li>
13-
<a href="{{url('admin')}}">管理中心</a>
14-
<i class="fa fa-circle"></i>
15-
</li>
1612
<li>
1713
<a href="{{url('admin/userList')}}">账号管理</a>
1814
<i class="fa fa-circle"></i>
@@ -42,7 +38,7 @@
4238
<div class="form-group">
4339
<label for="username" class="col-md-3 control-label">用户名</label>
4440
<div class="col-md-8">
45-
<input type="text" class="form-control" name="username" id="username" placeholder="" required>
41+
<input type="text" class="form-control" name="username" id="username" placeholder="" autofocus required>
4642
<input type="hidden" name="_token" value="{{csrf_token()}}">
4743
</div>
4844
</div>

0 commit comments

Comments
 (0)