pdkj
/
lcly-data-admin
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

调整添加port

dev
vine_liutk 2022-11-30 17:52:38 +08:00
parent 4ec62f805c
commit 237680bb20
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/Http/Controllers/DeviceController.php
View File

@ -371,11 +371,16 @@ class DeviceController extends Controller
} }
public function getFfmpegServiceIp(){ public function getFfmpegServiceIp(){
$ip = '127.0.0.1'; $data = [
'ip' => '127.0.0.1',
'port'=> '80',
];
$setting = Setting::where('slug', 'ffmpeg_websocket_ip')->first(); $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);
} }
} }

2
database/seeders/SettingTableSeeder.php
View File

@ -110,7 +110,7 @@ class SettingTableSeeder extends Seeder
['name' => '全市数据-生猪年出栏', 'slug' => 'city_data_pig_output', 'value' => '{"value":"42.01", "unit":"万头"}'], ['name' => '全市数据-生猪年出栏', 'slug' => 'city_data_pig_output', 'value' => '{"value":"42.01", "unit":"万头"}'],
['name' => '警报规则-土壤设备', 'slug' => 'device_warning_rule_soil', 'value' => $soilRule], ['name' => '警报规则-土壤设备', 'slug' => 'device_warning_rule_soil', 'value' => $soilRule],
['name' => '警报规则-水质设备', 'slug' => 'device_warning_rule_waterquality', 'value' => $waterRule], ['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); Setting::insert($list);
} }