From bbdb00b4e766b63fe40d4cd47dd96c5a745d74a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?LAPTOP-S9HJSOEB=5C=E6=98=8A=E5=A4=A9?=
 <wang.haotian@hzleaper.com>
Date: Sun, 22 Oct 2023 13:53:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=98=86=E8=88=B9=E8=BF=9E=E6=8E=A5=E5=A4=B1?=
 =?UTF-8?q?=E8=B4=A5=E6=97=B6=EF=BC=8C=E5=85=B3=E6=8E=89=E6=97=A7=E6=9C=89?=
 =?UTF-8?q?=E8=BF=9E=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/zhehekeji/web/lib/hik/HikLoginModuleImpl.java  | 6 +++---
 .../main/java/com/zhehekeji/web/service/CameraService.java  | 2 +-
 .../com/zhehekeji/web/service/ksec/KsecNettyClient.java     | 3 +++
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/web/src/main/java/com/zhehekeji/web/lib/hik/HikLoginModuleImpl.java b/web/src/main/java/com/zhehekeji/web/lib/hik/HikLoginModuleImpl.java
index ae4c71f..20460c1 100644
--- a/web/src/main/java/com/zhehekeji/web/lib/hik/HikLoginModuleImpl.java
+++ b/web/src/main/java/com/zhehekeji/web/lib/hik/HikLoginModuleImpl.java
@@ -41,9 +41,9 @@ public class HikLoginModuleImpl implements CameraControlLoginModule {
 			Boolean ok = hcNetsdk.NET_DVR_Init();
 			HCNetSDK.NET_DVR_LOCAL_TCP_PORT_BIND_CFG strLocalTcpBind = new HCNetSDK.NET_DVR_LOCAL_TCP_PORT_BIND_CFG();
 			strLocalTcpBind.read();
-			strLocalTcpBind.wLocalBindTcpMinPort = (short) 3000;
-			strLocalTcpBind.wLocalBindTcpMaxPort = (short) 3000;
-			strLocalTcpBind.write();
+			//strLocalTcpBind.wLocalBindTcpMinPort = (short) 3000;
+			//strLocalTcpBind.wLocalBindTcpMaxPort = (short) 3000;
+			//strLocalTcpBind.write();
 			Pointer pStrLocalTcoBind = strLocalTcpBind.getPointer();
 			if (hcNetsdk.NET_DVR_SetSDKLocalCfg(0, pStrLocalTcoBind) == false) {
 				System.out.println("绑定失败，错误码为" + hcNetsdk.NET_DVR_GetLastError());
diff --git a/web/src/main/java/com/zhehekeji/web/service/CameraService.java b/web/src/main/java/com/zhehekeji/web/service/CameraService.java
index 982e811..d19b630 100644
--- a/web/src/main/java/com/zhehekeji/web/service/CameraService.java
+++ b/web/src/main/java/com/zhehekeji/web/service/CameraService.java
@@ -319,7 +319,7 @@ public class CameraService {
     public void cameraLogin(Camera camera){
         NetSDKLib.LLong lLong = cameraControlLoginModule.login(camera.getIp(),camera.getPort(),camera.getUser(),camera.getPassword());
         if(lLong != null){
-            log.info("camera login success,cameraId:{},ip:{}",camera.getId(),camera.getIp());
+            log.info("camera login success,cameraId:{},ip:{},long{}",camera.getId(),camera.getIp(),lLong.intValue());
             CameraConnMap.conn(camera.getId(),lLong);
         }
     }
diff --git a/web/src/main/java/com/zhehekeji/web/service/ksec/KsecNettyClient.java b/web/src/main/java/com/zhehekeji/web/service/ksec/KsecNettyClient.java
index 09819b2..522769e 100644
--- a/web/src/main/java/com/zhehekeji/web/service/ksec/KsecNettyClient.java
+++ b/web/src/main/java/com/zhehekeji/web/service/ksec/KsecNettyClient.java
@@ -71,6 +71,9 @@ public class KsecNettyClient {
             try {
                 createClient(ksec);
             } catch (Exception e) {
+                if(channel!= null){
+                    channel.close();
+                }
                 //没连上 继续
                 log.error("reconnect error num:{}", num);
                 num++;