瀏覽代碼

测试修改版

zlSun 3 月之前
父節點
當前提交
19611fdb56

+ 0 - 3
src/main/java/com/dc/datachange/remote/SDRClient.java

@@ -5,13 +5,10 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
-import java.util.List;
 import java.util.Map;
 
 @FeignClient(name="SDR")
 public interface SDRClient {
-    @GetMapping("/api/sdk/send")
-    Map<String, List<Integer>> send();
     @GetMapping("/api/sdk/status")
     Map<String ,Object> status();
     @GetMapping("/api/sdk/initialize")

+ 1 - 1
src/main/java/com/dc/datachange/remote/SDRManager.java

@@ -89,7 +89,7 @@ public class SDRManager {
     }
 
     public R initialize(){
-        Map<String, Object> initialize = SDRClient.status();
+        Map<String, Object> initialize = SDRClient.initialize();
         Map<String,Object> data = (Map<String, Object>) initialize.get("data");
         Integer status = (Integer) data.get("status");
         if(status == 1){

+ 9 - 4
src/main/resources/application.yml

@@ -5,9 +5,14 @@ spring:
   cloud:
     nacos:
       discovery:
-        server-addr: 10.203.149.104:8848
+        server-addr: 10.203.74.57:8848
         namespace: fire
-
+feign:
+  client:
+    config:
+      default:
+        connectTimeout: 50000 # 连接超时时间,单位为毫秒
+        readTimeout: 100000 # 读取超时时间,单位为毫秒
 # 应用服务 WEB 访问端口
 server:
   port: 8081
@@ -24,7 +29,7 @@ dds:
     local: false
     DCPSConfigFile: D:\rocket\OpenDDS-3.16\java\tests\messenger\tcp.ini
     DCPSDefaultDiscovery: DEFAULT_REPO
-    DCPSInfoRepo: corbaloc:iiop:10.195.84.22:12345/DCPSInfoRepo
+    DCPSInfoRepo: corbaloc:iiop:10.195.127.44:12345/DCPSInfoRepo
     isReliable: false
     isWaitForAcks: false
   config:
@@ -41,7 +46,7 @@ dds:
       - "5" #雷达脉冲信息
       - "6" #电子干扰信息
       - "7" #综合情报信息
-#      - "8" #心跳
+      - "8" #心跳
       - "9" #平台参数单条数据
       - "10" #平台参数集合数据
       - "101" #平台参数集合请求