From 6a690408547f007ef239baff0d46f63c192b1f61 Mon Sep 17 00:00:00 2001 From: HuangXin Date: Wed, 20 Oct 2021 09:44:01 +0800 Subject: [PATCH] =?UTF-8?q?OCT=20REM:=201.=20=E5=85=BC=E5=AE=B9urlPath?= =?UTF-8?q?=E7=BB=93=E5=B0=BE=E6=B2=A1=E6=9C=89=E6=B7=BB=E5=8A=A0/?= =?UTF-8?q?=E5=AF=BC=E8=87=B4url=E6=8B=BC=E6=8E=A5=E4=B8=8D=E6=AD=A3?= =?UTF-8?q?=E7=A1=AE=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/DisposeAbilityRouterServiceImpl.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/dispose/service/impl/DisposeAbilityRouterServiceImpl.java b/src/main/java/com/dispose/service/impl/DisposeAbilityRouterServiceImpl.java index 37d4a8c3..d256506d 100644 --- a/src/main/java/com/dispose/service/impl/DisposeAbilityRouterServiceImpl.java +++ b/src/main/java/com/dispose/service/impl/DisposeAbilityRouterServiceImpl.java @@ -144,11 +144,19 @@ public class DisposeAbilityRouterServiceImpl implements DisposeAbilityRouterServ @Override public ErrorCode addDisposeAbilityDevice(DisposeDevice dev) { DisposeAbility db; - + String urlSpiltChar = "/"; + String url; String httpType = dev.getUrlType() == HttpType.HTTP ? "http://" : "https://"; String addr = (dev.getIpPort() == null || dev.getIpPort() .length() == 0) ? dev.getIpAddr() : (dev.getIpAddr() + ":" + dev.getIpPort()); - String url = httpType + addr + "/" + dev.getUrlPath(); + + if (dev.getUrlPath().length() == 0) { + url = httpType + addr + urlSpiltChar; + } else if (dev.getUrlPath().endsWith(urlSpiltChar)) { + url = httpType + addr + urlSpiltChar + dev.getUrlPath(); + } else { + url = httpType + addr + urlSpiltChar + dev.getUrlPath() + urlSpiltChar; + } switch (dev.getDeviceType()) { case DPTECH_UMC: