diff --git a/config/application-test.properties b/config/application-test.properties
index 19a8dd44..88a1eb8c 100644
--- a/config/application-test.properties
+++ b/config/application-test.properties
@@ -4,16 +4,16 @@ server.tomcat.basedir=./basedir
# 多个项目放在nginx下同个端口,通过该配置区分
server.servlet.context-path=/dispose
# 配置数据源
-spring.datasource.url=jdbc:mysql://10.88.77.65:33061/ci_dispose_v2?serverTimezone=Asia/Shanghai&zeroDateTimeBehavior\
- =convertToNull&useUnicode=true&characterEncoding=utf8&allowMultiQueries=true
-spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-spring.datasource.username=root
-spring.datasource.password=h0K0_8u
-#spring.datasource.url=jdbc:mysql://172.21.48.75:3306/ci_dispose_v1?serverTimezone=Asia/Shanghai&zeroDateTimeBehavior\
-# =convertToNull&useUnicode=true
+#spring.datasource.url=jdbc:mysql://10.88.77.65:33061/ci_dispose_v2?serverTimezone=Asia/Shanghai&zeroDateTimeBehavior\
+# =convertToNull&useUnicode=true&characterEncoding=utf8&allowMultiQueries=true
#spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
#spring.datasource.username=root
-#spring.datasource.password=BCcf6Dd7&8
+#spring.datasource.password=h0K0_8u
+spring.datasource.url=jdbc:mysql://172.21.48.75:3306/ci_dispose_v1?serverTimezone=Asia/Shanghai&zeroDateTimeBehavior\
+ =convertToNull&useUnicode=true
+spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
+spring.datasource.username=root
+spring.datasource.password=BCcf6Dd7&8
# 配置连接池
spring.datasource.schema=classpath:test_db/unit_test.sql
spring.datasource.initialization-mode=always
diff --git a/pom.xml b/pom.xml
index 7e19f224..6191ee56 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
org.springframework.boot
spring-boot-starter-parent
- 2.3.9.RELEASE
+ 2.3.12.RELEASE
com.dispose
diff --git a/src/main/java/com/dispose/service/impl/DisposeAbilityRouterServiceImpl.java b/src/main/java/com/dispose/service/impl/DisposeAbilityRouterServiceImpl.java
index a9353163..61065718 100644
--- a/src/main/java/com/dispose/service/impl/DisposeAbilityRouterServiceImpl.java
+++ b/src/main/java/com/dispose/service/impl/DisposeAbilityRouterServiceImpl.java
@@ -92,7 +92,7 @@ public class DisposeAbilityRouterServiceImpl implements DisposeAbilityRouterServ
if (dev != null) {
return disposeAbilityMap.get(getAbilityDeviceHashKey(dev.getIpAddr(), dev.getIpPort(),
- String.valueOf(dev.getDeviceType())));
+ String.valueOf(dev.getDeviceType())));
}
return null;
@@ -122,7 +122,7 @@ public class DisposeAbilityRouterServiceImpl implements DisposeAbilityRouterServ
@Override
public void deleteDisposeDevice(DisposeDevice dev) {
String hashKey = getAbilityDeviceHashKey(dev.getIpAddr(), dev.getIpPort(),
- String.valueOf(dev.getDeviceType()));
+ String.valueOf(dev.getDeviceType()));
disposeAbilityMap.remove(hashKey);
}
@@ -145,11 +145,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:
@@ -188,7 +196,7 @@ public class DisposeAbilityRouterServiceImpl implements DisposeAbilityRouterServ
db.getDisposeDeviceProtectObject();
String hashKey = getAbilityDeviceHashKey(dev.getIpAddr(), dev.getIpPort(),
- String.valueOf(dev.getDeviceType()));
+ String.valueOf(dev.getDeviceType()));
// 缓存处置设备到Hash表中
disposeAbilityMap.put(hashKey, AbilityInfo.builder()
@@ -250,7 +258,7 @@ public class DisposeAbilityRouterServiceImpl implements DisposeAbilityRouterServ
if (dev == null || !dev.getStatus().equals(ObjectStatus.NORMAL)) {
String hashKey = getAbilityDeviceHashKey(v.getDev().getIpAddr(), v.getDev().getIpPort(),
- String.valueOf(v.getDev().getDeviceType()));
+ String.valueOf(v.getDev().getDeviceType()));
disposeAbilityMap.remove(hashKey);
} else {