改进 重复判断

This commit is contained in:
iVampireSP.com 2023-03-03 13:11:00 +08:00
parent 25c502f41f
commit d5430494fc
No known key found for this signature in database
GPG Key ID: 2F7B001CA27A8132

View File

@ -36,9 +36,14 @@ public function create(): View
*/ */
public function store(Request $request): RedirectResponse public function store(Request $request): RedirectResponse
{ {
$request->validate([
'id' => 'required|string|max:255|unique:modules,id',
'api_token' => 'nullable|string|max:255|unique:modules,api_token',
]);
$request->validate($this->rules()); $request->validate($this->rules());
$api_token = Str::random(60); $api_token = $request->input('api_token') ?: Str::random(60);
$module = new Module(); $module = new Module();
@ -58,7 +63,6 @@ public function store(Request $request): RedirectResponse
private function rules(): array private function rules(): array
{ {
return [ return [
'id' => 'required|string|max:255',
'name' => 'required|string|max:255', 'name' => 'required|string|max:255',
'url' => 'required|url', 'url' => 'required|url',
'ip_port' => 'nullable|string|max:255', 'ip_port' => 'nullable|string|max:255',
@ -95,6 +99,11 @@ public function edit(Module $module): View
*/ */
public function update(Request $request, Module $module): RedirectResponse public function update(Request $request, Module $module): RedirectResponse
{ {
$request->validate([
'id' => 'required|string|max:255|unique:modules,id,'.$module->id,
'api_token' => 'required|string|max:255|unique:modules,api_token,'.$module->id,
]);
$request->validate($this->rules()); $request->validate($this->rules());
$module->id = $request->input('id'); $module->id = $request->input('id');