code style

mineadmin · Jan 19, 2024 · b43d29d · b43d29d
1 parent e26fe5c
commit b43d29d
Show file tree

Hide file tree

Showing 100 changed files with 1,030 additions and 801 deletions.
diff --git a/api/ApiController.php b/api/ApiController.php
@@ -38,7 +38,10 @@
 use Mine\Exception\TokenException;
 use Mine\Helper\MineCode;
 use Mine\MineApi;
+use Psr\Container\ContainerExceptionInterface;
+use Psr\Container\NotFoundExceptionInterface;
 use Psr\Http\Message\ResponseInterface;
+use Psr\SimpleCache\InvalidArgumentException;
 
 /**
  * Class ApiController.
@@ -50,8 +53,8 @@ class ApiController extends MineApi
 
     /**
      * 初始化.
-     * @throws \Psr\Container\ContainerExceptionInterface
-     * @throws \Psr\Container\NotFoundExceptionInterface
+     * @throws ContainerExceptionInterface
+     * @throws NotFoundExceptionInterface
      */
     protected function __init()
     {
@@ -64,9 +67,9 @@ protected function __init()
 
     /**
      * 获取accessToken.
-     * @throws \Psr\Container\ContainerExceptionInterface
-     * @throws \Psr\Container\NotFoundExceptionInterface
-     * @throws \Psr\SimpleCache\InvalidArgumentException
+     * @throws ContainerExceptionInterface
+     * @throws NotFoundExceptionInterface
+     * @throws InvalidArgumentException
      */
     #[PostMapping('v1/getAccessToken')]
     public function getAccessToken(): ResponseInterface
@@ -77,8 +80,8 @@ public function getAccessToken(): ResponseInterface
 
     /**
      * v1 版本.
-     * @throws \Psr\Container\ContainerExceptionInterface
-     * @throws \Psr\Container\NotFoundExceptionInterface
+     * @throws ContainerExceptionInterface
+     * @throws NotFoundExceptionInterface
      */
     #[RequestMapping('v1/{method}')]
     #[Middlewares([VerifyInterfaceMiddleware::class])]

diff --git a/api/ApiDocController.php b/api/ApiDocController.php
@@ -30,6 +30,8 @@
 use Mine\Annotation\Api\MApiCollector;
 use Mine\Helper\MineCode;
 use Mine\MineApi;
+use Psr\Container\ContainerExceptionInterface;
+use Psr\Container\NotFoundExceptionInterface;
 use Psr\Http\Message\ResponseInterface;
 
 /**
@@ -46,8 +48,8 @@ class ApiDocController extends MineApi
 
     /**
      * 登录文档.
-     * @throws \Psr\Container\ContainerExceptionInterface
-     * @throws \Psr\Container\NotFoundExceptionInterface
+     * @throws ContainerExceptionInterface
+     * @throws NotFoundExceptionInterface
      */
     #[PostMapping('login')]
     public function login(): ResponseInterface
@@ -68,8 +70,8 @@ public function login(): ResponseInterface
 
     /**
      * 通过app id获取接口数据.
-     * @throws \Psr\Container\ContainerExceptionInterface
-     * @throws \Psr\Container\NotFoundExceptionInterface
+     * @throws ContainerExceptionInterface
+     * @throws NotFoundExceptionInterface
      */
     #[GetMapping('getAppAndInterfaceList/{id}')]
     public function getAppAndInterfaceList(string $id): ResponseInterface
@@ -86,8 +88,8 @@ public function getAppAndInterfaceList(string $id): ResponseInterface
     }
 
     /**
-     * @throws \Psr\Container\ContainerExceptionInterface
-     * @throws \Psr\Container\NotFoundExceptionInterface
+     * @throws ContainerExceptionInterface
+     * @throws NotFoundExceptionInterface
      */
     #[GetMapping('getColumnList/{id}')]
     public function getColumnList(string $id): ResponseInterface

diff --git a/api/Listener/ApiLogListener.php b/api/Listener/ApiLogListener.php
@@ -19,6 +19,8 @@
 use Mine\Event\ApiAfter;
 use Mine\Helper\Str;
 use Mine\MineRequest;
