测试服务器版本

app/Controller/PublicController.php

@@ -579,8 +579,10 @@ class PublicController extends AbstractController
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
         }
+        echo 123;
         $requireData['user_id'] = Context::get("UserId");
         $result = $this->publicServiceClient->modZhinengbumen($requireData);
+        echo 4;
         return $result['code'] == 200 ? Result::success() : Result::error("修改失败");
     }
 }

app/JsonRpc/PublicRpcService.php

@@ -211,4 +211,12 @@ class PublicRpcService extends AbstractServiceClient implements PublicRpcService
     {
         return $this->__request(__FUNCTION__, $data);
     }
+    /**
+     * @param array $data
+     * @return array|mixed
+     */
+    public function modZhinengbumen(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
 }

app/JsonRpc/PublicRpcServiceInterface.php

@@ -128,5 +128,11 @@ interface PublicRpcServiceInterface
      * @return mixed
      */
     public function delZhinengbumen(array $data);
+    
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function modZhinengbumen(array $data);
 
 }

composer.json

@@ -33,6 +33,7 @@
         "hyperf/logger": "^3.1",
         "hyperf/memory": "~3.1.0",
         "hyperf/nacos": "^3.1",
+        "hyperf/paginator": "^3.1",
         "hyperf/process": "~3.1.0",
         "hyperf/redis": "~3.1.0",
         "hyperf/rpc-client": "^3.1",

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "e71f383836139c57d31eb8084467a897",
+    "content-hash": "d5f7fd6fcee090d2a5947dfb2b5bd447",
     "packages": [
         {
             "name": "carbonphp/carbon-doctrine-types",
@@ -3501,6 +3501,74 @@
             ],
             "time": "2024-03-23T11:28:51+00:00"
         },
