diff --git a/src/main/java/com/ycwl/basic/service/mobile/impl/GoodsServiceImpl.java b/src/main/java/com/ycwl/basic/service/mobile/impl/GoodsServiceImpl.java index 7679ffa0..ea8ddaf8 100644 --- a/src/main/java/com/ycwl/basic/service/mobile/impl/GoodsServiceImpl.java +++ b/src/main/java/com/ycwl/basic/service/mobile/impl/GoodsServiceImpl.java @@ -172,20 +172,7 @@ public class GoodsServiceImpl implements GoodsService { goodsDetailVO.setGoodsId(sourceRespVO.getId()); goodsDetailVO.setIsFree(sourceRespVO.getIsFree()); 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()); - } - } catch (IllegalArgumentException e) { - log.warn("url地址解析异常:{}", sourceRespVO.getVideoUrl(), e); - goodsDetailVO.setVideoUrl(sourceRespVO.getVideoUrl()); - } - } + goodsDetailVO.setVideoUrl(sourceRespVO.getVideoUrl()); goodsDetailVO.setUrl(sourceRespVO.getUrl()); goodsDetailVO.setCreateTime(sourceRespVO.getCreateTime()); goodsDetailVO.setIsFree(sourceRespVO.getIsFree()); @@ -523,20 +510,7 @@ public class GoodsServiceImpl implements GoodsService { } goodsDetailVO.setGoodsType(sourceRespVO.getType()); 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()); - } - } catch (IllegalArgumentException e) { - log.warn("url地址解析异常:{}", sourceRespVO.getVideoUrl(), e); - goodsDetailVO.setVideoUrl(sourceRespVO.getVideoUrl()); - } - } + goodsDetailVO.setVideoUrl(sourceRespVO.getVideoUrl()); goodsDetailVO.setTemplateCoverUrl(sourceRespVO.getUrl()); goodsDetailVO.setCreateTime(sourceRespVO.getCreateTime()); return ApiResponse.success(goodsDetailVO); diff --git a/src/main/java/com/ycwl/basic/service/pc/impl/SourceServiceImpl.java b/src/main/java/com/ycwl/basic/service/pc/impl/SourceServiceImpl.java index 6f333ef3..dc6aa81f 100644 --- a/src/main/java/com/ycwl/basic/service/pc/impl/SourceServiceImpl.java +++ b/src/main/java/com/ycwl/basic/service/pc/impl/SourceServiceImpl.java @@ -83,19 +83,6 @@ public class SourceServiceImpl implements SourceService { if (sourceRespVO.getDeviceId() != null) { 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 pageInfo = new PageInfo<>(list); return ApiResponse.success(pageInfo); @@ -130,19 +117,6 @@ public class SourceServiceImpl implements SourceService { if (sourceRespVO.getDeviceId() != null) { 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); } @@ -150,19 +124,6 @@ public class SourceServiceImpl implements SourceService { @Override public ApiResponse getById(Long id, Long 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 { ScenicV2DTO scenicBasic = scenicRepository.getScenicBasic(sourceRespVO.getScenicId()); sourceRespVO.setScenicName(scenicBasic.getName());