diff --git a/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/listener/event/ApplicationEventListener.java b/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/listener/event/ApplicationEventListener.java index c3bcb84..8975df3 100644 --- a/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/listener/event/ApplicationEventListener.java +++ b/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/listener/event/ApplicationEventListener.java @@ -10,8 +10,8 @@ import org.springframework.stereotype.Service; * Package: com.sz.admin.monitor.listener.event * Description: */ -@Slf4j -@Service +//@Slf4j +//@Service public class ApplicationEventListener { /** * 根容器初始化完成, @@ -21,6 +21,6 @@ public class ApplicationEventListener { // 监听ApplicationContext 初始化完成后的事件 // @EventListener public void onApplicationEvent(ContextRefreshedEvent event) { - log.info("执行相关的操作"); + //log.info("执行相关的操作"); } } diff --git a/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/sdk/hkSdk/HkNVR.java b/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/sdk/hkSdk/HkNVR.java index b62013f..eea8230 100644 --- a/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/sdk/hkSdk/HkNVR.java +++ b/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/sdk/hkSdk/HkNVR.java @@ -14,6 +14,7 @@ import com.sz.admin.monitor.utils.*; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; +import java.io.File; import java.io.UnsupportedEncodingException; import java.nio.charset.StandardCharsets; import java.time.LocalDateTime; @@ -153,7 +154,7 @@ public class HkNVR extends AbstractNVR { if (osSelect.isWindows()) //win系统加载SDK库路径 { - strDllPath = CommonKit.class.getClassLoader().getResource("").getPath().substring(1) + "lib/win/HCNetSDK.dll"; + strDllPath = CommonKit.class.getClassLoader().getResource("").getPath().substring(1) + "lib\\win\\HCNetSDK.dll"; } else if (osSelect.isLinux()) //Linux系统加载SDK库路径 { diff --git a/sz-service/sz-service-admin/src/main/resources/lib/win/HCCore.dll b/sz-service/sz-service-admin/src/main/resources/lib/win/HCCore.dll index 46629ad..fadba3d 100644 Binary files a/sz-service/sz-service-admin/src/main/resources/lib/win/HCCore.dll and b/sz-service/sz-service-admin/src/main/resources/lib/win/HCCore.dll differ diff --git a/sz-service/sz-service-admin/src/main/resources/lib/win/HCNetSDK.dll b/sz-service/sz-service-admin/src/main/resources/lib/win/HCNetSDK.dll index de7fc79..2b0a138 100644 Binary files a/sz-service/sz-service-admin/src/main/resources/lib/win/HCNetSDK.dll and b/sz-service/sz-service-admin/src/main/resources/lib/win/HCNetSDK.dll differ diff --git a/sz-service/sz-service-admin/src/main/resources/lib/win/HCNetSDKCom/AnalyzeData.dll b/sz-service/sz-service-admin/src/main/resources/lib/win/HCNetSDKCom/AnalyzeData.dll index 4160e3d..c4298ef 100644 Binary files a/sz-service/sz-service-admin/src/main/resources/lib/win/HCNetSDKCom/AnalyzeData.dll and b/sz-service/sz-service-admin/src/main/resources/lib/win/HCNetSDKCom/AnalyzeData.dll differ diff --git a/sz-service/sz-service-admin/src/main/resources/lib/win/HCNetSDKCom/AudioIntercom.dll b/sz-service/sz-service-admin/src/main/resources/lib/win/HCNetSDKCom/AudioIntercom.dll index 09e995b..888d607 100644 Binary files a/sz-service/sz-service-admin/src/main/resources/lib/win/HCNetSDKCom/AudioIntercom.dll and b/sz-service/sz-service-admin/src/main/resources/lib/win/HCNetSDKCom/AudioIntercom.dll differ diff --git a/sz-service/sz-service-admin/src/main/resources/lib/win/HCNetSDKCom/AudioRender.dll b/sz-service/sz-service-admin/src/main/resources/lib/win/HCNetSDKCom/AudioRender.dll index fe06119..3bf543e 100644 Binary files a/sz-service/sz-service-admin/src/main/resources/lib/win/HCNetSDKCom/AudioRender.dll and b/sz-service/sz-service-admin/src/main/resources/lib/win/HCNetSDKCom/AudioRender.dll differ diff --git a/sz-service/sz-service-admin/src/main/resources/lib/win/HCNetSDKCom/HCAlarm.dll b/sz-service/sz-service-admin/src/main/resources/lib/win/HCNetSDKCom/HCAlarm.dll index 79e6a70..adf4153 100644 Binary files a/sz-service/sz-service-admin/src/main/resources/lib/win/HCNetSDKCom/HCAlarm.dll and b/sz-service/sz-service-admin/src/main/resources/lib/win/HCNetSDKCom/HCAlarm.dll differ diff --git a/sz-service/sz-service-admin/src/main/resources/lib/win/HCNetSDKCom/HCCoreDevCfg.dll b/sz-service/sz-service-admin/src/main/resources/lib/win/HCNetSDKCom/HCCoreDevCfg.dll index 4a9fc40..f62213a 100644 Binary files a/sz-service/sz-service-admin/src/main/resources/lib/win/HCNetSDKCom/HCCoreDevCfg.dll and b/sz-service/sz-service-admin/src/main/resources/lib/win/HCNetSDKCom/HCCoreDevCfg.dll differ diff --git a/sz-service/sz-service-admin/src/main/resources/lib/win/HCNetSDKCom/HCDisplay.dll b/sz-service/sz-service-admin/src/main/resources/lib/win/HCNetSDKCom/HCDisplay.dll index 36ce3c1..3ad9fd7 100644 Binary files a/sz-service/sz-service-admin/src/main/resources/lib/win/HCNetSDKCom/HCDisplay.dll and b/sz-service/sz-service-admin/src/main/resources/lib/win/HCNetSDKCom/HCDisplay.dll differ diff --git a/sz-service/sz-service-admin/src/main/resources/lib/win/HCNetSDKCom/HCGeneralCfgMgr.dll b/sz-service/sz-service-admin/src/main/resources/lib/win/HCNetSDKCom/HCGeneralCfgMgr.dll index ec40bf8..53838f8 100644 Binary files a/sz-service/sz-service-admin/src/main/resources/lib/win/HCNetSDKCom/HCGeneralCfgMgr.dll and b/sz-service/sz-service-admin/src/main/resources/lib/win/HCNetSDKCom/HCGeneralCfgMgr.dll differ diff --git a/sz-service/sz-service-admin/src/main/resources/lib/win/HCNetSDKCom/HCIndustry.dll b/sz-service/sz-service-admin/src/main/resources/lib/win/HCNetSDKCom/HCIndustry.dll index e6949ae..a4bcec0 100644 Binary files a/sz-service/sz-service-admin/src/main/resources/lib/win/HCNetSDKCom/HCIndustry.dll and b/sz-service/sz-service-admin/src/main/resources/lib/win/HCNetSDKCom/HCIndustry.dll differ diff --git a/sz-service/sz-service-admin/src/main/resources/lib/win/HCNetSDKCom/HCPlayBack.dll b/sz-service/sz-service-admin/src/main/resources/lib/win/HCNetSDKCom/HCPlayBack.dll index bd0d967..7d43335 100644 Binary files a/sz-service/sz-service-admin/src/main/resources/lib/win/HCNetSDKCom/HCPlayBack.dll and b/sz-service/sz-service-admin/src/main/resources/lib/win/HCNetSDKCom/HCPlayBack.dll differ diff --git a/sz-service/sz-service-admin/src/main/resources/lib/win/HCNetSDKCom/HCPreview.dll b/sz-service/sz-service-admin/src/main/resources/lib/win/HCNetSDKCom/HCPreview.dll index 3499614..50c1df1 100644 Binary files a/sz-service/sz-service-admin/src/main/resources/lib/win/HCNetSDKCom/HCPreview.dll and b/sz-service/sz-service-admin/src/main/resources/lib/win/HCNetSDKCom/HCPreview.dll differ diff --git a/sz-service/sz-service-admin/src/main/resources/lib/win/HCNetSDKCom/HCVoiceTalk.dll b/sz-service/sz-service-admin/src/main/resources/lib/win/HCNetSDKCom/HCVoiceTalk.dll index b6c222e..aa67fa9 100644 Binary files a/sz-service/sz-service-admin/src/main/resources/lib/win/HCNetSDKCom/HCVoiceTalk.dll and b/sz-service/sz-service-admin/src/main/resources/lib/win/HCNetSDKCom/HCVoiceTalk.dll differ diff --git a/sz-service/sz-service-admin/src/main/resources/lib/win/HCNetSDKCom/OpenAL32.dll b/sz-service/sz-service-admin/src/main/resources/lib/win/HCNetSDKCom/OpenAL32.dll index e268aee..24ca039 100644 Binary files a/sz-service/sz-service-admin/src/main/resources/lib/win/HCNetSDKCom/OpenAL32.dll and b/sz-service/sz-service-admin/src/main/resources/lib/win/HCNetSDKCom/OpenAL32.dll differ diff --git a/sz-service/sz-service-admin/src/main/resources/lib/win/HCNetSDKCom/StreamTransClient.dll b/sz-service/sz-service-admin/src/main/resources/lib/win/HCNetSDKCom/StreamTransClient.dll index a6d42f3..480b4cd 100644 Binary files a/sz-service/sz-service-admin/src/main/resources/lib/win/HCNetSDKCom/StreamTransClient.dll and b/sz-service/sz-service-admin/src/main/resources/lib/win/HCNetSDKCom/StreamTransClient.dll differ diff --git a/sz-service/sz-service-admin/src/main/resources/lib/win/HCNetSDKCom/SystemTransform.dll b/sz-service/sz-service-admin/src/main/resources/lib/win/HCNetSDKCom/SystemTransform.dll index 24c2e7a..12ba69f 100644 Binary files a/sz-service/sz-service-admin/src/main/resources/lib/win/HCNetSDKCom/SystemTransform.dll and b/sz-service/sz-service-admin/src/main/resources/lib/win/HCNetSDKCom/SystemTransform.dll differ diff --git a/sz-service/sz-service-admin/src/main/resources/lib/win/HCNetSDKCom/libiconv2.dll b/sz-service/sz-service-admin/src/main/resources/lib/win/HCNetSDKCom/libiconv2.dll index 774f5e2..cddc745 100644 Binary files a/sz-service/sz-service-admin/src/main/resources/lib/win/HCNetSDKCom/libiconv2.dll and b/sz-service/sz-service-admin/src/main/resources/lib/win/HCNetSDKCom/libiconv2.dll differ diff --git a/sz-service/sz-service-admin/src/main/resources/lib/win/PlayCtrl.dll b/sz-service/sz-service-admin/src/main/resources/lib/win/PlayCtrl.dll index e2f09ce..9b644aa 100644 Binary files a/sz-service/sz-service-admin/src/main/resources/lib/win/PlayCtrl.dll and b/sz-service/sz-service-admin/src/main/resources/lib/win/PlayCtrl.dll differ diff --git a/sz-service/sz-service-admin/src/main/resources/lib/win/SuperRender.dll b/sz-service/sz-service-admin/src/main/resources/lib/win/SuperRender.dll index 4170d83..2584252 100644 Binary files a/sz-service/sz-service-admin/src/main/resources/lib/win/SuperRender.dll and b/sz-service/sz-service-admin/src/main/resources/lib/win/SuperRender.dll differ diff --git a/sz-service/sz-service-admin/src/main/resources/lib/win/hlog.dll b/sz-service/sz-service-admin/src/main/resources/lib/win/hlog.dll index 80b2044..83266a5 100644 Binary files a/sz-service/sz-service-admin/src/main/resources/lib/win/hlog.dll and b/sz-service/sz-service-admin/src/main/resources/lib/win/hlog.dll differ diff --git a/sz-service/sz-service-admin/src/main/resources/lib/win/hpr.dll b/sz-service/sz-service-admin/src/main/resources/lib/win/hpr.dll index 61cccaa..1e3f1ad 100644 Binary files a/sz-service/sz-service-admin/src/main/resources/lib/win/hpr.dll and b/sz-service/sz-service-admin/src/main/resources/lib/win/hpr.dll differ diff --git a/sz-service/sz-service-admin/src/main/resources/lib/win/libeay32.dll b/sz-service/sz-service-admin/src/main/resources/lib/win/libeay32.dll index a1ad17c..de8c6be 100644 Binary files a/sz-service/sz-service-admin/src/main/resources/lib/win/libeay32.dll and b/sz-service/sz-service-admin/src/main/resources/lib/win/libeay32.dll differ diff --git a/sz-service/sz-service-admin/src/main/resources/lib/win/ssleay32.dll b/sz-service/sz-service-admin/src/main/resources/lib/win/ssleay32.dll index bbe68b3..c086f10 100644 Binary files a/sz-service/sz-service-admin/src/main/resources/lib/win/ssleay32.dll and b/sz-service/sz-service-admin/src/main/resources/lib/win/ssleay32.dll differ diff --git a/sz-service/sz-service-admin/src/main/resources/lib/win/zlib1.dll b/sz-service/sz-service-admin/src/main/resources/lib/win/zlib1.dll index 19dd4da..23f8f92 100644 Binary files a/sz-service/sz-service-admin/src/main/resources/lib/win/zlib1.dll and b/sz-service/sz-service-admin/src/main/resources/lib/win/zlib1.dll differ