Merge remote-tracking branch 'origin/test' into test

e/admin/ecmsinfo.php

@@ -9,6 +9,11 @@ require("../class/copypath.php");
 require("../class/t_functions.php");
 require("../data/dbcache/class.php");
 require("../data/dbcache/MemberLevel.php");
+require '../config/config_ibanshou.php';
+require '../extend/internalApi/autoload.php';
+
+\internalApi\base\Client::config($config['wxh.internal']['client']);
+
 $link=db_connect();
 $empire=new mysqlquery();
 $enews=$_POST['enews'];

e/class/db_sql.php

@@ -37,7 +37,7 @@ class mysqlquery
 		return $this->sql;
 	}
 	//执行mysqli_fetch_array()
-	function fetch($sql)//此方法的参数是$sql就是sql语句执行结果
+            function fetch($sql)//此方法的参数是$sql就是sql语句执行结果
 	{
 		$this->r=mysqli_fetch_array($sql);
 		return $this->r;

e/class/hinfofun.php

@@ -239,7 +239,7 @@ function AddNews($add,$userid,$username){
 	//主表
 	$infosql=$empire->query("insert into ".$infotbr['tbname']."(id,classid,ttid,onclick,plnum,totaldown,newspath,filename,userid,username,firsttitle,isgood,ispic,istop,isqf,ismember,isurl,truetime,lastdotime,havehtml,groupid,userfen,titlefont,titleurl,stb,fstb,restb,keyboard".$ret_r['fields'].") values('$id','$add[classid]','$add[ttid]','$add[onclick]',0,'$add[totaldown]','$newspath','$filename','$userid','".addslashes($username)."','$add[firsttitle]','$add[isgood]','$add[ispic]','$add[istop]','$isqf',0,'$add[isurl]','$truetime','$lastdotime','$havehtml','$add[groupid]','$add[userfen]','".addslashes($add[my_titlefont])."','".addslashes($add[titleurl])."','$ret_r[tb]','$public_r[filedeftb]','$public_r[pldeftb]','".addslashes($add[keyboard])."'".$ret_r['values'].");");
 	//副表
-	$finfosql=$empire->query("insert into ".$infotbr['datatbname']."(id,classid,keyid,dokey,newstempid,closepl,haveaddfen,infotags".$ret_r['datafields'].") values('$id','$add[classid]','$keyid','$add[dokey]','$add[newstempid]','$add[closepl]',0,'".addslashes($add[infotags])."'".$ret_r['datavalues'].");");
+    $finfosql=$empire->query("insert into ".$infotbr['datatbname']."(id,classid,keyid,dokey,newstempid,closepl,haveaddfen,infotags".$ret_r['datafields'].") values('$id','$add[classid]','$keyid','$add[dokey]','$add[newstempid]','$add[closepl]',0,'".addslashes($add[infotags])."'".$ret_r['datavalues'].");");
 	//更新栏目信息数
 	AddClassInfos($add['classid'],'+1','+1',$add['checked']);
 	//更新新信息数
@@ -336,7 +336,40 @@ function AddNews($add,$userid,$username){
 		}
 		$GLOBALS['ecmsadderrorurl']=$ecmsfrom.$addecmscheck;
 		insert_dolog("classid=$add[classid]<br>id=".$id."<br>title=".$add[title],$pubid);//操作日志
-		printerror("AddNewsSuccess","AddNews.php?enews=AddNews&ecmsnfrom=$add[ecmsnfrom]&bclassid=$add[bclassid]&classid=$add[classid]".$addecmscheck.hReturnEcmsHashStrHref2(0));
+
+        //添加es数据
+        if(empty(!empty($add['checked']))){
+            global $dbtbpre,$ecms_config;
+            $tablenews  = "{$dbtbpre}ecms_news";
+            $tableDatas = "{$dbtbpre}ecms_news_data_1";
+            $sql = "select $tableDatas.newstext,$tablenews.* from $tablenews left JOIN $tableDatas on $tablenews.id = $tableDatas.id where $tablenews.id = $id ";
+            $data = $empire->fetch1($sql);
+            $content = cutstr_html($data['newstext']);
+            $id = $data['id'];
+            $title = $data['title'];
+            $from = 's';
+            $createAt = $data['newstime'];
+            $url = $ecms_config['site_url'].$data['titleurl'];
+            //获取图片
+
+            $img = $data['titlepic'];
+            if (!$img) {
+                $newstext = stripslashes($data['newstext']);
+                preg_match('/src="([^"]+?)"/i', $newstext, $match);
+                $img = isset($match[1]) ? $match[1] : '';
+            }
+            if ($img && !preg_match('/^https?:/', $img)) {
+                $img = $ecms_config['site_url'] . $img;
+            }
+
+            $extra = [
+                'classid'=>$data['classid'],
+
+            ];
+            \internalApi\ucenter\ElasContent::replace($id,$title,$content,$img,$url,$from,$createAt,$extra);
+
+        }
+        printerror("AddNewsSuccess","AddNews.php?enews=AddNews&ecmsnfrom=$add[ecmsnfrom]&bclassid=$add[bclassid]&classid=$add[classid]".$addecmscheck.hReturnEcmsHashStrHref2(0));
 	}
 	else
 	{
@@ -344,6 +377,20 @@ function AddNews($add,$userid,$username){
 	}
 }
 
+
+
+function cutstr_html($string)
+{
+    $string = strip_tags($string);
+    $string = trim($string);
+    $string = mb_ereg_replace("\t", "", $string);
+    $string = mb_ereg_replace("\r\n", "", $string);
+    $string = mb_ereg_replace("\r", "", $string);
+    $string = mb_ereg_replace("\n", "", $string);
+    $string = mb_ereg_replace(" ", "", $string);
+    return trim($string);
+}
+
 //修改信息
 function EditNews($add,$userid,$username){
 	global $empire,$class_r,$class_zr,$bclassid,$public_r,$dbtbpre,$emod_r;
@@ -589,7 +636,47 @@ function EditNews($add,$userid,$username){
 		{
 			$ecmsfrom="ListNews.php?bclassid=$add[bclassid]&classid=$add[classid]".hReturnEcmsHashStrHref2(0);
 		}
-		insert_dolog("classid=$add[classid]<br>id=".$add[id]."<br>title=".$add[title],$pubid);//操作日志
+
+		//添加elas
+        $from = 's';
+        $id = $index_checkr['id'];
+        if(empty($newchecked)){
+            //删除
+            \internalApi\ucenter\ElasContent::delete($id,$from);
+
+        }else{
+            //修改
+            global $dbtbpre,$ecms_config;
+            $tablenews  = "{$dbtbpre}ecms_news";
+            $tableDatas = "{$dbtbpre}ecms_news_data_1";
+            $sql = "select $tableDatas.newstext,$tablenews.* from $tablenews left JOIN $tableDatas on $tablenews.id = $tableDatas.id where $tablenews.id = $id ";
+            $data = $empire->fetch1($sql);
+            $content = cutstr_html($data['newstext']);
+            $id = $data['id'];
+            $title = $data['title'];
+            $createAt = $data['newstime'];
+            $url = $ecms_config['site_url'].$data['titleurl'];
+            //获取图片
+
+            $img = $data['titlepic'];
+            if (!$img) {
+                $newstext = stripslashes($data['newstext']);
+                preg_match('/src="([^"]+?)"/i', $newstext, $match);
+                $img = isset($match[1]) ? $match[1] : '';
+            }
+            if ($img && !preg_match('/^https?:/', $img)) {
+                $img = $ecms_config['site_url'] . $img;
+            }
+
+            $extra = [
+                'classid'=>$data['classid'],
+
+            ];
+            \internalApi\ucenter\ElasContent::replace($id,$title,$content,$img,$url,$from,$createAt,$extra);
+
+        }
+
+        insert_dolog("classid=$add[classid]<br>id=".$add[id]."<br>title=".$add[title],$pubid);//操作日志
 		printerror("EditNewsSuccess",$ecmsfrom.$addecmscheck);
 	}
 	else
@@ -756,6 +843,45 @@ function EditInfoSimple($add,$userid,$username){
 			$ecmsfrom="ListNews.php?bclassid=$add[bclassid]&classid=$add[classid]".hReturnEcmsHashStrHref2(0);
 		}
 		$ecmsfrom=$ecmsfrom.$addecmscheck;
+
+        //添加elas
+        $from = 's';
+        $id = $index_checkr['id'];
+        if(empty($newchecked)){
+            //删除
+            \internalApi\ucenter\ElasContent::delete($id,$from);
+
+        }else{
+            //修改
+            global $dbtbpre,$ecms_config;
+            $tablenews  = "{$dbtbpre}ecms_news";
+            $tableDatas = "{$dbtbpre}ecms_news_data_1";
+            $sql = "select $tableDatas.newstext,$tablenews.* from $tablenews left JOIN $tableDatas on $tablenews.id = $tableDatas.id where $tablenews.id = $id ";
+            $data = $empire->fetch1($sql);
+            $content = cutstr_html($data['newstext']);
+            $id = $data['id'];
+            $title = $data['title'];
+            $createAt = $data['newstime'];
+            $url = $ecms_config['site_url'].$data['titleurl'];
+            //获取图片
+
+            $img = $data['titlepic'];
+            if (!$img) {
+                $newstext = stripslashes($data['newstext']);
+                preg_match('/src="([^"]+?)"/i', $newstext, $match);
+                $img = isset($match[1]) ? $match[1] : '';
+            }
+            if ($img && !preg_match('/^https?:/', $img)) {
+                $img = $ecms_config['site_url'] . $img;
+            }
+
+            $extra = [
+                'classid'=>$data['classid'],
+            ];
+            \internalApi\ucenter\ElasContent::replace($id,$title,$content,$img,$url,$from,$createAt,$extra);
+
+        }
+
 		insert_dolog("classid=$add[classid]<br>id=".$add[id]."<br>title=".$add[title],$pubid);//操作日志
 		printerror("EditNewsSuccess",$closeurl,8);
 	}
@@ -878,7 +1004,12 @@ function DelNews($id,$classid,$userid,$username){
 				$returl="ListNews.php?bclassid=$adddatar[bclassid]&classid=$adddatar[classid]".$addecmscheck.hReturnEcmsHashStrHref2(0);
 			}
 		}
