From 941b1e308245aa479f8462cfb5382ac9b9e7acb4 Mon Sep 17 00:00:00 2001 From: GUO <1923636941@qq.com> Date: Thu, 20 Jun 2024 22:46:31 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"=E5=86=85=E7=BD=91=E8=AE=BF=E9=97=AE?= =?UTF-8?q?=E5=9B=BE=E7=89=87"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit e255264a01e7da8d1a457d297272cbddd59e1b47. --- src/main/java/com/zhgd/xmgl/call/HikvisionCall.java | 12 +----------- src/main/resources/application-xingzong.properties | 1 - 2 files changed, 1 insertion(+), 12 deletions(-) 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/