[WIP] feat: add redis connection check. Prevent the "DNS Lookup resolution failed" error

README-en.md

@@ -1,5 +1,5 @@
-[Chinese](./README.md) | English  
-# Project Introduction  
+[中文](./README.md) | English
+# Projects
 
 <p align="center">  
     <img src="https://doc.mineadmin.com/logo.svg" width="120" />  

README.md

@@ -22,8 +22,9 @@ PHP有很多优秀的后台管理系统，但基于Swoole的后台管理系统
 如果觉着还不错的话，就请点个 ⭐star 支持一下吧，这将是对我最大的支持和鼓励！
 在使用 MineAdmin 前请认真阅读[《免责声明》](https://doc.mineadmin.com/guide/start/declaration.html)并同意该声明。
 
-## 部门岗位分支（包含数据权限功能）
-当前默认分支不带部门、岗位、数据权限等功能，如需使用这些功能请移步 [`【包含部门岗位的MineAdmin----master-department】`](https://github.com/mineadmin/MineAdmin/tree/master-department) 分支代码下载
+## 默认主分支（不包含部门、岗位、数据权限功能）
+当前分支带有部门、岗位、数据权限等功能，如果不需要使用这些功能请移步 [`【主分支】`](https://github.com/mineadmin/MineAdmin) 下载代码
+
 
 ## 官方交流群
 > QQ群用于交流学习，请勿水群
@@ -41,7 +42,10 @@ PHP有很多优秀的后台管理系统，但基于Swoole的后台管理系统
 4. 操作日志，用户对系统的一些正常操作的查询
 5. 登录日志，用户登录系统的记录查询
 6. 附件管理，管理当前系统上传的文件及图片等信息
-7. 应用市场，可下载各种基础应用、插件、前端组件等等
+7. 部门管理，可以管理组织架构
+8. 岗位管理，在部门内管理，可以为部门设置岗位，再为用户分配岗位
+9. 数据权限，数据权限功能跟随岗位而设置，同时，也可以对用户单独设置数据权限，使岗位的数据权限失效。
+10. 应用市场，可下载各种基础应用、插件、前端组件等等
 
 ## 环境需求
 

app/Http/Admin/Controller/Permission/DepartmentController.php

@@ -0,0 +1,117 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * This file is part of MineAdmin.
+ *
+ * @link     https://www.mineadmin.com
+ * @document https://doc.mineadmin.com
+ * @contact  [email protected]
+ * @license  https://github.com/mineadmin/MineAdmin/blob/master/LICENSE
+ */
+
+namespace App\Http\Admin\Controller\Permission;
+
+use App\Http\Admin\Controller\AbstractController;
+use App\Http\Admin\Middleware\PermissionMiddleware;
+use App\Http\Admin\Request\Permission\DepartmentRequest;
+use App\Http\Common\Middleware\AccessTokenMiddleware;
+use App\Http\Common\Middleware\OperationMiddleware;
+use App\Http\Common\Result;
+use App\Http\CurrentUser;
+use App\Schema\DepartmentSchema;
+use App\Service\Permission\DepartmentService;
+use Hyperf\HttpServer\Annotation\Middleware;
+use Hyperf\Swagger\Annotation\Delete;
+use Hyperf\Swagger\Annotation\Get;
+use Hyperf\Swagger\Annotation\HyperfServer;
+use Hyperf\Swagger\Annotation\JsonContent;
+use Hyperf\Swagger\Annotation\Post;
+use Hyperf\Swagger\Annotation\Put;
+use Hyperf\Swagger\Annotation\RequestBody;
+use Mine\Access\Attribute\Permission;
+use Mine\Swagger\Attributes\PageResponse;
+use Mine\Swagger\Attributes\ResultResponse;
+
+#[HyperfServer(name: 'http')]
+#[Middleware(middleware: AccessTokenMiddleware::class, priority: 100)]
+#[Middleware(middleware: PermissionMiddleware::class, priority: 99)]
+#[Middleware(middleware: OperationMiddleware::class, priority: 98)]
+class DepartmentController extends AbstractController
+{
+    public function __construct(
+        protected readonly CurrentUser $currentUser,
+        protected readonly DepartmentService $service
+    ) {}
+
+    #[Get(
+        path: '/admin/department/list',
+        operationId: 'departmentList',
+        summary: '部门列表',
+        security: [['Bearer' => [], 'ApiKey' => []]],
+        tags: ['部门管理'],
+    )]
+    #[PageResponse(instance: DepartmentSchema::class)]
+    #[Permission(code: 'permission:department:index')]
+    public function pageList(): Result
+    {
+        return $this->success([
+            'list' => $this->service->getList($this->getRequestData()),
+        ]);
+    }
+
+    #[Post(
+        path: '/admin/department',
+        operationId: 'departmentCreate',
+        summary: '创建部门',
+        security: [['Bearer' => [], 'ApiKey' => []]],
+        tags: ['部门管理'],
+    )]
+    #[RequestBody(
+        content: new JsonContent(ref: DepartmentRequest::class)
+    )]
+    #[Permission(code: 'permission:department:save')]
+    #[ResultResponse(instance: new Result())]
+    public function create(DepartmentRequest $request): Result
+    {
+        $this->service->create(array_merge($request->validated(), [
+            'created_by' => $this->currentUser->id(),
+        ]));
+        return $this->success();
+    }
+
+    #[Put(
+        path: '/admin/department/{id}',
+        operationId: 'departmentSave',
+        summary: '保存部门',
+        security: [['Bearer' => [], 'ApiKey' => []]],
+        tags: ['部门管理'],
+    )]
+    #[RequestBody(
+        content: new JsonContent(ref: DepartmentRequest::class)
+    )]
+    #[Permission(code: 'permission:department:update')]
+    #[ResultResponse(instance: new Result())]
+    public function save(int $id, DepartmentRequest $request): Result
+    {
+        $this->service->updateById($id, array_merge($request->validated(), [
+            'updated_by' => $this->currentUser->id(),
+        ]));
+        return $this->success();
+    }
+
+    #[Delete(
+        path: '/admin/department',
+        operationId: 'departmentDelete',
+        summary: '删除部门',
+        security: [['Bearer' => [], 'ApiKey' => []]],
+        tags: ['部门管理'],
+    )]
+    #[ResultResponse(instance: new Result())]
+    #[Permission(code: 'permission:department:delete')]
+    public function delete(): Result
+    {
+        $this->service->deleteById($this->getRequestData());
+        return $this->success();
+    }
+}

