diff --git a/gb28181-service/pom.xml b/gb28181-service/pom.xml index 252a47c..a244781 100644 --- a/gb28181-service/pom.xml +++ b/gb28181-service/pom.xml @@ -19,6 +19,12 @@ + + cn.skcks.docking + zlmediakit-service + ${project.version} + + cn.skcks.docking.gb28181 orm diff --git a/starter/src/main/java/cn/skcks/docking/gb28181/Gb28181DockingPlatformApplication.java b/starter/src/main/java/cn/skcks/docking/gb28181/Gb28181DockingPlatformApplication.java index 09e7d15..dbc4509 100644 --- a/starter/src/main/java/cn/skcks/docking/gb28181/Gb28181DockingPlatformApplication.java +++ b/starter/src/main/java/cn/skcks/docking/gb28181/Gb28181DockingPlatformApplication.java @@ -2,7 +2,9 @@ package cn.skcks.docking.gb28181; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.openfeign.EnableFeignClients; +@EnableFeignClients @SpringBootApplication public class Gb28181DockingPlatformApplication { diff --git a/starter/src/test/java/cn/skcks/docking/gb28181/Gb28181DockingPlatformApplicationTest.java b/starter/src/test/java/cn/skcks/docking/gb28181/Gb28181DockingPlatformApplicationTest.java index a3cc818..7f25d3a 100644 --- a/starter/src/test/java/cn/skcks/docking/gb28181/Gb28181DockingPlatformApplicationTest.java +++ b/starter/src/test/java/cn/skcks/docking/gb28181/Gb28181DockingPlatformApplicationTest.java @@ -2,7 +2,6 @@ package cn.skcks.docking.gb28181; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; @SpringBootApplication public class Gb28181DockingPlatformApplicationTest { diff --git a/zlmediakit-service/src/main/java/cn/skcks/docking/gb28181/media/proxy/ZlmMediaHttpClient.java b/zlmediakit-service/src/main/java/cn/skcks/docking/gb28181/media/proxy/ZlmMediaHttpClient.java index 540d2d0..4ee1e44 100644 --- a/zlmediakit-service/src/main/java/cn/skcks/docking/gb28181/media/proxy/ZlmMediaHttpClient.java +++ b/zlmediakit-service/src/main/java/cn/skcks/docking/gb28181/media/proxy/ZlmMediaHttpClient.java @@ -14,12 +14,10 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.service.annotation.HttpExchange; import java.util.List; -@FeignClient(name="zlmMediaServerProxy",url = "${media.url}") -@HttpExchange +@FeignClient(name="zlmMediaServerProxy", url = "${media.url}") public interface ZlmMediaHttpClient { @GetMapping("/index/api/getApiList") ZlmResponse> getApiList(@RequestParam String secret);