admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "内网访问图片"

Browse Source 
This reverts commit e255264a01e7da8d1a457d297272cbddd59e1b47.
This commit is contained in:
GUO 2024-06-20 22:46:31 +08:00
parent e300dc418d
commit 941b1e3082
2 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/zhgd/xmgl/call/HikvisionCall.java
View File

@ -206,12 +206,6 @@ public class HikvisionCall {
@Lazy @Lazy
@Autowired @Autowired
private ISystemUserService systemUserService; 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); JSONObject rsJo = JSONObject.parseObject(rs);
String code = rsJo.getString("code"); String code = rsJo.getString("code");
if (Objects.equals(code, "0")) { if (Objects.equals(code, "0")) {
String picUrl = rsJo.getJSONObject("data").getString("picUrl"); return rsJo.getJSONObject("data").getString("picUrl");
if (EnvironmentUtil.isXingZong()) {
picUrl = picUrl.replaceAll("^https:\\/\\/[^/]+\\/", xingzongIscIpPort);
}
return picUrl;
} }
return null; return null;
} }

1
src/main/resources/application-xingzong.properties
View File

@ -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.driver-class-name=com.mysql.jdbc.Driver
spring.datasource.db2.username=root spring.datasource.db2.username=root
spring.datasource.db2.password=JXJ@admin spring.datasource.db2.password=JXJ@admin
xingzongIscIpPort=https://10.168.1.100:6113/