app/Http/Admin/Controller/Permission/LeaderController.php

@@ -0,0 +1,100 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * This file is part of MineAdmin.
+ *
+ * @link     https://www.mineadmin.com
+ * @document https://doc.mineadmin.com
+ * @contact  [email protected]
+ * @license  https://github.com/mineadmin/MineAdmin/blob/master/LICENSE
+ */
+
+namespace App\Http\Admin\Controller\Permission;
+
+use App\Http\Admin\Controller\AbstractController;
+use App\Http\Admin\Middleware\PermissionMiddleware;
+use App\Http\Admin\Request\Permission\LeaderRequest;
+use App\Http\Common\Middleware\AccessTokenMiddleware;
+use App\Http\Common\Middleware\OperationMiddleware;
+use App\Http\Common\Result;
+use App\Http\CurrentUser;
+use App\Schema\LeaderSchema;
+use App\Service\Permission\LeaderService;
+use Hyperf\HttpServer\Annotation\Middleware;
+use Hyperf\Swagger\Annotation\Delete;
+use Hyperf\Swagger\Annotation\Get;
+use Hyperf\Swagger\Annotation\HyperfServer;
+use Hyperf\Swagger\Annotation\JsonContent;
+use Hyperf\Swagger\Annotation\Post;
+use Hyperf\Swagger\Annotation\RequestBody;
+use Mine\Access\Attribute\Permission;
+use Mine\Swagger\Attributes\PageResponse;
+use Mine\Swagger\Attributes\ResultResponse;
+
+#[HyperfServer(name: 'http')]
+#[Middleware(middleware: AccessTokenMiddleware::class, priority: 100)]
+#[Middleware(middleware: PermissionMiddleware::class, priority: 99)]
+#[Middleware(middleware: OperationMiddleware::class, priority: 98)]
+class LeaderController extends AbstractController
+{
+    public function __construct(
+        protected readonly CurrentUser $currentUser,
+        protected readonly LeaderService $service
+    ) {}
+
+    #[Get(
+        path: '/admin/leader/list',
+        operationId: 'leaderList',
+        summary: '部门领导列表',
+        security: [['Bearer' => [], 'ApiKey' => []]],
+        tags: ['部门领导管理'],
+    )]
+    #[PageResponse(instance: LeaderSchema::class)]
+    #[Permission(code: 'permission:leader:index')]
+    public function pageList(): Result
+    {
+        return $this->success(
+            $this->service->page(
+                $this->getRequestData(),
+                $this->getCurrentPage(),
+                $this->getPageSize()
+            )
+        );
+    }
+
+    #[Post(
+        path: '/admin/leader',
+        operationId: 'leaderCreate',
+        summary: '部门领导岗位',
+        security: [['Bearer' => [], 'ApiKey' => []]],
+        tags: ['部门领导管理'],
+    )]
+    #[RequestBody(
+        content: new JsonContent(ref: LeaderRequest::class)
+    )]
+    #[Permission(code: 'permission:leader:save')]
+    #[ResultResponse(instance: new Result())]
+    public function create(LeaderRequest $request): Result
+    {
+        $this->service->create(array_merge($request->validated(), [
+            'created_by' => $this->currentUser->id(),
+        ]));
+        return $this->success();
+    }
+
+    #[Delete(
+        path: '/admin/leader',
+        operationId: 'leaderDelete',
+        summary: '删除部门领导',
+        security: [['Bearer' => [], 'ApiKey' => []]],
+        tags: ['部门领导管理'],
+    )]
+    #[ResultResponse(instance: new Result())]
+    #[Permission(code: 'permission:leader:delete')]
+    public function delete(): Result
+    {
+        $this->service->deleteByDoubleKey($this->getRequestData());
+        return $this->success();
+    }
+}

