带看链接

src/main/java/com/fdkankan/fusion/httpClient/FdService.java

@@ -8,6 +8,7 @@ import com.fdkankan.fusion.common.util.RedisKeyUtil;
 import com.fdkankan.fusion.entity.TmCamera;
 import com.fdkankan.fusion.exception.BusinessException;
 import com.fdkankan.fusion.httpClient.client.FdKKClient;
+import com.fdkankan.fusion.httpClient.client.TakeLookClient;
 import com.fdkankan.fusion.httpClient.request.FdRoomAddParam;
 import com.fdkankan.fusion.httpClient.request.FdkkCameraParam;
 import com.fdkankan.fusion.httpClient.response.FdRoomVo;
@@ -31,6 +32,8 @@ public class FdService {
     RedisUtil redisUtil;
     @Autowired
     FdKKClient fdKKClient;
+    @Autowired
+    TakeLookClient takeLookClient;
 
     public String getFdToken(String fusionToken){
         String jsObj = redisUtil.get(String.format(RedisKeyUtil.fusionLoginToken, fusionToken));
@@ -91,6 +94,6 @@ public class FdService {
         dateList.add(new Date());
         dateList.add(DateUtil.parse("2099-01-01 00:00:00","yyyy-MM-dd HH:mm:ss"));
         param.setUseTimeList(dateList);
-        return fdKKClient.roomAddOrUpdate(param,getFdToken());
+        return takeLookClient.roomAddOrUpdate(param,getFdToken());
     }
 }

src/main/java/com/fdkankan/fusion/httpClient/address/FdkkTakeLookAddressSource.java

@@ -0,0 +1,20 @@
+package com.fdkankan.fusion.httpClient.address;
+
+import com.dtflys.forest.callback.AddressSource;
+import com.dtflys.forest.http.ForestAddress;
+import com.dtflys.forest.http.ForestRequest;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+@Component
+public class FdkkTakeLookAddressSource implements AddressSource {
+
+    @Value("${4dkk.takeLookService.basePath}")
+    private String basePath;
+
+
+    @Override
+    public ForestAddress getAddress(ForestRequest forestRequest) {
+        return new ForestAddress("","",null,basePath);
+    }
+}

src/main/java/com/fdkankan/fusion/httpClient/client/FdKKClient.java

@@ -101,9 +101,4 @@ public interface FdKKClient {
     @Get("/fd/api/user/scene/getTokenByNum")
     String getFdTokenByNum(@Query("num") String num, @Header("token")  String token);
 
-    /**
-     * 获取相机详情
-     */
-    @Post("/takeLook/roomAddOrUpdate")
-    FdkkResponse<FdRoomAddParam> roomAddOrUpdate(@JSONBody FdRoomAddParam param, @Header("token")  String token);
 }

src/main/java/com/fdkankan/fusion/httpClient/client/TakeLookClient.java

@@ -0,0 +1,20 @@
+package com.fdkankan.fusion.httpClient.client;
+
+import com.dtflys.forest.annotation.Address;
+import com.dtflys.forest.annotation.Header;
+import com.dtflys.forest.annotation.JSONBody;
+import com.dtflys.forest.annotation.Post;
+import com.fdkankan.fusion.httpClient.address.FdkkAddressSource;
+import com.fdkankan.fusion.httpClient.address.FdkkTakeLookAddressSource;
+import com.fdkankan.fusion.httpClient.request.FdRoomAddParam;
+import com.fdkankan.fusion.httpClient.response.FdkkResponse;
+
+@Address(source = FdkkTakeLookAddressSource.class)
+public interface TakeLookClient {
+
+    /**
+     * 获取相机详情
+     */
+    @Post("/takeLook/roomAddOrUpdate")
+    FdkkResponse<FdRoomAddParam> roomAddOrUpdate(@JSONBody FdRoomAddParam param, @Header("token")  String token);
+}

src/main/resources/application-prod.yaml

@@ -49,4 +49,7 @@ spring:
   overallService:
     #全景看看生产环境 host: https://www.4dkankan.com/qjkankan
     basePath: http://test.4dkankan.com/qjkankan
+    port: 80
+  takeLookService:
+    basePath: https://www.4dkankan.com
     port: 80

src/main/resources/application-test.yaml

@@ -50,4 +50,6 @@ spring:
   overallService:
     #全景看看生产环境 host: https://www.4dkankan.com/qjkankan
     basePath: http://test.4dkankan.com/qjkankan
+  takeLookService:
+    basePath: https://v4-test.4dkankan.com
     port: 80