完善

common/src/main/resources/application.yml

@@ -3,4 +3,4 @@ spring:
     store-type: none
 
 project:
-  version: '@project.version@'
+  version: @project.version@

starter/src/test/java/cn/skcks/docking/gb28181/Gb28181DockingPlatformApplicationTest.java

@@ -4,7 +4,7 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 
-@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class})
+@SpringBootApplication
 public class Gb28181DockingPlatformApplicationTest {
 	public static void main(String[] args) {
 		SpringApplication.run(Gb28181DockingPlatformApplication.class, args);

zlmediakit-service/pom.xml

@@ -24,6 +24,12 @@
             <version>${project.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>cn.skcks.docking.gb28181</groupId>
+            <artifactId>common</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
@@ -54,11 +60,27 @@
             <artifactId>spring-test</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>cn.skcks.docking.gb28181</groupId>
-            <artifactId>common</artifactId>
-            <version>0.0.1-SNAPSHOT</version>
-            <scope>compile</scope>
-        </dependency>
     </dependencies>
+
+    <build>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <includes>
+                    <include>**/**</include>
+                </includes>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+
+        <testResources>
+            <testResource>
+                <directory>src/test/resources</directory>
+                <includes>
+                    <include>**/**</include>
+                </includes>
+                <filtering>true</filtering>
+            </testResource>
+        </testResources>
+    </build>
 </project>

zlmediakit-service/src/main/java/cn/skcks/docking/gb28181/media/dto/config/ClusterConfig.java

@@ -8,7 +8,6 @@ import lombok.Data;
 @JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)
 public class ClusterConfig {
     private String originUrl;
-
     private String retryCount;
     private String timeoutSec;
 }

zlmediakit-service/src/main/java/cn/skcks/docking/gb28181/media/dto/config/GeneralConfig.java

@@ -1,14 +1,31 @@
 package cn.skcks.docking.gb28181.media.dto.config;
 
-import com.fasterxml.jackson.annotation.JsonAlias;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
 @Data
 public class GeneralConfig {
-    @JsonAlias("check_nvidia_dev")
+    @JsonProperty("check_nvidia_dev")
     private Integer checkNvidiaDev;
+
     private Integer enableVhost;
+
+    @JsonProperty("enable_ffmpeg_log")
+    private Integer enableFfmpegLog;
+
     private Integer flowThreshold;
     private Integer maxStreamWaitMS;
+    private String mediaServerId;
+    private Integer mergeWriteMS;
+    private Integer resetWhenRePlay;
     private Integer streamNoneReaderDelayMS;
+
+    @JsonProperty("unready_frame_cache")
+    private Integer unreadyFrameCache;
+
+    @JsonProperty("wait_add_track_ms")
+    private Integer waitAddTrackMs;
+
+    @JsonProperty("wait_track_ready_ms")
+    private Integer waitTrackReadyMs;
 }

zlmediakit-service/src/main/java/cn/skcks/docking/gb28181/media/dto/config/HlsConfig.java

@@ -4,8 +4,11 @@ import lombok.Data;
 
 @Data
 public class HlsConfig {
+    private Integer broadcastRecordTs;
+    private Integer deleteDelaySec;
     private Integer fileBufSize;
     private String filePath;
     private Integer segDur;
     private Integer segNum;
+    private Integer segRetain;
 }

zlmediakit-service/src/main/java/cn/skcks/docking/gb28181/media/dto/config/ServerConfig.java

@@ -9,6 +9,9 @@ public class ServerConfig {
     @JsonUnwrapped(prefix = "api.")
     private ApiConfig api;
 
+    @JsonUnwrapped(prefix = "cluster.")
+    private ClusterConfig cluster;
+
     @JsonUnwrapped(prefix = "ffmpeg.")
     private FFMpegConfig ffmpeg;
 
@@ -18,6 +21,5 @@ public class ServerConfig {
     @JsonUnwrapped(prefix = "hls.")
     private HlsConfig hls;
 
-    @JsonUnwrapped(prefix = "cluster.")
+
-    private ClusterConfig cluster;
 }

zlmediakit-service/src/main/resources/application.yml

@@ -1,3 +1,6 @@
+project:
+  version: @project.version@
+
 media:
   url: 'http://10.10.10.200:5080'
   id: amrWMKmbKqoBjRQ9