From 82e4f55d48d523c91cbeecc0af4dca1d9b199041 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?LAPTOP-S9HJSOEB=5C=E6=98=8A=E5=A4=A9?= Date: Mon, 23 Sep 2024 10:00:41 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=86=E9=A2=91=E4=BF=9D=E5=AD=98=E6=AD=A3?= =?UTF-8?q?=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/zhehekeji/common/encryptor/Encryptor.java | 2 +- .../com/zhehekeji/web/lib/hik/HikCameraControlModuleImpl.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/common/src/main/java/com/zhehekeji/common/encryptor/Encryptor.java b/modules/common/src/main/java/com/zhehekeji/common/encryptor/Encryptor.java index be48731..10ed8c6 100644 --- a/modules/common/src/main/java/com/zhehekeji/common/encryptor/Encryptor.java +++ b/modules/common/src/main/java/com/zhehekeji/common/encryptor/Encryptor.java @@ -23,7 +23,7 @@ public class Encryptor { public static void main(String[] args) { - String noEncrypt = "BFEBFBFF000B06710025_38BC_21C3_A29D."; + String noEncrypt = "BFEBFBFF000906EAWD-WXA2D632LLYX"; String encrypt = Encryptor.encryptStr(noEncrypt); System.out.println(encrypt); } 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 b76f89c..dc814da 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 @@ -357,9 +357,9 @@ public class HikCameraControlModuleImpl implements CameraControlModule { log.info("download over,cameraId:{}",cameraId); String ffmpegFile = path+"ffmpeg.mp4"; convetor(path,ffmpegFile); - //PathUtil.deleteFile(path); + PathUtil.deleteFile(path); File file = new File(ffmpegFile); - //file.renameTo(new File(path)); + file.renameTo(new File(path)); }else { log.debug("cameraId:{},progress:{}",cameraId,nPos.getValue()); }