调整添加port
parent
4ec62f805c
commit
237680bb20
|
|
@ -371,11 +371,16 @@ class DeviceController extends Controller
|
|||
}
|
||||
|
||||
public function getFfmpegServiceIp(){
|
||||
$ip = '127.0.0.1';
|
||||
$data = [
|
||||
'ip' => '127.0.0.1',
|
||||
'port'=> '80',
|
||||
];
|
||||
|
||||
$setting = Setting::where('slug', 'ffmpeg_websocket_ip')->first();
|
||||
$ip = $setting?->value ?? '127.0.0.1';
|
||||
$dataValue = $setting?->value ?? '{"ip":"127.0.0.1", "port":"80"}';
|
||||
|
||||
return $this->json(['ip'=> $ip]);
|
||||
$data = json_decode($dataValue);
|
||||
|
||||
return $this->json($data);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -110,7 +110,7 @@ class SettingTableSeeder extends Seeder
|
|||
['name' => '全市数据-生猪年出栏', 'slug' => 'city_data_pig_output', 'value' => '{"value":"42.01", "unit":"万头"}'],
|
||||
['name' => '警报规则-土壤设备', 'slug' => 'device_warning_rule_soil', 'value' => $soilRule],
|
||||
['name' => '警报规则-水质设备', 'slug' => 'device_warning_rule_waterquality', 'value' => $waterRule],
|
||||
['name' => '监控设备-转流服务器', 'slug' => 'ffmpeg_websocket_ip', 'value' =>'127.0.0.1']
|
||||
['name' => '监控设备-转流服务器', 'slug' => 'ffmpeg_websocket_ip', 'value' =>'{"ip":"127.0.0.1", "port":"80"}']
|
||||
];
|
||||
Setting::insert($list);
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue