Browse Source

线上php7.3解决

urbanu619 7 months ago
parent
commit
3232addaa1

+ 7 - 2
web/app/admin/controller/LiveingController.php

@@ -153,6 +153,7 @@ class LiveingController extends AdminbaseController {
 
             $pull_key = cmf_get_option('configpri')['tx_play_key'];
 
+            require CMF_ROOT . 'vendor/tencentcloud/vendor/autoload.php';
 
             try {
                 // 为了保护密钥安全,建议将密钥设置在环境变量中或者配置文件中。
@@ -202,7 +203,7 @@ class LiveingController extends AdminbaseController {
                 $resp   = $client->CreateLivePullStreamTask( $req );
 
                 // 推流地址、播流地址、taskId
-                $data['push'] = $uid . '?' .$params['PushArgs'];
+                $data['push'] = 'rtmp://push.umotool.com/live/'. $uid . '?' .$params['PushArgs'];
                 $data['pull'] = 'https://umotool.com/live/'.$uid.'.flv?' .$params['PushArgs'];
                 $data['TaskId'] = $resp->TaskId;
 
@@ -265,7 +266,11 @@ class LiveingController extends AdminbaseController {
 //                return $json;
                 return json_decode( $json, 1 );
 
-            } catch ( TencentCloudSDKException | PDOException | Exception $e ) {
+            } catch ( TencentCloudSDKException $e ) {
+                return [ 'ode' => $e->getCode(), 'msg' => $e->getMessage() ];
+            } catch ( PDOException  $e ) {
+                return [ 'ode' => $e->getCode(), 'msg' => $e->getMessage() ];
+            }catch ( Exception   $e ) {
                 return [ 'ode' => $e->getCode(), 'msg' => $e->getMessage() ];
             }
         }

+ 0 - 1
web/public/index.php

@@ -28,7 +28,6 @@ define('WEB_ROOT', __DIR__ . '/');
 
 // 加载基础文件
 require CMF_ROOT . 'vendor/thinkphp/base.php';
-require_once CMF_ROOT.'vendor/tencentcloud/vendor/autoload.php';
 
 // 执行应用并响应
 Container::get('app', [APP_PATH])->run()->send();

+ 5 - 5
web/themes/admin_simpleboot3/admin/liveing/add.html

@@ -26,7 +26,7 @@
                     </select>
 				</div>
 			</div>
-            
+
             <div class="form-group" id="type">
 				<label for="input-type" class="col-sm-2 control-label"><span class="form-required">*</span>房间类型</label>
 				<div class="col-md-6 col-sm-10">
@@ -37,7 +37,7 @@
                     </select>
 				</div>
 			</div>
-            
+
             <div class="form-group" id="cdn_switch_1" style="display:none;">
 				<label for="input-type_val" class="col-sm-2 control-label"><span class="form-required">*</span>密码或价格</label>
 				<div class="col-md-6 col-sm-10">
@@ -72,7 +72,7 @@
 				</div>
 
 			</div>
-            
+
             <div class="form-group" id="anyway">
 				<label for="input-words" class="col-sm-2 control-label"><span class="form-required">*</span>视频类型</label>
 				<div class="col-md-6 col-sm-10">
@@ -81,14 +81,14 @@
                     </select>
 				</div>
 			</div>
-            
+
 			<div class="form-group">
 				<div class="col-sm-offset-2 col-sm-10">
 					<button type="submit" class="btn btn-primary js-ajax-submit">{:lang('ADD')}</button>
 					<a class="btn btn-default" href="{:url('Liveing/index')}">{:lang('BACK')}</a>
 				</div>
 			</div>
-            
+
 		</form>
 	</div>
 	<script src="__STATIC__/js/admin.js"></script>

+ 4 - 4
web/themes/admin_simpleboot3/admin/liveing/index.html

@@ -6,16 +6,16 @@
 			<li class="active"><a >直播列表</a></li>
 			<li><a href="{:url('Liveing/add')}">{:lang('ADD')}</a></li>
 		</ul>
-		
+
 		<form class="well form-inline margin-top-20" method="post" action="{:url('Liveing/index')}">
 			时间:
-			<input class="form-control js-bootstrap-date" name="start_time" id="start_time" value="{:input('request.start_time')}" aria-invalid="false" style="width: 110px;"> - 
+			<input class="form-control js-bootstrap-date" name="start_time" id="start_time" value="{:input('request.start_time')}" aria-invalid="false" style="width: 110px;"> -
             <input class="form-control js-bootstrap-date" name="end_time" id="end_time" value="{:input('request.end_time')}" aria-invalid="false" style="width: 110px;">
 			关键字:
             <input class="form-control" type="text" name="uid" style="width: 200px;" value="{:input('request.uid')}"
                    placeholder="请输入会员ID">
 			<input type="submit" class="btn btn-primary" value="搜索">
-		</form>		
+		</form>
 		<form method="post" class="js-ajax-form" >
 			<table class="table table-hover table-bordered">
 				<thead>
@@ -66,7 +66,7 @@
 							<a class="btn btn-xs btn-danger xiabo-btn" href="#" data-TaskId="{$vo['TaskId']}" data-uid="{$vo['uid']}" >下播</a>
                             </if>
 						</td>
-						
+
 					</tr>
 					</foreach>
 				</tbody>