diff --git a/app/Http/Controllers/Admin/ModuleController.php b/app/Http/Controllers/Admin/ModuleController.php index cb254c2..bb817d8 100644 --- a/app/Http/Controllers/Admin/ModuleController.php +++ b/app/Http/Controllers/Admin/ModuleController.php @@ -61,7 +61,7 @@ public function store(Request $request): RedirectResponse $module->save(); - return redirect()->route('admin.modules.edit', $module)->with('success', '模块创建成功, 请重置以获得 API Token。'); + return redirect()->route('admin.modules.edit', $module)->with('success', '模块创建成功。'); } @@ -101,7 +101,7 @@ public function show(Module $module): View */ public function edit(Module $module): View { - $module = $module->makeVisible('wecom_key'); + $module = $module->makeVisible(['wecom_key', 'api_token']); return view('admin.modules.edit', compact('module')); } @@ -118,16 +118,18 @@ public function update(Request $request, Module $module): RedirectResponse { $request->validate($this->rules()); - if ($request->input('reset_api_token')) { - $module->api_token = Str::random(60); - } - $module->id = $request->input('id'); $module->name = $request->input('name'); $module->url = $request->input('url'); $module->status = $request->input('status'); $module->wecom_key = $request->input('wecom_key'); + if (!$request->filled('api_token')) { + $module->api_token = Str::random(60); + } else { + $module->api_token = $request->input('api_token'); + } + $module->save(); $text = '模块更新成功'; @@ -158,8 +160,9 @@ public function destroy(Module $module): RedirectResponse public function allows(Module $module): View { $allows = (new ModuleAllow)->where('module_id', $module->id)->with('allowed_module')->paginate(50); + $modules = (new Module)->where('id', '!=', $module->id)->get(); - return view('admin.modules.allows', compact('module', 'allows')); + return view('admin.modules.allows', compact('module', 'allows', 'modules')); } public function allows_store(Request $request, Module $module): RedirectResponse diff --git a/resources/views/admin/modules/allows.blade.php b/resources/views/admin/modules/allows.blade.php index 652d440..44547f6 100644 --- a/resources/views/admin/modules/allows.blade.php +++ b/resources/views/admin/modules/allows.blade.php @@ -44,7 +44,13 @@