app/Http/Admin/Controller/Permission/PositionController.php

@@ -0,0 +1,137 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * This file is part of MineAdmin.
+ *
+ * @link     https://www.mineadmin.com
+ * @document https://doc.mineadmin.com
+ * @contact  [email protected]
+ * @license  https://github.com/mineadmin/MineAdmin/blob/master/LICENSE
+ */
+
+namespace App\Http\Admin\Controller\Permission;
+
+use App\Http\Admin\Controller\AbstractController;
+use App\Http\Admin\Middleware\PermissionMiddleware;
+use App\Http\Admin\Request\Permission\BatchGrantDataPermissionForPositionRequest;
+use App\Http\Admin\Request\Permission\PositionRequest;
+use App\Http\Common\Middleware\AccessTokenMiddleware;
+use App\Http\Common\Middleware\OperationMiddleware;
+use App\Http\Common\Result;
+use App\Http\CurrentUser;
+use App\Schema\PositionSchema;
+use App\Service\Permission\PositionService;
+use Hyperf\HttpServer\Annotation\Middleware;
+use Hyperf\Swagger\Annotation\Delete;
+use Hyperf\Swagger\Annotation\Get;
+use Hyperf\Swagger\Annotation\HyperfServer;
+use Hyperf\Swagger\Annotation\JsonContent;
+use Hyperf\Swagger\Annotation\Post;
+use Hyperf\Swagger\Annotation\Put;
+use Hyperf\Swagger\Annotation\RequestBody;
+use Mine\Access\Attribute\Permission;
+use Mine\Swagger\Attributes\PageResponse;
+use Mine\Swagger\Attributes\ResultResponse;
+
+#[HyperfServer(name: 'http')]
+#[Middleware(middleware: AccessTokenMiddleware::class, priority: 100)]
+#[Middleware(middleware: PermissionMiddleware::class, priority: 99)]
+#[Middleware(middleware: OperationMiddleware::class, priority: 98)]
+class PositionController extends AbstractController
+{
+    public function __construct(
+        protected readonly CurrentUser $currentUser,
+        protected readonly PositionService $service
+    ) {}
+
+    #[Get(
+        path: '/admin/position/list',
+        operationId: 'positionList',
+        summary: '岗位列表',
+        security: [['Bearer' => [], 'ApiKey' => []]],
+        tags: ['岗位管理'],
+    )]
+    #[PageResponse(instance: PositionSchema::class)]
+    #[Permission(code: 'permission:position:index')]
+    public function pageList(): Result
+    {
+        return $this->success(
+            $this->service->page(
+                $this->getRequestData(),
+                $this->getCurrentPage(),
+                $this->getPageSize()
+            )
+        );
+    }
+
+    #[Put(
+        path: '/admin/position/{id}/data_permission',
+        operationId: 'positionDataPermission',
+        summary: '设置岗位数据权限',
+        security: [['Bearer' => [], 'ApiKey' => []]],
+        tags: ['岗位管理'],
+    )]
+    #[Permission(code: 'permission:position:data_permission')]
+    #[ResultResponse(instance: new Result())]
+    public function batchDataPermission(int $id, BatchGrantDataPermissionForPositionRequest $request): Result
+    {
+        $this->service->batchDataPermission($id, $request->validated());
+        return $this->success();
+    }
+
+    #[Post(
+        path: '/admin/position',
+        operationId: 'positionCreate',
+        summary: '创建岗位',
+        security: [['Bearer' => [], 'ApiKey' => []]],
+        tags: ['岗位管理'],
+    )]
+    #[RequestBody(
+        content: new JsonContent(ref: PositionRequest::class)
+    )]
+    #[Permission(code: 'permission:position:save')]
+    #[ResultResponse(instance: new Result())]
+    public function create(PositionRequest $request): Result
+    {
+        $this->service->create(array_merge($request->validated(), [
+            'created_by' => $this->currentUser->id(),
+        ]));
+        return $this->success();
+    }
+
+    #[Put(
+        path: '/admin/position/{id}',
+        operationId: 'positionSave',
+        summary: '保存岗位',
+        security: [['Bearer' => [], 'ApiKey' => []]],
+        tags: ['岗位管理'],
+    )]
+    #[RequestBody(
+        content: new JsonContent(ref: PositionRequest::class)
+    )]
+    #[Permission(code: 'permission:position:update')]
+    #[ResultResponse(instance: new Result())]
+    public function save(int $id, PositionRequest $request): Result
+    {
+        $this->service->updateById($id, array_merge($request->validated(), [
+            'updated_by' => $this->currentUser->id(),
+        ]));
+        return $this->success();
+    }
+
+    #[Delete(
+        path: '/admin/position',
+        operationId: 'positionDelete',
+        summary: '删除岗位',
+        security: [['Bearer' => [], 'ApiKey' => []]],
+        tags: ['岗位管理'],
+    )]
+    #[ResultResponse(instance: new Result())]
+    #[Permission(code: 'permission:position:delete')]
+    public function delete(): Result
+    {
+        $this->service->deleteById($this->getRequestData());
+        return $this->success();
+    }
+}