Merge remote-tracking branch 'origin/master'

src/ucenter/ElasContent.php

@@ -26,9 +26,12 @@ class ElasContent extends Client
 	 * @param array $extra //额外属性 array
 	 * @return mixed
 	 * @deprecated
+	 * @param false $isNewES
+	 * @throws \internalApi\base\ApiException
+	 * @throws \internalApi\base\ClientException
 	 */
-    public static function replace($id, $title, $contentData, $pic,$url,$from, $createdAt, $extra){
-        return self::call('elasContent.replace',compact('id','title','contentData','pic','url','from','createdAt','extra'));
+    public static function replace($id, $title, $contentData, $pic,$url,$from, $createdAt, $extra,$isNewES=false){
+        return self::call('elasContent.replace',compact('id','title','contentData','pic','url','from','createdAt','extra','isNewES'));
     }
 
 
@@ -38,7 +41,7 @@ class ElasContent extends Client
 	 * @param string $contentData  纯文本内容 过滤掉富文本部分
 	 * @param array $imgs 图片列表
 	 * @param string $url 地址
-     * @param string $from 来源 bbs  xue moment 动态
+	 * @param string $from 来源 bbs  xue moments 动态
 	 * @param integer $hot 热度
 	 * @param integer $fid 版块id
 	 * @param array $tags 标签数组
@@ -48,17 +51,13 @@ class ElasContent extends Client
 	 * @param integer $uid 用户中心uid
 	 * @param integer $createdAt
 	 * @param array $extra
-     *        [
-     *          'diagnose'=>'', //诊断 1 代表为诊断类型 1
-     *          'technology'', //工艺 1 代表为工艺类型
-     *          ....
-     *        ]
+	 * @param false $isNewES
 	 * @return mixed
 	 * @throws \internalApi\base\ApiException
 	 * @throws \internalApi\base\ClientException
 	 */
-    public static function newreplace($id, $title, $contentData, $imgs,$fid,$url,$from,$hot,$tags,$like_num,$comment_num,$order_time,$uid, $createdAt, $extra){
-        return self::call('elasContent.newreplace',compact('id', 'title', 'contentData', 'imgs', 'fid','url', 'from','hot','tags','like_num','comment_num','order_time','uid', 'createdAt', 'extra'));
+    public static function newreplace($id, $title, $contentData, $imgs,$fid,$url,$from,$hot,$tags,$like_num,$comment_num,$order_time,$uid, $createdAt, $extra,$isNewES=false){
+        return self::call('elasContent.newreplace',compact('id', 'title', 'contentData', 'imgs', 'fid','url', 'from','hot','tags','like_num','comment_num','order_time','uid', 'createdAt', 'extra','isNewES'));
     }