bug fixed

web/PhalApi/Appapi/Api/Live.php

@@ -809,7 +809,7 @@ class Api_Live extends PhalApi_Api {
 			$pull=PrivateKeyA('rtmp',$stream,0);
 		}
 	
-		$info['pull']=$pull;
+		$info['pull']=html_entity_decode($pull);
 		$info['userlists']=$userlists['userlist'];
         
 		

web/PhalApi/Common/functions.php

@@ -426,7 +426,7 @@
 						->where('user_id = ?', $uid)
 						->fetchOne();
             if($userinfo){
-                setcaches("token_".$uid,$userinfo);
+//                setcaches("token_".$uid,$userinfo);
             }
 			
 		}

web/app/admin/controller/LiveingController.php

@@ -174,21 +174,17 @@ class LiveingController extends AdminbaseController {
 
                 // 实例化一个请求对象,每个接口都会对应一个request对象
                 $req = new CreateLivePullStreamTaskRequest();
-
-                // https://umotool.com  推流域名
-                $SourceUrls = ['https://umotool.com/live/'.$uid.'.flv'];
-
                 $timestamp = time();
                 //播放链接限制10分钟 60*10  一天 60*60*24
                 $end_timestamp     = time() + 60*60*24;
-
                 $txTime = strtoupper(base_convert($end_timestamp, 10, 16));
                 $txSecret   = md5( $pull_key . $uid . $txTime );
-
                 $params = array(
                     "SourceType" => "PullLivePushLive",
-                    "SourceUrls" => $SourceUrls,
-                    "DomainName" => 'https://umotool.com',
+                    "SourceUrls" => [
+                        'https://umotool.com/live/'.$uid.'.m3u8',
+                    ],
+                    "DomainName" => 'push.umotool.com',
                     "PushArgs"   => 'txSecret='.$txSecret.'&txTime='.$txTime,
                     "AppName"    => 'live',
                     "StreamName" => $uid,
@@ -196,15 +192,13 @@ class LiveingController extends AdminbaseController {
                     "EndTime"    => gmdate("Y-m-d\TH:i:s\Z", $end_timestamp),
                     "Operator"   => 'tom001',
                 );
-//                print_r($params);die;
-
                 $req->fromJsonString( json_encode( $params ) );
                 // 返回的resp是一个CreateLivePullStreamTaskResponse的实例，与请求对象对应
                 $resp   = $client->CreateLivePullStreamTask( $req );
 
                 // 推流地址、播流地址、taskId
                 $data['push'] = 'rtmp://push.umotool.com/live/'. $uid . '?' .$params['PushArgs'];
-                $data['pull'] = 'https://umotool.com/live/'.$uid.'.flv?' .$params['PushArgs'];
+                $data['pull'] = 'https://umotool.com/live/'.$uid.'.m3u8?' .$params['PushArgs'];
                 $data['TaskId'] = $resp->TaskId;
 
                 echo json_encode( $data , JSON_UNESCAPED_UNICODE );
@@ -229,6 +223,8 @@ class LiveingController extends AdminbaseController {
             echo "TaskId 必须是数字";
         } else {
 
+            require CMF_ROOT . 'vendor/tencentcloud/vendor/autoload.php';
+
             try {
                 // 实例化一个认证对象，入参需要传入腾讯云账户 SecretId 和 SecretKey，此处还需注意密钥对的保密
                 // 代码泄露可能会导致 SecretId 和 SecretKey 泄露，并威胁账号下所有资源的安全性。密钥可前往官网控制台 https://console.tencentcloud.com/capi 进行获取
@@ -320,8 +316,10 @@ class LiveingController extends AdminbaseController {
             }
             
             $TaskId=$data['TaskId'];
-            $pull=urldecode($data['pull']);
-            $push=urldecode($data['push']);
+//            $pull=urldecode($data['pull']);
+//            $push=urldecode($data['push']);
+            $pull=$data['pull'];
+            $push=$data['push'];
             $type=$data['type'];
             $type_val=$data['type_val'];
             $anyway=$data['anyway'];
@@ -397,8 +395,8 @@ class LiveingController extends AdminbaseController {
             
             $data = $this->request->param();
             
-            $data['pull']=urldecode($data['pull']);
-            $data['push']=urldecode($data['push']);
+//            $data['pull']=urldecode($data['pull']);
+//            $data['push']=urldecode($data['push']);