Merge remote-tracking branch 'origin/master'

Modules/Camera/Http/Controllers/Api/HaiKangController.php

@@ -269,6 +269,7 @@ class HaiKangController extends BaseController
         if (!Input::has('cameraIndexCode')) {
             return $this->error(1, '缺少必要参数');
         }
+        $parent_id  = Input::get('parent_id');
         $protocol   = Input::get('protocol', 'hls');
         $streamType = Input::get('streamType', 1);
         $url        = $this->artemis . '/api/video/v1/cameras/previewURLs';
@@ -286,7 +287,7 @@ class HaiKangController extends BaseController
 
         $result = $this->curlPost($this->pre_url . $url, json_encode($params));
         $result = json_decode($result, true);
-        if (isset($result['code']) && $result['code'] == 0) {  // 将内网地址替换为外网地址
+        if (isset($result['code']) && $result['code'] == 0 && $parent_id != 353) {  // 将内网地址替换为外网地址,除了羊二
             $video_url = $result['data']['url'];
             preg_match('/\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/i', $video_url, $res);  // 提取内网ip
             preg_match('/\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/i', $this->pre_url, $res_n);  // 提取外网ip

Modules/Camera/Services/CameraServices.php

@@ -1838,7 +1838,8 @@ class CameraServices
                     'secret'          => $query->secret,
                     'cameraIndexCode' => $camera->index_code,
                     'streamType'      => CameraEnum::CODE_STREAM_HAK[$camera->code_stream],
-                    'protocol'        => 'rtmp'
+                    'protocol'        => 'rtmp',
+                    'parent_id'       => $parent_id
                 ]
             );
             $haikang   = new HaiKangController();