BitMaster/ProxyPanel
1
0
Fork 0
mirror of https://github.com/ProxyPanel/ProxyPanel.git synced 2026-04-03 02:58:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed User saving

Browse Source
This commit is contained in:
BrettonYe
2025-09-03 21:22:40 +08:00
committed by BrettonYe
parent f8bcb855e5
commit 188032d48b
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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');

2
resources/views/admin/user/info.blade.php
View File

@@ -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">