+        {
+            "name": "hyperf/paginator",
+            "version": "v3.1.42",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/hyperf/paginator.git",
+                "reference": "b637a3deeee69f4a3e5a6d62ab8214244b98412a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/hyperf/paginator/zipball/b637a3deeee69f4a3e5a6d62ab8214244b98412a",
+                "reference": "b637a3deeee69f4a3e5a6d62ab8214244b98412a",
+                "shasum": ""
+            },
+            "require": {
+                "hyperf/contract": "~3.1.0",
+                "hyperf/support": "~3.1.0",
+                "hyperf/utils": "~3.1.0",
+                "php": ">=8.1"
+            },
+            "suggest": {
+                "hyperf/event": "Reqiured to use PageResolverListener.",
+                "hyperf/framework": "Reqiured to use PageResolverListener.",
+                "hyperf/http-server": "Reqiured to use PageResolverListener."
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.1-dev"
+                },
+                "hyperf": {
+                    "config": "Hyperf\\Paginator\\ConfigProvider"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Hyperf\\Paginator\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "A paginator component for hyperf.",
+            "homepage": "https://hyperf.io",
+            "keywords": [
+                "hyperf",
+                "paginator",
+                "php"
+            ],
+            "support": {
+                "docs": "https://hyperf.wiki",
+                "issues": "https://github.com/hyperf/hyperf/issues",
+                "pull-request": "https://github.com/hyperf/hyperf/pulls",
+                "source": "https://github.com/hyperf/hyperf"
+            },
+            "funding": [
+                {
+                    "url": "https://hyperf.wiki/#/zh-cn/donate",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://opencollective.com/hyperf",
+                    "type": "open_collective"
+                }
+            ],
+            "time": "2024-09-25T02:54:12+00:00"
+        },
         {
             "name": "hyperf/pipeline",
             "version": "v3.1.15",

runtime/container/proxy/App_Controller_AdController.proxy.php

@@ -4,16 +4,16 @@ declare (strict_types=1);
 namespace App\Controller;
 
 use App\JsonRpc\PublicRpcServiceInterface;
-use Hyperf\Di\Annotation\Inject;
-use App\Tools\Result;
 use App\Tools\CommonService;
-use Hyperf\Validation\Contract\ValidatorFactoryInterface;
 use App\Tools\PublicData;
+use App\Tools\Result;
+use function Hyperf\Support\env;
+use Hyperf\Context\Context;
+use Hyperf\Di\Annotation\Inject;
 use Hyperf\HttpServer\Contract\RequestInterface;
 use Hyperf\HttpServer\Contract\ResponseInterface;
+use Hyperf\Validation\Contract\ValidatorFactoryInterface;
 use ZipArchive;
-use function Hyperf\Support\env;
-use Hyperf\Context\Context;
 /**
  * Class PublicController
  * @package App\Controller
@@ -259,7 +259,7 @@ class PublicController extends AbstractController
         $fileName = $requireData['fileName'] . time() . mt_rand(1, 1000000) . '.zip';
         $zipFileName = $allDir . DIRECTORY_SEPARATOR . $requireData['fileName'] . time() . mt_rand(1, 1000000) . '.zip';
         //        $zipFileName = 'public/zip/files.zip';
-        if ($zip->open($zipFileName, ZipArchive::CREATE) === TRUE) {
+        if ($zip->open($zipFileName, ZipArchive::CREATE) === true) {
             // 将要下载的文件逐个添加到zip文件中
             //            $string = trim($requireData['files'], "[]'"); // 去掉最外层的方括号和单引号（注意：这里假设了单引号，如果是双引号则替换为 "）
             //            $string = str_replace("'", '', $string); // 去掉所有剩余的单引号（如果原字符串中使用的是双引号，则替换为双引号）
@@ -309,4 +309,111 @@ class PublicController extends AbstractController
         $result = $this->publicServiceClient->getDepartment($requireData);
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error("查询失败");
     }
+    /**
+     * 获取职能部门
+     * @return array
+     */
+    public function getZhinengbumenList()
+    {
+        // 获取请求参数
+        $requireData = $this->request->all();
+        // 参数验证
+        $validator = $this->validationFactory->make($requireData, ['page' => 'integer|min:1', 'pagesize' => 'integer|min:1', 'search' => 'string|nullable'], ['page.integer' => 'page 必须是整数', 'page.min' => 'page 必须大于等于 1', 'pagesize.integer' => 'pagesize 必须是整数', 'pagesize.min' => 'pagesize 必须大于等于 1', 'search.string' => 'search 必须是字符串']);
+        if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        // 添加用户 ID
+        $requireData['user_id'] = Context::get("UserId");
+        // 调用服务客户端方法获取分页数据
+        $result = $this->publicServiceClient->getZhinengbumenList($requireData);
+        // 处理结果
+        return $result['code'] == 200 ? Result::success($result['data']) : Result::error("查询失败");
+    }
+    /**
+     * 添加职能部门
+     * @return array
+     */
+    public function addZhinengbumen()
+    {
+        // 获取请求参数
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make($requireData, ['name' => 'required|string|regex:/^[\\x{4e00}-\\x{9fa5}]+$/u', 'pid' => 'required|integer'], ['name.required' => 'name 不能为空', 'name.string' => 'name 必须是字符串', 'name.regex' => 'name 必须是汉字', 'pid.required' => 'pid 不能为空', 'pid.integer' => 'pid 必须是整数']);
+        if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        // $requireData['user_id'] = Context::get("UserId");
+        $result = $this->publicServiceClient->addZhinengbumen($requireData);
+        return $result['code'] == 200 ? Result::success() : Result::error("添加失败");
+    }
+    /**
+     * 删除职能部门
+     * @return array
+     */
+    public function delZhinengbumen()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make($requireData, ['id' => 'required|integer'], ['id.required' => 'id 不能为空', 'id.integer' => 'id 必须是整数']);
+        if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $requireData['user_id'] = Context::get("UserId");
+        $result = $this->publicServiceClient->delZhinengbumen($requireData);
+        return $result['code'] == 200 ? Result::success() : Result::error("删除失败");
+    }
+    /**
+     * 职能部门详情
+     * @return array
+     */
+    public function getZhinengbumen()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make($requireData, ['id' => 'required|integer'], ['id.required' => 'id 不能为空', 'id.integer' => 'id 必须是整数']);
+        if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $requireData['user_id'] = Context::get("UserId");
+        $result = $this->publicServiceClient->getZhinengbumen($requireData);
+        return $result['code'] == 200 ? Result::success($result['data']) : Result::error("查询失败");
+    }
+    /**
+     * 获取职能部门某pid的所有子级，默认0级
+     * @return array
+     */
+    public function getPidZhinengbumen()
+    {
+        // 获取请求参数
+        $requireData = $this->request->all();
+        // 参数验证
+        $validator = $this->validationFactory->make($requireData, ['pid' => 'integer|min:0'], ['pid.integer' => 'pid 必须是整数', 'pid.min' => 'pid 必须大于等于 0']);
+        if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $requireData['user_id'] = Context::get("UserId");
+        $result = $this->publicServiceClient->getPidZhinengbumen($requireData);
+        return $result['code'] == 200 ? Result::success($result['data']) : Result::error("查询失败");
+    }
+    /**
+     * 修改职能部门名称
+     * @return array
+     */
+    public function modZhinengbumen()
+    {
+        $requireData = $this->request->all();
+        // 参数验证
+        $validator = $this->validationFactory->make($requireData, ['id' => 'required|integer', 'name' => 'required|string|regex:/^[\\x{4e00}-\\x{9fa5}]+$/u'], ['id.required' => 'id 不能为空', 'id.integer' => 'id 必须是整数', 'name.required' => 'name 不能为空', 'name.string' => 'name 必须是字符串', 'name.regex' => 'name 必须是汉字']);
+        if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        echo 123;
+        $requireData['user_id'] = Context::get("UserId");
+        $result = $this->publicServiceClient->modZhinengbumen($requireData);
+        echo 4;
+        return $result['code'] == 200 ? Result::success() : Result::error("修改失败");
+    }
 }

