修改录像参数

.idea/compiler.xml

@@ -7,10 +7,10 @@
         <sourceOutputDir name="target/generated-sources/annotations" />
         <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
         <outputRelativeToContentRoot value="true" />
-        <module name="hazard-admin" />
         <module name="hazard-sdk" />
-        <module name="base-admin" />
         <module name="business-service" />
+        <module name="hazard-admin" />
+        <module name="base-admin" />
       </profile>
     </annotationProcessing>
     <bytecodeTargetLevel>

.idea/jarRepositories.xml

@@ -1,16 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="RemoteRepositoriesConfiguration">
-    <remote-repository>
-      <option name="id" value="central" />
-      <option name="name" value="Central Repository" />
-      <option name="url" value="https://maven.aliyun.com/repository/public" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="central" />
-      <option name="name" value="Central Repository" />
-      <option name="url" value="https://repo.maven.apache.org/maven2" />
-    </remote-repository>
     <remote-repository>
       <option name="id" value="public" />
       <option name="name" value="aliyun nexus" />
@@ -18,8 +8,8 @@
     </remote-repository>
     <remote-repository>
       <option name="id" value="central" />
-      <option name="name" value="Maven Central repository" />
-      <option name="url" value="https://repo1.maven.org/maven2" />
+      <option name="name" value="Central Repository" />
+      <option name="url" value="https://repo.maven.apache.org/maven2" />
     </remote-repository>
     <remote-repository>
       <option name="id" value="central" />
@@ -36,6 +26,11 @@
       <option name="name" value="Central Repository" />
       <option name="url" value="http://maven.aliyun.com/nexus/content/repositories/central/" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Maven Central repository" />
+      <option name="url" value="https://repo1.maven.org/maven2" />
+    </remote-repository>
     <remote-repository>
       <option name="id" value="custom_group" />
       <option name="name" value="Nexus Repository" />
@@ -46,5 +41,10 @@
       <option name="name" value="JBoss Community repository" />
       <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Central Repository" />
+      <option name="url" value="https://maven.aliyun.com/repository/public" />
+    </remote-repository>
   </component>
 </project>

hazard-admin/src/main/java/com/ozs/web/core/config/CaneraConfig.java

@@ -33,7 +33,5 @@ public class CaneraConfig {
     @Value("${base.filePath:/opt/streams/}")
     private String filePath;
 
-    @Value("${base.flvPath:/opt/streams/record/flv/hazard/}")
-    private String flvPath;
 
 }

hazard-admin/src/main/java/com/ozs/web/core/util/CameraUtil.java

@@ -4,18 +4,15 @@ package com.ozs.web.core.util;
 import com.alibaba.fastjson2.JSON;
 import com.ozs.common.config.BaseConfig;
 import com.ozs.common.constant.Constants;
-import com.ozs.common.core.domain.AjaxResult;
 import com.ozs.common.exception.base.BaseException;
 import com.ozs.common.utils.DateUtils;
 import com.ozs.common.utils.http.HttpUtils;
 import com.ozs.web.core.config.CaneraConfig;
-import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.util.ObjectUtils;
-import org.springframework.web.bind.annotation.GetMapping;
 
 import javax.annotation.PostConstruct;
 import java.io.*;
@@ -35,8 +32,6 @@ public class CameraUtil {
     private static String url;
     private static String historyUrl;
     private static String ffmpegPath;
-    private static String mappingUrl;
-    private static String flvPath;
     private static String filePath;
 
     @Autowired
@@ -53,7 +48,6 @@ public class CameraUtil {
      */
     public static String historyPlay(List<String> fromVideoFileList, String ph) {
         // 视频服务映射路径
-//        String NewfilePath = flvPath + ph;
         String NewfilePath = BaseConfig.getProfile() + "/" + ph;
         log.info("NewfilePath:{}", NewfilePath);
         log.info("fromVideoFileList:{}", fromVideoFileList);
@@ -452,10 +446,8 @@ public class CameraUtil {
     @PostConstruct
     public void init() {
         url = caneraConfig.getUrl();
-        mappingUrl = caneraConfig.getMappingUrl();
         historyUrl = caneraConfig.getHistoryUrl();
         ffmpegPath = caneraConfig.getFfmpegPath();
-        flvPath = caneraConfig.getFlvPath();
         filePath = caneraConfig.getFilePath();
     }
 

hazard-admin/src/main/resources/application.yml

@@ -16,10 +16,12 @@ base:
   # 验证码类型 math 数组计算 char 字符验证
   captchaType: math
   #  path: http://47.106.159.135:8554
-  path: http://47.106.159.135:8554
+  path: http://124.70.58.209:8554
   ffmpegPath: /usr/local/ffmpeg/bin/ffmpeg
-  mappingUrl: http://47.106.159.135/
+  #  mappingUrl: http://47.106.159.135/
   filePath: /opt/streams/
+  url: http://124.70.58.209:8554
+  historyUrl: http://127.0.0.1:9080
 
 # 开发环境配置
 server: