time and data size define

app/Console/Commands/AutoJob.php

@@ -238,7 +238,7 @@ class AutoJob extends Command {
 				                                 ->whereNodeId(0)
 				                                 ->where('created_at', '>=', date('Y-m-d H:i:s', time() - 3900))
 				                                 ->sum('total');
-				if($totalTraffic >= (self::$systemConfig['traffic_ban_value'] * 1073741824)){
+				if($totalTraffic >= (self::$systemConfig['traffic_ban_value'] * GB)){
 					User::query()->whereId($user->id)->update([
 						'enable'   => 0,
 						'ban_time' => strtotime(date('Y-m-d H:i:s',
@@ -337,7 +337,7 @@ class AutoJob extends Command {
 							$times = Cache::get($cacheKey);
 						}else{
 							// 键将保留24小时
-							Cache::put($cacheKey, 1, 86400);
+							Cache::put($cacheKey, 1, Day);
 							$times = 1;
 						}
 

app/Console/Commands/DailyJob.php

@@ -161,18 +161,18 @@ class DailyJob extends Command {
 				$nextResetTime = null;
 			}
 			// 可用流量 变动日志
-			if($user->transfer_enable != $order->goods->traffic * 1048576){
+			if($user->transfer_enable != $order->goods->traffic * MB){
 				Helpers::addUserTrafficModifyLog($order->user_id, $order->oid, $user->transfer_enable,
-					$order->goods->traffic * 1048576, '【流量重置】重置可用流量');
+					$order->goods->traffic * MB, '【流量重置】重置可用流量');
 			}
 			// 重置流量
 			User::query()->whereId($user->id)->update([
 				'u'               => 0,
 				'd'               => 0,
-				'transfer_enable' => $order->goods->traffic * 1048576,
+				'transfer_enable' => $order->goods->traffic * MB,
 				'reset_time'      => $nextResetTime
 			]);
-			Log::info('用户[ID：'.$user->id.'  昵称： '.$user->username.'  邮箱： '.$user->email.'] 流量重置为 '.($order->goods->traffic * 1048576).'. 重置日期为 '.($nextResetTime?: '【无】'));
+			Log::info('用户[ID：'.$user->id.'  昵称： '.$user->username.'  邮箱： '.$user->email.'] 流量重置为 '.($order->goods->traffic * MB).'. 重置日期为 '.($nextResetTime?: '【无】'));
 		}
 	}
 }

app/Console/Commands/NodeBlockedDetection.php

@@ -109,7 +109,7 @@ class NodeBlockedDetection extends Command {
 		}
 
 		// 随机生成下次检测时间
-		Cache::put('LastCheckTime', time() + mt_rand(3000, 3600), 4000);
+		Cache::put('LastCheckTime', time() + mt_rand(3000, Hour), 3700);
 	}
 
 	/**

app/Console/Commands/UserExpireAutoWarning.php

@@ -44,7 +44,7 @@ class UserExpireAutoWarning extends Command {
 			}
 
 			// 计算剩余可用时间
-			$lastCanUseDays = ceil(round(strtotime($user->expire_time) - strtotime(date('Y-m-d H:i:s'))) / 3600 / 24);
+			$lastCanUseDays = ceil(round(strtotime($user->expire_time) - strtotime(date('Y-m-d H:i:s'))) / Day);
 			if($lastCanUseDays == 0){
 				$title = '账号过期提醒';
 				$content = '您的账号将于今天晚上【24:00】过期。';

app/Console/Commands/UserTrafficAbnormalAutoWarning.php

@@ -36,7 +36,7 @@ class UserTrafficAbnormalAutoWarning extends Command {
 		// 1小时内流量异常用户(多往前取5分钟，防止数据统计任务执行时间过长导致没有数据)
 		$userTotalTrafficList = UserTrafficHourly::query()
 		                                         ->whereNodeId(0)
-		                                         ->where('total', '>', 104857600)
+		                                         ->where('total', '>', MB * 100)
 		                                         ->where('created_at', '>=', date('Y-m-d H:i:s', time() - 3900))
 		                                         ->groupBy('user_id')
 		                                         ->selectRaw("user_id, sum(total) as totalTraffic")
@@ -48,7 +48,7 @@ class UserTrafficAbnormalAutoWarning extends Command {
 				$user = User::query()->whereId($vo->user_id)->first();
 
 				// 推送通知管理员
-				if($vo->totalTraffic > (self::$systemConfig['traffic_ban_value'] * 1073741824)){
+				if($vo->totalTraffic > (self::$systemConfig['traffic_ban_value'] * GB)){
 					$traffic = UserTrafficHourly::query()
 					                            ->whereNodeId(0)
 					                            ->whereUserId($vo->user_id)

app/Http/Controllers/AdminController.php

@@ -74,7 +74,7 @@ class AdminController extends Controller {
 		                                 ->whereEnable(1)
 		                                 ->where('t', '>', 0)
 		                                 ->count(); // 不活跃用户数
-		$view['onlineUserCount'] = User::query()->where('t', '>=', time() - 600)->count(); // 10分钟内在线用户数
+		$view['onlineUserCount'] = User::query()->where('t', '>=', time() - Minute * 10)->count(); // 10分钟内在线用户数
 		$view['expireWarningUserCount'] = User::query()
 		                                      ->where('expire_time', '>=', date('Y-m-d', strtotime("now")))
 		                                      ->where('expire_time', '<=', date('Y-m-d',
@@ -89,14 +89,14 @@ class AdminController extends Controller {
 		$tempUsers = [];
 		$userTotalTrafficList = UserTrafficHourly::query()
 		                                         ->whereNodeId(0)
-		                                         ->where('total', '>', 104857600)
+		                                         ->where('total', '>', MB * 100)
 		                                         ->where('created_at', '>=', date('Y-m-d H:i:s', time() - 3900))
 		                                         ->groupBy('user_id')
 		                                         ->selectRaw("user_id, sum(total) as totalTraffic")
 		                                         ->get(); // 只统计100M以上的记录，加快速度
 		if(!$userTotalTrafficList->isEmpty()){
 			foreach($userTotalTrafficList as $vo){
-				if($vo->totalTraffic > (self::$systemConfig['traffic_ban_value'] * 1073741824)){
+				if($vo->totalTraffic > (self::$systemConfig['traffic_ban_value'] * GB)){
 					$tempUsers[] = $vo->user_id;
 				}
 			}
@@ -183,7 +183,7 @@ class AdminController extends Controller {
 
 		// 当前在线
 		if($online){
-			$query->where('t', '>=', time() - 600);
+			$query->where('t', '>=', time() - Minute * 10);
 		}
 
 		// 不活跃用户
@@ -199,14 +199,14 @@ class AdminController extends Controller {
 			$tempUsers = [];
 			$userTotalTrafficList = UserTrafficHourly::query()
 			                                         ->whereNodeId(0)
-			                                         ->where('total', '>', 104857600)
+			                                         ->where('total', '>', MB * 100)
 			                                         ->where('created_at', '>=', date('Y-m-d H:i:s', time() - 3900))
 			                                         ->groupBy('user_id')
 			                                         ->selectRaw("user_id, sum(total) as totalTraffic")
 			                                         ->get(); // 只统计100M以上的记录，加快速度
 			if(!$userTotalTrafficList->isEmpty()){
 				foreach($userTotalTrafficList as $vo){
-					if($vo->totalTraffic > (self::$systemConfig['traffic_ban_value'] * 1024 * 1024 * 1024)){
+					if($vo->totalTraffic > (self::$systemConfig['traffic_ban_value'] * GB)){
 						$tempUsers[] = $vo->user_id;
 					}
 				}
@@ -235,7 +235,7 @@ class AdminController extends Controller {
 			                                 ->whereNodeId(0)
 			                                 ->where('created_at', '>=', $time)
 			                                 ->sum('total');
-			$user->trafficWarning = $totalTraffic > (self::$systemConfig['traffic_ban_value'] * 1024 * 1024 * 1024)? 1 : 0;
+			$user->trafficWarning = $totalTraffic > (self::$systemConfig['traffic_ban_value'] * GB)? 1 : 0;
 
 			// 订阅地址
 			$user->link = (self::$systemConfig['subscribe_domain']? self::$systemConfig['subscribe_domain'] : self::$systemConfig['website_url']).'/s/'.$user->subscribe->code;
@@ -579,8 +579,8 @@ class AdminController extends Controller {
 				$node->v2_method = $request->input('v2_method');
 				$node->v2_net = $request->input('v2_net');
 				$node->v2_type = $request->input('v2_type');
-				$node->v2_host = $request->input('v2_host')?: '';
-				$node->v2_path = $request->input('v2_path')?: '';
+				$node->v2_host = $request->input('v2_host');
+				$node->v2_path = $request->input('v2_path');
 				$node->v2_tls = intval($request->input('v2_tls'));
 				$node->v2_tls_insecure = intval($request->input('v2_tls_insecure'));
 				$node->v2_tls_insecure_ciphers = intval($request->input('v2_tls_insecure_ciphers'));
@@ -831,7 +831,7 @@ class AdminController extends Controller {
 			$dailyData[$x] = 0;
 		}
 		for($x = ($dailyTotal - $dailyCount); $x < $dailyTotal; $x++){
-			$dailyData[$x] = round($nodeTrafficDaily[$x - ($dailyTotal - $dailyCount)] / (1024 * 1024 * 1024), 3);
+			$dailyData[$x] = round($nodeTrafficDaily[$x - ($dailyTotal - $dailyCount)] / GB, 3);
 		}
 
 		// 节点一天内的流量
@@ -848,12 +848,12 @@ class AdminController extends Controller {
 			$hourlyData[$x] = 0;
 		}
 		for($x = ($hourlyTotal - $hourlyCount); $x < $hourlyTotal; $x++){
-			$hourlyData[$x] = round($nodeTrafficHourly[$x - ($hourlyTotal - $hourlyCount)] / (1024 * 1024 * 1024), 3);
+			$hourlyData[$x] = round($nodeTrafficHourly[$x - ($hourlyTotal - $hourlyCount)] / GB, 3);
 		}
 
-		$view['trafficDaily'] = ['nodeName' => $node->name, 'dailyData' => "'".implode("','", $dailyData)."'"];
+		$view['trafficDaily'] = ['nodeName' => $node->name, 'dailyData' => json_encode($dailyData)];
 
-		$view['trafficHourly'] = ['nodeName' => $node->name, 'hourlyData' => "'".implode("','", $hourlyData)."'"];
+		$view['trafficHourly'] = ['nodeName' => $node->name, 'hourlyData' => json_encode($hourlyData)];
 
 
 		// 本月天数数据
@@ -869,8 +869,8 @@ class AdminController extends Controller {
 
 		$view['nodeName'] = $node->name;
 		$view['nodeServer'] = $node->server;
-		$view['monthDays'] = "'".implode("','", $monthDays)."'";
-		$view['dayHours'] = "'".implode("','", $dayHours)."'";
+		$view['monthDays'] = json_encode($monthDays);
+		$view['dayHours'] = json_encode($dayHours);
 
 		return Response::view('admin.node.nodeMonitor', $view);
 	}
@@ -1216,7 +1216,7 @@ EOF;
 			$dailyData[$x] = 0;
 		}
 		for($x = $dailyTotal - $dailyCount; $x < $dailyTotal; $x++){
-			$dailyData[$x] = round($userTrafficDaily[$x - ($dailyTotal - $dailyCount)] / (1024 * 1024 * 1024), 3);
+			$dailyData[$x] = round($userTrafficDaily[$x - ($dailyTotal - $dailyCount)] / GB, 3);
 		}
 
 		// 节点一天内的流量
@@ -1233,7 +1233,7 @@ EOF;
 			$hourlyData[$x] = 0;
 		}
 		for($x = ($hourlyTotal - $hourlyCount); $x < $hourlyTotal; $x++){
-			$hourlyData[$x] = round($userTrafficHourly[$x - ($hourlyTotal - $hourlyCount)] / (1024 * 1024 * 1024), 3);
+			$hourlyData[$x] = round($userTrafficHourly[$x - ($hourlyTotal - $hourlyCount)] / GB, 3);
 		}
 
 		// 本月天数数据
@@ -1247,10 +1247,10 @@ EOF;
 			$dayHours[] = $i;
 		}
 
-		$view['trafficDaily'] = "'".implode("','", $dailyData)."'";
-		$view['trafficHourly'] = "'".implode("','", $hourlyData)."'";
-		$view['monthDays'] = "'".implode("','", $monthDays)."'";
-		$view['dayHours'] = "'".implode("','", $dayHours)."'";
+		$view['trafficDaily'] = json_encode($dailyData);
+		$view['trafficHourly'] = json_encode($hourlyData);
+		$view['monthDays'] = json_encode($monthDays);
+		$view['dayHours'] = json_encode($dayHours);
 		$view['email'] = $user->email;
 
 		return Response::view('admin.logs.userMonitor', $view);
@@ -1456,7 +1456,7 @@ EOF;
 		$validator = Validator::make($request->all(), [
 			'id' => 'required|numeric|exists:level,id',
 		]);
-		
+
 		if($validator->fails()){
 			return Response::json(['status' => 'fail', 'message' => $validator->errors()->all()]);
 		}

app/Http/Controllers/Api/LoginController.php

@@ -47,7 +47,7 @@ class LoginController extends Controller {
 				return Response::json(['status' => 'fail', 'data' => [], 'message' => '请求失败超限，禁止访问1小时']);
 			}
 		}else{
-			Cache::put($cacheKey, 1, 3600);
+			Cache::put($cacheKey, 1, Hour);
 		}
 
 		$user = User::query()->whereEmail($email)->where('status', '>=', 0)->first();

app/Http/Controllers/AuthController.php

@@ -330,7 +330,7 @@ class AuthController extends Controller {
 			$affArr = $this->getAff($code, $aff);
 			$referral_uid = $affArr['referral_uid'];
 
-			$transfer_enable = 1048576 * (self::$systemConfig['default_traffic'] + ($referral_uid? self::$systemConfig['referral_traffic'] : 0));
+			$transfer_enable = MB * (self::$systemConfig['default_traffic'] + ($referral_uid? self::$systemConfig['referral_traffic'] : 0));
 
 			// 创建新用户
 			$uid = Helpers::addUser($email, Hash::make($password), $transfer_enable,
@@ -354,7 +354,7 @@ class AuthController extends Controller {
 			if(Cache::has($cacheKey)){
 				Cache::increment($cacheKey);
 			}else{
-				Cache::put($cacheKey, 1, 86400); // 24小时
+				Cache::put($cacheKey, 1, Day); // 24小时
 			}
 
 			// 更新邀请码
@@ -383,7 +383,7 @@ class AuthController extends Controller {
 						if($referralUser->expire_time >= date('Y-m-d')){
 							User::query()
 							    ->whereId($referral_uid)
-							    ->increment('transfer_enable', self::$systemConfig['referral_traffic'] * 1048576);
+							    ->increment('transfer_enable', self::$systemConfig['referral_traffic'] * MB);
 						}
 					}
 				}
@@ -530,7 +530,7 @@ class AuthController extends Controller {
 			$logId = Helpers::addNotificationLog('重置密码', '请求地址：'.$resetPasswordUrl, 1, $email);
 			Mail::to($email)->send(new resetPassword($logId, $resetPasswordUrl));
 
-			Cache::put('resetPassword_'.md5($email), $resetTimes + 1, 86400);
+			Cache::put('resetPassword_'.md5($email), $resetTimes + 1, Day);
 
 			return Redirect::back()->with('successMsg', trans('auth.reset_password_success_tip'));
 		}else{
@@ -642,7 +642,7 @@ class AuthController extends Controller {
 			$logId = Helpers::addNotificationLog('激活账号', '请求地址：'.$activeUserUrl, 1, $email);
 			Mail::to($email)->send(new activeUser($logId, $activeUserUrl));
 
-			Cache::put('activeUser_'.md5($email), $activeTimes + 1, 86400);
+			Cache::put('activeUser_'.md5($email), $activeTimes + 1, Day);
 
 			return Redirect::back()->with('successMsg', trans('auth.register_active_tip'));
 		}else{
@@ -695,7 +695,7 @@ class AuthController extends Controller {
 
 		// 账号激活后给邀请人送流量
 		if($verify->user->referral_uid){
-			$transfer_enable = self::$systemConfig['referral_traffic'] * 1048576;
+			$transfer_enable = self::$systemConfig['referral_traffic'] * MB;
 
 			User::query()
 			    ->whereId($verify->user->referral_uid)
@@ -748,7 +748,7 @@ class AuthController extends Controller {
 
 		$this->addVerifyCode($email, $code);
 
-		Cache::put('send_verify_code_'.md5(getClientIP()), getClientIP(), 60);
+		Cache::put('send_verify_code_'.md5(getClientIP()), getClientIP(), Minute);
 
 		return Response::json(['status' => 'success', 'message' => trans('auth.captcha_send')]);
 	}

app/Http/Controllers/Gateway/AbstractPayment.php

@@ -68,9 +68,9 @@ abstract class AbstractPayment {
 			case 1:
 				$order->status = 2;
 				$order->save();
-				User::query()->whereId($order->user_id)->increment('transfer_enable', $goods->traffic * 1048576);
+				User::query()->whereId($order->user_id)->increment('transfer_enable', $goods->traffic * MB);
 				Helpers::addUserTrafficModifyLog($order->user_id, $order->oid, $user->transfer_enable,
-					$user->transfer_enable + $goods->traffic * 1048576, '['.$method.']加上用户购买的套餐流量');
+					$user->transfer_enable + $goods->traffic * MB, '['.$method.']加上用户购买的套餐流量');
 				break;
 			case 2:
 				$activePlan = Order::query()
@@ -106,7 +106,7 @@ abstract class AbstractPayment {
 					Helpers::addUserTrafficModifyLog($order->user_id, $order->oid, $user->transfer_enable, 0,
 						'['.$method.']用户购买新套餐，先清空流量');
 
-					$userTraffic = $goods->traffic * 1048576;
+					$userTraffic = $goods->traffic * MB;
 					// 添加账号有效期
 					$expireTime = date('Y-m-d', strtotime("+".$goods->days." days"));
 					//账号下一个重置时间

app/Http/Controllers/ServiceController.php

@@ -28,7 +28,7 @@ class ServiceController extends Controller {
 		//取出用户信息
 		$user = User::query()->whereId($prepaidOrder->user_id)->first();
 
-		$userTraffic = $prepaidGood->traffic * 1048576;
+		$userTraffic = $prepaidGood->traffic * MB;
 		//拿出可能存在的其余套餐, 推算 最新的到期时间
 		$expire_time = date('Y-m-d', strtotime("+".$prepaidGood->days." days"));
 		$prepaidOrders = Order::query()->whereUserId($prepaidOrder->user_id)->whereStatus(3)->get();

app/Http/Controllers/User/AffiliateController.php

@@ -24,7 +24,7 @@ class AffiliateController extends Controller {
 			return Response::view('auth.error',
 				['message' => '本功能对非付费用户禁用！请 <a class="btn btn-sm btn-danger" href="/">返 回</a>']);
 		}
-		$view['referral_traffic'] = flowAutoShow(self::$systemConfig['referral_traffic'] * 1048576);
+		$view['referral_traffic'] = flowAutoShow(self::$systemConfig['referral_traffic'] * MB);
 		$view['referral_percent'] = self::$systemConfig['referral_percent'];
 		$view['referral_money'] = self::$systemConfig['referral_money'];
 		$view['totalAmount'] = ReferralLog::uid()->sum('ref_amount') / 100;

app/Http/Controllers/UserController.php

@@ -56,8 +56,8 @@ class UserController extends Controller {
 		$usedTransfer = $user->u + $user->d;
 		$unusedTransfer = $totalTransfer - $usedTransfer > 0? $totalTransfer - $usedTransfer : 0;
 		$expireTime = $user->expire_time;
-		$view['remainDays'] = $expireTime < date('Y-m-d')? -1 : (strtotime($expireTime) - strtotime(date('Y-m-d'))) / 86400;
-		$view['resetDays'] = $user->reset_time? round((strtotime($user->reset_time) - strtotime(date('Y-m-d'))) / 86400) : 0;
+		$view['remainDays'] = $expireTime < date('Y-m-d')? -1 : (strtotime($expireTime) - strtotime(date('Y-m-d'))) / Day;
+		$view['resetDays'] = $user->reset_time? round((strtotime($user->reset_time) - strtotime(date('Y-m-d'))) / Day) : 0;
 		$view['unusedTransfer'] = $unusedTransfer;
 		$view['expireTime'] = $expireTime;
 		$view['banedTime'] = $user->ban_time? date('Y-m-d H:i:s', $user->ban_time) : 0;
@@ -67,9 +67,9 @@ class UserController extends Controller {
 		$hourlyTraffic = UserTrafficHourly::query()
 		                                  ->whereUserId($user->id)
 		                                  ->whereNodeId(0)
-		                                  ->where('created_at', '>=', date('Y-m-d H:i:s', time() - 3900))
+		                                  ->where('created_at', '>=', date('Y-m-d H:i:s', time() - Minute * 65))
 		                                  ->sum('total');
-		$view['isTrafficWarning'] = $hourlyTraffic >= (self::$systemConfig['traffic_ban_value'] * 1073741824)?: 0;
+		$view['isTrafficWarning'] = $hourlyTraffic >= (self::$systemConfig['traffic_ban_value'] * GB)?: 0;
 		//付费用户判断
 		$view['not_paying_user'] = Order::uid()
 		                                ->whereStatus(2)
@@ -90,14 +90,13 @@ class UserController extends Controller {
 		                                    ->orderBy('created_at')
 		                                    ->pluck('total')
 		                                    ->toArray();
-
 		$dailyTotal = date('d', time()) - 1; // 今天不算，减一
 		$dailyCount = count($userTrafficDaily);
 		for($x = 0; $x < $dailyTotal - $dailyCount; $x++){
 			$dailyData[$x] = 0;
 		}
 		for($x = $dailyTotal - $dailyCount; $x < $dailyTotal; $x++){
-			$dailyData[$x] = round($userTrafficDaily[$x - ($dailyTotal - $dailyCount)] / (1024 * 1024 * 1024), 3);
+			$dailyData[$x] = round($userTrafficDaily[$x - ($dailyTotal - $dailyCount)] / GB, 3);
 		}
 
 		// 节点一天内的流量
@@ -114,7 +113,7 @@ class UserController extends Controller {
 			$hourlyData[$x] = 0;
 		}
 		for($x = ($hourlyTotal - $hourlyCount); $x < $hourlyTotal; $x++){
-			$hourlyData[$x] = round($userTrafficHourly[$x - ($hourlyTotal - $hourlyCount)] / (1024 * 1024 * 1024), 3);
+			$hourlyData[$x] = round($userTrafficHourly[$x - ($hourlyTotal - $hourlyCount)] / GB, 3);
 		}
 
 		// 本月天数数据
@@ -128,10 +127,10 @@ class UserController extends Controller {
 			$dayHours[] = $i;
 		}
 
-		$view['trafficDaily'] = "'".implode("','", $dailyData)."'";
-		$view['trafficHourly'] = "'".implode("','", $hourlyData)."'";
-		$view['monthDays'] = "'".implode("','", $monthDays)."'";
-		$view['dayHours'] = "'".implode("','", $dayHours)."'";
+		$view['trafficDaily'] = json_encode($dailyData);
+		$view['trafficHourly'] = json_encode($hourlyData);
+		$view['monthDays'] = json_encode($monthDays);
+		$view['dayHours'] = json_encode($dayHours);
 
 		return Response::view('user.index', $view);
 	}
@@ -150,7 +149,7 @@ class UserController extends Controller {
 		}
 
 		$traffic = mt_rand((int) self::$systemConfig['min_rand_traffic'],
-				(int) self::$systemConfig['max_rand_traffic']) * 1048576;
+				(int) self::$systemConfig['max_rand_traffic']) * MB;
 		$ret = User::uid()->increment('transfer_enable', $traffic);
 		if(!$ret){
 			return Response::json(['status' => 'fail', 'message' => '签到失败，系统异常']);
@@ -161,7 +160,7 @@ class UserController extends Controller {
 			'[签到]');
 
 		// 多久后可以再签到
-		$ttl = self::$systemConfig['traffic_limit_time']? self::$systemConfig['traffic_limit_time'] * 60 : 86400;
+		$ttl = self::$systemConfig['traffic_limit_time']? self::$systemConfig['traffic_limit_time'] * Minute : Day;
 		Cache::put('userCheckIn_'.$user->id, '1', $ttl);
 
 		return Response::json(['status' => 'success', 'message' => '签到成功，系统送您 '.flowAutoShow($traffic).'流量']);
@@ -302,7 +301,7 @@ class UserController extends Controller {
 		$view['renewTraffic'] = $renewPrice? $renewPrice->renew : 0;
 		// 有重置日时按照重置日为标准，否者就以过期日为标准
 		$dataPlusDays = $user->reset_time? $user->reset_time : $user->expire_time;
-		$view['dataPlusDays'] = $dataPlusDays > date('Y-m-d')? round((strtotime($dataPlusDays) - strtotime(date('Y-m-d'))) / 86400) : 0;
+		$view['dataPlusDays'] = $dataPlusDays > date('Y-m-d')? round((strtotime($dataPlusDays) - strtotime(date('Y-m-d'))) / Day) : 0;
 		$view['purchaseHTML'] = PaymentController::purchaseHTML();
 
 		return Response::view('user.services', $view);
@@ -481,7 +480,7 @@ class UserController extends Controller {
 
 		$view['num'] = Auth::getUser()->invite_num; // 还可以生成的邀请码数量
 		$view['inviteList'] = Invite::uid()->with(['generator', 'user'])->paginate(10); // 邀请码列表
-		$view['referral_traffic'] = flowAutoShow(self::$systemConfig['referral_traffic'] * 1048576);
+		$view['referral_traffic'] = flowAutoShow(self::$systemConfig['referral_traffic'] * MB);
 		$view['referral_percent'] = self::$systemConfig['referral_percent'];
 
 		return Response::view('user.invite', $view);
@@ -551,7 +550,7 @@ class UserController extends Controller {
 		}
 		// 有重置日时按照重置日为标准，否者就以过期日为标准
 		$dataPlusDays = Auth::getUser()->reset_time?: Auth::getUser()->expire_time;
-		$view['dataPlusDays'] = $dataPlusDays > date('Y-m-d')? round((strtotime($dataPlusDays) - strtotime(date('Y-m-d'))) / 86400) : 0;
+		$view['dataPlusDays'] = $dataPlusDays > date('Y-m-d')? round((strtotime($dataPlusDays) - strtotime(date('Y-m-d'))) / Day) : 0;
 		$view['activePlan'] = Order::uid()
 		                           ->with(['goods'])
 		                           ->whereIsExpire(0)

app/Models/Goods.php

@@ -89,6 +89,6 @@ class Goods extends Model {
 	}
 
 	function getTrafficLabelAttribute() {
-		return flowAutoShow($this->attributes['traffic'] * 1048576);
+		return flowAutoShow($this->attributes['traffic'] * MB);
 	}
 }

app/helpers.php

@@ -2,6 +2,16 @@
 
 use App\Components\Curl;
 
+define('KB', 1024);
+define('MB', 1048576);
+define('GB', 1073741824);
+define('TB', 1099511627776);
+define('PB', 1125899906842624);
+
+define('Minute', 60);
+define('Hour', 3600);
+define('Day', 86400);
+
 // 生成SS密码
 if(!function_exists('makeRandStr')){
 	function makeRandStr($length = 6, $isNumbers = false) {
@@ -38,21 +48,16 @@ if(!function_exists('base64url_decode')){
 // 根据流量值自动转换单位输出
 if(!function_exists('flowAutoShow')){
 	function flowAutoShow($value = 0) {
-		$kb = 1024;
-		$mb = 1048576;
-		$gb = 1073741824;
-		$tb = $gb * 1024;
-		$pb = $tb * 1024;
-		if(abs($value) >= $pb){
-			return round($value / $pb, 2)."PB";
-		}elseif(abs($value) >= $tb){
-			return round($value / $tb, 2)."TB";
-		}elseif(abs($value) >= $gb){
-			return round($value / $gb, 2)."GB";
-		}elseif(abs($value) >= $mb){
-			return round($value / $mb, 2)."MB";
-		}elseif(abs($value) >= $kb){
-			return round($value / $kb, 2)."KB";
+		if(abs($value) >= PB){
+			return round($value / PB, 2)."PB";
+		}elseif(abs($value) >= TB){
+			return round($value / TB, 2)."TB";
+		}elseif(abs($value) >= GB){
+			return round($value / GB, 2)."GB";
+		}elseif(abs($value) >= MB){
+			return round($value / MB, 2)."MB";
+		}elseif(abs($value) >= KB){
+			return round($value / KB, 2)."KB";
 		}else{
 			return round($value, 2)."B";
 		}
@@ -61,25 +66,19 @@ if(!function_exists('flowAutoShow')){
 
 if(!function_exists('toMB')){
 	function toMB($traffic) {
-		$mb = 1048576;
-
-		return $traffic * $mb;
+		return $traffic * MB;
 	}
 }
 
 if(!function_exists('toGB')){
 	function toGB($traffic) {
-		$gb = 1048576 * 1024;
-
-		return $traffic * $gb;
+		return $traffic * GB;
 	}
 }
 
 if(!function_exists('flowToGB')){
 	function flowToGB($traffic) {
-		$gb = 1048576 * 1024;
-
-		return $traffic / $gb;
+		return $traffic / GB;
 	}
 }
 
@@ -88,9 +87,9 @@ if(!function_exists('formatBytes')){
 	function formatBytes($bytes, $precision = 2) {
 		$units = ['B', 'KB', 'MB', 'GB', 'TB'];
 		$bytes = max($bytes, 0);
-		$pow = floor(($bytes? log($bytes) : 0) / log(1024));
+		$pow = floor(($bytes? log($bytes) : 0) / log(KB));
 		$pow = min($pow, count($units) - 1);
-		$bytes /= pow(1024, $pow);
+		$bytes /= pow(KB, $pow);
 
 		return round($bytes, $precision).' '.$units[$pow];
 	}
@@ -99,9 +98,9 @@ if(!function_exists('formatBytes')){
 // 秒转时间
 if(!function_exists('seconds2time')){
 	function seconds2time($seconds) {
-		$day = floor($seconds / (3600 * 24));
-		$hour = floor(($seconds % (3600 * 24)) / 3600);
-		$minute = floor((($seconds % (3600 * 24)) % 3600) / 60);
+		$day = floor($seconds / Day);
+		$hour = floor(($seconds % Day) / Hour);
+		$minute = floor((($seconds % Day) % Hour) / Minute);
 		if($day > 0){
 			return $day.'天'.$hour.'小时'.$minute.'分';
 		}else{

resources/views/admin/logs/userMonitor.blade.php

@@ -32,7 +32,7 @@
 		const dailyChart = new Chart(document.getElementById('dailyChart').getContext('2d'), {
 			type: 'line',
 			data: {
-				labels: [{!! $dayHours !!}],
+				labels: {{$dayHours}},
 				datasets: [{
 					fill: true,
 					backgroundColor: "rgba(98, 168, 234, .1)",
@@ -43,7 +43,7 @@
 					pointBackgroundColor: Config.colors("primary", 600),
 					pointHoverBackgroundColor: "#fff",
 					pointHoverBorderColor: Config.colors("primary", 600),
-					data: [{!! $trafficHourly !!}],
+					data: {{$trafficHourly}},
 				}]
 			},
 			options: {
@@ -79,7 +79,7 @@
 		const monthlyChart = new Chart(document.getElementById('monthlyChart').getContext('2d'), {
 			type: 'line',
 			data: {
-				labels: [{!! $monthDays !!}],
+				labels: {{$monthDays}},
 				datasets: [{
 					fill: true,
 					backgroundColor: "rgba(98, 168, 234, .1)",
@@ -90,7 +90,7 @@
 					pointBackgroundColor: Config.colors("primary", 600),
 					pointHoverBackgroundColor: "#fff",
 					pointHoverBorderColor: Config.colors("primary", 600),
-					data: [{!! $trafficDaily !!}],
+					data: {{$trafficDaily}},
 				}]
 			},
 			options: {

resources/views/admin/node/nodeList.blade.php

@@ -71,7 +71,7 @@
 											class="btn btn-primary"><i class="icon wb-edit"></i></a>
 									<a href="javascript:delNode('{{$node->id}}','{{$node->name}}')"
 											class="btn btn-danger"><i class="icon wb-trash"></i></a>
-									<a href="/admin/nodeMonitor/{{$node->id}})" class="btn btn-primary"><i
+									<a href="/admin/nodeMonitor/{{$node->id}}" class="btn btn-primary"><i
 												class="icon wb-stats-bars"></i></a>
 								</div>
 							</td>

resources/views/admin/node/nodeMonitor.blade.php

@@ -34,7 +34,7 @@
 		const dailyChart = new Chart(document.getElementById('dailyChart').getContext('2d'), {
 			type: 'line',
 			data: {
-				labels: [{!! $dayHours !!}],
+				labels: {{$dayHours}},
 				datasets: [{
 					fill: true,
 					backgroundColor: "rgba(98, 168, 234, .1)",
@@ -45,7 +45,7 @@
 					pointBackgroundColor: Config.colors("primary", 600),
 					pointHoverBackgroundColor: "#fff",
 					pointHoverBorderColor: Config.colors("primary", 600),
-					data: [{!! $trafficHourly['hourlyData'] !!}],
+					data: {{$trafficHourly['hourlyData']}},
 				}]
 			},
 			options: {
@@ -78,7 +78,7 @@
 		const monthlyChart = new Chart(document.getElementById('monthlyChart').getContext('2d'), {
 			type: 'line',
 			data: {
-				labels: [{!! $monthDays !!}],
+				labels: {{$monthDays}},
 				datasets: [{
 					fill: true,
 					backgroundColor: "rgba(98, 168, 234, .1)",
@@ -89,7 +89,7 @@
 					pointBackgroundColor: Config.colors("primary", 600),
 					pointHoverBackgroundColor: "#fff",
 					pointHoverBorderColor: Config.colors("primary", 600),
-					data: [{!! $trafficDaily['dailyData'] !!}],
+					data: {{$trafficDaily['dailyData']}},
 				}]
 			},
 			options: {

resources/views/user/index.blade.php

@@ -259,7 +259,7 @@
 		const dailyChart = new Chart(document.getElementById('dailyChart').getContext('2d'), {
 			type: 'line',
 			data: {
-				labels: [{!! $dayHours !!}],
+				labels: {{$dayHours}},
 				datasets: [{
 					fill: true,
 					backgroundColor: "rgba(98, 168, 234, .1)",
@@ -270,7 +270,7 @@
 					pointBackgroundColor: Config.colors("primary", 600),
 					pointHoverBackgroundColor: "#fff",
 					pointHoverBorderColor: Config.colors("primary", 600),
-					data: [{!! $trafficHourly !!}],
+					data: {{$trafficHourly}},
 				}]
 			},
 			options: {
@@ -306,7 +306,7 @@
 		const monthlyChart = new Chart(document.getElementById('monthlyChart').getContext('2d'), {
 			type: 'line',
 			data: {
-				labels: [{!! $monthDays !!}],
+				labels: {{$monthDays}},
 				datasets: [{
 					fill: true,
 					backgroundColor: "rgba(98, 168, 234, .1)",
@@ -317,7 +317,7 @@
 					pointBackgroundColor: Config.colors("primary", 600),
 					pointHoverBackgroundColor: "#fff",
 					pointHoverBorderColor: Config.colors("primary", 600),
-					data: [{!! $trafficDaily !!}],
+					data: {{$trafficDaily}},
 				}]
 			},
 			options: {

sql/mod/20200503.sql

@@ -90,7 +90,7 @@ ALTER TABLE `user`
     DROP `obfs_param`,
     DROP `speed_limit_per_con`,
     DROP `speed_limit_per_user`,
-    ADD `speed_limit`                          BIGINT(20) UNSIGNED  NOT NULL DEFAULT '0' COMMENT '用户限速，为0表示不限速，单位Byte' AFTER `obfs_param`,
+    ADD `speed_limit`                          BIGINT(20) UNSIGNED  NOT NULL DEFAULT '0' COMMENT '用户限速，为0表示不限速，单位Byte' AFTER `obfs`,
     DROP `usage`,
     DROP `pay_way`,
     CHANGE `balance` `credit`                  INT(10) UNSIGNED     NOT NULL DEFAULT '0' COMMENT '余额，单位分',