Merge remote-tracking branch 'origin/master'

example/ucenter_elascontent.php

@@ -11,17 +11,17 @@ use internalApi\ucenter\ElasContent;
 require __DIR__ . '/_init.php';
 
 ElasContent::setDebug();
-//ElasContent::newreplace(5, "测试标题1", "内容", ['//imgs1', 'imgs2'], 'http://www.baidu.com', 'bbs', 10, [
-//    '洗衣机',
-//
-//], 8, 9, 1551601307, 38, 1551601307, [
-//    'a' => 1,
-//    'b' => 2
-//]);
+ElasContent::newreplace(5, "测试标题1", "内容", [], 1,'http://www.baidu.com', 'bbs', 10, [
+    '洗衣机',
+
+], 8, 9, 1551601307, 38, 1551601307, [
+    'a' => 1,
+    'b' => 2
+]);
 //ElasContent::update(5,'bbs',[
 //    'title'=>'夏彬 修改',
 //    'tags'=>[
 //        'aas','夏彬','夏彬','1'
 //    ]
 //]);
-ElasContent::delete(5,'bbs');
+//ElasContent::delete(5,'bbs');

example/ucenter_label.php

@@ -15,5 +15,5 @@ require __DIR__.'/_init.php';
 Label::setDebug();
 
 //$info = Group::getPotentialGroupMemberList('worker-71318');
-$info = Label::getLabels(Label::TYPE_BRAND);
+$info = Label::getLabels([Label::TYPE_BRAND,Label::TYPE_CATEGORY]);
 print_r($info);

src/ucenter/ElasContent.php

@@ -39,6 +39,7 @@ class ElasContent extends Client
      * @param string $url 地址
      * @param string $from 来源 bbs  xue
      * @param integer $hot 热度
+     * @param integer $fid 版块id
      * @param array $tags 标签数组
      * @param integer $like_num 点赞数
      * @param integer $comment_num 评论数
@@ -50,8 +51,8 @@ class ElasContent extends Client
      * @throws \internalApi\base\ApiException
      * @throws \internalApi\base\ClientException
      */
-    public static function newreplace($id, $title, $contentData, $imgs,$url,$from,$hot,$tags,$like_num,$comment_num,$order_time,$uid, $createdAt, $extra){
-        return self::call('elasContent.newreplace',compact('id', 'title', 'contentData', 'imgs', '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){
+        return self::call('elasContent.newreplace',compact('id', 'title', 'contentData', 'imgs', 'fid','url', 'from','hot','tags','like_num','comment_num','order_time','uid', 'createdAt', 'extra'));
     }
 
 
@@ -67,6 +68,18 @@ class ElasContent extends Client
         return self::call('elasContent.update',compact('id', 'from', 'data'));
     }
 
+
+    /**
+     * @param integer $id 数据id
+     * @param string $from 来源 bbs xue
+     * @param array $data 修改的数据 ['like_num'=>1]
+     * @return mixed
+     * @throws \internalApi\base\ApiException
+     * @throws \internalApi\base\ClientException
+     */
+    public static function increase($id,$from,$data){
+        return self::call('elasContent.increase',compact('id', 'from', 'data'));
+    }
     /**
      * delete
      * @param $id