Skip to content

Commit 3bceb9a

Browse files
ScyllalyScyllaly
committed
日常开发
1 parent 4ab6be1 commit 3bceb9a

File tree

8 files changed

+63
-153
lines changed

8 files changed

+63
-153
lines changed

‎app/Http/Controllers/AdminController.php‎

Lines changed: 4 additions & 116 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ function __construct()
3131

3232
public function index(Request $request)
3333
{
34-
$past = strtotime(date('Y-m-d', strtotime("-7 days")));
34+
$past = strtotime(date('Y-m-d', strtotime("-" . self::$config['expire_days'] . " days")));
3535
$online = time() - 3600;
3636

3737
$view['userCount'] = User::count();
@@ -190,7 +190,7 @@ public function addUser(Request $request)
190190
return Response::json(['status' => 'fail', 'data' => '', 'message' => '添加失败']);
191191
}
192192
} else {
193-
// 最后一个可用端口
193+
// 生成一个可用端口
194194
$last_user = User::orderBy('id', 'desc')->first();
195195
$view['last_port'] = self::$config['is_rand_port'] ? $this->getRandPort() : $last_user->port + 1;
196196

@@ -1105,114 +1105,12 @@ public function setConfig(Request $request)
11051105
}
11061106
}
11071107

1108-
$ret = Config::where('name', $name)->update(['value' => $value]);
1109-
if (!$ret) {
1110-
return Response::json(['status' => 'fail', 'data' => '', 'message' => '设置失败']);
1111-
}
1108+
// 更新配置
1109+
Config::where('name', $name)->update(['value' => $value]);
11121110

11131111
return Response::json(['status' => 'success', 'data' => '', 'message' => '操作成功']);
11141112
}
11151113

1116-
// 设置注册时默认可用流量
1117-
public function setDefaultTraffic(Request $request)
1118-
{
1119-
$value = intval($request->get('value'));
1120-
1121-
Config::where('name', 'default_traffic')->update(['value' => $value]);
1122-
1123-
return Response::json(['status' => 'success', 'data' => '', 'message' => '设置成功']);
1124-
}
1125-
1126-
// 设置可生成邀请码数
1127-
public function setInviteNum(Request $request)
1128-
{
1129-
$value = intval($request->get('value'));
1130-
1131-
Config::where('name', 'invite_num')->update(['value' => $value]);
1132-
1133-
return Response::json(['status' => 'success', 'data' => '', 'message' => '设置成功']);
1134-
}
1135-
1136-
// 设置网站名称
1137-
public function setWebsiteName(Request $request)
1138-
{
1139-
$value = trim($request->get('value'));
1140-
1141-
Config::where('name', 'website_name')->update(['value' => $value]);
1142-
1143-
return Response::json(['status' => 'success', 'data' => '', 'message' => '设置成功']);
1144-
}
1145-
1146-
// 设置网站地址
1147-
public function setWebsiteUrl(Request $request)
1148-
{
1149-
$value = trim($request->get('value'));
1150-
1151-
Config::where('name', 'website_url')->update(['value' => $value]);
1152-
1153-
return Response::json(['status' => 'success', 'data' => '', 'message' => '设置成功']);
1154-
}
1155-
1156-
// 设置重置密码次数
1157-
public function setResetPasswordTimes(Request $request)
1158-
{
1159-
$value = intval($request->get('value'));
1160-
1161-
Config::where('name', 'reset_password_times')->update(['value' => $value]);
1162-
1163-
return Response::json(['status' => 'success', 'data' => '', 'message' => '设置成功']);
1164-
}
1165-
1166-
// 设置激活账号次数
1167-
public function setActiveTimes(Request $request)
1168-
{
1169-
$value = intval($request->get('value'));
1170-
1171-
Config::where('name', 'active_times')->update(['value' => $value]);
1172-
1173-
return Response::json(['status' => 'success', 'data' => '', 'message' => '设置成功']);
1174-
}
1175-
1176-
// 设置激活账号次数
1177-
public function setTrafficWarningPercent(Request $request)
1178-
{
1179-
$value = intval($request->get('value'));
1180-
1181-
Config::where('name', 'traffic_warning_percent')->update(['value' => $value]);
1182-
1183-
return Response::json(['status' => 'success', 'data' => '', 'message' => '设置成功']);
1184-
}
1185-
1186-
// 设置账号过期提醒阈值
1187-
public function setExpireDays(Request $request)
1188-
{
1189-
$value = intval($request->get('value'));
1190-
1191-
Config::where('name', 'expire_days')->update(['value' => $value]);
1192-
1193-
return Response::json(['status' => 'success', 'data' => '', 'message' => '设置成功']);
1194-
}
1195-
1196-
// 设置激活账号次数
1197-
public function setAddScoreRange(Request $request)
1198-
{
1199-
$value = intval($request->get('value'));
1200-
1201-
Config::where('name', 'login_add_score_range')->update(['value' => $value]);
1202-
1203-
return Response::json(['status' => 'success', 'data' => '', 'message' => '设置成功']);
1204-
}
1205-
1206-
// 设置注册送流量值
1207-
public function setReferralTraffic(Request $request)
1208-
{
1209-
$value = intval($request->get('value'));
1210-
1211-
Config::where('name', 'referral_traffic')->update(['value' => $value]);
1212-
1213-
return Response::json(['status' => 'success', 'data' => '', 'message' => '设置成功']);
1214-
}
1215-
12161114
// 设置返利比例
12171115
public function setReferralPercent(Request $request)
12181116
{
@@ -1224,16 +1122,6 @@ public function setReferralPercent(Request $request)
12241122
return Response::json(['status' => 'success', 'data' => '', 'message' => '设置成功']);
12251123
}
12261124

