diff --git a/src/main/java/com/zhgd/xmgl/call/HikvisionCall.java b/src/main/java/com/zhgd/xmgl/call/HikvisionCall.java index 5e3c93664..42f83d411 100644 --- a/src/main/java/com/zhgd/xmgl/call/HikvisionCall.java +++ b/src/main/java/com/zhgd/xmgl/call/HikvisionCall.java @@ -206,12 +206,6 @@ public class HikvisionCall { @Lazy @Autowired private ISystemUserService systemUserService; - private static String xingzongIscIpPort; - - @Value("${xingzongIscIpPort:}") - public void setXingzongIscIpPort(String xingzongIscIpPort) { - HikvisionCall.xingzongIscIpPort = xingzongIscIpPort; - } /** * 获取图片 @@ -235,11 +229,7 @@ public class HikvisionCall { JSONObject rsJo = JSONObject.parseObject(rs); String code = rsJo.getString("code"); if (Objects.equals(code, "0")) { - String picUrl = rsJo.getJSONObject("data").getString("picUrl"); - if (EnvironmentUtil.isXingZong()) { - picUrl = picUrl.replaceAll("^https:\\/\\/[^/]+\\/", xingzongIscIpPort); - } - return picUrl; + return rsJo.getJSONObject("data").getString("picUrl"); } return null; } diff --git a/src/main/resources/application-xingzong.properties b/src/main/resources/application-xingzong.properties index 946477b66..a829fff91 100644 --- a/src/main/resources/application-xingzong.properties +++ b/src/main/resources/application-xingzong.properties @@ -73,4 +73,3 @@ spring.datasource.db2.jdbc-url=jdbc:mysql://127.0.0.1:3306/wflow_pro?useUnicode= spring.datasource.db2.driver-class-name=com.mysql.jdbc.Driver spring.datasource.db2.username=root spring.datasource.db2.password=JXJ@admin -xingzongIscIpPort=https://10.168.1.100:6113/