Merge branch 'bug_fix_1212_liu' into dev

app/Controller/UserController.php

@@ -81,6 +81,31 @@ class UserController extends AbstractController
         return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
     }
 
+    /**
+     * @return array|void
+     */
+    public function resetPassword()
+    {
+        $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);
+        }
+        $salt = rand(1, 999999);
+        $requireData['salt'] = $salt;
+        $requireData['password'] = 111111;
+        $result =  $this->userServiceClient->resetPassword($requireData);
+        return $result?Result::success($result['data']):Result::error($result['message']);
+    }
     /**
      * 更新用户
      * @return array

app/JsonRpc/PublicRpcService.php

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

app/JsonRpc/UserService.php

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

app/JsonRpc/UserServiceInterface.php

@@ -108,4 +108,10 @@ interface UserServiceInterface
 
     public function upUserStatus(array $data);
 
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function resetPassword(array $data);
+
 }