diff --git a/libs/code_scan/TestJNI-bak.dll b/libs/code_scan/TestJNI-bak.dll deleted file mode 100644 index ab9e6a6..0000000 Binary files a/libs/code_scan/TestJNI-bak.dll and /dev/null differ diff --git a/libs/code_scan/TestJNI.dll b/libs/code_scan/TestJNI.dll index 659a180..5b1f10b 100644 Binary files a/libs/code_scan/TestJNI.dll and b/libs/code_scan/TestJNI.dll differ diff --git a/libs/code_scan/libCyclops.dll b/libs/code_scan/libCyclops.dll index a926266..64c0c4e 100644 Binary files a/libs/code_scan/libCyclops.dll and b/libs/code_scan/libCyclops.dll differ diff --git a/libs/code_scan/lpv.dll b/libs/code_scan/lpv.dll index 197e755..cb088b5 100644 Binary files a/libs/code_scan/lpv.dll and b/libs/code_scan/lpv.dll differ diff --git a/libs/code_scan/opencv_world341.dll b/libs/code_scan/opencv_world341.dll index c507654..06cac75 100644 Binary files a/libs/code_scan/opencv_world341.dll and b/libs/code_scan/opencv_world341.dll differ diff --git a/web/src/main/java/com/zhehekeji/web/config/ConfigProperties.java b/web/src/main/java/com/zhehekeji/web/config/ConfigProperties.java index 1de3578..8c1efb5 100644 --- a/web/src/main/java/com/zhehekeji/web/config/ConfigProperties.java +++ b/web/src/main/java/com/zhehekeji/web/config/ConfigProperties.java @@ -42,14 +42,13 @@ public class ConfigProperties { public static class CameraConfig{ private Integer cameraType; + private String cameraPassword; private String cameraUser; private Integer cameraPort; - private String videoServer; - private Long delayCaptureTime; private Long delayScanTime; diff --git a/web/src/main/java/com/zhehekeji/web/controller/RealTimeController.java b/web/src/main/java/com/zhehekeji/web/controller/RealTimeController.java index af1c690..5fd8d84 100644 --- a/web/src/main/java/com/zhehekeji/web/controller/RealTimeController.java +++ b/web/src/main/java/com/zhehekeji/web/controller/RealTimeController.java @@ -50,11 +50,4 @@ public class RealTimeController { return Result.success(styles); } - @GetMapping("/videoServer") - @ApiOperation(value = "视频服务器地址") - public Result getVideoServer(){ - return Result.success(configProperties.getCameraConfig().getVideoServer()); - } - - } diff --git a/web/src/main/resources/application-dev.yml b/web/src/main/resources/application-dev.yml index 54bc987..e4b5db4 100644 --- a/web/src/main/resources/application-dev.yml +++ b/web/src/main/resources/application-dev.yml @@ -31,7 +31,6 @@ cameraConfig: cameraPassword: a1234567 cameraUser: admin cameraPort: 37777 - videoServer: localhost:8083 #相机抓图延迟 毫秒 delayCaptureTime: 2000 #OCR识别延迟 毫秒