1227-
// 设置返利满多少可提现
1228-
public function setReferralMoney(Request $request)
1229-
{
1230-
$value = intval($request->get('value'));
1231-
1232-
Config::where('name', 'referral_money')->update(['value' => $value]);
1233-
1234-
return Response::json(['status' => 'success', 'data' => '', 'message' => '设置成功']);
1235-
}
1236-
12371125
// 设置微信、支付宝二维码
12381126
public function setQrcode(Request $request)
12391127
{

‎app/Http/Controllers/BaseController.php‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<?php
22

33
namespace App\Http\Controllers;
4+
45
use App\Http\Models\Config;
56
use App\Http\Models\EmailLog;
67
use App\Http\Models\SsConfig;
@@ -112,10 +113,12 @@ public function systemConfig()
112113
// 获取一个随机端口
113114
public function getRandPort()
114115
{
115-
$port = mt_rand(10000,30000);
116+
$port = mt_rand(10000, 40000);
117+
$deny_port = [17185, 28281];
118+
116119
$exists_port = User::query()->pluck('port')->toArray();
117-
if (in_array($port, $exists_port)) {
118-
$this->getRandPort();
120+
if (in_array($port, $exists_port) || in_array($port, $deny_port)) {
121+
$port = $this->getRandPort();
119122
}
120123

121124
return $port;

‎app/Http/Controllers/RegisterController.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ public function index(Request $request)
111111
$user->passwd = $this->makeRandStr();
112112
$user->transfer_enable = $transfer_enable;
113113
$user->enable_time = date('Y-m-d H:i:s');
114-
$user->expire_time = date('Y-m-d H:i:s', strtotime("+1 days"));
114+
$user->expire_time = date('Y-m-d H:i:s', strtotime("+" . self::$config['default_days'] . " days"));
115115
$user->reg_ip = $request->getClientIp();
116116
$user->referral_uid = $referral_uid;
117117
$user->save();

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

Lines changed: 41 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -117,18 +117,33 @@
117117
<label for="is_rand_port" class="col-md-2 control-label">随机端口</label>
118118
<div class="col-md-6">
119119
<input type="checkbox" class="make-switch" @if($is_rand_port) checked @endif id="is_rand_port" data-on-color="success" data-off-color="danger" data-on-text="启用" data-off-text="关闭">
120-
<span class="help-block"> 随机生成端口 </span>
120+
<span class="help-block"> 添加账号时随机生成端口 </span>
121121
</div>
122122
</div>
123+
<!--
123124
<div class="form-group">
124125
<label for="is_user_rand_port" class="col-md-2 control-label">自定义端口</label>
125126
<div class="col-md-6">
126127
<input type="checkbox" class="make-switch" @if($is_user_rand_port) checked @endif id="is_user_rand_port" data-on-color="success" data-off-color="danger" data-on-text="启用" data-off-text="关闭">
127128
<span class="help-block"> 用户可以自定义端口 </span>
128129
</div>
129130
</div>
131+
-->
130132
<div class="form-group">
131-
<label for="default_traffic" class="col-md-2 control-label">注册初始流量</label>
133+
<label for="default_days" class="col-md-2 control-label">初始有效期</label>
134+
<div class="col-md-3">
135+
<div class="input-group">
136+
<input class="form-control" type="text" name="default_days" value="{{$default_days}}" id="default_days" />
137+
<span class="input-group-addon">天</span>
138+
<span class="input-group-btn">
139+
<button class="btn btn-success" type="button" onclick="setDefaultDays()">修改</button>
140+
</span>
141+
</div>
142+
<span class="help-block"> 用户注册时默认SS(R)有效天数 </span>
143+
</div>
144+
</div>
145+
<div class="form-group">
146+
<label for="default_traffic" class="col-md-2 control-label">初始流量</label>
132147
<div class="col-md-3">
133148
<div class="input-group">
134149
<input class="form-control" type="text" name="default_traffic" value="{{$default_traffic}}" id="default_traffic" />
@@ -563,11 +578,24 @@
563578
});
564579
});
565580
581+
// 设置注册时默认有效期
582+
function setDefaultDays() {
583+
var default_days = $("#default_days").val();
584+
585+
$.post("{{url('admin/setConfig')}}", {_token:'{{csrf_token()}}', name:'default_days', value:default_days}, function (ret) {
586+
if (ret.status == 'success') {
587+
bootbox.alert(ret.message, function() {
588+
window.location.reload();
589+
});
590+
}
591+
});
592+
}
593+
566594
// 设置注册时默认流量
567595
function setDefaultTraffic() {
568596
var default_traffic = $("#default_traffic").val();
569597
570-
$.post("{{url('admin/setDefaultTraffic')}}", {_token:'{{csrf_token()}}', value:default_traffic}, function (ret) {
598+
$.post("{{url('admin/setConfig')}}", {_token:'{{csrf_token()}}', name:'default_traffic', value:default_traffic}, function (ret) {
571599
if (ret.status == 'success') {
572600
bootbox.alert(ret.message, function() {
573601
window.location.reload();
@@ -580,7 +608,7 @@ function setDefaultTraffic() {
580608
function setInviteNum() {
581609
var invite_num = $("#invite_num").val();
582610
583-
$.post("{{url('admin/setInviteNum')}}", {_token:'{{csrf_token()}}', value:invite_num}, function (ret) {
611+
$.post("{{url('admin/setConfig')}}", {_token:'{{csrf_token()}}', name:'invite_num', value:invite_num}, function (ret) {
584612
if (ret.status == 'success') {
585613
bootbox.alert(ret.message, function() {
586614
window.location.reload();
@@ -593,7 +621,7 @@ function setInviteNum() {
593621
function setResetPasswordTimes() {
594622
var reset_password_times = $("#reset_password_times").val();
595623
596-
$.post("{{url('admin/setResetPasswordTimes')}}", {_token:'{{csrf_token()}}', value:reset_password_times}, function (ret) {
624+
$.post("{{url('admin/setConfig')}}", {_token:'{{csrf_token()}}', name:'reset_password_times', value:reset_password_times}, function (ret) {
597625
if (ret.status == 'success') {
598626
bootbox.alert(ret.message, function() {
599627
window.location.reload();
@@ -606,7 +634,7 @@ function setResetPasswordTimes() {
606634
function setActiveTimes() {
607635
var active_times = $("#active_times").val();
608636
609-
$.post("{{url('admin/setActiveTimes')}}", {_token:'{{csrf_token()}}', value:active_times}, function (ret) {
637+
$.post("{{url('admin/setConfig')}}", {_token:'{{csrf_token()}}', name:'active_times', value:active_times}, function (ret) {
610638
if (ret.status == 'success') {
611639
bootbox.alert(ret.message, function() {
612640
window.location.reload();
@@ -619,7 +647,7 @@ function setActiveTimes() {
619647
function setTrafficWarningPercent() {
620648
var traffic_warning_percent = $("#traffic_warning_percent").val();
621649
622-
$.post("{{url('admin/setTrafficWarningPercent')}}", {_token:'{{csrf_token()}}', value:traffic_warning_percent}, function (ret) {
650+
$.post("{{url('admin/setConfig')}}", {_token:'{{csrf_token()}}', name:'traffic_warning_percent', value:traffic_warning_percent}, function (ret) {
623651
if (ret.status == 'success') {
624652
bootbox.alert(ret.message, function() {
625653
window.location.reload();
@@ -633,7 +661,7 @@ function setTrafficWarningPercent() {
633661
function setExpireDays() {
634662
var expire_days = $("#expire_days").val();
635663
636-
$.post("{{url('admin/setExpireDays')}}", {_token:'{{csrf_token()}}', value:expire_days}, function (ret) {
664+
$.post("{{url('admin/setConfig')}}", {_token:'{{csrf_token()}}', name:'expire_days', value:expire_days}, function (ret) {
637665
if (ret.status == 'success') {
638666
bootbox.alert(ret.message, function() {
639667
window.location.reload();
@@ -646,7 +674,7 @@ function setExpireDays() {
646674
function setWebsiteName() {
647675
var website_name = $("#website_name").val();
648676
649-
$.post("{{url('admin/setWebsiteName')}}", {_token:'{{csrf_token()}}', value:website_name}, function (ret) {
677+
$.post("{{url('admin/setConfig')}}", {_token:'{{csrf_token()}}', name:'website_name', value:website_name}, function (ret) {
650678
if (ret.status == 'success') {
651679
bootbox.alert(ret.message, function() {
652680
window.location.reload();
@@ -659,7 +687,7 @@ function setWebsiteName() {
659687
function setWebsiteUrl() {
660688
var website_url = $("#website_url").val();
661689
662-
$.post("{{url('admin/setWebsiteUrl')}}", {_token:'{{csrf_token()}}', value:website_url}, function (ret) {
690+
$.post("{{url('admin/setConfig')}}", {_token:'{{csrf_token()}}', name:'website_url', value:website_url}, function (ret) {
663691
if (ret.status == 'success') {
664692
bootbox.alert(ret.message, function() {
665693
window.location.reload();
@@ -672,7 +700,7 @@ function setWebsiteUrl() {
672700
function setLoginAddScoreRange() {
673701
var login_add_score_range = $("#login_add_score_range").val();
674702
675-
$.post("{{url('admin/setAddScoreRange')}}", {_token:'{{csrf_token()}}', value:login_add_score_range}, function (ret) {
703+
$.post("{{url('admin/setConfig')}}", {_token:'{{csrf_token()}}', name:'login_add_score_range', value:login_add_score_range}, function (ret) {
676704
if (ret.status == 'success') {
677705
bootbox.alert(ret.message, function() {
678706
window.location.reload();
@@ -685,7 +713,7 @@ function setLoginAddScoreRange() {
685713
function setReferralTraffic() {
686714
var referral_traffic = $("#referral_traffic").val();
687715
688-
$.post("{{url('admin/setReferralTraffic')}}", {_token:'{{csrf_token()}}', value:referral_traffic}, function (ret) {
716+
$.post("{{url('admin/setConfig')}}", {_token:'{{csrf_token()}}', name:'referral_traffic', value:referral_traffic}, function (ret) {
689717
if (ret.status == 'success') {
690718
bootbox.alert(ret.message, function() {
691719
window.location.reload();
@@ -711,7 +739,7 @@ function setReferralPercent() {
711739
function setReferralMoney() {
712740
var referral_money = $("#referral_money").val();
713741
714-
$.post("{{url('admin/setReferralMoney')}}", {_token:'{{csrf_token()}}', value:referral_money}, function (ret) {
742+
$.post("{{url('admin/setConfig')}}", {_token:'{{csrf_token()}}', name:'referral_money', value:referral_money}, function (ret) {
715743
if (ret.status == 'success') {
716744
bootbox.alert(ret.message, function() {
717745
window.location.reload();

0 commit comments

Comments
 (0)