diff --git a/app/Aspect/AdminLoginLogAspect.php b/app/Aspect/AdminLoginLogAspect.php index b6ed509..3fbc5c9 100644 --- a/app/Aspect/AdminLoginLogAspect.php +++ b/app/Aspect/AdminLoginLogAspect.php @@ -4,18 +4,18 @@ declare(strict_types=1); namespace App\Aspect; +use App\Common\Repository\AdminUserRepository; +use App\Common\Trait\ClientIpTrait; +use App\Common\Trait\ClientOsTrait; use App\Lib\Log\Logger; use App\Model\AdminUserLoginLog; -use App\Repository\AdminUserRepository; use App\Service\Admin\Login\LoginService; -use App\Trait\ClientIpTrait; -use App\Trait\ClientOsTrait; use Hyperf\Coroutine\Coroutine; use Hyperf\Di\Annotation\Aspect; use Hyperf\Di\Aop\AbstractAspect; +use Hyperf\Di\Aop\ProceedingJoinPoint; use Hyperf\Di\Exception\Exception; use Hyperf\HttpServer\Contract\RequestInterface; -use Hyperf\Di\Aop\ProceedingJoinPoint; use Throwable; #[Aspect] diff --git a/app/Aspect/AdminReturnLogAspect.php b/app/Aspect/AdminReturnLogAspect.php index cab3f93..5a1dde4 100644 --- a/app/Aspect/AdminReturnLogAspect.php +++ b/app/Aspect/AdminReturnLogAspect.php @@ -4,20 +4,18 @@ declare(strict_types=1); namespace App\Aspect; +use App\Common\Trait\AdminUserTrait; +use App\Common\Trait\ClientIpTrait; use App\Lib\Log\Logger; use App\Lib\Return\AdminReturn; use App\Model\AdminUser; use App\Model\AdminUserOperationLog; -use App\Service\Admin\Login\LoginService; -use App\Trait\AdminUserTrait; -use App\Trait\ClientIpTrait; use Hyperf\Context\Context; use Hyperf\Coroutine\Coroutine; use Hyperf\Di\Annotation\Aspect; use Hyperf\Di\Aop\AbstractAspect; -use Hyperf\HttpServer\Contract\RequestInterface; -use Psr\Container\ContainerInterface; use Hyperf\Di\Aop\ProceedingJoinPoint; +use Hyperf\HttpServer\Contract\RequestInterface; #[Aspect] class AdminReturnLogAspect extends AbstractAspect diff --git a/app/Interface/CheckTokenInterface.php b/app/Common/Interface/CheckTokenInterface.php similarity index 81% rename from app/Interface/CheckTokenInterface.php rename to app/Common/Interface/CheckTokenInterface.php index 96eaf25..1e20c4a 100644 --- a/app/Interface/CheckTokenInterface.php +++ b/app/Common/Interface/CheckTokenInterface.php @@ -1,6 +1,6 @@ request->isMethod('POST'); + } + + /** + * @return bool + */ + public function isUpdate(): bool + { + return $this->request->isMethod('PATCH') || $this->request->isMethod('PUT'); + } + + /** + * @return bool + */ + public function isDelete(): bool + { + return $this->request->isMethod('DELETE'); + } + + /** + * @return bool + */ + public function isSearch(): bool + { + return $this->request->isMethod('GET'); + } +} \ No newline at end of file diff --git a/app/Trait/ParserRouterTrait.php b/app/Common/Trait/ParserRouterTrait.php similarity index 95% rename from app/Trait/ParserRouterTrait.php rename to app/Common/Trait/ParserRouterTrait.php index 51a66a0..bd1e522 100644 --- a/app/Trait/ParserRouterTrait.php +++ b/app/Common/Trait/ParserRouterTrait.php @@ -1,6 +1,6 @@ service->create(); } /** * @param int $id + * @param AdminMenuRequest $request * @return array */ #[RequestMapping(path: "{id}", methods: "PUT")] #[Permission(code: 'permission:menu:save')] - public function updateMenu(int $id): array + #[Scene(scene: "update")] + public function updateMenu(int $id, AdminMenuRequest $request): array { return $this->service->update($id); } diff --git a/app/Controller/Admin/AdminRoleController.php b/app/Controller/Admin/AdminRoleController.php index 7572a12..96a27e7 100644 --- a/app/Controller/Admin/AdminRoleController.php +++ b/app/Controller/Admin/AdminRoleController.php @@ -9,11 +9,13 @@ use App\Annotation\ResponseFormat; use App\Controller\AbstractController; use App\Middleware\Admin\AdminTokenMiddleware; use App\Middleware\Admin\PermissionMiddleware; +use App\Request\Admin\AdminRoleRequest; use App\Service\Admin\AdminUser\RoleService; use Hyperf\Di\Annotation\Inject; use Hyperf\HttpServer\Annotation\Controller; use Hyperf\HttpServer\Annotation\Middleware; use Hyperf\HttpServer\Annotation\RequestMapping; +use Hyperf\Validation\Annotation\Scene; #[Controller(prefix: "admin/role")] @@ -39,22 +41,26 @@ class AdminRoleController extends AbstractController } /** + * @param AdminRoleRequest $request * @return array */ #[RequestMapping(path: "", methods: "POST")] #[Permission(code: 'permission:role:save')] - public function createRole(): array + #[Scene(scene: "create")] + public function createRole(AdminRoleRequest $request): array { return $this->service->create(); } /** * @param int $id + * @param AdminRoleRequest $request * @return array */ #[RequestMapping(path: "{id}", methods: "PUT")] #[Permission(code: 'permission:role:update')] - public function updateRole(int $id): array + #[Scene(scene: "create")] + public function updateRole(int $id, AdminRoleRequest $request): array { return $this->service->update($id); } @@ -82,11 +88,13 @@ class AdminRoleController extends AbstractController /** * @param int $id + * @param AdminRoleRequest $request * @return array */ #[RequestMapping(path: "{id}/permission", methods: "PUT")] #[Permission(code: 'permission:role:setMenu')] - public function batchGrantPermissionByRole(int $id): array + #[Scene(scene: "batch_grant_permission")] + public function batchGrantPermissionByRole(int $id,AdminRoleRequest $request): array { return $this->service->setRole($id); } diff --git a/app/Controller/Admin/AdminUserController.php b/app/Controller/Admin/AdminUserController.php index cc2cebd..1c08e12 100644 --- a/app/Controller/Admin/AdminUserController.php +++ b/app/Controller/Admin/AdminUserController.php @@ -9,11 +9,13 @@ use App\Annotation\ResponseFormat; use App\Controller\AbstractController; use App\Middleware\Admin\AdminTokenMiddleware; use App\Middleware\Admin\PermissionMiddleware; +use App\Request\Admin\AdminUserRequest; use App\Service\Admin\AdminUser\UserService; use Hyperf\Di\Annotation\Inject; use Hyperf\HttpServer\Annotation\Controller; use Hyperf\HttpServer\Annotation\Middleware; use Hyperf\HttpServer\Annotation\RequestMapping; +use Hyperf\Validation\Annotation\Scene; #[Controller(prefix: "admin/adminUser")] @@ -57,11 +59,13 @@ class AdminUserController extends AbstractController } /** + * @param AdminUserRequest $request * @return array */ #[RequestMapping(path: "", methods: "PUT")] #[Permission(code: 'permission:user:update')] - public function updateInfo(): array + #[Scene(scene: "update")] + public function updateInfo(AdminUserRequest $request): array { return $this->service->updateInfo(); } @@ -77,11 +81,13 @@ class AdminUserController extends AbstractController } /** + * @param AdminUserRequest $request * @return array */ #[RequestMapping(path: "", methods: "POST")] #[Permission(code: 'permission:user:save')] - public function createAdminUser(): array + #[Scene(scene: "create")] + public function createAdminUser(AdminUserRequest $request): array { return $this->service->createUser(); } @@ -98,7 +104,8 @@ class AdminUserController extends AbstractController #[RequestMapping(path: "{userId}", methods: "PUT")] #[Permission(code: 'permission:user:update')] - public function saveInfo(int $userId): array + #[Scene(scene: "update")] + public function saveInfo(int $userId,AdminUserRequest $request): array { return $this->service->saveUser($userId); } @@ -116,11 +123,13 @@ class AdminUserController extends AbstractController /** * @param int $userId + * @param AdminUserRequest $request * @return array */ #[RequestMapping(path: "{userId}/roles", methods: "PUT")] #[Permission(code: 'permission:user:setRole')] - public function batchGrantRolesForAdminUser(int $userId): array + #[Scene(scene: "batch_grant_role")] + public function batchGrantRolesForAdminUser(int $userId,AdminUserRequest $request): array { return $this->service->batchGrantRoleForUser($userId); } diff --git a/app/Controller/Admin/PermissionController.php b/app/Controller/Admin/PermissionController.php index e877584..9b91de5 100644 --- a/app/Controller/Admin/PermissionController.php +++ b/app/Controller/Admin/PermissionController.php @@ -8,11 +8,13 @@ use App\Annotation\Permission; use App\Annotation\ResponseFormat; use App\Controller\AbstractController; use App\Middleware\Admin\AdminTokenMiddleware; +use App\Request\Admin\PermissionRequest; use App\Service\Admin\AdminUser\PermissionService; use Hyperf\Di\Annotation\Inject; use Hyperf\HttpServer\Annotation\Controller; use Hyperf\HttpServer\Annotation\Middleware; use Hyperf\HttpServer\Annotation\RequestMapping; +use Hyperf\Validation\Annotation\Scene; #[Controller(prefix: "admin/permission")] #[ResponseFormat('admin')] @@ -44,10 +46,12 @@ class PermissionController extends AbstractController } /** + * @param PermissionRequest $request * @return array */ #[RequestMapping(path: "update", methods: "POST")] - public function update(): array + #[Scene(scene: "update")] + public function update(PermissionRequest $request): array { return $this->service->update(); } diff --git a/app/Lib/Jwt/AbstractJwt.php b/app/Lib/Jwt/AbstractJwt.php index 8383848..f07f1ba 100644 --- a/app/Lib/Jwt/AbstractJwt.php +++ b/app/Lib/Jwt/AbstractJwt.php @@ -2,9 +2,7 @@ namespace App\Lib\Jwt; -use App\Constants\ResultCode; -use App\Exception\ErrException; -use App\Interface\JwtInterface; +use App\Common\Interface\JwtInterface; use Carbon\Carbon; use Hyperf\Cache\CacheManager; use Hyperf\Cache\Driver\DriverInterface; @@ -18,7 +16,6 @@ use Lcobucci\JWT\UnencryptedToken; use Lcobucci\JWT\Validation\Constraint; use Lcobucci\JWT\Validation\Constraint\SignedWith; use Lcobucci\JWT\Validation\Constraint\StrictValidAt; -use Lcobucci\JWT\Validation\RequiredConstraintsViolated; use Psr\SimpleCache\InvalidArgumentException; abstract class AbstractJwt implements JwtInterface diff --git a/app/Lib/Jwt/Jwt.php b/app/Lib/Jwt/Jwt.php index 4995a12..9ef0040 100644 --- a/app/Lib/Jwt/Jwt.php +++ b/app/Lib/Jwt/Jwt.php @@ -2,6 +2,6 @@ namespace App\Lib\Jwt; -use App\Interface\JwtInterface; +use App\Common\Interface\JwtInterface; final class Jwt extends AbstractJwt implements JwtInterface {} \ No newline at end of file diff --git a/app/Lib/Jwt/JwtFactory.php b/app/Lib/Jwt/JwtFactory.php index d57b69d..c5346c4 100644 --- a/app/Lib/Jwt/JwtFactory.php +++ b/app/Lib/Jwt/JwtFactory.php @@ -2,7 +2,7 @@ namespace App\Lib\Jwt; -use App\Interface\JwtInterface; +use App\Common\Interface\JwtInterface; use Hyperf\Collection\Arr; use Hyperf\Contract\ConfigInterface; use function Hyperf\Support\make; diff --git a/app/Middleware/Admin/AdminTokenMiddleware.php b/app/Middleware/Admin/AdminTokenMiddleware.php index 18806ac..adf6c33 100644 --- a/app/Middleware/Admin/AdminTokenMiddleware.php +++ b/app/Middleware/Admin/AdminTokenMiddleware.php @@ -4,9 +4,9 @@ declare(strict_types=1); namespace App\Middleware\Admin; +use App\Common\Interface\JwtInterface; use App\Constants\ResultCode; use App\Exception\ErrException; -use App\Interface\JwtInterface; use App\Middleware\Token\AbstractTokenMiddleware; use Lcobucci\JWT\Token\RegisteredClaims; use Lcobucci\JWT\UnencryptedToken; diff --git a/app/Middleware/Admin/PermissionMiddleware.php b/app/Middleware/Admin/PermissionMiddleware.php index 1cb8dec..5e85084 100644 --- a/app/Middleware/Admin/PermissionMiddleware.php +++ b/app/Middleware/Admin/PermissionMiddleware.php @@ -5,21 +5,21 @@ declare(strict_types=1); namespace App\Middleware\Admin; use App\Annotation\Permission; +use App\Common\Trait\AdminUserTrait; +use App\Common\Trait\ParserRouterTrait; use App\Constants\AdminCode; use App\Constants\Model\AdminUser\AdminUserStatusCode; use App\Exception\ErrException; use App\Lib\Jwt\RequestScopedTokenTrait; use App\Model\AdminUser; -use App\Trait\AdminUserTrait; -use App\Trait\ParserRouterTrait; use Hyperf\Collection\Arr; use Hyperf\Di\Annotation\AnnotationCollector; use Hyperf\HttpServer\Router\Dispatched; use Lcobucci\JWT\Token\RegisteredClaims; use Psr\Container\ContainerInterface; use Psr\Http\Message\ResponseInterface; -use Psr\Http\Server\MiddlewareInterface; use Psr\Http\Message\ServerRequestInterface; +use Psr\Http\Server\MiddlewareInterface; use Psr\Http\Server\RequestHandlerInterface; class PermissionMiddleware implements MiddlewareInterface diff --git a/app/Middleware/Admin/RefreshAdminTokenMiddleware.php b/app/Middleware/Admin/RefreshAdminTokenMiddleware.php index 6832dc6..6c980f7 100644 --- a/app/Middleware/Admin/RefreshAdminTokenMiddleware.php +++ b/app/Middleware/Admin/RefreshAdminTokenMiddleware.php @@ -4,9 +4,9 @@ declare(strict_types=1); namespace App\Middleware\Admin; +use App\Common\Interface\JwtInterface; use App\Constants\ResultCode; use App\Exception\ErrException; -use App\Interface\JwtInterface; use App\Middleware\Token\AbstractTokenMiddleware; use Lcobucci\JWT\Token\RegisteredClaims; use Lcobucci\JWT\UnencryptedToken; diff --git a/app/Middleware/Token/AbstractTokenMiddleware.php b/app/Middleware/Token/AbstractTokenMiddleware.php index a50d5cc..bd1cf1a 100644 --- a/app/Middleware/Token/AbstractTokenMiddleware.php +++ b/app/Middleware/Token/AbstractTokenMiddleware.php @@ -4,10 +4,10 @@ declare(strict_types=1); namespace App\Middleware\Token; +use App\Common\Interface\CheckTokenInterface; +use App\Common\Interface\JwtInterface; use App\Constants\ResultCode; use App\Exception\ErrException; -use App\Interface\CheckTokenInterface; -use App\Interface\JwtInterface; use App\Lib\Jwt\JwtFactory; use Hyperf\Collection\Arr; use Hyperf\Stringable\Str; diff --git a/app/Request/Admin/AdminMenuRequest.php b/app/Request/Admin/AdminMenuRequest.php new file mode 100644 index 0000000..966e7a2 --- /dev/null +++ b/app/Request/Admin/AdminMenuRequest.php @@ -0,0 +1,114 @@ + 'sometimes|integer', + 'name' => 'required|string|max:255', + 'path' => 'sometimes|string|max:255', + 'component' => 'sometimes|string|max:255', + 'redirect' => 'sometimes|string|max:255', + 'status' => 'sometimes|integer', + 'sort' => 'sometimes|integer', + 'remark' => 'sometimes|string|max:255', + 'meta.title' => 'required|string|max:255', + 'meta.i18n' => 'sometimes|string|max:255', + 'meta.badge' => 'sometimes|string|max:255', + 'meta.link' => 'sometimes|string|max:255', + 'meta.icon' => 'sometimes|string|max:255', + 'meta.affix' => 'sometimes|boolean', + 'meta.hidden' => 'sometimes|boolean', + 'meta.type' => 'sometimes|string|max:255', + 'meta.cache' => 'sometimes|boolean', + 'meta.breadcrumbEnable' => 'sometimes|boolean', + 'meta.copyright' => 'sometimes|boolean', + 'meta.componentPath' => 'sometimes|string|max:64', + 'meta.componentSuffix' => 'sometimes|string|max:4', + 'meta.activeName' => 'sometimes|string|max:255', + 'btnPermission' => 'sometimes|array', + ]; + } + + /** + * @return array + */ + public function messages(): array + { + return parent::messages(); + } + + /** + * @var array|array[] + */ + protected array $scenes = [ + 'update' => [ + 'parent_id', + 'name', + 'path', + 'component', + 'redirect', + 'status', + 'sort', + 'remark', + 'meta.title', + 'meta.i18n', + 'meta.badge', + 'meta.link', + 'meta.icon', + 'meta.affix', + 'meta.hidden', + 'meta.type', + 'meta.cache', + 'meta.breadcrumbEnable', + 'meta.copyright', + 'meta.componentPath', + 'meta.componentSuffix', + 'meta.activeName', + 'btnPermission', + ], + 'create' => [ + 'parent_id', + 'name', + 'path', + 'component', + 'redirect', + 'status', + 'sort', + 'remark', + 'meta.title', + 'meta.i18n', + 'meta.badge', + 'meta.link', + 'meta.icon', + 'meta.affix', + 'meta.hidden', + 'meta.type', + 'meta.cache', + 'meta.breadcrumbEnable', + 'meta.copyright', + 'meta.componentPath', + 'meta.componentSuffix', + 'meta.activeName', + 'btnPermission', + ], + ]; +} diff --git a/app/Request/Admin/AdminRoleRequest.php b/app/Request/Admin/AdminRoleRequest.php new file mode 100644 index 0000000..4381cbc --- /dev/null +++ b/app/Request/Admin/AdminRoleRequest.php @@ -0,0 +1,79 @@ + 'required|string|max:60', + 'code' => [ + 'required', + 'string', + 'max:60', + 'regex:/^[a-zA-Z0-9_]+$/', + ], + 'status' => 'sometimes|integer|in:1,2', + 'sort' => 'required|integer', + 'remark' => 'nullable|string|max:255', + 'permissions' => 'sometimes|array', + 'permissions.*' => 'string|exists:menu,name', + ]; + if ($this->isCreate()) { + $rules['code'][] = 'unique:role,code'; + } + if ($this->isUpdate()) { + $rules['code'][] = 'unique:role,code,' . $this->route('id'); + } + + return $rules; + } + + /** + * @return array + */ + public function messages(): array + { + return parent::messages(); + } + + protected array $scenes = [ + 'update' => [ + 'code', + 'name', + 'status', + 'sort', + 'remark', + ], + 'create' => [ + 'code', + 'name', + 'status', + 'sort', + 'remark', + ], + 'batch_grant_permission' => [ + 'permissions', + 'permissions.*', + ] + ]; +} diff --git a/app/Request/Admin/AdminUserRequest.php b/app/Request/Admin/AdminUserRequest.php new file mode 100644 index 0000000..fe1efab --- /dev/null +++ b/app/Request/Admin/AdminUserRequest.php @@ -0,0 +1,81 @@ + 'required|string|max:20', + 'user_type' => 'required|integer', + 'nickname' => ['required', 'string', 'max:60', 'regex:/^[^\s]+$/'], + 'phone' => 'sometimes|string|max:12', + 'email' => 'sometimes|string|max:60|email:rfc,dns', + 'avatar' => 'sometimes|string|max:255|url', + 'signed' => 'sometimes|string|max:255', + 'status' => 'sometimes|integer', + 'backend_setting' => 'sometimes|array|max:255', + 'remark' => 'sometimes|string|max:255', + 'password' => 'sometimes|string|min:6|max:20', + 'role_codes' => 'required|array', + 'role_codes.*' => 'string|exists:role,code', + ]; + } + + /** + * @return array + */ + public function messages(): array + { + return parent::messages(); + } + + protected array $scenes = [ + 'update' => [ + 'username', + 'user_type', + 'nickname', + 'phone', + 'email', + 'avatar', + 'signed', + 'status', + 'backend_setting', + 'remark', + 'password', + ], + 'create' => [ + 'username', + 'user_type', + 'nickname', + 'phone', + 'email', + 'avatar', + 'signed', + 'status', + 'backend_setting', + 'remark', + 'password', + ], + 'batch_grant_role' => [ + 'role_codes', + 'role_codes.*', + ] + ]; +} diff --git a/app/Request/Admin/LoginRequest.php b/app/Request/Admin/LoginRequest.php index 9c28b96..2af4c10 100644 --- a/app/Request/Admin/LoginRequest.php +++ b/app/Request/Admin/LoginRequest.php @@ -22,7 +22,20 @@ class LoginRequest extends FormRequest public function rules(): array { return [ - + 'username' => 'required|string|exists:admin_user,username', + 'password' => 'required|string' ]; } + + /** + * @return array + */ + public function messages(): array + { + return parent::messages(); + } + + protected array $scenes = [ + 'login' => ['username', 'password'], + ]; } diff --git a/app/Request/Admin/PermissionRequest.php b/app/Request/Admin/PermissionRequest.php new file mode 100644 index 0000000..b0b32f6 --- /dev/null +++ b/app/Request/Admin/PermissionRequest.php @@ -0,0 +1,57 @@ + 'sometimes|string|max:255', + 'new_password' => 'sometimes|confirmed|string|min:8', + 'new_password_confirmation' => 'sometimes|string|min:8', + 'old_password' => ['sometimes', 'string'], + 'avatar' => 'sometimes|string|max:255', + 'signed' => 'sometimes|string|max:255', + 'backend_setting' => 'sometimes|array', + ]; + } + + /** + * @return array + */ + public function messages(): array + { + return parent::messages(); + } + + /** + * @var array|array[] + */ + protected array $scenes = [ + 'update' => [ + 'nickname', + 'new_password', + 'new_password_confirmation', + 'old_password', + 'avatar', + 'signed', + 'backend_setting', + ], + ]; +} diff --git a/app/Service/Admin/AdminUser/MenuService.php b/app/Service/Admin/AdminUser/MenuService.php index 0a3248d..1bd5f0a 100644 --- a/app/Service/Admin/AdminUser/MenuService.php +++ b/app/Service/Admin/AdminUser/MenuService.php @@ -10,9 +10,9 @@ declare(strict_types=1); namespace App\Service\Admin\AdminUser; +use App\Common\Repository\AdminMenuRepository; use App\Exception\ErrException; use App\Model\AdminMenu; -use App\Repository\AdminMenuRepository; use App\Service\Admin\BaseAdminService; use Hyperf\Di\Annotation\Inject; diff --git a/app/Service/Admin/AdminUser/PermissionService.php b/app/Service/Admin/AdminUser/PermissionService.php index cb81679..2afb401 100644 --- a/app/Service/Admin/AdminUser/PermissionService.php +++ b/app/Service/Admin/AdminUser/PermissionService.php @@ -10,14 +10,14 @@ declare(strict_types=1); namespace App\Service\Admin\AdminUser; +use App\Common\Repository\AdminMenuRepository; +use App\Common\Repository\AdminRoleRepository; +use App\Common\Trait\AdminUserTrait; use App\Constants\Model\AdminUser\AdminMenuStatusCode; use App\Constants\Model\AdminUser\AdminRoleStatusCode; use App\Constants\ResultCode; use App\Exception\ErrException; -use App\Repository\AdminMenuRepository; -use App\Repository\AdminRoleRepository; use App\Service\Admin\BaseAdminService; -use App\Trait\AdminUserTrait; use Hyperf\Collection\Arr; class PermissionService extends BaseAdminService diff --git a/app/Service/Admin/AdminUser/RoleService.php b/app/Service/Admin/AdminUser/RoleService.php index d1d0dc1..92393b0 100644 --- a/app/Service/Admin/AdminUser/RoleService.php +++ b/app/Service/Admin/AdminUser/RoleService.php @@ -10,10 +10,10 @@ declare(strict_types=1); namespace App\Service\Admin\AdminUser; +use App\Common\Repository\AdminMenuRepository; +use App\Common\Repository\AdminRoleRepository; use App\Exception\ErrException; use App\Model\AdminMenu; -use App\Repository\AdminMenuRepository; -use App\Repository\AdminRoleRepository; use App\Service\Admin\BaseAdminService; use Hyperf\Collection\Arr; use Hyperf\Di\Annotation\Inject; diff --git a/app/Service/Admin/AdminUser/UserService.php b/app/Service/Admin/AdminUser/UserService.php index 5abdc22..771d7b2 100644 --- a/app/Service/Admin/AdminUser/UserService.php +++ b/app/Service/Admin/AdminUser/UserService.php @@ -12,17 +12,15 @@ namespace App\Service\Admin\AdminUser; use App\Cache\Redis\Lua\RateLimit; use App\Cache\Redis\RedisCache; +use App\Common\Repository\AdminRoleRepository; +use App\Common\Repository\AdminUserRepository; +use App\Common\Trait\AdminUserTrait; use App\Exception\ErrException; -use App\Lib\Jwt\RequestScopedTokenTrait; use App\Model\AdminRole; -use App\Repository\AdminRoleRepository; -use App\Repository\AdminUserRepository; use App\Service\Admin\BaseAdminService; use App\Service\BaseTokenService; -use App\Trait\AdminUserTrait; use Hyperf\Collection\Arr; use Hyperf\Di\Annotation\Inject; -use Lcobucci\JWT\Token\RegisteredClaims; class UserService extends BaseAdminService { diff --git a/app/Service/Admin/Log/AdminUserLoginLogService.php b/app/Service/Admin/Log/AdminUserLoginLogService.php index 0e1c515..553d5fe 100644 --- a/app/Service/Admin/Log/AdminUserLoginLogService.php +++ b/app/Service/Admin/Log/AdminUserLoginLogService.php @@ -10,8 +10,8 @@ declare(strict_types=1); namespace App\Service\Admin\Log; +use App\Common\Repository\AdminUserLoginLogRepository; use App\Exception\ErrException; -use App\Repository\AdminUserLoginLogRepository; use App\Service\Admin\BaseAdminService; use Hyperf\Di\Annotation\Inject; diff --git a/app/Service/Admin/Log/AdminUserOperationLogService.php b/app/Service/Admin/Log/AdminUserOperationLogService.php index 6fc33b6..50c763c 100644 --- a/app/Service/Admin/Log/AdminUserOperationLogService.php +++ b/app/Service/Admin/Log/AdminUserOperationLogService.php @@ -10,8 +10,8 @@ declare(strict_types=1); namespace App\Service\Admin\Log; +use App\Common\Repository\AdminUserOperationLogRepository; use App\Exception\ErrException; -use App\Repository\AdminUserOperationLogRepository; use App\Service\Admin\BaseAdminService; use Hyperf\Di\Annotation\Inject; diff --git a/app/Service/Admin/Login/LoginService.php b/app/Service/Admin/Login/LoginService.php index 8f0601c..88164c8 100644 --- a/app/Service/Admin/Login/LoginService.php +++ b/app/Service/Admin/Login/LoginService.php @@ -10,9 +10,9 @@ declare(strict_types=1); namespace App\Service\Admin\Login; +use App\Common\Repository\AdminUserRepository; use App\Constants\Model\AdminUser\AdminUserStatusCode; use App\Exception\ErrException; -use App\Repository\AdminUserRepository; use App\Service\Admin\BaseAdminService; use App\Service\BaseTokenService; use Hyperf\Di\Annotation\Inject; diff --git a/app/Service/BaseTokenService.php b/app/Service/BaseTokenService.php index fd3fa1b..3c4aeaa 100644 --- a/app/Service/BaseTokenService.php +++ b/app/Service/BaseTokenService.php @@ -10,13 +10,13 @@ declare(strict_types=1); namespace App\Service; +use App\Common\Interface\CheckTokenInterface; +use App\Common\Interface\JwtInterface; use App\Exception\ErrException; -use App\Interface\CheckTokenInterface; use App\Lib\Jwt\JwtFactory; use Hyperf\Di\Annotation\Inject; use Lcobucci\JWT\Token\RegisteredClaims; use Lcobucci\JWT\UnencryptedToken; -use App\Interface\JwtInterface; use function Hyperf\Support\value; final class BaseTokenService implements CheckTokenInterface diff --git a/config/autoload/dependencies.php b/config/autoload/dependencies.php index 17ec871..f25f7a2 100644 --- a/config/autoload/dependencies.php +++ b/config/autoload/dependencies.php @@ -11,5 +11,5 @@ declare(strict_types=1); */ return [ Hyperf\Database\Schema\Blueprint::class => App\Common\Macros\BlueprintMacros::class, - App\Interface\CheckTokenInterface::class => App\Service\BaseTokenService::class, + \App\Common\Interface\CheckTokenInterface::class => App\Service\BaseTokenService::class, ];