-		insert_dolog("classid=$classid<br>id=".$id."<br>title=".$r[title],$pubid);//操作日志
+
+		//添加es
+        $from = 's';
+        \internalApi\ucenter\ElasContent::delete($id,$from);
+
+        insert_dolog("classid=$classid<br>id=".$id."<br>title=".$r[title],$pubid);//操作日志
 		printerror("DelNewsSuccess",$returl);
 	}
 	else

e/extend/internalApi/ucenter/ElasContent.php

+<?php
+/**
+ * Created by PhpStorm.
+ * User: xiabin
+ * Date: 11/10/2017
+ * Time: 5:03 PM
+ */
+
+
+namespace internalApi\ucenter;
+
+
+use internalApi\base\Client;
+
+class ElasContent extends Client
+{
+
+    /**
+     * @param $id //数据id
+     * @param $title //标题
+     * @param $contentData //纯文本内容
+     * @param $pic //图片 没有预览图去文本第一章
+     * @param $url
+     * @param $from bbs xue s
+     * @param $createdAt //创建时间
+     * @param $extra //额外属性 array
+     * @return mixed
+     */
+    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'));
+    }
+
+
+    /**
+     * delete
+     * @param $id
+     * @param $from bbs xue s
+     * @return mixed
+     */
+    public static function delete($id,$from){
+        return self::call('elasContent.delete',compact('id','from'));
+
+    }
+
+
+
+}
\ No newline at end of file