+use Psr\Container\ContainerExceptionInterface;
+use Psr\Container\NotFoundExceptionInterface;
 
 /**
  * API访问日志保存.
@@ -39,8 +41,8 @@ public function listen(): array
 
     /**
      * 事件处理.
-     * @throws \Psr\Container\ContainerExceptionInterface
-     * @throws \Psr\Container\NotFoundExceptionInterface
+     * @throws ContainerExceptionInterface
+     * @throws NotFoundExceptionInterface
      */
     public function process(object $event): void
     {

diff --git a/api/Middleware/VerifyInterfaceMiddleware.php b/api/Middleware/VerifyInterfaceMiddleware.php
@@ -40,6 +40,7 @@
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\MiddlewareInterface;
 use Psr\Http\Server\RequestHandlerInterface;
+use Psr\SimpleCache\InvalidArgumentException;
 
 class VerifyInterfaceMiddleware implements MiddlewareInterface
 {
@@ -53,7 +54,7 @@ class VerifyInterfaceMiddleware implements MiddlewareInterface
      * 验证检查接口.
      * @throws ContainerExceptionInterface
      * @throws NotFoundExceptionInterface
-     * @throws \Psr\SimpleCache\InvalidArgumentException
+     * @throws InvalidArgumentException
      */
     public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
     {
@@ -64,7 +65,7 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
      * 访问接口鉴权处理.
      * @throws ContainerExceptionInterface
      * @throws NotFoundExceptionInterface
-     * @throws \Psr\SimpleCache\InvalidArgumentException
+     * @throws InvalidArgumentException
      */
     protected function auth(ServerRequestInterface $request): int
     {
@@ -169,7 +170,7 @@ protected function apiModelCheck($request): ServerRequestInterface
      * 运行.
      * @throws ContainerExceptionInterface
      * @throws NotFoundExceptionInterface
-     * @throws \Psr\SimpleCache\InvalidArgumentException
+     * @throws InvalidArgumentException
      */
     protected function run(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
     {

diff --git a/api/Middleware/VerifyParamsMiddleware.php b/api/Middleware/VerifyParamsMiddleware.php
@@ -21,7 +21,11 @@
 
 namespace Api\Middleware;
 
+use App\System\Service\SystemApiService;
 use Mine\Annotation\Api\MApi;
+use PhpOffice\PhpSpreadsheet\Writer\Exception;
+use Psr\Container\ContainerExceptionInterface;
+use Psr\Container\NotFoundExceptionInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\MiddlewareInterface;
@@ -31,16 +35,16 @@ class VerifyParamsMiddleware implements MiddlewareInterface
 {
     /**
      * 验证接口参数.
-     * @throws \PhpOffice\PhpSpreadsheet\Writer\Exception
-     * @throws \Psr\Container\ContainerExceptionInterface
-     * @throws \Psr\Container\NotFoundExceptionInterface
+     * @throws Exception
+     * @throws ContainerExceptionInterface
+     * @throws NotFoundExceptionInterface
      */
     public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
     {
         $apiData = $request->getParsedBody()['apiData'];
         $requestData = $this->getRequestData($request, $apiData);
 
-        $columns = container()->get(\App\System\Service\SystemApiService::class)
+        $columns = container()->get(SystemApiService::class)
             ->getColumnListByApiId((string) $apiData['id'])['api_column'];
 
         // todo...

diff --git a/app/Setting/Controller/CommonController.php b/app/Setting/Controller/CommonController.php
@@ -16,6 +16,9 @@
 use Hyperf\HttpServer\Annotation\GetMapping;
 use Mine\Annotation\Auth;
 use Mine\MineController;
+use Psr\Container\ContainerExceptionInterface;
+use Psr\Container\NotFoundExceptionInterface;
+use Psr\Http\Message\ResponseInterface;
 
 /**
  * setting 公共方法控制器
@@ -26,11 +29,11 @@ class CommonController extends MineController
 {
     /**
      * 返回模块信息及表前缀
-     * @throws \Psr\Container\ContainerExceptionInterface
-     * @throws \Psr\Container\NotFoundExceptionInterface
+     * @throws ContainerExceptionInterface
+     * @throws NotFoundExceptionInterface
      */
     #[GetMapping('getModuleList')]
-    public function getModuleList(): \Psr\Http\Message\ResponseInterface
+    public function getModuleList(): ResponseInterface
     {
         return $this->success($this->mine->getModuleInfo());
     }

diff --git a/app/Setting/Controller/Modules/ModuleController.php b/app/Setting/Controller/Modules/ModuleController.php
@@ -24,6 +24,8 @@
 use Mine\Annotation\OperationLog;
 use Mine\Annotation\Permission;
 use Mine\MineController;
+use Psr\Container\ContainerExceptionInterface;
+use Psr\Container\NotFoundExceptionInterface;
 use Psr\Http\Message\ResponseInterface;
 
 /**
@@ -38,8 +40,8 @@ class ModuleController extends MineController
 
     /**
      * 本地模块列表.
-     * @throws \Psr\Container\ContainerExceptionInterface
-     * @throws \Psr\Container\NotFoundExceptionInterface
+     * @throws ContainerExceptionInterface
+     * @throws NotFoundExceptionInterface
      */
     #[GetMapping('index'), Permission('setting:module, setting:module:index')]
     public function index(): ResponseInterface
@@ -49,8 +51,8 @@ public function index(): ResponseInterface
 
     /**
      * 新增本地模块.
-     * @throws \Psr\Container\ContainerExceptionInterface
-     * @throws \Psr\Container\NotFoundExceptionInterface
+     * @throws ContainerExceptionInterface
+     * @throws NotFoundExceptionInterface
      */
     #[PutMapping('save'), Permission('setting:module:save'), OperationLog]
     public function save(ModuleRequest $request): ResponseInterface
@@ -61,8 +63,8 @@ public function save(ModuleRequest $request): ResponseInterface
 
     /**
      * 启停用模块.
-     * @throws \Psr\Container\ContainerExceptionInterface
-     * @throws \Psr\Container\NotFoundExceptionInterface
+     * @throws ContainerExceptionInterface
+     * @throws NotFoundExceptionInterface
      */
     #[PostMapping('modifyStatus'), Permission('setting:module:status'), OperationLog]
     public function modifyStatus(ModuleRequest $request): ResponseInterface
@@ -72,8 +74,8 @@ public function modifyStatus(ModuleRequest $request): ResponseInterface
 
     /**
      * 安装模块.
-     * @throws \Psr\Container\ContainerExceptionInterface
-     * @throws \Psr\Container\NotFoundExceptionInterface
+     * @throws ContainerExceptionInterface
+     * @throws NotFoundExceptionInterface
      */
     #[PutMapping('install'), Permission('setting:module:install'), OperationLog]
     public function install(): ResponseInterface
@@ -83,8 +85,8 @@ public function install(): ResponseInterface
 
     /**
      * 卸载删除模块.
-     * @throws \Psr\Container\ContainerExceptionInterface
-     * @throws \Psr\Container\NotFoundExceptionInterface
+     * @throws ContainerExceptionInterface
+     * @throws NotFoundExceptionInterface
      * @throws \Throwable
      */
     #[DeleteMapping('delete'), Permission('setting:module:delete'), OperationLog]

diff --git a/app/Setting/Controller/Settings/SystemConfigController.php b/app/Setting/Controller/Settings/SystemConfigController.php
@@ -24,6 +24,8 @@
 use Mine\Annotation\Permission;
 use Mine\Annotation\RemoteState;
 use Mine\MineController;
+use Psr\Container\ContainerExceptionInterface;
+use Psr\Container\NotFoundExceptionInterface;
 use Psr\Http\Message\ResponseInterface;
 
 /**
@@ -38,8 +40,8 @@ class SystemConfigController extends MineController
 
     /**
      * 获取配置列表.
-     * @throws \Psr\Container\ContainerExceptionInterface
-     * @throws \Psr\Container\NotFoundExceptionInterface
+     * @throws ContainerExceptionInterface
+     * @throws NotFoundExceptionInterface
      */
     #[GetMapping('index'), Permission('setting:config, setting:config:index')]
     public function index(): ResponseInterface
@@ -49,8 +51,8 @@ public function index(): ResponseInterface
 
     /**
      * 保存配置.
-     * @throws \Psr\Container\ContainerExceptionInterface
-     * @throws \Psr\Container\NotFoundExceptionInterface
+     * @throws ContainerExceptionInterface
+     * @throws NotFoundExceptionInterface
      */
     #[PostMapping('save'), Permission('setting:config:save'), OperationLog]
     public function save(SettingConfigRequest $request): ResponseInterface
@@ -60,8 +62,8 @@ public function save(SettingConfigRequest $request): ResponseInterface
 
     /**
      * 更新配置.
-     * @throws \Psr\Container\ContainerExceptionInterface
-     * @throws \Psr\Container\NotFoundExceptionInterface
+     * @throws ContainerExceptionInterface
+     * @throws NotFoundExceptionInterface
      */
     #[PostMapping('update'), Permission('setting:config:update'), OperationLog]
     public function update(SettingConfigRequest $request): ResponseInterface
@@ -71,8 +73,8 @@ public function update(SettingConfigRequest $request): ResponseInterface
 
     /**
      * 按 keys 更新配置.
-     * @throws \Psr\Container\ContainerExceptionInterface
-     * @throws \Psr\Container\NotFoundExceptionInterface
+     * @throws ContainerExceptionInterface
+     * @throws NotFoundExceptionInterface
      */
     #[PostMapping('updateByKeys'), Permission('setting:config:update'), OperationLog]
     public function updateByKeys(): ResponseInterface
@@ -82,8 +84,8 @@ public function updateByKeys(): ResponseInterface
 
     /**
      * 删除配置.
-     * @throws \Psr\Container\ContainerExceptionInterface
-     * @throws \Psr\Container\NotFoundExceptionInterface
+     * @throws ContainerExceptionInterface
+     * @throws NotFoundExceptionInterface
      */
     #[DeleteMapping('delete'), Permission('setting:config:delete'), OperationLog]
     public function delete(): ResponseInterface
@@ -93,8 +95,8 @@ public function delete(): ResponseInterface
 
     /**
      * 清除配置缓存.
-     * @throws \Psr\Container\ContainerExceptionInterface
-     * @throws \Psr\Container\NotFoundExceptionInterface
+     * @throws ContainerExceptionInterface
+     * @throws NotFoundExceptionInterface
      */
     #[PostMapping('clearCache'), Permission('setting:config:clearCache'), OperationLog]
     public function clearCache(): ResponseInterface

diff --git a/app/Setting/Controller/Settings/SystemConfigGroupController.php b/app/Setting/Controller/Settings/SystemConfigGroupController.php
@@ -24,6 +24,8 @@
 use Mine\Annotation\Permission;
 use Mine\Annotation\RemoteState;
 use Mine\MineController;
+use Psr\Container\ContainerExceptionInterface;
+use Psr\Container\NotFoundExceptionInterface;
 use Psr\Http\Message\ResponseInterface;
 
 /**
@@ -38,8 +40,8 @@ class SystemConfigGroupController extends MineController
 
     /**
      * 获取系统组配置.
-     * @throws \Psr\Container\ContainerExceptionInterface
-     * @throws \Psr\Container\NotFoundExceptionInterface
+     * @throws ContainerExceptionInterface
+     * @throws NotFoundExceptionInterface
      */
     #[GetMapping('index'), Permission('setting:config, setting:config:index')]
     public function index(): ResponseInterface
@@ -49,8 +51,8 @@ public function index(): ResponseInterface
 
     /**
      * 保存配置组.
-     * @throws \Psr\Container\ContainerExceptionInterface
-     * @throws \Psr\Container\NotFoundExceptionInterface
+     * @throws ContainerExceptionInterface
+     * @throws NotFoundExceptionInterface
      */
     #[PostMapping('save'), Permission('setting:config:save'), OperationLog('保存配置组')]
     public function save(SettingConfigGroupRequest $request): ResponseInterface
@@ -60,8 +62,8 @@ public function save(SettingConfigGroupRequest $request): ResponseInterface
 
     /**
      * 更新配置组.
-     * @throws \Psr\Container\ContainerExceptionInterface
-     * @throws \Psr\Container\NotFoundExceptionInterface
+     * @throws ContainerExceptionInterface
+     * @throws NotFoundExceptionInterface
      */
     #[PostMapping('update'), Permission('setting:config:update'), OperationLog('更新配置组')]
     public function update(SettingConfigGroupRequest $request): ResponseInterface
@@ -71,8 +73,8 @@ public function update(SettingConfigGroupRequest $request): ResponseInterface
 
     /**
      * 删除配置组.
-     * @throws \Psr\Container\ContainerExceptionInterface
-     * @throws \Psr\Container\NotFoundExceptionInterface
+     * @throws ContainerExceptionInterface
+     * @throws NotFoundExceptionInterface
      */
     #[DeleteMapping('delete'), Permission('setting:config:delete'), OperationLog('删除配置组')]
     public function delete(): ResponseInterface