runtime/container/proxy/App_Controller_UserController.proxy.php

@@ -239,4 +239,23 @@ class UserController extends AbstractController
         }
         return Result::success($result['data']);
     }
+    /**
+     * 修改密码
+     * @return array
+     */
+    public function changePassword()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make($requireData, ['password' => 'required', 'new_password' => 'required|min:6', 'new_password1' => 'required|same:new_password'], ['password.required' => '密码不能为空', 'new_password1.required' => '确认密码不能为空', 'new_password1.same' => '新密码和确认密码不一致', 'new_password.min' => "密码长度不能低于6位数"]);
+        if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $requireData['user_id'] = Context::get("UserId");
+        $result = $this->userServiceClient->changePassword($requireData);
+        if ($result['code'] != ErrorCode::SUCCESS) {
+            return Result::error($result['message'], 0, []);
+        }
+        return Result::success($result['data']);
+    }
 }

runtime/container/proxy/App_Controller_WebsiteController.proxy.php

@@ -2,7 +2,7 @@
 
 namespace App\JsonRpc;
 
-class AuthorityServiceInterface_938f151b2d38b882e7131c7b756b34e5 extends \Hyperf\RpcClient\Proxy\AbstractProxyService implements AuthorityServiceInterface
+class AuthorityServiceInterface_737bd28c9003cacaca2c3cadd5b88ddc extends \Hyperf\RpcClient\Proxy\AbstractProxyService implements AuthorityServiceInterface
 {
     /**
      * 菜单列表

runtime/container/proxy/App_JsonRpc_NewsServiceInterface.rpc-client.proxy.php

@@ -2,7 +2,7 @@
 
 namespace App\JsonRpc;
 
-class NewsServiceInterface_5754771ce906b41891d5f6190d493bc2 extends \Hyperf\RpcClient\Proxy\AbstractProxyService implements NewsServiceInterface
+class NewsServiceInterface_184906805182848d10c54c9de700a4ca extends \Hyperf\RpcClient\Proxy\AbstractProxyService implements NewsServiceInterface
 {
     /**
      * @param array $data

runtime/container/proxy/App_JsonRpc_WebsiteServiceInterface.rpc-client.proxy.php

@@ -2,7 +2,7 @@
 
 namespace App\JsonRpc;
 
-class WebsiteServiceInterface_959420a0fc6b6fbefe87e711052495ed extends \Hyperf\RpcClient\Proxy\AbstractProxyService implements WebsiteServiceInterface
+class WebsiteServiceInterface_127900004ae2e61eff371d3fbc39d0f4 extends \Hyperf\RpcClient\Proxy\AbstractProxyService implements WebsiteServiceInterface
 {
     /**
      * @param string $keyword