From a6d5e5fda772a3bac72b890d170dfb7be4dd3317 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Mon, 31 Oct 2022 13:45:52 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D+=E8=BD=A6=E8=BE=86=E5=90=88=E6=A0=BC?= =?UTF-8?q?=E8=AF=81=E8=AF=86=E5=88=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppSubsetVersionRest.java | 8 +- .../biz/appversion/AppVersionMapper.xml | 2 +- .../portal/biz/appversion/AppVersionRest.java | 2 +- .../terminal/api/base/baidu/BaiDuFeign.java | 30 + .../api/base/baidu/BaiDuFeignFallback.java | 12 + .../terminal/biz/base/baidu/BaiDuRest.java | 29 + .../terminal/biz/base/baidu/BaiDuService.java | 28 + .../datas/anrui_portal-202110151154.sql | 1597 +++++++++-------- 8 files changed, 907 insertions(+), 801 deletions(-) create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/baidu/BaiDuFeign.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/baidu/BaiDuFeignFallback.java create mode 100644 anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/base/baidu/BaiDuRest.java create mode 100644 anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/base/baidu/BaiDuService.java diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/appsubsetversion/AppSubsetVersionRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/appsubsetversion/AppSubsetVersionRest.java index 333d0127dd..11eec5e7e1 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/appsubsetversion/AppSubsetVersionRest.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/appsubsetversion/AppSubsetVersionRest.java @@ -91,7 +91,13 @@ public class AppSubsetVersionRest implements AppSubsetVersionFeign { appSubsetVersionOneDto.setModulePluginName(""); } appSubsetVersionOneDto.setAppName(dto.getAppName()); - appSubsetVersionOneDto.setIconUrl(dto.getIconUrl()); + if (StringUtils.isNotBlank(dto.getIconUrl())) { + if (dto.getIconUrl().contains(fileUploadComponent.getUrlPrefix())) { + appSubsetVersionOneDto.setIconUrl(dto.getIconUrl().replace(fileUploadComponent.getUrlPrefix(), "")); + } else { + appSubsetVersionOneDto.setIconUrl(dto.getIconUrl()); + } + } appSubsetVersionOneDto.setUpgradeInfo(dto.getUpgradeInfo()); appSubsetVersionOneDto.setType(dto.getType()); appSubsetVersionOneDto.setSortNo(dto.getSortNo()); diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/appversion/AppVersionMapper.xml b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/appversion/AppVersionMapper.xml index 641b7794e3..3ff3f6a05b 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/appversion/AppVersionMapper.xml +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/appversion/AppVersionMapper.xml @@ -12,7 +12,7 @@