Merge branch '20250121_lj_avator'

app/Controller/PublicController.php

@@ -635,5 +635,7 @@ class PublicController extends AbstractController
         $result['data'] = PublicData::buildMenuTree($result['data']);
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error("查询失败");
     }
+
+    //test
 }
 

app/Controller/UserController.php

@@ -475,7 +475,40 @@ class UserController extends AbstractController
          }
          return Result::success($result['data']);
      }
-
+     /**
+      * 修改用户头像和昵称
+      * @return array
+     */
+    public function  updateUserAvatarNickname()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                // 'nickname' =>'required',
+                'avatar' =>'required',
+                // 'real_name'=>'required',
+            ],
+            [
+                'avatar.required' => '头像不能为空',
+            ]
+        );
+        if ($validator->fails()){
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $requireData['user_id'] =Context::get("UserId");
+        //过滤掉除user_id，nickname,avatar外的数据
+        $requireData = array_filter($requireData,function($key){
+            return in_array($key,['user_id','nickname','avatar','real_name']);
+        },ARRAY_FILTER_USE_KEY);    
+        var_dump($requireData);
+        $result =  $this->userServiceClient->updateUserAvatarNickname($requireData);
+        if ($result['code'] != ErrorCode::SUCCESS) {
+            return Result::error($result['message'],0,[]);
+        }
+        return Result::success($result['data']);
+    }
 
 
 

app/JsonRpc/UserService.php

@@ -166,4 +166,11 @@ class UserService extends AbstractServiceClient implements UserServiceInterface
 
         return $this->__request(__FUNCTION__, $data);
     }
+    /**
+     * @param array $data
+     * @return array|mixed
+     */
+    public function updateUserAvatarNickname(array $data){
+        return $this->__request(__FUNCTION__, $data); 
+    }
 }

app/JsonRpc/UserServiceInterface.php

@@ -49,8 +49,7 @@ interface UserServiceInterface
      * @param int $id
      * @return array
      */
-    public function  delUser(int $id);
-
+    public function delUser(int $id);
 
     /**
      * 添加角色
@@ -113,5 +112,6 @@ interface UserServiceInterface
      * @return mixed
      */
     public function resetPassword(array $data);
+    public function updateUserAvatarNickname(array $data);
 
-}
+}

config/api/user.php

@@ -33,6 +33,8 @@ Router::addGroup(
         //重置密码
         Router::post('/resetPassword', [UserController::class, 'resetPassword']);
         Router::post('/getToken', [UserController::class, 'getToken']);
+        //修改用户头像和昵称
+        Router::post('/updateUserAvatarNickname', [UserController::class, 'updateUserAvatarNickname']);
 
     },
     ['middleware' => [FooMiddleware::class]]