diff --git a/libs/hik/HCNetSDKCom/libAudioIntercom.so b/libs/hik/HCNetSDKCom/libAudioIntercom.so new file mode 100644 index 0000000..49685d9 Binary files /dev/null and b/libs/hik/HCNetSDKCom/libAudioIntercom.so differ diff --git a/libs/hik/HCNetSDKCom/libHCAlarm.so b/libs/hik/HCNetSDKCom/libHCAlarm.so new file mode 100644 index 0000000..a54dee3 Binary files /dev/null and b/libs/hik/HCNetSDKCom/libHCAlarm.so differ diff --git a/libs/hik/HCNetSDKCom/libHCCoreDevCfg.so b/libs/hik/HCNetSDKCom/libHCCoreDevCfg.so new file mode 100644 index 0000000..5ada40f Binary files /dev/null and b/libs/hik/HCNetSDKCom/libHCCoreDevCfg.so differ diff --git a/libs/hik/HCNetSDKCom/libHCDisplay.so b/libs/hik/HCNetSDKCom/libHCDisplay.so new file mode 100644 index 0000000..9871c9e Binary files /dev/null and b/libs/hik/HCNetSDKCom/libHCDisplay.so differ diff --git a/libs/hik/HCNetSDKCom/libHCGeneralCfgMgr.so b/libs/hik/HCNetSDKCom/libHCGeneralCfgMgr.so new file mode 100644 index 0000000..7666233 Binary files /dev/null and b/libs/hik/HCNetSDKCom/libHCGeneralCfgMgr.so differ diff --git a/libs/hik/HCNetSDKCom/libHCIndustry.so b/libs/hik/HCNetSDKCom/libHCIndustry.so new file mode 100644 index 0000000..4b11107 Binary files /dev/null and b/libs/hik/HCNetSDKCom/libHCIndustry.so differ diff --git a/libs/hik/HCNetSDKCom/libHCPlayBack.so b/libs/hik/HCNetSDKCom/libHCPlayBack.so new file mode 100644 index 0000000..6137552 Binary files /dev/null and b/libs/hik/HCNetSDKCom/libHCPlayBack.so differ diff --git a/libs/hik/HCNetSDKCom/libHCPreview.so b/libs/hik/HCNetSDKCom/libHCPreview.so new file mode 100644 index 0000000..035cd3d Binary files /dev/null and b/libs/hik/HCNetSDKCom/libHCPreview.so differ diff --git a/libs/hik/HCNetSDKCom/libHCVoiceTalk.so b/libs/hik/HCNetSDKCom/libHCVoiceTalk.so new file mode 100644 index 0000000..6a2ab90 Binary files /dev/null and b/libs/hik/HCNetSDKCom/libHCVoiceTalk.so differ diff --git a/libs/hik/HCNetSDKCom/libStreamTransClient.so b/libs/hik/HCNetSDKCom/libStreamTransClient.so new file mode 100644 index 0000000..6b16337 Binary files /dev/null and b/libs/hik/HCNetSDKCom/libStreamTransClient.so differ diff --git a/libs/hik/HCNetSDKCom/libSystemTransform.so b/libs/hik/HCNetSDKCom/libSystemTransform.so new file mode 100644 index 0000000..086c631 Binary files /dev/null and b/libs/hik/HCNetSDKCom/libSystemTransform.so differ diff --git a/libs/hik/HCNetSDKCom/libanalyzedata.so b/libs/hik/HCNetSDKCom/libanalyzedata.so new file mode 100644 index 0000000..fa416e9 Binary files /dev/null and b/libs/hik/HCNetSDKCom/libanalyzedata.so differ diff --git a/libs/hik/HCNetSDKCom/libiconv2.so b/libs/hik/HCNetSDKCom/libiconv2.so new file mode 100644 index 0000000..d17b0a8 Binary files /dev/null and b/libs/hik/HCNetSDKCom/libiconv2.so differ diff --git a/libs/hikLinux/HCNetSDK_Log_Switch.xml b/libs/hikLinux/HCNetSDK_Log_Switch.xml new file mode 100644 index 0000000..8b7e236 --- /dev/null +++ b/libs/hikLinux/HCNetSDK_Log_Switch.xml @@ -0,0 +1,12 @@ + + + + 3 + ./SDKLOG/ + true + + + 120 + 1 + + \ No newline at end of file diff --git a/libs/hikLinux/libAudioRender.so b/libs/hikLinux/libAudioRender.so new file mode 100644 index 0000000..f39a4a1 Binary files /dev/null and b/libs/hikLinux/libAudioRender.so differ diff --git a/libs/hikLinux/libHCCore.so b/libs/hikLinux/libHCCore.so new file mode 100644 index 0000000..7846902 Binary files /dev/null and b/libs/hikLinux/libHCCore.so differ diff --git a/libs/hikLinux/libNPQos.so b/libs/hikLinux/libNPQos.so new file mode 100644 index 0000000..4972715 Binary files /dev/null and b/libs/hikLinux/libNPQos.so differ diff --git a/libs/hikLinux/libPlayCtrl.so b/libs/hikLinux/libPlayCtrl.so new file mode 100644 index 0000000..e255c22 Binary files /dev/null and b/libs/hikLinux/libPlayCtrl.so differ diff --git a/libs/hikLinux/libSuperRender.so b/libs/hikLinux/libSuperRender.so new file mode 100644 index 0000000..3f36846 Binary files /dev/null and b/libs/hikLinux/libSuperRender.so differ diff --git a/libs/hikLinux/libcrypto.so.1.1 b/libs/hikLinux/libcrypto.so.1.1 new file mode 100644 index 0000000..88c3746 Binary files /dev/null and b/libs/hikLinux/libcrypto.so.1.1 differ diff --git a/libs/hikLinux/libhcnetsdk.so b/libs/hikLinux/libhcnetsdk.so new file mode 100644 index 0000000..2607cee Binary files /dev/null and b/libs/hikLinux/libhcnetsdk.so differ diff --git a/libs/hikLinux/libhpr.so b/libs/hikLinux/libhpr.so new file mode 100644 index 0000000..8efcabb Binary files /dev/null and b/libs/hikLinux/libhpr.so differ diff --git a/libs/hikLinux/libopenal.so.1 b/libs/hikLinux/libopenal.so.1 new file mode 100644 index 0000000..a9dcb82 Binary files /dev/null and b/libs/hikLinux/libopenal.so.1 differ diff --git a/libs/hikLinux/libssl.so.1.1 b/libs/hikLinux/libssl.so.1.1 new file mode 100644 index 0000000..f3e4481 Binary files /dev/null and b/libs/hikLinux/libssl.so.1.1 differ diff --git a/libs/hikLinux/libz.so b/libs/hikLinux/libz.so new file mode 100644 index 0000000..13b4ed9 Binary files /dev/null and b/libs/hikLinux/libz.so differ diff --git a/out/artifacts/lia_monitor_backend_jar/mysqlLogin.jar b/out/artifacts/lia_monitor_backend_jar/mysqlLogin.jar new file mode 100644 index 0000000..a7aec16 Binary files /dev/null and b/out/artifacts/lia_monitor_backend_jar/mysqlLogin.jar differ diff --git a/web/src/main/java/com/zhehekeji/web/lib/hik/HCNetSDK.java b/web/src/main/java/com/zhehekeji/web/lib/hik/HCNetSDK.java index 9e2e61f..565dc82 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/hik/HCNetSDK.java +++ b/web/src/main/java/com/zhehekeji/web/lib/hik/HCNetSDK.java @@ -11,17 +11,15 @@ package com.zhehekeji.web.lib.hik; -import com.sun.jna.Native; -import com.sun.jna.Pointer; -import com.sun.jna.Structure; -import com.sun.jna.Union; +import com.sun.jna.*; import com.sun.jna.examples.win32.GDI32.RECT; import com.sun.jna.examples.win32.W32API; import com.sun.jna.examples.win32.W32API.HWND; import com.sun.jna.ptr.ByteByReference; import com.sun.jna.ptr.IntByReference; import com.sun.jna.ptr.ShortByReference; -import com.sun.jna.win32.StdCallLibrary; +import com.zhehekeji.web.lib.joyware.CallBack; +import com.zhehekeji.web.lib.joyware.Utils; import java.util.ArrayList; import java.util.Arrays; @@ -30,9 +28,9 @@ import java.util.List; //import com.sun. //SDK鎺ュ彛璇存槑,HCNetSDK.dll -public interface HCNetSDK extends StdCallLibrary { +public interface HCNetSDK extends Library { - HCNetSDK INSTANCE = Native.load(".\\libs\\hik\\HCNetSDK", HCNetSDK.class); + HCNetSDK INSTANCE = Native.load(Utils.getLoadLibrary("hcnetsdk"), HCNetSDK.class); //HCNetSDK INSTANCE = (HCNetSDK) Native.load(Utils.getLoadLibrary("HCNetSDK"), NetSDKLib.class); //HCNetSDK INSTANCE = (HCNetSDK) Native.loadLibrary("E:\\Leaper\\robo\\backend-duoji-monitor-1.0.1\\libs\\win64\\HCNetSDK.dll", // HCNetSDK.class); /***瀹忓畾涔***/ @@ -3216,7 +3214,7 @@ DVR瀹炵幇宸¤埅鏁版嵁缁撴瀯 public static final int NET_DVR_LOGIN_USERNAME_MAX_LEN = 64; public static final int NET_DVR_LOGIN_PASSWD_MAX_LEN = 64; - public static interface FLoginResultCallBack extends StdCallCallback{ + public static interface FLoginResultCallBack extends Callback{ public int invoke(int lUserID,int dwResult,NET_DVR_DEVICEINFO_V30 lpDeviceinfo,Pointer pUser); } @@ -6730,91 +6728,91 @@ DVR瀹炵幇宸¤埅鏁版嵁缁撴瀯 /***API鍑芥暟澹版槑,璇︾粏璇存槑瑙丄PI鎵嬪唽***/ - public static interface FRealDataCallBack_V30 extends StdCallCallback { + public static interface FRealDataCallBack_V30 extends Callback { public void invoke(int lRealHandle, int dwDataType, ByteByReference pBuffer, int dwBufSize, Pointer pUser); } - public static interface FMSGCallBack extends StdCallCallback { + public static interface FMSGCallBack extends Callback { public void invoke(int lCommand, NET_DVR_ALARMER pAlarmer, Pointer pAlarmInfo, int dwBufLen, Pointer pUser); } - public static interface FMSGCallBack_V31 extends StdCallCallback { + public static interface FMSGCallBack_V31 extends Callback { public boolean invoke(int lCommand, NET_DVR_ALARMER pAlarmer, Pointer pAlarmInfo, int dwBufLen, Pointer pUser); } - public static interface FMessCallBack extends StdCallCallback { + public static interface FMessCallBack extends Callback { public boolean invoke(int lCommand,String sDVRIP,String pBuf,int dwBufLen); } - public static interface FMessCallBack_EX extends StdCallCallback { + public static interface FMessCallBack_EX extends Callback { public boolean invoke(int lCommand,int lUserID,String pBuf,int dwBufLen); } - public static interface FMessCallBack_NEW extends StdCallCallback { + public static interface FMessCallBack_NEW extends Callback { public boolean invoke(int lCommand,String sDVRIP,String pBuf,int dwBufLen, short dwLinkDVRPort); } - public static interface FMessageCallBack extends StdCallCallback { + public static interface FMessageCallBack extends Callback { public boolean invoke(int lCommand,String sDVRIP,String pBuf,int dwBufLen, int dwUser); } - public static interface FExceptionCallBack extends StdCallCallback { + public static interface FExceptionCallBack extends Callback { public void invoke(int dwType, int lUserID, int lHandle, Pointer pUser); } - public static interface FDrawFun extends StdCallCallback { + public static interface FDrawFun extends Callback { public void invoke(int lRealHandle,W32API.HDC hDc,int dwUser); } - public static interface FStdDataCallBack extends StdCallCallback { + public static interface FStdDataCallBack extends Callback { public void invoke(int lRealHandle, int dwDataType, ByteByReference pBuffer,int dwBufSize,int dwUser); } - public static interface FPlayDataCallBack extends StdCallCallback { + public static interface FPlayDataCallBack extends Callback { public void invoke(int lPlayHandle, int dwDataType, ByteByReference pBuffer,int dwBufSize,int dwUser); } - public static interface FVoiceDataCallBack extends StdCallCallback { + public static interface FVoiceDataCallBack extends Callback { public void invoke(int lVoiceComHandle, String pRecvDataBuffer, int dwBufSize, byte byAudioFlag, int dwUser); } - public static interface FVoiceDataCallBack_V30 extends StdCallCallback { + public static interface FVoiceDataCallBack_V30 extends Callback { public void invoke(int lVoiceComHandle, String pRecvDataBuffer, int dwBufSize, byte byAudioFlag,Pointer pUser); } - public static interface FVoiceDataCallBack_MR extends StdCallCallback { + public static interface FVoiceDataCallBack_MR extends Callback { public void invoke(int lVoiceComHandle, String pRecvDataBuffer, int dwBufSize, byte byAudioFlag, int dwUser); } - public static interface FVoiceDataCallBack_MR_V30 extends StdCallCallback { + public static interface FVoiceDataCallBack_MR_V30 extends Callback { public void invoke(int lVoiceComHandle, String pRecvDataBuffer, int dwBufSize, byte byAudioFlag, String pUser); } - public static interface FVoiceDataCallBack2 extends StdCallCallback { + public static interface FVoiceDataCallBack2 extends Callback { public void invoke(String pRecvDataBuffer, int dwBufSize, Pointer pUser); } - public static interface FSerialDataCallBack extends StdCallCallback { + public static interface FSerialDataCallBack extends Callback { public void invoke(int lSerialHandle,String pRecvDataBuffer,int dwBufSize,int dwUser); } - public static interface FRowDataCallBack extends StdCallCallback { + public static interface FRowDataCallBack extends Callback { public void invoke(int lUserID,String sIPAddr, int lRowAmout, String pRecvDataBuffer,int dwBufSize,int dwUser); } - public static interface FColLocalDataCallBack extends StdCallCallback { + public static interface FColLocalDataCallBack extends Callback { public void invoke(int lUserID, String sIPAddr, int lColumnAmout, String pRecvDataBuffer,int dwBufSize,int dwUser); } - public static interface FColGlobalDataCallBack extends StdCallCallback { + public static interface FColGlobalDataCallBack extends Callback { public void invoke(int lUserID, String sIPAddr, int lColumnAmout, String pRecvDataBuffer,int dwBufSize,int dwUser); } - public static interface FJpegdataCallBack extends StdCallCallback { + public static interface FJpegdataCallBack extends Callback { public int invoke(int lCommand, int lUserID, String sDVRIP, String sJpegName, String pJpegBuf,int dwBufLen, int dwUser); } - public static interface FPostMessageCallBack extends StdCallCallback { + public static interface FPostMessageCallBack extends Callback { public int invoke(int dwType, int lIndex); } @@ -6973,7 +6971,7 @@ DVR瀹炵幇宸¤埅鏁版嵁缁撴瀯 //閫忔槑閫氶亾璁剧疆 int NET_DVR_SerialStart(int lUserID,int lSerialPort,FSerialDataCallBack fSerialDataCallBack,int dwUser); - public static interface FSerialDataCallBack_V40 extends StdCallCallback { + public static interface FSerialDataCallBack_V40 extends Callback { public void invoke(int lSerialHandle, int lCHannel, byte[] pRecvDataBuffer, int dwBufSize, Pointer pUser); } int NET_DVR_SerialStart_V40(int lUserID, Pointer lpInBuffer, int dwInBufferSize, FSerialDataCallBack_V40 fSerialDataCallBack_V40,Pointer pUser); @@ -7148,7 +7146,7 @@ DVR瀹炵幇宸¤埅鏁版嵁缁撴瀯 boolean NET_DVR_ContinuousShoot(int lUserID, NET_DVR_SNAPCFG lpInter); boolean NET_DVR_ManualSnap(int lUserID, NET_DVR_MANUALSNAP lpInter, NET_DVR_PLATE_RESULT lpOuter); - public static interface FRemoteConfigCallback extends StdCallCallback { + public static interface FRemoteConfigCallback extends Callback { public void invoke(int dwType, Pointer lpBuffer, int dwBufLen, Pointer pUserData); } @@ -7246,7 +7244,7 @@ DVR瀹炵幇宸¤埅鏁版嵁缁撴瀯 public byte[] byRes = new byte[12]; } - public static interface fGPSDataCallback extends StdCallCallback { + public static interface fGPSDataCallback extends Callback { public void invoke(int nHandle, int dwState, Pointer lpBuffer, int dwBufLen, Pointer pUser); } @@ -7255,7 +7253,7 @@ DVR瀹炵幇宸¤埅鏁版嵁缁撴瀯 //鎾斁搴撳嚱鏁板０鏄,PlayCtrl.dll -interface PlayCtrl extends StdCallLibrary +interface PlayCtrl extends Library { PlayCtrl INSTANCE = (PlayCtrl) Native.loadLibrary("../lib/PlayCtrl.dll", PlayCtrl.class); diff --git a/web/src/main/java/com/zhehekeji/web/lib/hik/HikCameraControlModuleImpl.java b/web/src/main/java/com/zhehekeji/web/lib/hik/HikCameraControlModuleImpl.java index 97b497a..86b089e 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/hik/HikCameraControlModuleImpl.java +++ b/web/src/main/java/com/zhehekeji/web/lib/hik/HikCameraControlModuleImpl.java @@ -329,7 +329,7 @@ public class HikCameraControlModuleImpl implements CameraControlModule { public static void convetor(String videoInputPath, String videoOutPath){ List command = new ArrayList(); - command.add(".\\libs\\ffmpeg\\ffmpeg.exe"); + command.add("ffmpeg"); command.add("-i"); command.add(videoInputPath); command.add("-c"); diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/Utils.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/Utils.java index 64eec4e..8c8d8e0 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/Utils.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/Utils.java @@ -2,6 +2,10 @@ package com.zhehekeji.web.lib.joyware; import com.sun.jna.Platform; +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; + public class Utils { public Utils() { @@ -75,11 +79,14 @@ public class Utils { if(osPrefix.toLowerCase().startsWith("win32-x86")) { loadLibrary = "./libs/win32/"; } else if(osPrefix.toLowerCase().startsWith("win32-amd64") ) { - loadLibrary = "./libs/win64/"; + loadLibrary = "./libs/" + + "win64/"; } else if(osPrefix.toLowerCase().startsWith("linux-i386")) { - loadLibrary = ""; + loadLibrary = "/lib/javaDhLibs/linux64/lib"; + library = library+".so"; }else if(osPrefix.toLowerCase().startsWith("linux-amd64")) { - loadLibrary = ""; + loadLibrary = "/lib/javaLibs/linux64/lib"; + library = library+".so"; } System.out.printf("[Load %s Path : %s]\n", library, loadLibrary + library); diff --git a/web/src/main/resources/application-prod.yml b/web/src/main/resources/application-prod.yml index 90faa6f..03fbe0c 100644 --- a/web/src/main/resources/application-prod.yml +++ b/web/src/main/resources/application-prod.yml @@ -7,14 +7,14 @@ spring: maxWait: 60000 minEvictableIdleTimeMillis: 300000 minIdle: 15 - password: Leaper@123 + password: root poolPreparedStatements: true testOnBorrow: true testOnReturn: false testWhileIdle: false timeBetweenEvictionRunsMillis: 60000 type: com.alibaba.druid.pool.DruidDataSource - url: jdbc:mysql://127.0.0.1:3306/lia_duoji?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8 + url: jdbc:mysql://127.0.0.1:3306/lia_duoji?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8 username: root validationQuery: SELECT 1 FROM DUAL # --------鏈湇鍔＄鍙ｅ彿