q792602257/FrameTour-BE
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(service): 移除视频URL内网代理逻辑

Browse Source 
- 删除移动端商品服务中的视频URL内网地址代理转换代码
- 移除PC端资源服务中的视频URL内网代理处理逻辑
- 简化视频URL设置流程，直接使用原始URL地址
- 清理相关的异常处理和日志记录代码
This commit is contained in:
Jerry Yan
2026-01-16 18:14:25 +08:00
parent 5ab2882777
commit 83c831887e
2 changed files with 2 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/main/java/com/ycwl/basic/service/mobile/impl/GoodsServiceImpl.java
View File

@@ -172,20 +172,7 @@ public class GoodsServiceImpl implements GoodsService {
goodsDetailVO.setGoodsId(sourceRespVO.getId()); goodsDetailVO.setGoodsId(sourceRespVO.getId());
goodsDetailVO.setIsFree(sourceRespVO.getIsFree()); goodsDetailVO.setIsFree(sourceRespVO.getIsFree());
goodsDetailVO.setIsBuy(sourceRespVO.getIsBuy()); goodsDetailVO.setIsBuy(sourceRespVO.getIsBuy());
if (sourceRespVO.getVideoUrl() != null) {
try {
URI url = URI.create(sourceRespVO.getVideoUrl());
if (StringUtils.startsWith(url.getHost(), "100.64.")) {
// 内网地址，需要代理
goodsDetailVO.setVideoUrl("https://zhentuai.com/proxy?url=" + sourceRespVO.getVideoUrl());
} else {
goodsDetailVO.setVideoUrl(sourceRespVO.getVideoUrl()); goodsDetailVO.setVideoUrl(sourceRespVO.getVideoUrl());
}
} catch (IllegalArgumentException e) {
log.warn("url地址解析异常：{}", sourceRespVO.getVideoUrl(), e);
goodsDetailVO.setVideoUrl(sourceRespVO.getVideoUrl());
}
}
goodsDetailVO.setUrl(sourceRespVO.getUrl()); goodsDetailVO.setUrl(sourceRespVO.getUrl());
goodsDetailVO.setCreateTime(sourceRespVO.getCreateTime()); goodsDetailVO.setCreateTime(sourceRespVO.getCreateTime());
goodsDetailVO.setIsFree(sourceRespVO.getIsFree()); goodsDetailVO.setIsFree(sourceRespVO.getIsFree());
@@ -523,20 +510,7 @@ public class GoodsServiceImpl implements GoodsService {
} }
goodsDetailVO.setGoodsType(sourceRespVO.getType()); goodsDetailVO.setGoodsType(sourceRespVO.getType());
goodsDetailVO.setGoodsId(sourceRespVO.getId()); goodsDetailVO.setGoodsId(sourceRespVO.getId());
if (sourceRespVO.getVideoUrl() != null) {
try {
URI url = URI.create(sourceRespVO.getVideoUrl());
if (StringUtils.startsWith(url.getHost(), "100.64.")) {
// 内网地址，需要代理
goodsDetailVO.setVideoUrl("https://zhentuai.com/proxy?url=" + sourceRespVO.getVideoUrl());
} else {
goodsDetailVO.setVideoUrl(sourceRespVO.getVideoUrl()); goodsDetailVO.setVideoUrl(sourceRespVO.getVideoUrl());
}
} catch (IllegalArgumentException e) {
log.warn("url地址解析异常：{}", sourceRespVO.getVideoUrl(), e);
goodsDetailVO.setVideoUrl(sourceRespVO.getVideoUrl());
}
}
goodsDetailVO.setTemplateCoverUrl(sourceRespVO.getUrl()); goodsDetailVO.setTemplateCoverUrl(sourceRespVO.getUrl());
goodsDetailVO.setCreateTime(sourceRespVO.getCreateTime()); goodsDetailVO.setCreateTime(sourceRespVO.getCreateTime());
return ApiResponse.success(goodsDetailVO); return ApiResponse.success(goodsDetailVO);

