BitMaster/ProxyPanel
1
0
Fork 0
mirror of https://github.com/ProxyPanel/ProxyPanel.git synced 2026-04-06 20:50:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Clean Code

Browse Source
This commit is contained in:
BrettonYe
2024-07-31 22:15:20 +08:00
parent 5d6e7412d4
commit 32d53e9178
19 changed files with 45 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Channels/Library/WeChat.php
View File

@@ -96,7 +96,7 @@ XML;
public function extract(string $xmlText): array
{
try {
$xml = new DOMDocument();
$xml = new DOMDocument;
$xml->loadXML($xmlText);
$encrypt = $xml->getElementsByTagName('Encrypt')->item(0)->nodeValue;

2
app/Channels/WeChatChannel.php
View File

@@ -111,7 +111,7 @@ class WeChatChannel
public function verify(Request $request): void
{
$errCode = (new WeChat())->verifySignature($request->input('msg_signature'), $request->input('timestamp'), $request->input('nonce'), $request->input('echostr'), $sEchoStr);
$errCode = (new WeChat)->verifySignature($request->input('msg_signature'), $request->input('timestamp'), $request->input('nonce'), $request->input('echostr'), $sEchoStr);
if ($errCode === 0) {
exit($sEchoStr);
}

2
app/Http/Controllers/Admin/CouponController.php
View File

@@ -133,7 +133,7 @@ class CouponController extends Controller
try {
$filename = '卡券_Coupon_'.date('Ymd').'.xlsx';
$spreadsheet = new Spreadsheet();
$spreadsheet = new Spreadsheet;
$spreadsheet->getProperties()
->setCreator('ProxyPanel')
->setLastModifiedBy('ProxyPanel')

2
app/Http/Controllers/Admin/SystemController.php
View File

@@ -32,7 +32,7 @@ class SystemController extends Controller
return view('admin.config.system', array_merge([
'payments' => $this->getPayment(),
'captcha' => $this->getCaptcha(),
'ddns_labels' => (new DDNS())->getLabels(),
'ddns_labels' => (new DDNS)->getLabels(),
], Config::pluck('value', 'name')->toArray()));
}

2
app/Http/Controllers/Admin/ToolsController.php
View File

@@ -155,7 +155,7 @@ class ToolsController extends Controller
try {
DB::beginTransaction();
foreach ($data as $user) {
$obj = new User();
$obj = new User;
$obj->nickname = $user->user;
$obj->username = $user->user;
$obj->password = '123456';

10
app/Http/Controllers/Admin/UserController.php
View File

@@ -45,7 +45,7 @@ class UserController extends Controller
});
}
// 流量超过100G的
// 流量使用超过90%的用户
$request->whenFilled('largeTraffic', function () use ($query) {
$query->whereIn('status', [0, 1])->whereRaw('(u + d)/transfer_enable >= 0.9');
});
@@ -65,7 +65,7 @@ class UserController extends Controller
$query->whereBetween('t', [1, strtotime('-'.sysConfig('expire_days').' days')])->whereEnable(1);
});
// 不活跃用户
// 付费服务中的用户
$request->whenFilled('paying', function () use ($query) {
$payingUser = Order::whereStatus(2)->whereNotNull('goods_id')->whereIsExpire(0)->where('amount', '>', 0)->pluck('user_id')->unique();
$query->whereIn('id', $payingUser);
@@ -176,8 +176,8 @@ class UserController extends Controller
{
try {
for ($i = 0; $i < (int) request('amount', 1); $i++) {
$user = Helpers::addUser(Str::random(8).'@auto.generate', Str::random(), (int) sysConfig('default_traffic'), (int) sysConfig('default_days'));
Helpers::addUserTrafficModifyLog($user->id, 0, TiB, trans('admin.user.massive.note'));
$user = Helpers::addUser(Str::random(8).'@auto.generate', Str::random(), MiB * sysConfig('default_traffic'), (int) sysConfig('default_days'));
Helpers::addUserTrafficModifyLog($user->id, 0, $user->transfer_enable, trans('admin.user.massive.note'));
}
return Response::json(['status' => 'success', 'message' => trans('admin.user.massive.succeed')]);
@@ -305,7 +305,7 @@ class UserController extends Controller
public function VNetInfo(User $user): JsonResponse
{
$nodes = $user->nodes()->whereType(4)->get(['node.id', 'node.name']);
$nodeList = (new getUser())->existsinVNet($user);
$nodeList = (new getUser)->existsinVNet($user);
foreach ($nodes as $node) {
$node->avaliable = in_array($node->id, $nodeList, true) ? '✔️' : '❌';

4
app/Http/Controllers/AdminController.php
View File

@@ -90,7 +90,7 @@ class AdminController extends Controller
public function makeInvite(): JsonResponse
{
for ($i = 0; $i < 10; $i++) {
$obj = new Invite();
$obj = new Invite;
$obj->code = strtoupper(substr(md5(microtime().Str::random(6)), 8, 12));
$obj->dateline = date('Y-m-d H:i:s', strtotime(sysConfig('admin_invite_days').' days'));
$obj->save();
@@ -105,7 +105,7 @@ class AdminController extends Controller
$inviteList = Invite::whereStatus(0)->orderBy('id')->get();
$filename = '邀请码'.date('Ymd').'.xlsx';
$spreadsheet = new Spreadsheet();
$spreadsheet = new Spreadsheet;
$spreadsheet->getProperties()->setCreator('ProxyPanel')->setLastModifiedBy('ProxyPanel')->setTitle('邀请码')->setSubject('邀请码');
try {

2
app/Http/Controllers/Api/Client/AuthController.php
View File

@@ -39,7 +39,7 @@ class AuthController extends Controller
$data = $validator->validated();
// 创建新用户
if ($user = Helpers::addUser($data['username'], $data['password'], (int) sysConfig('default_traffic'), (int) sysConfig('default_days'), null, $data['nickname'])) {
if ($user = Helpers::addUser($data['username'], $data['password'], MiB * sysConfig('default_traffic'), (int) sysConfig('default_days'), null, $data['nickname'])) {
auth()->login($user, true);
return $this->succeed([

4
app/Http/Controllers/AuthController.php
View File

@@ -127,7 +127,7 @@ class AuthController extends Controller
}
break;
case 5: // Turnstile
$validator = Validator::make($request->all(), ['cf-turnstile-response' => ['required', 'string', new TurnstileCaptcha()]]);
$validator = Validator::make($request->all(), ['cf-turnstile-response' => ['required', 'string', new TurnstileCaptcha]]);
if ($validator->fails()) {
return Redirect::back()->withInput()->withErrors($validator->errors());
@@ -368,7 +368,7 @@ class AuthController extends Controller
private function addVerifyUrl($uid, $email): string
{ // 生成申请的请求地址
$token = md5(sysConfig('website_name').$email.microtime());
$verify = new Verify();
$verify = new Verify;
$verify->user_id = $uid;
$verify->token = $token;
$verify->save();

20
app/Http/Controllers/PaymentController.php
View File

@@ -42,25 +42,25 @@ class PaymentController extends Controller
{
switch (self::$method) {
case 'credit':
return new Local();
return new Local;
case 'f2fpay':
return new F2Fpay();
return new F2Fpay;
case 'codepay':
return new Codepay();
return new Codepay;
case 'payjs':
return new PayJs();
return new PayJs;
case 'paypal':
return new PayPal();
return new PayPal;
case 'epay':
return new EPay();
return new EPay;
case 'stripe':
return new Stripe();
return new Stripe;
case 'paybeaver':
return new PayBeaver();
return new PayBeaver;
case 'theadpay':
return new THeadPay();
return new THeadPay;
case 'manual':
return new Manual();
return new Manual;
default:
Log::emergency('未知支付：'.self::$method);
exit(404);

8
app/Http/Controllers/TelegramController.php
View File

@@ -30,7 +30,7 @@ class TelegramController extends Controller
break;
}
} catch (Exception $e) {
$telegramService = new TelegramService();
$telegramService = new TelegramService;
$telegramService->sendMessage($this->msg->chat_id, $e->getMessage());
}
}
@@ -40,7 +40,7 @@ class TelegramController extends Controller
if (! isset($data['message'])) {
return false;
}
$obj = new StdClass();
$obj = new StdClass;
$obj->is_private = $data['message']['chat']['type'] === 'private';
if (! isset($data['message']['text'])) {
return false;
@@ -99,7 +99,7 @@ class TelegramController extends Controller
if (! $user->userAuths()->create(['type' => 'telegram', 'identifier' => $msg->chat_id])) {
abort(500, '设置失败');
}
$telegramService = new TelegramService();
$telegramService = new TelegramService;
$telegramService->sendMessage($msg->chat_id, '绑定成功');
}
@@ -109,7 +109,7 @@ class TelegramController extends Controller
if (! $msg->is_private) {
return;
}
$telegramService = new TelegramService();
$telegramService = new TelegramService;
if (! $oauth = UserOauth::query()->where([
'type' => 'telegram',
'identifier' => $msg->chat_id,

2
app/Http/Controllers/User/AffiliateController.php
View File

@@ -56,7 +56,7 @@ class AffiliateController extends Controller
]);
}
$ref = new ReferralApply();
$ref = new ReferralApply;
$ref->user_id = Auth::id();
$ref->before = $commission;
$ref->amount = $commission;

4
app/Http/Controllers/User/SubscribeController.php
View File

@@ -31,7 +31,7 @@ class SubscribeController extends Controller
// 检查订阅码是否有效
$subscribe = UserSubscribe::whereCode($code)->first();
$this->proxyServer = new ProxyService();
$this->proxyServer = new ProxyService;
if (! $subscribe) {
return $this->failed(trans('errors.subscribe.unknown'));
}
@@ -81,7 +81,7 @@ class SubscribeController extends Controller
private function subscribeLog(int $subscribeId, ?string $ip, string $headers): void
{ // 写入订阅访问日志
$log = new UserSubscribeLog();
$log = new UserSubscribeLog;
$log->user_subscribe_id = $subscribeId;
$log->request_ip = $ip;
$log->request_time = now();

2
app/Jobs/VNet/editUser.php
View File

@@ -47,7 +47,7 @@ class editUser implements ShouldQueue
public function handle(): void
{
foreach ($this->nodes as $node) {
$list = (new getUser())->list($node);
$list = (new getUser)->list($node);
if ($list && in_array($this->data['uid'], $list, true)) { // 如果用户已存在节点内，则执行修改；否则为添加
if ($node->is_ddns) {
$this->send($node->server.':'.$node->push_port, $node->auth->secret);

2
app/Services/CouponService.php
View File

@@ -94,7 +94,7 @@ class CouponService
return $this->failedReturn(trans('user.coupon.error.unmet'), trans('user.coupon.error.users'));
}
if (isset($coupon->limit['users']['newbie']['order']) && $user->orders()->exists()) { // 第一个套餐订单
if (isset($coupon->limit['users']['newbie']['order']) && $user->orders()->whereIn('status', [2, 3])->exists()) { // 第一个支付过的订单
return $this->failedReturn(trans('user.coupon.error.unmet'), trans('user.coupon.error.users'));
}

4
app/Services/PaymentService.php
View File

@@ -11,7 +11,7 @@ class PaymentService
{
final public function createPayment(int $uid, int $oid, float|int $amount): Payment
{
$payment = new Payment();
$payment = new Payment;
$payment->trade_no = Str::random(8);
$payment->user_id = $uid;
$payment->order_id = $oid;
@@ -28,7 +28,7 @@ class PaymentService
*/
final protected function createPaymentCallback(string $trade_no, string $out_trade_no, float|int $amount): int
{
$log = new PaymentCallback();
$log = new PaymentCallback;
$log->trade_no = $trade_no;
$log->out_trade_no = $out_trade_no;
$log->amount = $amount;

4
app/Services/ProxyService.php
View File

@@ -183,7 +183,7 @@ class ProxyService
public function getUserProxyConfig(array $server, bool $is_url): string
{ // 用户显示用代理信息
$type = $is_url ? new URLSchemes() : new Text();
$type = $is_url ? new URLSchemes : new Text;
return match ($server['type']) {
'shadowsocks' => $type->buildShadowsocks($server),
@@ -201,7 +201,7 @@ class ProxyService
foreach ($reflectionClass->getConstant('AGENT') as $agent) {
if (str_contains($target, $agent)) {
return (new $class())->getConfig($this->getServers(), $this->getUser(), $target);
return (new $class)->getConfig($this->getServers(), $this->getUser(), $target);
}
}
}

12
app/Utils/Helpers.php
View File

@@ -141,7 +141,7 @@ class Helpers
*/
public static function addNotificationLog(string $title, string $content, int $type, int $status = 1, ?string $error = null, ?string $msgId = null, string $address = 'admin'): int
{
$log = new NotificationLog();
$log = new NotificationLog;
$log->type = $type;
$log->msg_id = $msgId;
$log->address = $address;
@@ -164,7 +164,7 @@ class Helpers
*/
public static function addCouponLog(string $description, int $couponId, ?int $goodsId = null, ?int $orderId = null): bool
{
$log = new CouponLog();
$log = new CouponLog;
$log->coupon_id = $couponId;
$log->goods_id = $goodsId;
$log->order_id = $orderId;
@@ -185,7 +185,7 @@ class Helpers
*/
public static function addUserCreditLog(int $userId, ?int $orderId, float|int $before, float|int $after, float|int $amount, ?string $description = null): bool
{
$log = new UserCreditLog();
$log = new UserCreditLog;
$log->user_id = $userId;
$log->order_id = $orderId;
$log->before = $before;
@@ -208,7 +208,7 @@ class Helpers
*/
public static function addUserTrafficModifyLog(int $userId, int $before, int $after, ?string $description = null, ?int $orderId = null): bool
{
$log = new UserDataModifyLog();
$log = new UserDataModifyLog;
$log->user_id = $userId;
$log->order_id = $orderId;
$log->before = $before;
@@ -230,7 +230,7 @@ class Helpers
*/
public static function addMarketing(string $receiver, int $type, string $title, string $content, int $status = 1, ?string $error = null): bool
{
$marketing = new Marketing();
$marketing = new Marketing;
$marketing->type = $type;
$marketing->receiver = $receiver;
$marketing->title = $title;
@@ -255,7 +255,7 @@ class Helpers
Log::warning(trans('errors.get_ip').'：'.$ip);
}
$log = new UserLoginLog();
$log = new UserLoginLog;
$log->user_id = $user->id;
$log->ip = $ip;
$log->country = $ipLocation['country'] ?? '';

2
app/Utils/IP.php
View File

@@ -328,7 +328,7 @@ class IP
private static function ip2Region(string $ip): ?array
{ // 通过ip2Region查询IP地址的详细信息 数据库不经常更新
try {
$data = (new XdbSearcher())->search($ip);
$data = (new XdbSearcher)->search($ip);
} catch (Exception $e) {
Log::error('【ip2Region】错误信息：'.$e->getMessage());
}