From 22cb6a19b9c8b892db201589fa4e81b343186e4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9F=B3=E6=B8=85=E7=88=BD?= Date: Tue, 22 Apr 2025 17:32:20 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B6=85=E7=AE=A1=E5=90=8E=E5=8F=B0=20-=20?= =?UTF-8?q?=E9=99=90=E5=88=B6=E8=B4=A6=E5=8F=B7=E5=8F=AA=E8=83=BD=E4=B8=BA?= =?UTF-8?q?=E8=8B=B1=E6=96=87=E6=88=96=E8=80=85=E6=95=B0=E5=AD=97=E5=8F=8A?= =?UTF-8?q?=E7=BB=84=E5=90=88=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/administrator/AddAdministratorController.php | 3 ++- .../administrator/UpdateAdministratorController.php | 3 ++- .../superadmin/controller/company/CreateCompanyController.php | 3 ++- .../superadmin/controller/company/UpdateCompanyController.php | 3 ++- SuperAdmin/app/dashboard/admins/[id]/edit/page.tsx | 4 ++-- 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/Server/application/superadmin/controller/administrator/AddAdministratorController.php b/Server/application/superadmin/controller/administrator/AddAdministratorController.php index 5f5a9505..dc9551e3 100644 --- a/Server/application/superadmin/controller/administrator/AddAdministratorController.php +++ b/Server/application/superadmin/controller/administrator/AddAdministratorController.php @@ -41,12 +41,13 @@ class AddAdministratorController extends BaseController protected function dataValidate(array $params): self { $validate = Validate::make([ - 'account' => 'require|/\S+/', + 'account' => 'require|regex:^[a-zA-Z0-9]+$|/\S+/', 'username' => 'require|/\S+/', 'password' => 'require|/\S+/', 'permissionIds' => 'require|array', ], [ 'account.require' => '账号不能为空', + 'account.regex' => '账号只能用数字或者字母或者数字字母组合', 'username.require' => '用户名不能为空', 'password.require' => '密码不能为空', 'permissionIds.require' => '请至少分配一种权限', diff --git a/Server/application/superadmin/controller/administrator/UpdateAdministratorController.php b/Server/application/superadmin/controller/administrator/UpdateAdministratorController.php index 13ff4071..5cb8ba17 100644 --- a/Server/application/superadmin/controller/administrator/UpdateAdministratorController.php +++ b/Server/application/superadmin/controller/administrator/UpdateAdministratorController.php @@ -49,13 +49,14 @@ class UpdateAdministratorController extends BaseController { $validate = Validate::make([ 'id' => 'require|regex:/^[1-9]\d*$/', - 'account' => 'require|/\S+/', + 'account' => 'require|regex:^[a-zA-Z0-9]+$|/\S+/', 'username' => 'require|/\S+/', 'password' => '/\S+/', 'permissionIds' => 'array', ], [ 'id.require' => '缺少必要参数', 'account.require' => '账号不能为空', + 'account.regex' => '账号只能用数字或者字母或者数字字母组合', 'username.require' => '用户名不能为空', 'permissionIds.array' => '请至少分配一种权限', ]); diff --git a/Server/application/superadmin/controller/company/CreateCompanyController.php b/Server/application/superadmin/controller/company/CreateCompanyController.php index efebb4f3..52c02705 100644 --- a/Server/application/superadmin/controller/company/CreateCompanyController.php +++ b/Server/application/superadmin/controller/company/CreateCompanyController.php @@ -53,7 +53,7 @@ class CreateCompanyController extends BaseController { $validate = Validate::make([ 'name' => 'require|max:50|/\S+/', - 'account' => 'require|max:20|/\S+/', + 'account' => 'require|regex:^[a-zA-Z0-9]+$|max:20|/\S+/', 'username' => 'require|max:20|/\S+/', 'phone' => 'require|regex:/^1[3-9]\d{9}$/', 'status' => 'require|in:0,1', @@ -63,6 +63,7 @@ class CreateCompanyController extends BaseController 'name.require' => '请输入项目名称', 'account.require' => '请输入账号', 'account.max' => '账号长度受限', + 'account.regex' => '账号只能用数字或者字母或者数字字母组合', 'username.require' => '请输入用户昵称', 'phone.require' => '请输入手机号', 'phone.regex' => '手机号格式错误', diff --git a/Server/application/superadmin/controller/company/UpdateCompanyController.php b/Server/application/superadmin/controller/company/UpdateCompanyController.php index d709c493..c7d63bb6 100644 --- a/Server/application/superadmin/controller/company/UpdateCompanyController.php +++ b/Server/application/superadmin/controller/company/UpdateCompanyController.php @@ -178,7 +178,7 @@ class UpdateCompanyController extends BaseController 'id' => 'require', 'name' => 'require|max:50|/\S+/', 'username' => 'require|max:20|/\S+/', - 'account' => 'require|max:20|/\S+/', + 'account' => 'require|regex:^[a-zA-Z0-9]+$|max:20|/\S+/', 'phone' => 'require|regex:/^1[3-9]\d{9}$/', 'status' => 'require|in:0,1' ], [ @@ -186,6 +186,7 @@ class UpdateCompanyController extends BaseController 'name.require' => '请输入项目名称', 'username.require' => '请输入用户昵称', 'account.require' => '请输入账号', + 'account.regex' => '账号只能用数字或者字母或者数字字母组合', 'account.max' => '账号长度受限', 'phone.require' => '请输入手机号', 'phone.regex' => '手机号格式错误', diff --git a/SuperAdmin/app/dashboard/admins/[id]/edit/page.tsx b/SuperAdmin/app/dashboard/admins/[id]/edit/page.tsx index 7c042dff..df9d1b4a 100644 --- a/SuperAdmin/app/dashboard/admins/[id]/edit/page.tsx +++ b/SuperAdmin/app/dashboard/admins/[id]/edit/page.tsx @@ -59,7 +59,7 @@ export default function EditAdminPage({ params }: { params: { id: string } }) { if (adminResponse.code === 200 && adminResponse.data) { setAdminInfo(adminResponse.data) - setAccount(adminResponse.data.username) + setAccount(adminResponse.data.account) setUserName(adminResponse.data.username) // 判断是否可以编辑权限 @@ -222,7 +222,7 @@ export default function EditAdminPage({ params }: { params: { id: string } }) { id="account" value={account} onChange={(e) => setAccount(e.target.value)} - placeholder="请输入账号" + placeholder="只能用数字或者字母或者数字字母组合" required />