39
src/main/java/com/ycwl/basic/service/pc/impl/SourceServiceImpl.java
View File

@@ -83,19 +83,6 @@ public class SourceServiceImpl implements SourceService {
if (sourceRespVO.getDeviceId() != null) { if (sourceRespVO.getDeviceId() != null) {
sourceRespVO.setDeviceName(deviceNames.get(sourceRespVO.getDeviceId())); sourceRespVO.setDeviceName(deviceNames.get(sourceRespVO.getDeviceId()));
} }
if (sourceRespVO.getVideoUrl() != null) {
try {
URL url = new URL(sourceRespVO.getVideoUrl());
if (StringUtils.startsWith(url.getHost(), "100.64.")) {
// 内网地址，需要代理
sourceRespVO.setVideoUrl("https://zhentuai.com/proxy?url=" + sourceRespVO.getVideoUrl());
} else {
sourceRespVO.setVideoUrl(sourceRespVO.getVideoUrl());
}
} catch (MalformedURLException e) {
sourceRespVO.setVideoUrl(sourceRespVO.getVideoUrl());
}
}
}); });
PageInfo<SourceRespVO> pageInfo = new PageInfo<>(list); PageInfo<SourceRespVO> pageInfo = new PageInfo<>(list);
return ApiResponse.success(pageInfo); return ApiResponse.success(pageInfo);
@@ -130,19 +117,6 @@ public class SourceServiceImpl implements SourceService {
if (sourceRespVO.getDeviceId() != null) { if (sourceRespVO.getDeviceId() != null) {
sourceRespVO.setDeviceName(deviceNames.get(sourceRespVO.getDeviceId())); sourceRespVO.setDeviceName(deviceNames.get(sourceRespVO.getDeviceId()));
} }
if (sourceRespVO.getVideoUrl() != null) {
try {
URL url = new URL(sourceRespVO.getVideoUrl());
if (StringUtils.startsWith(url.getHost(), "100.64.")) {
// 内网地址，需要代理
sourceRespVO.setVideoUrl("https://zhentuai.com/proxy?url=" + sourceRespVO.getVideoUrl());
} else {
sourceRespVO.setVideoUrl(sourceRespVO.getVideoUrl());
}
} catch (MalformedURLException e) {
sourceRespVO.setVideoUrl(sourceRespVO.getVideoUrl());
}
}
}); });
return ApiResponse.success(list); return ApiResponse.success(list);
} }
@@ -150,19 +124,6 @@ public class SourceServiceImpl implements SourceService {
@Override @Override
public ApiResponse<SourceRespVO> getById(Long id, Long userId) { public ApiResponse<SourceRespVO> getById(Long id, Long userId) {
SourceRespVO sourceRespVO = sourceMapper.userGetById(id, userId); SourceRespVO sourceRespVO = sourceMapper.userGetById(id, userId);
if (sourceRespVO.getVideoUrl() != null) {
try {
URL url = new URL(sourceRespVO.getVideoUrl());
if (StringUtils.startsWith(url.getHost(), "100.64.")) {
// 内网地址，需要代理
sourceRespVO.setVideoUrl("https://zhentuai.com/proxy?url=" + sourceRespVO.getVideoUrl());
} else {
sourceRespVO.setVideoUrl(sourceRespVO.getVideoUrl());
}
} catch (MalformedURLException e) {
sourceRespVO.setVideoUrl(sourceRespVO.getVideoUrl());
}
}
try { try {
ScenicV2DTO scenicBasic = scenicRepository.getScenicBasic(sourceRespVO.getScenicId()); ScenicV2DTO scenicBasic = scenicRepository.getScenicBasic(sourceRespVO.getScenicId());
sourceRespVO.setScenicName(scenicBasic.getName()); sourceRespVO.setScenicName(scenicBasic.getName());