From 83c831887eed817108b48fb16074738610116617 Mon Sep 17 00:00:00 2001 From: Jerry Yan <792602257@qq.com> Date: Fri, 16 Jan 2026 18:14:25 +0800 Subject: [PATCH] =?UTF-8?q?refactor(service):=20=E7=A7=BB=E9=99=A4?= =?UTF-8?q?=E8=A7=86=E9=A2=91URL=E5=86=85=E7=BD=91=E4=BB=A3=E7=90=86?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 删除移动端商品服务中的视频URL内网地址代理转换代码 - 移除PC端资源服务中的视频URL内网代理处理逻辑 - 简化视频URL设置流程，直接使用原始URL地址 - 清理相关的异常处理和日志记录代码 --- .../service/mobile/impl/GoodsServiceImpl.java | 30 +------------- .../service/pc/impl/SourceServiceImpl.java | 39 ------------------- 2 files changed, 2 insertions(+), 67 deletions(-) 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());