diff --git a/bjairService/pom.xml b/bjairService/pom.xml index b59157e..1b2c198 100644 --- a/bjairService/pom.xml +++ b/bjairService/pom.xml @@ -58,15 +58,15 @@ jna 1.0.0 system - ${project.basedir}/lib/jna-1.0.0.jar + ${project.basedir}/src/main/resources/lib/jna-1.0.0.jar com.iformall.haikang - jna + jna_1 4.5.2 system - ${project.basedir}/lib/jna-4.5.2.jar + ${project.basedir}/src/main/resources/lib/jna-4.5.2.jar @@ -74,7 +74,7 @@ examples 1.0.0 system - ${project.basedir}/lib/examples-1.0.0.jar + ${project.basedir}/src/main/resources/lib/examples-1.0.0.jar diff --git a/bjairService/sdklog1/SdkLog_1_W.log b/bjairService/sdklog1/SdkLog_1_W.log new file mode 100644 index 0000000..81b7614 --- /dev/null +++ b/bjairService/sdklog1/SdkLog_1_W.log @@ -0,0 +1,22 @@ +[2025-01-02 15:45:05.798][ERR] CCoreGlobalCtrlBase::LoadDSo, HPR_LoadDSo Failed, Path[C:/project/bjAirport/bjairService/lib/zlib1.dll] syserror[126] +[2025-01-02 15:45:05.798][ERR] Load zlib failed[syserr: 126] +[2025-01-02 15:45:05.798][INF] The COM:HCCoreBase ver is 6.1.4.15, 2020_03_05. Async:1. +[2025-01-02 15:45:05.798][INF] The COM:Core ver is 6.1.9.48, 2023_04_10. Async:1. +[2025-01-02 15:45:05.799][INF] This HCNetSDK ver is 6.1.9.48 Ver 2023_04_10. +[2025-01-02 15:45:06.465][INF] Login dev 192.168.2.200:8000. +[2025-01-02 15:45:06.465][INF] dwTotalNum[2048] +[2025-01-02 15:45:06.468][INF] Private connect 192.168.2.200:8000 sock=2876 this=0x1e17a8b4 cmd=0x10000 port=59313 +[2025-01-02 15:45:06.468][INF] LogonDev1 in[192.168.2.200:8000] +[2025-01-02 15:45:06.679][DBG] CCoreGlobalCtrlBase::LoadDSo, HPR_LoadDSo Succ, Path[C:/project/bjAirport/bjairService/lib/libcrypto-1_1-x64.dll], hHandleRet[859963392] +[2025-01-02 15:45:06.679][DBG] Load [libcrypto-1_1-x64.dll] SUCC, Real Path[C:\project\bjAirport\bjairService\lib\libcrypto-1_1-x64.dll] +[2025-01-02 15:45:06.899][DBG] CCoreGlobalCtrlBase::LoadDSo, HPR_LoadDSo Succ, Path[C:/project/bjAirport/bjairService/lib/libssl-1_1-x64.dll], hHandleRet[910950400] +[2025-01-02 15:45:06.899][DBG] Load [libssl-1_1-x64.dll] SUCC, Real Path[C:\project\bjAirport\bjairService\lib\libssl-1_1-x64.dll] +[2025-01-02 15:45:06.899][INF] SSLTRANSAPI::IsAllAPILoaded, SSL_library_init Unload +[2025-01-02 15:45:06.899][INF] OpenSSL, Not All Function Loaded! +[2025-01-02 15:45:06.899][INF] SSLTRANSAPI::PrintVersion, OpenSSL version info [OpenSSL 1.1.1l 24 Aug 2021] +[2025-01-02 15:45:06.899][INF] CSSLTrans::SSLCtxInit, dwSSLVersion[6], m_fnTLSServerMethod +[2025-01-02 15:45:06.923][ERR] CSSLTrans::SSLTrans_CTX_Load_CA, invalid path[C:/project/bjAirport/bjairService/lib/cert/\] +[2025-01-02 15:45:10.481][DBG] CComBase::Load, Load szDllPath[C:/project/bjAirport/bjairService/lib/HCNetSDKCom/HCAlarm.dll] SUCC +[2025-01-02 15:45:10.482][INF] AbilityAnalyze---Init-- start +[2025-01-02 15:45:10.525][INF] The COM:HCAlarm ver is 6.1.9.48, 2023_04_10. +[2025-01-02 15:45:10.526][INF] Listen Proc get Addr[0X000000001E18BC70] diff --git a/bjairService/src/main/java/com/iformall/haikang/alarm/Alarm.java b/bjairService/src/main/java/com/iformall/haikang/alarm/Alarm.java index b67d0c1..7155fb2 100644 --- a/bjairService/src/main/java/com/iformall/haikang/alarm/Alarm.java +++ b/bjairService/src/main/java/com/iformall/haikang/alarm/Alarm.java @@ -8,22 +8,31 @@ import com.sun.jna.Pointer; import java.util.Scanner; +import javax.annotation.PreDestroy; +import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Service; + +@Service public class Alarm { + + private final Logger logger = LoggerFactory.getLogger(this.getClass()); - static HCNetSDK hCNetSDK = null; - static int lUserID = -1;//用户句柄 实现对设备登录 - static int lAlarmHandle =-1;//报警布防句柄 - static int lListenHandle = -1;//报警监听句柄 - static FMSGCallBack_V31 fMSFCallBack_V31 = null; //报警布防回调函数 - static FMSGCallBack fMSFCallBack=null; //报警监听回调函数 + private HCNetSDK hCNetSDK = null; + private int lUserID = -1;//用户句柄 实现对设备登录 + private int lAlarmHandle =-1;//报警布防句柄 + private int lListenHandle = -1;//监听句柄 + private FMSGCallBack_V31 fMSFCallBack_V31 = null; //报警布防回调函数 + private FMSGCallBack fMSFCallBack=null; //报警监听回调函数 /** * 动态库加载 * * @return */ - private static boolean createSDKInstance() { + private boolean createSDKInstance() { if (hCNetSDK == null) { synchronized (HCNetSDK.class) { String strDllPath = ""; @@ -36,23 +45,18 @@ public class Alarm { strDllPath = System.getProperty("user.dir") + "/lib/libhcnetsdk.so"; hCNetSDK = (HCNetSDK) Native.loadLibrary(strDllPath, HCNetSDK.class); } catch (Exception ex) { - System.out.println("loadLibrary: " + strDllPath + " Error: " + ex.getMessage()); + logger.error("createSDKInstance loadLibrary: " + strDllPath + " Error: " + ex.getMessage(),ex); return false; } } } return true; } - - - /** - * @param args - */ - public static void main(String[] args) throws InterruptedException { - - if (hCNetSDK == null) { + + private void initSdk() { + if (hCNetSDK == null) { if (!createSDKInstance()) { - System.out.println("Load SDK fail"); + logger.error("Load SDK fail"); return; } } @@ -92,67 +96,175 @@ public class Alarm { } } /** 设备上传的报警信息是COMM_VCA_ALARM(0x4993)类型, - 在SDK初始化之后增加调用NET_DVR_SetSDKLocalCfg(enumType为NET_DVR_LOCAL_CFG_TYPE_GENERAL)设置通用参数NET_DVR_LOCAL_GENERAL_CFG的byAlarmJsonPictureSeparate为1, - 将Json数据和图片数据分离上传,这样设置之后,报警布防回调函数里面接收到的报警信息类型为COMM_ISAPI_ALARM(0x6009), - 报警信息结构体为NET_DVR_ALARM_ISAPI_INFO(与设备无关,SDK封装的数据结构),更便于解析。*/ - - HCNetSDK.NET_DVR_LOCAL_GENERAL_CFG struNET_DVR_LOCAL_GENERAL_CFG = new HCNetSDK.NET_DVR_LOCAL_GENERAL_CFG(); - struNET_DVR_LOCAL_GENERAL_CFG.byAlarmJsonPictureSeparate = 1; //设置JSON透传报警数据和图片分离 - struNET_DVR_LOCAL_GENERAL_CFG.write(); - Pointer pStrNET_DVR_LOCAL_GENERAL_CFG = struNET_DVR_LOCAL_GENERAL_CFG.getPointer(); - hCNetSDK.NET_DVR_SetSDKLocalCfg(17, pStrNET_DVR_LOCAL_GENERAL_CFG); - - lUserID=Alarm.loginDevice( "10.9.137.17", (short) 8000, "admin", "hik12345"); //登录设备 - - for (boolean exit = false; !exit; ) { - System.out.println("请输入您想要执行的demo实例! (退出请输入yes)"); - Scanner input = new Scanner(System.in); - String str = input.next(); - // 转换为标准输入 - str = str.toLowerCase(); - if (str.equals("yes")) { - // 退出程序 - exit = true; - break; - } - switch (str) { - case "1": - { - System.out.println("\n[Module]报警布防示例代码"); - lAlarmHandle=Alarm.setAlarmChan(lUserID);//报警布防,和报警监听二选一即可 - break; - } - case "2": - { - System.out.println("\n[Module]报警撤防示例代码"); - Alarm.closedAlarmChan(lAlarmHandle); - break; - } - case "3": - { - //报警监听不需要登录设备,Alarm.loginDevice登录接口可以注释 - System.out.println("\n[Module]开启报警监听示例代码"); - lListenHandle = Alarm.startListen("10.9.137.101",(short) 7201); //传入监听PC本机的IP地址和端口 - break; - } - case "4": - { - System.out.println("\n[Module]停止监听示例代码"); - Alarm.stopListen(lListenHandle); - break; - } - default: - { - System.out.println("\n未知的指令操作!请重新输入!\n"); - } - } + 在SDK初始化之后增加调用NET_DVR_SetSDKLocalCfg(enumType为NET_DVR_LOCAL_CFG_TYPE_GENERAL)设置通用参数NET_DVR_LOCAL_GENERAL_CFG的byAlarmJsonPictureSeparate为1, + 将Json数据和图片数据分离上传,这样设置之后,报警布防回调函数里面接收到的报警信息类型为COMM_ISAPI_ALARM(0x6009), + 报警信息结构体为NET_DVR_ALARM_ISAPI_INFO(与设备无关,SDK封装的数据结构),更便于解析。*/ + HCNetSDK.NET_DVR_LOCAL_GENERAL_CFG struNET_DVR_LOCAL_GENERAL_CFG = new HCNetSDK.NET_DVR_LOCAL_GENERAL_CFG(); + struNET_DVR_LOCAL_GENERAL_CFG.byAlarmJsonPictureSeparate = 1; //设置JSON透传报警数据和图片分离 + struNET_DVR_LOCAL_GENERAL_CFG.write(); + Pointer pStrNET_DVR_LOCAL_GENERAL_CFG = struNET_DVR_LOCAL_GENERAL_CFG.getPointer(); + hCNetSDK.NET_DVR_SetSDKLocalCfg(17, pStrNET_DVR_LOCAL_GENERAL_CFG); + } + + @PreDestroy + public void onDestory() { + //释放SDK + if (hCNetSDK != null) { + stopListen(); + hCNetSDK.NET_DVR_Cleanup(); + } + } + + /** + * 开启监听 + * @return + */ + public void listen() { + if (hCNetSDK == null) { + initSdk(); } + + //lUserID=loginDevice( "192.168.2.200", (short) 8000, "admin", "wushikeji001"); //登录设备 + + lListenHandle = startListen("192.168.2.103",(short) 7201); //设备注销 - Alarm.logoutDev(lUserID); - //释放SDK - hCNetSDK.NET_DVR_Cleanup(); + //logoutDev(lUserID); + } + + /** + * 停止监听 + * @param Handle 监听句柄 + */ + public void stopListen() + { + int Handle = lListenHandle; + if (Handle <= -1) + { + logger.info("监听未开启"); + return; + } + if (!hCNetSDK.NET_DVR_StopListen_V30(Handle)) { + logger.error("停止监听失败,err: "+hCNetSDK.NET_DVR_GetLastError()); + return; + } + logger.info("停止监听成功"); return; + } + + + + + + +// /** +// * @param args +// */ +// public static void main(String[] args) throws InterruptedException { +// +// if (hCNetSDK == null) { +// if (!createSDKInstance()) { +// System.out.println("Load SDK fail"); +// return; +// } +// } +// //linux系统建议调用以下接口加载组件库 +// if (osSelect.isLinux()) { +// HCNetSDK.BYTE_ARRAY ptrByteArray1 = new HCNetSDK.BYTE_ARRAY(256); +// HCNetSDK.BYTE_ARRAY ptrByteArray2 = new HCNetSDK.BYTE_ARRAY(256); +// //这里是库的绝对路径,请根据实际情况修改,注意改路径必须有访问权限 +// String strPath1 = System.getProperty("user.dir") + "/lib/libcrypto.so.1.1"; +// String strPath2 = System.getProperty("user.dir") + "/lib/libssl.so.1.1"; +// System.arraycopy(strPath1.getBytes(), 0, ptrByteArray1.byValue, 0, strPath1.length()); +// ptrByteArray1.write(); +// hCNetSDK.NET_DVR_SetSDKInitCfg(HCNetSDK.NET_SDK_INIT_CFG_LIBEAY_PATH, ptrByteArray1.getPointer()); +// System.arraycopy(strPath2.getBytes(), 0, ptrByteArray2.byValue, 0, strPath2.length()); +// ptrByteArray2.write(); +// hCNetSDK.NET_DVR_SetSDKInitCfg(HCNetSDK.NET_SDK_INIT_CFG_SSLEAY_PATH, ptrByteArray2.getPointer()); +// String strPathCom = System.getProperty("user.dir") + "/lib/"; +// HCNetSDK.NET_DVR_LOCAL_SDK_PATH struComPath = new HCNetSDK.NET_DVR_LOCAL_SDK_PATH(); +// System.arraycopy(strPathCom.getBytes(), 0, struComPath.sPath, 0, strPathCom.length()); +// struComPath.write(); +// hCNetSDK.NET_DVR_SetSDKInitCfg(HCNetSDK.NET_SDK_INIT_CFG_SDK_PATH, struComPath.getPointer()); +// } +// +// /**初始化*/ +// hCNetSDK.NET_DVR_Init(); +// /**加载日志*/ +// hCNetSDK.NET_DVR_SetLogToFile(3, "./sdklog1", false); +// //设置报警回调函数 +// if (fMSFCallBack_V31 == null) { +// fMSFCallBack_V31 = new FMSGCallBack_V31(); +// Pointer pUser = null; +// if (!hCNetSDK.NET_DVR_SetDVRMessageCallBack_V31(fMSFCallBack_V31, pUser)) { +// System.out.println("设置回调函数失败!"); +// return; +// } else { +// System.out.println("设置回调函数成功!"); +// } +// } +// /** 设备上传的报警信息是COMM_VCA_ALARM(0x4993)类型, +// 在SDK初始化之后增加调用NET_DVR_SetSDKLocalCfg(enumType为NET_DVR_LOCAL_CFG_TYPE_GENERAL)设置通用参数NET_DVR_LOCAL_GENERAL_CFG的byAlarmJsonPictureSeparate为1, +// 将Json数据和图片数据分离上传,这样设置之后,报警布防回调函数里面接收到的报警信息类型为COMM_ISAPI_ALARM(0x6009), +// 报警信息结构体为NET_DVR_ALARM_ISAPI_INFO(与设备无关,SDK封装的数据结构),更便于解析。*/ +// +// HCNetSDK.NET_DVR_LOCAL_GENERAL_CFG struNET_DVR_LOCAL_GENERAL_CFG = new HCNetSDK.NET_DVR_LOCAL_GENERAL_CFG(); +// struNET_DVR_LOCAL_GENERAL_CFG.byAlarmJsonPictureSeparate = 1; //设置JSON透传报警数据和图片分离 +// struNET_DVR_LOCAL_GENERAL_CFG.write(); +// Pointer pStrNET_DVR_LOCAL_GENERAL_CFG = struNET_DVR_LOCAL_GENERAL_CFG.getPointer(); +// hCNetSDK.NET_DVR_SetSDKLocalCfg(17, pStrNET_DVR_LOCAL_GENERAL_CFG); +// +// lUserID=Alarm.loginDevice( "192.168.2.200", (short) 8000, "admin", "wushikeji001"); //登录设备 +// +// for (boolean exit = false; !exit; ) { +// System.out.println("请输入您想要执行的demo实例! (退出请输入yes)"); +// Scanner input = new Scanner(System.in); +// String str = input.next(); +// // 转换为标准输入 +// str = str.toLowerCase(); +// if (str.equals("yes")) { +// // 退出程序 +// exit = true; +// break; +// } +// switch (str) { +// case "1": +// { +// System.out.println("\n[Module]报警布防示例代码"); +// lAlarmHandle=Alarm.setAlarmChan(lUserID);//报警布防,和报警监听二选一即可 +// break; +// } +// case "2": +// { +// System.out.println("\n[Module]报警撤防示例代码"); +// Alarm.closedAlarmChan(lAlarmHandle); +// break; +// } +// case "3": +// { +// //报警监听不需要登录设备,Alarm.loginDevice登录接口可以注释 +// System.out.println("\n[Module]开启报警监听示例代码"); +// lListenHandle = Alarm.startListen("192.168.2.103",(short) 7201); //传入监听PC本机的IP地址和端口 +// break; +// } +// case "4": +// { +// System.out.println("\n[Module]停止监听示例代码"); +// Alarm.stopListen(lListenHandle); +// break; +// } +// default: +// { +// System.out.println("\n未知的指令操作!请重新输入!\n"); +// } +// } +// } +// //设备注销 +// Alarm.logoutDev(lUserID); +// //释放SDK +// hCNetSDK.NET_DVR_Cleanup(); +// return; +// } /** @@ -164,7 +276,7 @@ public class Alarm { * @param psw 设备密码 * @return 登录成功返回用户ID,失败返回-1 */ - public static int loginDevice(String ip, short port, String user, String psw) { + public int loginDevice(String ip, short port, String user, String psw) { // 创建设备登录信息和设备信息对象 HCNetSDK.NET_DVR_USER_LOGIN_INFO loginInfo = new HCNetSDK.NET_DVR_USER_LOGIN_INFO(); HCNetSDK.NET_DVR_DEVICEINFO_V40 deviceInfo = new HCNetSDK.NET_DVR_DEVICEINFO_V40(); @@ -207,7 +319,7 @@ public class Alarm { * @param user 设备用户名 * @param psw 设备密码 */ - public static void loginDeviceV30(String ip, short port, String user, String psw) { + public void loginDeviceV30(String ip, short port, String user, String psw) { HCNetSDK.NET_DVR_DEVICEINFO_V30 m_strDeviceInfo = new HCNetSDK.NET_DVR_DEVICEINFO_V30(); lUserID = hCNetSDK.NET_DVR_Login_V30(ip, port, user, psw, m_strDeviceInfo); System.out.println("UsID:" + lUserID); @@ -225,7 +337,7 @@ public class Alarm { * @param userID 设备登录句柄ID * @return */ - public static int setAlarmChan(int userID ) { + public int setAlarmChan(int userID ) { if (userID == -1) { System.out.println("请先注册"); return -1; @@ -257,7 +369,7 @@ public class Alarm { * 设备撤防 * @param AlarmHandle 布防句柄 */ - public static void closedAlarmChan(int AlarmHandle) + public void closedAlarmChan(int AlarmHandle) { if (AlarmHandle <= -1) { @@ -277,7 +389,7 @@ public class Alarm { * * @param */ - public static int setAlarmChanV50(int userID) { + public int setAlarmChanV50(int userID) { if (userID == -1) { System.out.println("请先注册"); return -1; @@ -314,9 +426,8 @@ public class Alarm { * @param ip 监听IP * @param port 监听端口 */ - public static int startListen(String ip, short port) { - if (lListenHandle <= 0) - { + public int startListen(String ip, short port) { + if (lListenHandle <= 0){ if (fMSFCallBack == null) { fMSFCallBack = new FMSGCallBack(); } @@ -335,31 +446,11 @@ public class Alarm { } - /** - * 停止监听 - * @param Handle 监听句柄 - */ - public static void stopListen(int Handle) - { - if (Handle <= -1) - { - System.out.println("监听未开启"); - return; - } - if (!hCNetSDK.NET_DVR_StopListen_V30(Handle)) { - System.err.println("停止监听失败,err: "+hCNetSDK.NET_DVR_GetLastError()); - return; - } - System.out.println("停止监听成功"); - return; - - } - /** * 设备注销 * @param */ - public static void logoutDev(int userID) { + public void logoutDev(int userID) { if (userID>-1) { diff --git a/bjairService/src/main/java/com/iformall/haikang/alarm/AlarmDataParse.java b/bjairService/src/main/java/com/iformall/haikang/alarm/AlarmDataParse.java index 4ca7080..a7cc93e 100644 --- a/bjairService/src/main/java/com/iformall/haikang/alarm/AlarmDataParse.java +++ b/bjairService/src/main/java/com/iformall/haikang/alarm/AlarmDataParse.java @@ -978,6 +978,7 @@ public class AlarmDataParse { String sAlarmPDC0Info = "实时客流量统计,进入人数:" + strPDCResult.dwEnterNum + ",离开人数:" + strPDCResult.dwLeaveNum + ", byMode:" + strPDCResult.byMode + ", dwRelativeTime:" + strPDCResult.uStatModeParam.struStatFrame.dwRelativeTime + ", dwAbsTime:" + strPDCResult.uStatModeParam.struStatFrame.dwAbsTime; + System.out.println(sAlarmPDC0Info); } // byMode=1-周期统计结果(联合体中struStatTime有效), if (strPDCResult.byMode == 1) { @@ -996,6 +997,7 @@ public class AlarmDataParse { String.format("%02d", strPDCResult.uStatModeParam.struStatTime.tmEnd.dwSecond); String sAlarmPDC1Info = "周期性客流量统计,进入人数:" + strPDCResult.dwEnterNum + ",离开人数:" + strPDCResult.dwLeaveNum + ", byMode:" + strPDCResult.byMode + ", tmStart:" + strtmStart + ",tmEnd :" + strtmEnd; + System.out.println(sAlarmPDC1Info); } break; case HCNetSDK.COMM_ALARM_V30: //移动侦测、视频丢失、遮挡、IO信号量等报警信息(V3.0以上版本支持的设备) diff --git a/bjairService/src/main/java/com/iformall/haikang/alarm/FMSGCallBack_V31.java b/bjairService/src/main/java/com/iformall/haikang/alarm/FMSGCallBack_V31.java index 01a8ce3..98a389d 100644 --- a/bjairService/src/main/java/com/iformall/haikang/alarm/FMSGCallBack_V31.java +++ b/bjairService/src/main/java/com/iformall/haikang/alarm/FMSGCallBack_V31.java @@ -15,7 +15,8 @@ import java.util.Date; public class FMSGCallBack_V31 implements HCNetSDK.FMSGCallBack_V31 { //报警信息回调函数 public boolean invoke(int lCommand, HCNetSDK.NET_DVR_ALARMER pAlarmer, Pointer pAlarmInfo, int dwBufLen, Pointer pUser) { - AlarmDataParse.alarmDataHandle(lCommand, pAlarmer, pAlarmInfo, dwBufLen, pUser); + //AlarmDataParse.alarmDataHandle(lCommand, pAlarmer, pAlarmInfo, dwBufLen, pUser); + AlarmDataParse.alarmDataHandle(HCNetSDK.COMM_ALARM_PDC, pAlarmer, pAlarmInfo, dwBufLen, pUser); return true; } } diff --git a/bjairService/lib/AudioRender.dll b/bjairService/src/main/resources/lib/AudioRender.dll similarity index 100% rename from bjairService/lib/AudioRender.dll rename to bjairService/src/main/resources/lib/AudioRender.dll diff --git a/bjairService/lib/ClientDemo.exe b/bjairService/src/main/resources/lib/ClientDemo.exe similarity index 100% rename from bjairService/lib/ClientDemo.exe rename to bjairService/src/main/resources/lib/ClientDemo.exe diff --git a/bjairService/lib/ClientDemoDll/ReadMe.txt b/bjairService/src/main/resources/lib/ClientDemoDll/ReadMe.txt similarity index 100% rename from bjairService/lib/ClientDemoDll/ReadMe.txt rename to bjairService/src/main/resources/lib/ClientDemoDll/ReadMe.txt diff --git a/bjairService/lib/ClientDemoDll/calib.dll b/bjairService/src/main/resources/lib/ClientDemoDll/calib.dll similarity index 100% rename from bjairService/lib/ClientDemoDll/calib.dll rename to bjairService/src/main/resources/lib/ClientDemoDll/calib.dll diff --git a/bjairService/lib/ClientDemoDll/iconv.dll b/bjairService/src/main/resources/lib/ClientDemoDll/iconv.dll similarity index 100% rename from bjairService/lib/ClientDemoDll/iconv.dll rename to bjairService/src/main/resources/lib/ClientDemoDll/iconv.dll diff --git a/bjairService/lib/ClientDemoDll/libcrypto-1_1-x64.dll b/bjairService/src/main/resources/lib/ClientDemoDll/libcrypto-1_1-x64.dll similarity index 100% rename from bjairService/lib/ClientDemoDll/libcrypto-1_1-x64.dll rename to bjairService/src/main/resources/lib/ClientDemoDll/libcrypto-1_1-x64.dll diff --git a/bjairService/lib/ClientDemoDll/libssl-1_1-x64.dll b/bjairService/src/main/resources/lib/ClientDemoDll/libssl-1_1-x64.dll similarity index 100% rename from bjairService/lib/ClientDemoDll/libssl-1_1-x64.dll rename to bjairService/src/main/resources/lib/ClientDemoDll/libssl-1_1-x64.dll diff --git a/bjairService/lib/ClientDemoDll/libxml2.dll b/bjairService/src/main/resources/lib/ClientDemoDll/libxml2.dll similarity index 100% rename from bjairService/lib/ClientDemoDll/libxml2.dll rename to bjairService/src/main/resources/lib/ClientDemoDll/libxml2.dll diff --git a/bjairService/lib/ClientDemoDll/zlib1.dll b/bjairService/src/main/resources/lib/ClientDemoDll/zlib1.dll similarity index 100% rename from bjairService/lib/ClientDemoDll/zlib1.dll rename to bjairService/src/main/resources/lib/ClientDemoDll/zlib1.dll diff --git a/bjairService/lib/DataType.h b/bjairService/src/main/resources/lib/DataType.h similarity index 100% rename from bjairService/lib/DataType.h rename to bjairService/src/main/resources/lib/DataType.h diff --git a/bjairService/lib/DecodeCardSdk.h b/bjairService/src/main/resources/lib/DecodeCardSdk.h similarity index 100% rename from bjairService/lib/DecodeCardSdk.h rename to bjairService/src/main/resources/lib/DecodeCardSdk.h diff --git a/bjairService/lib/GdiPlus.dll b/bjairService/src/main/resources/lib/GdiPlus.dll similarity index 100% rename from bjairService/lib/GdiPlus.dll rename to bjairService/src/main/resources/lib/GdiPlus.dll diff --git a/bjairService/lib/GdiPlus.lib b/bjairService/src/main/resources/lib/GdiPlus.lib similarity index 100% rename from bjairService/lib/GdiPlus.lib rename to bjairService/src/main/resources/lib/GdiPlus.lib diff --git a/bjairService/lib/HCCore.dll b/bjairService/src/main/resources/lib/HCCore.dll similarity index 100% rename from bjairService/lib/HCCore.dll rename to bjairService/src/main/resources/lib/HCCore.dll diff --git a/bjairService/lib/HCCore.lib b/bjairService/src/main/resources/lib/HCCore.lib similarity index 100% rename from bjairService/lib/HCCore.lib rename to bjairService/src/main/resources/lib/HCCore.lib diff --git a/bjairService/lib/HCNetSDK.dll b/bjairService/src/main/resources/lib/HCNetSDK.dll similarity index 100% rename from bjairService/lib/HCNetSDK.dll rename to bjairService/src/main/resources/lib/HCNetSDK.dll diff --git a/bjairService/lib/HCNetSDK.h b/bjairService/src/main/resources/lib/HCNetSDK.h similarity index 100% rename from bjairService/lib/HCNetSDK.h rename to bjairService/src/main/resources/lib/HCNetSDK.h diff --git a/bjairService/lib/HCNetSDK.lib b/bjairService/src/main/resources/lib/HCNetSDK.lib similarity index 100% rename from bjairService/lib/HCNetSDK.lib rename to bjairService/src/main/resources/lib/HCNetSDK.lib diff --git a/bjairService/lib/HCNetSDKCom/AnalyzeData.dll b/bjairService/src/main/resources/lib/HCNetSDKCom/AnalyzeData.dll similarity index 100% rename from bjairService/lib/HCNetSDKCom/AnalyzeData.dll rename to bjairService/src/main/resources/lib/HCNetSDKCom/AnalyzeData.dll diff --git a/bjairService/lib/HCNetSDKCom/AudioIntercom.dll b/bjairService/src/main/resources/lib/HCNetSDKCom/AudioIntercom.dll similarity index 100% rename from bjairService/lib/HCNetSDKCom/AudioIntercom.dll rename to bjairService/src/main/resources/lib/HCNetSDKCom/AudioIntercom.dll diff --git a/bjairService/lib/HCNetSDKCom/AudioRender.dll b/bjairService/src/main/resources/lib/HCNetSDKCom/AudioRender.dll similarity index 100% rename from bjairService/lib/HCNetSDKCom/AudioRender.dll rename to bjairService/src/main/resources/lib/HCNetSDKCom/AudioRender.dll diff --git a/bjairService/lib/HCNetSDKCom/HCAlarm.dll b/bjairService/src/main/resources/lib/HCNetSDKCom/HCAlarm.dll similarity index 100% rename from bjairService/lib/HCNetSDKCom/HCAlarm.dll rename to bjairService/src/main/resources/lib/HCNetSDKCom/HCAlarm.dll diff --git a/bjairService/lib/HCNetSDKCom/HCAlarm.lib b/bjairService/src/main/resources/lib/HCNetSDKCom/HCAlarm.lib similarity index 100% rename from bjairService/lib/HCNetSDKCom/HCAlarm.lib rename to bjairService/src/main/resources/lib/HCNetSDKCom/HCAlarm.lib diff --git a/bjairService/lib/HCNetSDKCom/HCCoreDevCfg.dll b/bjairService/src/main/resources/lib/HCNetSDKCom/HCCoreDevCfg.dll similarity index 100% rename from bjairService/lib/HCNetSDKCom/HCCoreDevCfg.dll rename to bjairService/src/main/resources/lib/HCNetSDKCom/HCCoreDevCfg.dll diff --git a/bjairService/lib/HCNetSDKCom/HCDisplay.dll b/bjairService/src/main/resources/lib/HCNetSDKCom/HCDisplay.dll similarity index 100% rename from bjairService/lib/HCNetSDKCom/HCDisplay.dll rename to bjairService/src/main/resources/lib/HCNetSDKCom/HCDisplay.dll diff --git a/bjairService/lib/HCNetSDKCom/HCGeneralCfgMgr.dll b/bjairService/src/main/resources/lib/HCNetSDKCom/HCGeneralCfgMgr.dll similarity index 100% rename from bjairService/lib/HCNetSDKCom/HCGeneralCfgMgr.dll rename to bjairService/src/main/resources/lib/HCNetSDKCom/HCGeneralCfgMgr.dll diff --git a/bjairService/lib/HCNetSDKCom/HCGeneralCfgMgr.lib b/bjairService/src/main/resources/lib/HCNetSDKCom/HCGeneralCfgMgr.lib similarity index 100% rename from bjairService/lib/HCNetSDKCom/HCGeneralCfgMgr.lib rename to bjairService/src/main/resources/lib/HCNetSDKCom/HCGeneralCfgMgr.lib diff --git a/bjairService/lib/HCNetSDKCom/HCIndustry.dll b/bjairService/src/main/resources/lib/HCNetSDKCom/HCIndustry.dll similarity index 100% rename from bjairService/lib/HCNetSDKCom/HCIndustry.dll rename to bjairService/src/main/resources/lib/HCNetSDKCom/HCIndustry.dll diff --git a/bjairService/lib/HCNetSDKCom/HCPlayBack.dll b/bjairService/src/main/resources/lib/HCNetSDKCom/HCPlayBack.dll similarity index 100% rename from bjairService/lib/HCNetSDKCom/HCPlayBack.dll rename to bjairService/src/main/resources/lib/HCNetSDKCom/HCPlayBack.dll diff --git a/bjairService/lib/HCNetSDKCom/HCPreview.dll b/bjairService/src/main/resources/lib/HCNetSDKCom/HCPreview.dll similarity index 100% rename from bjairService/lib/HCNetSDKCom/HCPreview.dll rename to bjairService/src/main/resources/lib/HCNetSDKCom/HCPreview.dll diff --git a/bjairService/lib/HCNetSDKCom/HCPreview.lib b/bjairService/src/main/resources/lib/HCNetSDKCom/HCPreview.lib similarity index 100% rename from bjairService/lib/HCNetSDKCom/HCPreview.lib rename to bjairService/src/main/resources/lib/HCNetSDKCom/HCPreview.lib diff --git a/bjairService/lib/HCNetSDKCom/HCVoiceTalk.dll b/bjairService/src/main/resources/lib/HCNetSDKCom/HCVoiceTalk.dll similarity index 100% rename from bjairService/lib/HCNetSDKCom/HCVoiceTalk.dll rename to bjairService/src/main/resources/lib/HCNetSDKCom/HCVoiceTalk.dll diff --git a/bjairService/lib/HCNetSDKCom/OpenAL32.dll b/bjairService/src/main/resources/lib/HCNetSDKCom/OpenAL32.dll similarity index 100% rename from bjairService/lib/HCNetSDKCom/OpenAL32.dll rename to bjairService/src/main/resources/lib/HCNetSDKCom/OpenAL32.dll diff --git a/bjairService/lib/HCNetSDKCom/StreamTransClient.dll b/bjairService/src/main/resources/lib/HCNetSDKCom/StreamTransClient.dll similarity index 100% rename from bjairService/lib/HCNetSDKCom/StreamTransClient.dll rename to bjairService/src/main/resources/lib/HCNetSDKCom/StreamTransClient.dll diff --git a/bjairService/lib/HCNetSDKCom/SystemTransform.dll b/bjairService/src/main/resources/lib/HCNetSDKCom/SystemTransform.dll similarity index 100% rename from bjairService/lib/HCNetSDKCom/SystemTransform.dll rename to bjairService/src/main/resources/lib/HCNetSDKCom/SystemTransform.dll diff --git a/bjairService/lib/HCNetSDKCom/libiconv2.dll b/bjairService/src/main/resources/lib/HCNetSDKCom/libiconv2.dll similarity index 100% rename from bjairService/lib/HCNetSDKCom/libiconv2.dll rename to bjairService/src/main/resources/lib/HCNetSDKCom/libiconv2.dll diff --git a/bjairService/lib/HXVA.dll b/bjairService/src/main/resources/lib/HXVA.dll similarity index 100% rename from bjairService/lib/HXVA.dll rename to bjairService/src/main/resources/lib/HXVA.dll diff --git a/bjairService/lib/HmMerge.dll b/bjairService/src/main/resources/lib/HmMerge.dll similarity index 100% rename from bjairService/lib/HmMerge.dll rename to bjairService/src/main/resources/lib/HmMerge.dll diff --git a/bjairService/lib/LocalSensorAdd.dat b/bjairService/src/main/resources/lib/LocalSensorAdd.dat similarity index 100% rename from bjairService/lib/LocalSensorAdd.dat rename to bjairService/src/main/resources/lib/LocalSensorAdd.dat diff --git a/bjairService/lib/LocalXml.zip b/bjairService/src/main/resources/lib/LocalXml.zip similarity index 100% rename from bjairService/lib/LocalXml.zip rename to bjairService/src/main/resources/lib/LocalXml.zip diff --git a/bjairService/lib/MP_Render.dll b/bjairService/src/main/resources/lib/MP_Render.dll similarity index 100% rename from bjairService/lib/MP_Render.dll rename to bjairService/src/main/resources/lib/MP_Render.dll diff --git a/bjairService/lib/NPQos.dll b/bjairService/src/main/resources/lib/NPQos.dll similarity index 100% rename from bjairService/lib/NPQos.dll rename to bjairService/src/main/resources/lib/NPQos.dll diff --git a/bjairService/lib/OpenAL32.dll b/bjairService/src/main/resources/lib/OpenAL32.dll similarity index 100% rename from bjairService/lib/OpenAL32.dll rename to bjairService/src/main/resources/lib/OpenAL32.dll diff --git a/bjairService/lib/PlayCtrl.dll b/bjairService/src/main/resources/lib/PlayCtrl.dll similarity index 100% rename from bjairService/lib/PlayCtrl.dll rename to bjairService/src/main/resources/lib/PlayCtrl.dll diff --git a/bjairService/lib/PlayCtrl.lib b/bjairService/src/main/resources/lib/PlayCtrl.lib similarity index 100% rename from bjairService/lib/PlayCtrl.lib rename to bjairService/src/main/resources/lib/PlayCtrl.lib diff --git a/bjairService/lib/SuperRender.dll b/bjairService/src/main/resources/lib/SuperRender.dll similarity index 100% rename from bjairService/lib/SuperRender.dll rename to bjairService/src/main/resources/lib/SuperRender.dll diff --git a/bjairService/lib/YUVProcess.dll b/bjairService/src/main/resources/lib/YUVProcess.dll similarity index 100% rename from bjairService/lib/YUVProcess.dll rename to bjairService/src/main/resources/lib/YUVProcess.dll diff --git a/bjairService/lib/examples-1.0.0.jar b/bjairService/src/main/resources/lib/examples-1.0.0.jar similarity index 100% rename from bjairService/lib/examples-1.0.0.jar rename to bjairService/src/main/resources/lib/examples-1.0.0.jar diff --git a/bjairService/lib/hlog.dll b/bjairService/src/main/resources/lib/hlog.dll similarity index 100% rename from bjairService/lib/hlog.dll rename to bjairService/src/main/resources/lib/hlog.dll diff --git a/bjairService/lib/hpr.dll b/bjairService/src/main/resources/lib/hpr.dll similarity index 100% rename from bjairService/lib/hpr.dll rename to bjairService/src/main/resources/lib/hpr.dll diff --git a/bjairService/lib/jna-1.0.0.jar b/bjairService/src/main/resources/lib/jna-1.0.0.jar similarity index 100% rename from bjairService/lib/jna-1.0.0.jar rename to bjairService/src/main/resources/lib/jna-1.0.0.jar diff --git a/bjairService/lib/jna-4.5.2.jar b/bjairService/src/main/resources/lib/jna-4.5.2.jar similarity index 100% rename from bjairService/lib/jna-4.5.2.jar rename to bjairService/src/main/resources/lib/jna-4.5.2.jar diff --git a/bjairService/lib/libcrypto-1_1-x64.dll b/bjairService/src/main/resources/lib/libcrypto-1_1-x64.dll similarity index 100% rename from bjairService/lib/libcrypto-1_1-x64.dll rename to bjairService/src/main/resources/lib/libcrypto-1_1-x64.dll diff --git a/bjairService/lib/libmmd.dll b/bjairService/src/main/resources/lib/libmmd.dll similarity index 100% rename from bjairService/lib/libmmd.dll rename to bjairService/src/main/resources/lib/libmmd.dll diff --git a/bjairService/lib/libssl-1_1-x64.dll b/bjairService/src/main/resources/lib/libssl-1_1-x64.dll similarity index 100% rename from bjairService/lib/libssl-1_1-x64.dll rename to bjairService/src/main/resources/lib/libssl-1_1-x64.dll diff --git a/bjairService/lib/plaympeg4.h b/bjairService/src/main/resources/lib/plaympeg4.h similarity index 100% rename from bjairService/lib/plaympeg4.h rename to bjairService/src/main/resources/lib/plaympeg4.h diff --git a/bjairService/lib/zlib1.dll b/bjairService/src/main/resources/lib/zlib1.dll similarity index 100% rename from bjairService/lib/zlib1.dll rename to bjairService/src/main/resources/lib/zlib1.dll