diff --git a/beike/Admin/Repositories/AdminRoleRepo.php b/beike/Admin/Repositories/AdminRoleRepo.php index af686b14..094ddb71 100644 --- a/beike/Admin/Repositories/AdminRoleRepo.php +++ b/beike/Admin/Repositories/AdminRoleRepo.php @@ -73,7 +73,7 @@ class AdminRoleRepo } } if (empty($items)) { - throw new \Exception('权限不能为空,请选择至少一项'); + throw new \Exception(trans('admin/role.select_one_at_least')); } $adminRole->syncPermissions($items); } diff --git a/beike/Admin/Services/CustomerGroupService.php b/beike/Admin/Services/CustomerGroupService.php index e706f86e..4c986da2 100644 --- a/beike/Admin/Services/CustomerGroupService.php +++ b/beike/Admin/Services/CustomerGroupService.php @@ -39,9 +39,6 @@ class CustomerGroupService { $data = self::getParams($data); $customerGroup = CustomerGroupRepo::find($id); - if (!$customerGroup) { - throw New \Exception("您更新的ID不存在"); - } $customerGroup->update($data); diff --git a/beike/Admin/Services/FileManagerService.php b/beike/Admin/Services/FileManagerService.php index d407d34c..61c95c8b 100644 --- a/beike/Admin/Services/FileManagerService.php +++ b/beike/Admin/Services/FileManagerService.php @@ -96,7 +96,7 @@ class FileManagerService $catalogFolderPath = "catalog/{$folderName}"; $folderPath = public_path($catalogFolderPath); if (is_dir($folderPath)) { - throw new \Exception("目录已存在"); + throw new \Exception(trans('admin/file_manager.directory_already_exist')); } create_directories($catalogFolderPath); } @@ -114,7 +114,7 @@ class FileManagerService if (is_dir($filePath)) { $files = glob($filePath . '/*'); if ($files) { - throw new \Exception("该目录不为空"); + throw new \Exception(trans('admin/file_manager.directory_not_empty')); } @rmdir($filePath); } elseif (file_exists($filePath)) { @@ -154,7 +154,7 @@ class FileManagerService { $originPath = public_path("catalog/{$originPath}"); if (!is_dir($originPath) && !file_exists($originPath)) { - throw new \Exception('原始文件或者文件夹无效'); + throw new \Exception(trans('admin/file_manager.target_not_exist')); } $originBase = dirname($originPath); $newPath = $originBase . '/' . $newPath; diff --git a/beike/Admin/Services/UserService.php b/beike/Admin/Services/UserService.php index aa75ef84..f7c85263 100644 --- a/beike/Admin/Services/UserService.php +++ b/beike/Admin/Services/UserService.php @@ -51,16 +51,16 @@ class UserService $verifyCode = VerifyCodeRepo::findByAccount($account); if ($verifyCode->created_at->addMinutes(10) < Carbon::now()) { $verifyCode->delete(); - throw new \Exception("您的验证码已过期（10分钟），请重新获取"); + throw new \Exception(trans('admin/user.verify_code_expired')); } if ($verifyCode->code != $code) { - throw new \Exception("您的验证码错误"); + throw new \Exception(trans('admin/user.verify_code_error')); } $user = UserRepo::findByEmail($account); if (!$user) { - throw new \Exception("账号不存在"); + throw new \Exception(trans('admin/user.account_not_exist')); } UserRepo::update($user, ['password' => $password]); diff --git a/beike/Admin/View/DesignBuilders/Brand.php b/beike/Admin/View/DesignBuilders/Brand.php index 1c5f1460..03a6dfe1 100644 --- a/beike/Admin/View/DesignBuilders/Brand.php +++ b/beike/Admin/View/DesignBuilders/Brand.php @@ -35,7 +35,7 @@ class Brand extends Component $data['register'] = [ 'code' => 'brand', 'sort' => 0, - 'name' => '品牌模块', + 'name' => trans('admin/design_builder.module_brand'), 'icon' => '', ]; diff --git a/beike/Admin/View/DesignBuilders/Image100.php b/beike/Admin/View/DesignBuilders/Image100.php index 606d955a..16a82008 100644 --- a/beike/Admin/View/DesignBuilders/Image100.php +++ b/beike/Admin/View/DesignBuilders/Image100.php @@ -35,7 +35,7 @@ class Image100 extends Component $data['register'] = [ 'code' => 'image100', 'sort' => 0, - 'name' => '单图模块', + 'name' => trans('admin/design_builder.module_banner'), 'icon' => '', ]; diff --git a/beike/Admin/View/DesignBuilders/Image401.php b/beike/Admin/View/DesignBuilders/Image401.php index 973a863b..4c16e57a 100644 --- a/beike/Admin/View/DesignBuilders/Image401.php +++ b/beike/Admin/View/DesignBuilders/Image401.php @@ -35,7 +35,7 @@ class Image401 extends Component $data['register'] = [ 'code' => 'image401', 'sort' => 0, - 'name' => '一行四图-pro', + 'name' => trans('admin/design_builder.module_four_image_pro'), 'icon' => '', ]; diff --git a/beike/Admin/View/DesignBuilders/SlideShow.php b/beike/Admin/View/DesignBuilders/SlideShow.php index f87e5e98..d250255f 100644 --- a/beike/Admin/View/DesignBuilders/SlideShow.php +++ b/beike/Admin/View/DesignBuilders/SlideShow.php @@ -35,7 +35,7 @@ class SlideShow extends Component $data['register'] = [ 'code' => 'slideshow', 'sort' => 0, - 'name' => '幻灯片模块', + 'name' => trans('admin/design_builder.module_slideshow'), 'icon' => '', 'style' => 'font-size: 40px;', ]; diff --git a/beike/Admin/View/DesignBuilders/TabProduct.php b/beike/Admin/View/DesignBuilders/TabProduct.php index c93ecb5f..92f8530e 100644 --- a/beike/Admin/View/DesignBuilders/TabProduct.php +++ b/beike/Admin/View/DesignBuilders/TabProduct.php @@ -35,7 +35,7 @@ class TabProduct extends Component $data['register'] = [ 'code' => 'tab_product', 'sort' => 0, - 'name' => '选项卡商品', + 'name' => trans('admin/design_builder.module_tab_products'), 'icon' => '', ]; diff --git a/beike/Repositories/CustomerGroupRepo.php b/beike/Repositories/CustomerGroupRepo.php index 0b66aa24..2d58ddc5 100644 --- a/beike/Repositories/CustomerGroupRepo.php +++ b/beike/Repositories/CustomerGroupRepo.php @@ -46,7 +46,7 @@ class CustomerGroupRepo */ public static function find($id) { - return CustomerGroup::query()->find($id); + return CustomerGroup::query()->findOrFail($id); } /** diff --git a/resources/lang/en/admin/design_builder.php b/resources/lang/en/admin/design_builder.php new file mode 100644 index 00000000..6762d9e9 --- /dev/null +++ b/resources/lang/en/admin/design_builder.php @@ -0,0 +1,18 @@ + + * @created 2022-08-30 11:03:19 + * @modified 2022-08-30 11:03:19 + */ + +return [ + 'module_brand' => 'Brand Module', + 'module_banner' => 'Banner Module', + 'module_four_image_pro' => 'For Image PRO Module', + 'module_slideshow' => 'Slideshow Module', + 'module_tab_products' => 'Tab Products Module', +]; diff --git a/resources/lang/en/admin/file_manager.php b/resources/lang/en/admin/file_manager.php index 511e80b2..63f282f4 100644 --- a/resources/lang/en/admin/file_manager.php +++ b/resources/lang/en/admin/file_manager.php @@ -13,5 +13,8 @@ return [ 'file_manager_create' => 'Create', 'file_manager_show' => 'View', 'file_manager_update' => 'Rename', - 'file_manager_delete' => 'Delete' + 'file_manager_delete' => 'Delete', + 'directory_already_exist' => 'The directory not exist!', + 'directory_not_empty' => 'The directory not empty!', + 'target_not_exist' => 'The target file/directory not exist!', ]; diff --git a/resources/lang/en/admin/role.php b/resources/lang/en/admin/role.php index 189f77ef..cb9bd4ed 100644 --- a/resources/lang/en/admin/role.php +++ b/resources/lang/en/admin/role.php @@ -14,5 +14,6 @@ return [ 'admin_roles_create' => 'Create', 'admin_roles_show' => 'Detail', 'admin_roles_update' => 'Edit', - 'admin_roles_delete' => 'Delete' + 'admin_roles_delete' => 'Delete', + 'select_one_at_least' => 'Please select one permission at least!' ]; diff --git a/resources/lang/en/admin/user.php b/resources/lang/en/admin/user.php index 17d0b41b..9170e20e 100644 --- a/resources/lang/en/admin/user.php +++ b/resources/lang/en/admin/user.php @@ -14,5 +14,8 @@ return [ 'admin_users_create' => 'Create', 'admin_users_show' => 'Detail', 'admin_users_update' => 'Edit', - 'admin_users_delete' => 'Delete' + 'admin_users_delete' => 'Delete', + 'verify_code_expired' => 'The verify code expired (10 minute), please retry.', + 'verify_code_error' => 'Verify code error!', + 'account_not_exist' => 'Account not exist!', ]; diff --git a/resources/lang/zh_cn/admin/design_builder.php b/resources/lang/zh_cn/admin/design_builder.php new file mode 100644 index 00000000..f12503d7 --- /dev/null +++ b/resources/lang/zh_cn/admin/design_builder.php @@ -0,0 +1,18 @@ + + * @created 2022-08-30 11:03:19 + * @modified 2022-08-30 11:03:19 + */ + +return [ + 'module_brand' => '品牌模块', + 'module_banner' => '横幅模块', + 'module_four_image_pro' => '一行四图 PRO', + 'module_slideshow' => '幻灯片模块', + 'module_tab_products' => '选项卡商品', +]; diff --git a/resources/lang/zh_cn/admin/file_manager.php b/resources/lang/zh_cn/admin/file_manager.php index d81ac788..cde073b9 100644 --- a/resources/lang/zh_cn/admin/file_manager.php +++ b/resources/lang/zh_cn/admin/file_manager.php @@ -13,5 +13,8 @@ return [ 'file_manager_create' => '创建目录/文件', 'file_manager_show' => '查看目录/文件', 'file_manager_update' => '重命名', - 'file_manager_delete' => '删除目录/文件' + 'file_manager_delete' => '删除目录/文件', + 'directory_already_exist' => '目录已存在', + 'directory_not_empty' => '该目录不为空', + 'target_not_exist' => '原始文件或者文件夹不存在', ]; diff --git a/resources/lang/zh_cn/admin/role.php b/resources/lang/zh_cn/admin/role.php index 8a9cfd2f..71b805b4 100644 --- a/resources/lang/zh_cn/admin/role.php +++ b/resources/lang/zh_cn/admin/role.php @@ -15,4 +15,5 @@ return [ 'admin_roles_show' => '角色详情', 'admin_roles_update' => '更新角色', 'admin_roles_delete' => '删除角色', + 'select_one_at_least' => '权限不能为空,请选择至少一项' ]; diff --git a/resources/lang/zh_cn/admin/user.php b/resources/lang/zh_cn/admin/user.php index 860c232e..c138afb9 100644 --- a/resources/lang/zh_cn/admin/user.php +++ b/resources/lang/zh_cn/admin/user.php @@ -15,4 +15,7 @@ return [ 'admin_users_show' => '用户详情', 'admin_users_update' => '更新用户', 'admin_users_delete' => '删除用户', + 'verify_code_expired' => '您的验证码已过期（10分钟），请重新获取', + 'verify_code_error' => '您的验证码错误', + 'account_not_exist' => '账号不存在', ];