From 188032d48b8cdfaaa9fc90a74f1e29614d7da4de Mon Sep 17 00:00:00 2001
From: BrettonYe <monkeyblacktech97@gmail.com>
Date: Wed, 3 Sep 2025 21:22:40 +0800
Subject: [PATCH] Fixed User saving

---
 app/Http/Controllers/Admin/UserController.php | 7 ++++---
 resources/views/admin/user/info.blade.php     | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/Http/Controllers/Admin/UserController.php b/app/Http/Controllers/Admin/UserController.php
index b3728f76..bfb08c09 100644
--- a/app/Http/Controllers/Admin/UserController.php
+++ b/app/Http/Controllers/Admin/UserController.php
@@ -92,7 +92,6 @@ class UserController extends Controller
         $data['port'] = $data['port'] ?? Helpers::getPort();
         $data['passwd'] = $data['passwd'] ?? Str::random();
         $data['vmess_id'] = $data['vmess_id'] ?: Str::uuid();
-        Arr::forget($data, 'uuid');
         $data['transfer_enable'] *= GiB;
         $data['expired_at'] = $data['expired_at'] ?? date('Y-m-d', strtotime('next year'));
         $data['remark'] = str_replace(['atob', 'eval'], '', $data['remark'] ?? '');
@@ -217,13 +216,15 @@ class UserController extends Controller
     public function update(UserUpdateRequest $request, User $user): JsonResponse
     {
         $data = $request->validated();
+        Arr::forget($data, ['roles', 'password']);
         $data['passwd'] = $request->input('passwd') ?? Str::random();
         $data['vmess_id'] = $data['vmess_id'] ?: Str::uuid();
-        Arr::forget($data, ['roles', 'uuid', 'password']);
         $data['transfer_enable'] *= GiB;
         $data['enable'] = $data['status'] < 0 ? 0 : $data['enable'];
         $data['expired_at'] = $data['expired_at'] ?? date('Y-m-d', strtotime('next year'));
-        $data['remark'] = str_replace(['atob', 'eval'], '', $data['remark']);
+        if ($data['remark']) {
+            $data['remark'] = str_replace(['atob', 'eval'], '', $data['remark']);
+        }
 
         // 只有超级管理员才能赋予超级管理员
         $roles = $request->input('roles');
diff --git a/resources/views/admin/user/info.blade.php b/resources/views/admin/user/info.blade.php
index 7754c5b0..1ab91e9b 100644
--- a/resources/views/admin/user/info.blade.php
+++ b/resources/views/admin/user/info.blade.php
@@ -21,7 +21,7 @@
                         <x-admin.form.input name="username" :label="trans('model.user.username')" required />
                         <x-admin.form.input name="password" type="password" :label="trans('model.user.password')" :placeholder="isset($user) ? trans('common.stay_unchanged') : trans('common.random_generate')" attribute="autocomplete=new-password" />
                         <x-admin.form.select name="level" :label="trans('model.common.level')" :options="$levels" />
-                        <x-admin.form.select name="group" :label="trans('model.user_group.attribute')" :options="$userGroups" :placeholder="trans('common.none')" />
+                        <x-admin.form.select name="user_group_id" :label="trans('model.user_group.attribute')" :options="$userGroups" :placeholder="trans('common.none')" />
                         @isset($user)
                             <x-admin.form.skeleton name="credit" :label="trans('model.user.credit')">
                                 <div class="input-group">