rkljw 9 mesiacov pred
rodič
commit
037627f42e

+ 93 - 4
app/Controller/PublicController.php

@@ -7,6 +7,8 @@ use Hyperf\Di\Annotation\Inject;
 use Hyperf\HttpServer\Annotation\AutoController;
 use App\Tools\Result;
 use App\Tools\CommonService;
+use Hyperf\Validation\Contract\ValidatorFactoryInterface;
+
 /**
  * Class PublicController
  * @package App\Controller
@@ -14,7 +16,8 @@ use App\Tools\CommonService;
 #[AutoController]
 class PublicController extends AbstractController
 {
-
+    #[Inject]
+    protected ValidatorFactoryInterface $validationFactory;
     /**
      * @var PublicRpcServiceInterface
      */
@@ -41,9 +44,15 @@ class PublicController extends AbstractController
      */
     public function getUserLevelList()
     {
-        $result = $this->publicServiceClient->getUserLevelList([]);
+        $requireData = $this->request->all();
+        $result = $this->publicServiceClient->getUserLevelList($requireData);
         return $result ? Result::success($result['data']) : Result::error($result['message']);
     }
+
+    /**
+     * 上传图片
+     * @return array
+     */
     public function uploadFile()
     {
         $urlN = new CommonService();
@@ -60,8 +69,88 @@ class PublicController extends AbstractController
 
         }
     }
-
-
+    /**
+     * 添加用户等级
+     * @return array
+     */
+    public function addUserLevel()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'name' => 'required',
+            ],
+            [
+                'name.required' => '等级名不能为空',
+            ]
+        );
+        if ($validator->fails()){
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $result = $this->publicServiceClient->addUserLevel($requireData);
+        return $result ? Result::success($result['data']) : Result::error($result['message']);
+    }
+    /**
+     * 删除用户等级
+     * @return array
+     */
+    public function delUserLevel()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'id' => 'required'
+            ],
+            [
+                'id.required' => 'ID不能为空'
+            ]
+        );
+        if ($validator->fails()){
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $result = $this->publicServiceClient->delUserLevel($requireData);
+        return $result ? Result::success($result['data']) : Result::error($result['message']);
+    }
+    /**
+     * 更新用户等级
+     * @return array
+     */
+    public function updateUserLevel()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'name' => 'required',
+                'id' => 'required'
+            ],
+            [
+                'id.required' => 'ID不能为空',
+                'name.required' => '名称不能为空'
+            ]
+        );
+        if ($validator->fails()){
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $result = $this->publicServiceClient->updateUserLevel($requireData);
+        return $result ? Result::success($result['data']) : Result::error($result['message']);
+    }
+    /**
+     * 城市列表
+     * @return array
+     */
+    public function getCityList()
+    {
+        $requireData = $this->request->all();
+        var_dump($requireData);
+        $result = $this->publicServiceClient->getDistrictList($requireData);
+        return $result ? Result::success($result['data']) : Result::error($result['message']);
+    }
 
 
 }

+ 26 - 0
app/JsonRpc/PublicRpcService.php

@@ -34,4 +34,30 @@ class PublicRpcService extends AbstractServiceClient implements PublicRpcService
     {
         return $this->__request(__FUNCTION__, $data);
     }
+    /**
+     * 添加等级
+     * @param array $data
+     * @return array
+     */
+    public function addUserLevel(array $data){
+        return $this->__request(__FUNCTION__, $data);
+    }
+
+    /**
+     * 删除等级
+     * @param array $data
+     * @return array
+     */
+    public function delUserLevel(array $data){
+        return $this->__request(__FUNCTION__, $data);
+    }
+
+    /**
+     * 更新等级
+     * @param array $data
+     * @return array
+     */
+    public function updateUserLevel(array $data){
+        return $this->__request(__FUNCTION__, $data);
+    }
 }

+ 13 - 0
app/JsonRpc/PublicRpcServiceInterface.php

@@ -11,6 +11,19 @@ interface PublicRpcServiceInterface
      * @param array $data
      */
     public function getUserLevelList(array $data);
+    /**
+     * @param array $data
+     */
+    public function addUserLevel(array $data);
+
+    /**
+     * @param array $data
+     */
+    public function delUserLevel(array $data);
 
+    /**
+     * @param array $data
+     */
+    public function updateUserLevel(array $data);
 
 }

+ 8 - 1
app/Middleware/Auth/FooMiddleware.php

@@ -56,7 +56,14 @@ class FooMiddleware implements MiddlewareInterface
             }
 
         }catch (\Exception $e){
-            var_dump("错误消息:",$e->getMessage(),$e->getCode(),"====%====",$e->getCode());
+            var_dump("错误消息:",$e->getMessage(),$e->getCode());
+            return $this->response->json(
+                [
+                    'code' => $e->getCode(),
+                    'data' => [],
+                    'message' => $e->getMessage(),
+                ]
+            );
         }
 
         return $this->response->json(

+ 65 - 1
runtime/container/proxy/App_Controller_PublicController.proxy.php

@@ -8,6 +8,7 @@ use Hyperf\Di\Annotation\Inject;
 use Hyperf\HttpServer\Annotation\AutoController;
 use App\Tools\Result;
 use App\Tools\CommonService;
+use Hyperf\Validation\Contract\ValidatorFactoryInterface;
 /**
  * Class PublicController
  * @package App\Controller
@@ -24,6 +25,8 @@ class PublicController extends AbstractController
         }
         $this->__handlePropertyHandler(__CLASS__);
     }
+    #[Inject]
+    protected ValidatorFactoryInterface $validationFactory;
     /**
      * @var PublicRpcServiceInterface
      */
@@ -46,9 +49,14 @@ class PublicController extends AbstractController
      */
     public function getUserLevelList()
     {
-        $result = $this->publicServiceClient->getUserLevelList([]);
+        $requireData = $this->request->all();
+        $result = $this->publicServiceClient->getUserLevelList($requireData);
         return $result ? Result::success($result['data']) : Result::error($result['message']);
     }
+    /**
+     * 上传图片
+     * @return array
+     */
     public function uploadFile()
     {
         $urlN = new CommonService();
@@ -64,4 +72,60 @@ class PublicController extends AbstractController
             return Result::error($e->getMessage());
         }
     }
