Merge branch 'develop' of http://code.dev.soooner.com:18000/wuxiande/SooonerHotel into develop

Docs/实时下线接口说明.txt

+
+媒资实时下线接口
+
+ 请求:
+    GET http://api.hotel.wasu.tv/api/center/media_offline?spid=1&mid=33431345
+
+ 输入:
+    spid :  合作方标识(我们提供,每个合作方标识不一样)
+    mid :   媒资标识代码(经纬cms中的媒资id)
+
+ 输出:
+
+    样例  :   {"code":0,"msg":"ok"}
+    code :  0-成功,1001-传入的媒资参数有问题,1002,2001-下线失败
+    msg  :  结果说明
\ No newline at end of file

Docs/实时下线接口说明1.txt

+
+媒资实时下线接口
+
+ 请求:
+    GET http://api.hotel.wasu.tv/api/center/media_offline?spid=1&mid=33431345&sw_time=1523345555&sw_sign=xxxxx
+
+ 输入:
+    spid :  合作方标识(我们提供,每个合作方标识不一样)
+    mid :   媒资标识代码(经纬cms中的媒资id)
+    sw_time :   请求时间戳(秒)
+    sw_sign :   请求签名 md5(spid&mid&sw_time&key)
+                如:
+                    md5(1&33431345&1523345555&key)
+                    key : 我们提供(每个spid对应不同的key)
+
+ 输出:
+
+    样例  :   {"code":0,"msg":"ok"}
+    code :  0-成功
+            101-请求过期
+            102-签名验证失败
+            1001-传入的媒资参数有问题
+            1002-sp info err
+            2001-下线失败
+    msg  :  结果说明
+
+  小帅参数:
+    spid=1
+    key=4396a121f631e4fa777b70b7
\ No newline at end of file

Services/CenterService/Controller/WasuChecker.go

@@ -44,4 +44,3 @@ func (this *WasuChecker) check() {
 	}
 }
 
-

Services/CenterService/Model/Wasu/MediaListModel.go

@@ -28,13 +28,15 @@ import (
 **/
 
 type Media struct {
-	Spid string `json:"spid"`
-	PushMode string `json:"push_mode"` //是否自动转推：0手动，1自动
-	JsonUrl string `json:"jsonUrl"`
-	//Md5			string 	`json:"md5"`
-	//NewsId		string	`json:"newsId"`
-	//NewsName	string	`json:"newsName"`
-	//PlayUrl		string	`json:"playUrl"`
+	Spid 		string 	`json:"spid"`
+	PushMode 	string 	`json:"push_mode"` //是否自动转推：0手动，1自动
+	JsonUrl 	string 	`json:"jsonUrl"`
+	NewsId		string	`json:"newsId"`
+	NewsName	string	`json:"newsName"`
+	NodeId		string	`json:"nodeId"`
+	NodeName	string	`json:"nodeName"`
+	// Md5			string 	`json:"md5"`
+	// PlayUrl		string	`json:"playUrl"`
 }
 
 type MediaList struct {
@@ -116,7 +118,9 @@ func (this *MediaListModel) UpdateMedia(media *Media) bool {
 	b := false
 	if ok {
 		inData, _ := json.Marshal(media)
+		//fmt.Printf("****** media_info : %v",media)
 		data, err := Request.Post(center_api_media_update.(string), *(*string)(unsafe.Pointer(&inData)))
+		//data, err := Request.Post(center_api_media_update.(string), string(inData))
 		if err == nil {
 			if data == "true" {
 				b = true

Services/CenterService/Model/Wasu/SpModel.go

@@ -39,7 +39,7 @@ func (this *SpModel) pull() {
 	mediaModel.Config = this.Config
 	mediaModel.Spid = this.Spid
 	date := DateTime.Format("YYYYMMDD", time.Now())
-	//date:="20190627"
+	//date:="20190901"
 	mediaList := mediaModel.FetchList(date, 1)
 	ok := mediaModel.UpdateMediaList(mediaList)
 	if !ok {
@@ -58,4 +58,6 @@ func (this *SpModel) pull() {
 			}
 		}
 	}
-}
\ No newline at end of file
+}
+
+

Services/CenterService/config.ini

@@ -5,3 +5,7 @@ log_path = ./
 log_filename = center_service.log
 
 [release]
+api_conf_sys = http://api.hotel.wasu.tv/api/center/conf_sys	#系统配置接口
+api_conf_sps = http://api.hotel.wasu.tv/api/center/conf_sps	#合作方配置接口
+log_path = ./
+log_filename = center_service.log
\ No newline at end of file

SooonerHotel/App/Lib/Action/Hotel/HotelAction.class.php

@@ -87,9 +87,13 @@ class HotelAction extends CommonAction{
                 $where["type_code"]="wasu_incrementList_push_mode";
                 $push_mode = D("Conf")->field("v")->where($where)->find();
                 if ($push_mode["v"]==1) {
-                    $sql = "INSERT INTO sh_hotel_media_map_$spid (media_id,hotel_id,status,status_inject)"
-                        . " SELECT id,$id,status,0 FROM sh_media_wasu WHERE sp_id=$spid;";
-                    $model->execute($sql);
+                    $spinfo = D("Sp")->field("site_id")->where(array("id"=>$spid))->find();
+                    $siteid = $spinfo["site_id"];
+                    if ($siteid){
+                        $sql = "INSERT INTO sh_hotel_media_map_$spid (media_id,hotel_id,status,status_inject)"
+                            . " SELECT id,$id,status,0 FROM sh_media_wasu WHERE site_id=$siteid;";
+                        $model->execute($sql);
+                    }
                 }
 
                 echo 'true';

SooonerHotel/App/Lib/Model/PullLogModel.class.php

+<?php
+class PullLogModel extends RelationModel{
+	protected $tableName = 'sh_log_pull'; //重新定义表名
+}
\ No newline at end of file

SooonerHotel/App/Lib/Model/SiteModel.class.php

+<?php
+class SiteModel extends RelationModel{
+	protected $tableName = 'sh_site'; //重新定义表名
+}
\ No newline at end of file