格式化代码
This commit is contained in:
parent
1d6b89f9d0
commit
e4b8eeb312
@ -3,7 +3,6 @@
|
||||
namespace App\Console\Commands;
|
||||
|
||||
use App\Models\Balance;
|
||||
use App\Models\User;
|
||||
use Illuminate\Console\Command;
|
||||
use Symfony\Component\Console\Command\Command as CommandAlias;
|
||||
|
||||
@ -37,7 +36,6 @@ public function handle(): int
|
||||
->get();
|
||||
|
||||
|
||||
|
||||
// table
|
||||
$this->table(['支付方式', '数量', '日期'], $balances->toArray());
|
||||
|
||||
|
@ -4,7 +4,6 @@
|
||||
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Jobs\SendCommonNotificationsJob;
|
||||
use App\Models\Host;
|
||||
use App\Models\Module;
|
||||
use App\Models\User;
|
||||
use GeneaLabs\LaravelModelCaching\CachedBuilder;
|
||||
@ -29,28 +28,6 @@ public function create(Request $request)
|
||||
return view('admin.notifications.create', compact('modules', 'users'));
|
||||
}
|
||||
|
||||
/**
|
||||
* Store a newly created resource in storage.
|
||||
*
|
||||
* @param Request $request
|
||||
*
|
||||
* @return RedirectResponse
|
||||
*/
|
||||
public function store(Request $request)
|
||||
{
|
||||
$request->validate([
|
||||
'title' => 'required',
|
||||
'content' => 'required',
|
||||
'user_id' => 'nullable',
|
||||
'module_id' => 'nullable',
|
||||
'user' => 'nullable',
|
||||
]);
|
||||
|
||||
dispatch(new SendCommonNotificationsJob($request->toArray(), $request->input('title'), $request->input('content')));
|
||||
|
||||
return back()->with('success', '通知发送成功。')->withInput();
|
||||
}
|
||||
|
||||
public function query(Request|array $request): User|CachedBuilder
|
||||
{
|
||||
if ($request instanceof Request) {
|
||||
@ -85,4 +62,26 @@ public function query(Request|array $request): User|CachedBuilder
|
||||
|
||||
return $users;
|
||||
}
|
||||
|
||||
/**
|
||||
* Store a newly created resource in storage.
|
||||
*
|
||||
* @param Request $request
|
||||
*
|
||||
* @return RedirectResponse
|
||||
*/
|
||||
public function store(Request $request)
|
||||
{
|
||||
$request->validate([
|
||||
'title' => 'required',
|
||||
'content' => 'required',
|
||||
'user_id' => 'nullable',
|
||||
'module_id' => 'nullable',
|
||||
'user' => 'nullable',
|
||||
]);
|
||||
|
||||
dispatch(new SendCommonNotificationsJob($request->toArray(), $request->input('title'), $request->input('content')));
|
||||
|
||||
return back()->with('success', '通知发送成功。')->withInput();
|
||||
}
|
||||
}
|
||||
|
@ -33,6 +33,13 @@ public function call(Request $request, Module $module)
|
||||
return $this->moduleResponse($response['json'], $response['status']);
|
||||
}
|
||||
|
||||
private function fixPath(Request $request, Module $module, $prefix): string
|
||||
{
|
||||
$path = substr($request->path(), strlen("/{$prefix}/modules/{$module->id}"));
|
||||
|
||||
return preg_replace('/[^a-zA-Z0-9\/]/', '', $path);
|
||||
}
|
||||
|
||||
public function exportCall(Request $request, Module $module): Response|JsonResponse
|
||||
{
|
||||
$path = $this->fixPath($request, $module, 'modules');
|
||||
@ -46,11 +53,4 @@ public function exportCall(Request $request, Module $module): Response|JsonRespo
|
||||
|
||||
return $this->moduleResponse($response['json'], $response['status']);
|
||||
}
|
||||
|
||||
private function fixPath(Request $request, Module $module, $prefix): string
|
||||
{
|
||||
$path = substr($request->path(), strlen("/{$prefix}/modules/{$module->id}"));
|
||||
|
||||
return preg_replace('/[^a-zA-Z0-9\/]/', '', $path);
|
||||
}
|
||||
}
|
||||
|
@ -2,7 +2,6 @@
|
||||
|
||||
namespace App\Jobs\Module;
|
||||
|
||||
use App\Events\ServerEvent;
|
||||
use App\Models\Module;
|
||||
use Exception;
|
||||
use Illuminate\Bus\Queueable;
|
||||
|
@ -7,12 +7,10 @@
|
||||
use App\Notifications\CommonNotification;
|
||||
use GeneaLabs\LaravelModelCaching\CachedBuilder;
|
||||
use Illuminate\Bus\Queueable;
|
||||
use Illuminate\Contracts\Queue\ShouldBeUnique;
|
||||
use Illuminate\Contracts\Queue\ShouldQueue;
|
||||
use Illuminate\Foundation\Bus\Dispatchable;
|
||||
use Illuminate\Queue\InteractsWithQueue;
|
||||
use Illuminate\Queue\SerializesModels;
|
||||
use Illuminate\Support\Facades\Log;
|
||||
|
||||
class SendCommonNotificationsJob implements ShouldQueue
|
||||
{
|
||||
|
@ -5,7 +5,6 @@
|
||||
use Eloquent;
|
||||
use GeneaLabs\LaravelModelCaching\Traits\Cachable;
|
||||
use Illuminate\Database\Eloquent\Builder;
|
||||
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
||||
use Illuminate\Foundation\Auth\User as Authenticatable;
|
||||
use Illuminate\Support\Carbon;
|
||||
|
||||
|
@ -6,7 +6,6 @@
|
||||
use App\Exceptions\CommonException;
|
||||
use Eloquent;
|
||||
use GeneaLabs\LaravelModelCaching\CachedBuilder;
|
||||
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
use Illuminate\Database\Eloquent\Relations\BelongsTo;
|
||||
use Illuminate\Support\Carbon;
|
||||
|
@ -3,7 +3,6 @@
|
||||
namespace App\Models;
|
||||
|
||||
use Carbon\Carbon;
|
||||
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
use Illuminate\Database\Eloquent\Relations\HasMany;
|
||||
use Illuminate\Support\Facades\Cache;
|
||||
|
@ -6,7 +6,6 @@
|
||||
use Illuminate\Contracts\Queue\ShouldQueue;
|
||||
use Illuminate\Notifications\Messages\MailMessage;
|
||||
use Illuminate\Notifications\Notification;
|
||||
use Illuminate\Support\Facades\Log;
|
||||
|
||||
class CommonNotification extends Notification implements ShouldQueue
|
||||
{
|
||||
|
@ -4,7 +4,6 @@
|
||||
|
||||
use App\Models\PersonalAccessToken;
|
||||
use Illuminate\Pagination\Paginator;
|
||||
use Illuminate\Support\Carbon;
|
||||
use Illuminate\Support\Facades\Http;
|
||||
use Illuminate\Support\ServiceProvider;
|
||||
use Laravel\Sanctum\Sanctum;
|
||||
|
Loading…
Reference in New Issue
Block a user