+    /**
+     * 添加用户等级
+     * @return array
+     */
+    public function addUserLevel()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make($requireData, ['name' => 'required'], ['name.required' => '等级名不能为空']);
+        if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $result = $this->publicServiceClient->addUserLevel($requireData);
+        return $result ? Result::success($result['data']) : Result::error($result['message']);
+    }
+    /**
+     * 删除用户等级
+     * @return array
+     */
+    public function delUserLevel()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make($requireData, ['id' => 'required'], ['id.required' => 'ID不能为空']);
+        if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $result = $this->publicServiceClient->delUserLevel($requireData);
+        return $result ? Result::success($result['data']) : Result::error($result['message']);
+    }
+    /**
+     * 更新用户等级
+     * @return array
+     */
+    public function updateUserLevel()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make($requireData, ['name' => 'required', 'id' => 'required'], ['id.required' => 'ID不能为空', 'name.required' => '名称不能为空']);
+        if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $result = $this->publicServiceClient->updateUserLevel($requireData);
+        return $result ? Result::success($result['data']) : Result::error($result['message']);
+    }
+    /**
+     * 城市列表
+     * @return array
+     */
+    public function getCityList()
+    {
+        $requireData = $this->request->all();
+        var_dump($requireData);
+        $result = $this->publicServiceClient->getDistrictList($requireData);
+        return $result ? Result::success($result['data']) : Result::error($result['message']);
+    }
 }

+ 22 - 1
runtime/container/proxy/App_JsonRpc_PublicRpcServiceInterface.rpc-client.proxy.php

@@ -2,7 +2,7 @@
 
 namespace App\JsonRpc;
 
-class PublicRpcServiceInterface_6b19d6d2af8fe6dab250ee26b9ac3a3b extends \Hyperf\RpcClient\Proxy\AbstractProxyService implements PublicRpcServiceInterface
+class PublicRpcServiceInterface_9fcf97a1b8c9cfca559f94bd44a73b1d extends \Hyperf\RpcClient\Proxy\AbstractProxyService implements PublicRpcServiceInterface
 {
     /**
      * @param array $data
@@ -18,4 +18,25 @@ class PublicRpcServiceInterface_6b19d6d2af8fe6dab250ee26b9ac3a3b extends \Hyperf
     {
         return $this->client->__call(__FUNCTION__, func_get_args());
     }
+    /**
+     * @param array $data
+     */
+    public function addUserLevel(array $data)
+    {
+        return $this->client->__call(__FUNCTION__, func_get_args());
+    }
+    /**
+     * @param array $data
+     */
+    public function delUserLevel(array $data)
+    {
+        return $this->client->__call(__FUNCTION__, func_get_args());
+    }
+    /**
+     * @param array $data
+     */
+    public function updateUserLevel(array $data)
+    {
+        return $this->client->__call(__FUNCTION__, func_get_args());
+    }
 }

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
runtime/container/scan.cache


+ 1 - 1
runtime/hyperf.pid

@@ -1 +1 @@
-6949
+1741

+ 7 - 0
runtime/logs/hyperf.log

@@ -240,3 +240,10 @@
 [2024-06-26 17:36:49] admin_consumer:.INFO: 修改用户返回值: {"code":200,"message":"success","data":[]} []
 [2024-06-26 17:38:05] admin_consumer:.INFO: 修改用户返回值: {"code":200,"message":"success","data":[]} []
 [2024-06-26 17:46:08] admin_consumer:.INFO: 修改用户返回值: {"code":200,"message":"success","data":[]} []
+[2024-06-27 09:15:23] admin_consumer:.INFO: 验证之前 [] []
+[2024-06-27 09:15:23] admin_consumer:.INFO: 验证之前 [] []
+[2024-06-27 09:15:34] admin_consumer:.INFO: 验证之前 [] []
+[2024-06-27 09:15:34] admin_consumer:.INFO: 验证之前 [] []
+[2024-06-27 09:18:14] admin_consumer:.INFO: 验证之前 [] []
+[2024-06-27 09:18:14] admin_consumer:.INFO: 验证之前 [] []
+[2024-06-27 09:18:15] admin_consumer:.INFO: 验证用户返回值: {"code":200,"message":"success","data":{"id":32,"user_name":"1","password":"71ab877bcad54b1f348d59675c7980c7","avatar":"https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg","last_login_ip":null,"last_login_time":"2024-06-11 17:05:28","mobile":"15801245755","status":1,"role_id":1,"email":"5@qq.com","salt":"569295","rong_token":"","level_id":1,"type_id":1,"nickname":"昵称","updated_at":"2024-06-11 17:05:28","created_at":"2024-06-11 17:05:28"}} []

Niektoré súbory nie sú zobrazené, pretože je v týchto rozdielových dátach zmenené mnoho súborov