Sumuxi/fastbee
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

20260209:从http更换成https，监控拉流失败（跨域问题）

Browse Source
This commit is contained in:
George 2026-02-09 14:53:21 +08:00
parent 121d0b41d8
commit ba3eb91485
2 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
fastbee-server/sip-server/src/main/java/com/fastbee/sip/service/impl/ZmlHookServiceImpl.java
View File

@ -394,10 +394,28 @@ public class ZmlHookServiceImpl implements IZmlHookService {
return streamUrl; return streamUrl;
} }
/**
* 构建 HTTP 主机地址（ip:port），当端口为标准端口(80)时省略端口号
*/
private String buildHttpHost(MediaServer mediaInfo) {
if (mediaInfo.getPortHttp() != null && mediaInfo.getPortHttp() == 80) {
return mediaInfo.getIp();
}
return String.format("%s:%s", mediaInfo.getIp(), mediaInfo.getPortHttp());
}
/**
* 构建 HTTPS 主机地址。使用 HTTPS 协议时，流媒体请求通过 Nginx 反向代理（443端口）转发，
* 因此 HTTPS URL 只使用域名，不拼接 ZLMediaKit 的 portHttps，避免跨域问题。
*/
private String buildHttpsHost(MediaServer mediaInfo) {
return mediaInfo.getDomain();
}
public void setFlv(String app, Stream streamUrl, MediaServer mediaInfo, String streamId, String secret) { public void setFlv(String app, Stream streamUrl, MediaServer mediaInfo, String streamId, String secret) {
String file = String.format("%s/%s.live.flv", app, streamId); String file = String.format("%s/%s.live.flv", app, streamId);
String host = String.format("%s:%s", mediaInfo.getIp(), mediaInfo.getPortHttp()); String host = buildHttpHost(mediaInfo);
String hosts = String.format("%s:%s", mediaInfo.getDomain(), mediaInfo.getPortHttps()); String hosts = buildHttpsHost(mediaInfo);
streamUrl.setFlv(String.format("http://%s/%s?secret=%s", host, file, secret)); streamUrl.setFlv(String.format("http://%s/%s?secret=%s", host, file, secret));
streamUrl.setWs_flv(String.format("ws://%s/%s?secret=%s", host, file, secret)); streamUrl.setWs_flv(String.format("ws://%s/%s?secret=%s", host, file, secret));
streamUrl.setHttps_flv(String.format("https://%s/%s?secret=%s", hosts, file, secret)); streamUrl.setHttps_flv(String.format("https://%s/%s?secret=%s", hosts, file, secret));
@ -406,8 +424,8 @@ public class ZmlHookServiceImpl implements IZmlHookService {
public void setFmp4(String app, Stream streamUrl, MediaServer mediaInfo, String streamId, String secret) { public void setFmp4(String app, Stream streamUrl, MediaServer mediaInfo, String streamId, String secret) {
String file = String.format("%s/%s.live.mp4", app, streamId); String file = String.format("%s/%s.live.mp4", app, streamId);
String host = String.format("%s:%s", mediaInfo.getIp(), mediaInfo.getPortHttp()); String host = buildHttpHost(mediaInfo);
String hosts = String.format("%s:%s", mediaInfo.getDomain(), mediaInfo.getPortHttps()); String hosts = buildHttpsHost(mediaInfo);
streamUrl.setFmp4(String.format("http://%s/%s?secret=%s", host, file, secret)); streamUrl.setFmp4(String.format("http://%s/%s?secret=%s", host, file, secret));
streamUrl.setWs_fmp4(String.format("ws://%s/%s?secret=%s", host, file, secret)); streamUrl.setWs_fmp4(String.format("ws://%s/%s?secret=%s", host, file, secret));
streamUrl.setHttps_fmp4(String.format("https://%s/%s?secret=%s", hosts, file, secret)); streamUrl.setHttps_fmp4(String.format("https://%s/%s?secret=%s", hosts, file, secret));
@ -416,8 +434,8 @@ public class ZmlHookServiceImpl implements IZmlHookService {
public void setHls(String app, Stream streamUrl, MediaServer mediaInfo, String streamId, String secret) { public void setHls(String app, Stream streamUrl, MediaServer mediaInfo, String streamId, String secret) {
String file = String.format("%s/%s/hls.m3u8", app, streamId); String file = String.format("%s/%s/hls.m3u8", app, streamId);
String host = String.format("%s:%s", mediaInfo.getIp(), mediaInfo.getPortHttp()); String host = buildHttpHost(mediaInfo);
String hosts = String.format("%s:%s", mediaInfo.getDomain(), mediaInfo.getPortHttps()); String hosts = buildHttpsHost(mediaInfo);
streamUrl.setHls(String.format("http://%s/%s?secret=%s", host, file, secret)); streamUrl.setHls(String.format("http://%s/%s?secret=%s", host, file, secret));
streamUrl.setWs_hls(String.format("ws://%s/%s?secret=%s", host, file, secret)); streamUrl.setWs_hls(String.format("ws://%s/%s?secret=%s", host, file, secret));
streamUrl.setHttps_hls(String.format("https://%s/%s?secret=%s", hosts, file, secret)); streamUrl.setHttps_hls(String.format("https://%s/%s?secret=%s", hosts, file, secret));
@ -426,8 +444,8 @@ public class ZmlHookServiceImpl implements IZmlHookService {
public void setRtc(String app, Stream streamUrl, MediaServer mediaInfo, String streamId, boolean isPlay) { public void setRtc(String app, Stream streamUrl, MediaServer mediaInfo, String streamId, boolean isPlay) {
String file = String.format("index/api/webrtc?app=%s&stream=%s&type=%s", app, streamId, isPlay ? "play" : "push"); String file = String.format("index/api/webrtc?app=%s&stream=%s&type=%s", app, streamId, isPlay ? "play" : "push");
String host = String.format("%s:%s", mediaInfo.getIp(), mediaInfo.getPortHttp()); String host = buildHttpHost(mediaInfo);
String hosts = String.format("%s:%s", mediaInfo.getDomain(), mediaInfo.getPortHttps()); String hosts = buildHttpsHost(mediaInfo);
streamUrl.setRtc(String.format("http://%s/%s", host, file)); streamUrl.setRtc(String.format("http://%s/%s", host, file));
streamUrl.setRtcs(String.format("https://%s/%s", hosts, file)); streamUrl.setRtcs(String.format("https://%s/%s", hosts, file));
} }

2
vue/src/views/dataCenter/dataRepair.vue
View File

@ -567,7 +567,7 @@ export default {
type: 'warning' type: 'warning'
}); });
const res = await removeAutoCalibrationConfig({ const res = await removeAutoCalibrationConfig({
deviceId: config.deviceId, serialNumber: config.serialNumber,
identifier: config.identifier identifier: config.identifier
}); });
if (res.code === 200) { if (res.code === 200) {