e/tasks/es_content.php

+<?php
+/**
+ * Created by PhpStorm.
+ * User: xiabin
+ * Date: 14/10/2017
+ * Time: 4:52 PM
+ */
+require '../class/connect.php';
+require '../class/db_sql.php';
+require '../class/q_functions.php';
+
+require '../extend/internalApi/autoload.php';
+require '../config/config_ibanshou.php';
+\internalApi\base\Client::config($config['wxh.internal']['client']);
+
+$link = db_connect();
+$empire = new mysqlquery();
+$tablenews  = "{$dbtbpre}ecms_news";
+$tableDatas = "{$dbtbpre}ecms_news_data_1";
+
+$offset = 0;
+$limit = 100;
+$start = 0;
+$count = 0;
+while($start == 0 or $count >= $limit ){
+    $sql = "select $tableDatas.newstext,$tablenews.* from $tablenews left JOIN $tableDatas on $tablenews.id = $tableDatas.id where $tablenews.id >  $start limit $limit offset $offset  ";
+    $query = $empire->query($sql);
+    $count = $empire->num1($query);
+    while($data = $empire->fetch($query)){
+        $content = cutstr_html($data['newstext']);
+        $id = $data['id'];
+        $title = $data['title'];
+        $from = 's';
+        $createAt = $data['newstime'];
+        $url = $ecms_config['site_url'].$data['titleurl'];
+        //获取图片
+
+        $img = $data['titlepic'];
+        if (!$img) {
+            $newstext = stripslashes($data['newstext']);
+            preg_match('/src="([^"]+?)"/i', $newstext, $match);
+            $img = isset($match[1]) ? $match[1] : '';
+        }
+        if ($img && !preg_match('/^https?:/', $img)) {
+            $img = $ecms_config['site_url'] . $img;
+        }
+
+        $extra = [
+            'classid'=>$data['classid'],
+
+        ];
+
+        \internalApi\ucenter\ElasContent::replace($id,$title,$content,$img,$url,$from,$createAt,$extra);
+        echo "{$data['id']}  {$data['title']}\n";
+        $start = $data['id'];
+    }
+}
+
+
+function cutstr_html($string)
+{
+    $string = strip_tags($string);
+    $string = trim($string);
+    $string = mb_ereg_replace("\t", "", $string);
+    $string = mb_ereg_replace("\r\n", "", $string);
+    $string = mb_ereg_replace("\r", "", $string);
+    $string = mb_ereg_replace("\n", "", $string);
+    $string = mb_ereg_replace(" ", "", $string);
+    return trim($string);
+}
+