发布v2.5.8版本

webmain/model/reimModel.php

@@ -75,7 +75,8 @@ class reimClassModel extends Model
 		return array(
 			'recid' => $this->serverrecid,			
 			'title' => $this->servertitle,			
-			'chehui' => $chehui * 60,			
+			'chehui'=> $chehui * 60,			
+			'appwx' => $this->optiondb->getval('reimappwxsystem'),			
 			'wsurl' => $this->rock->jm->base64encode($this->serverhosturl)			
 		);
 	}
@@ -1105,6 +1106,9 @@ class reimClassModel extends Model
 		foreach($conta as $k=>$v)$contjson.=',"'.$k.'":"'.$v.'"';
 		$contjson 	= '{'.substr($contjson,1).'}';
 		
+		$pushcont = arrvalue($conta,'pushcont');
+		if(!$pushcont)$pushcont = arrvalue($conta,'cont'); //推送的内容已经是base64的
+		
 		//最新webapp也用服务端推送
 		$uid2019	= $alias['uid2019'];
 		$alias2019	= $alias['alias2019'];
@@ -1113,7 +1117,9 @@ class reimClassModel extends Model
 			$reimappwx= $this->option->getval('reimappwxsystem');
 			if($reimtype=='1' && $reimappwx=='1'){
 				$gbarr = $this->pushserver('sendapp', array(
-					'receid' => join(',', $uid2019)
+					'receid' => join(',', $uid2019),
+					'title'	 => $title,
+					'content'=> $pushcont
 				));
 				//服务端返回{"zshu":2,"yfuid":"1,8","wfuid":""}
 				if($gbarr && $gbarr['success'] && $bstr = arrvalue($gbarr, 'data')){
@@ -1131,8 +1137,7 @@ class reimClassModel extends Model
 				}
 			}
 		}
-		$pushcont = arrvalue($conta,'pushcont');
-		if(!$pushcont)$pushcont = arrvalue($conta,'cont'); //推送的内容已经是base64的
+		
 		return c('JPush')->push($title, $pushcont, $contjson, $alias);
 	}