lyhzzz 2 år sedan
förälder
incheckning
ef81c7cfc8

+ 5 - 5
src/main/java/com/fdkankan/site/controller/TestController.java

@@ -9,6 +9,8 @@ import com.fdkankan.site.httpClient.bim.BimCallBackDTO;
 import com.fdkankan.site.httpClient.bim.BimFaceVO;
 import com.fdkankan.site.httpClient.client.BimClient;
 import com.fdkankan.site.httpClient.bim.BimUploadParam;
+import com.fdkankan.site.httpClient.client.FdKKClient;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -17,6 +19,9 @@ import javax.annotation.Resource;
 @RequestMapping("/test")
 public class TestController extends BaseController {
 
+    @Resource
+    FdKKClient fdKKClient;
+
 
     @PostMapping("/test")
     public ResultData test(){
@@ -26,9 +31,4 @@ public class TestController extends BaseController {
                 + request.getRequestURI();
         return ResultData.ok(url);
     }
-    @PostMapping("/test1")
-    public ResultData test1(@RequestBody BimCallBackDTO param){
-        System.out.println("----------------------bimcallBack-------------------------------");
-        return ResultData.ok();
-    }
 }

+ 1 - 1
src/main/java/com/fdkankan/site/httpClient/address/BimAddressSource.java

@@ -17,6 +17,6 @@ public class BimAddressSource implements AddressSource {
 
     @Override
     public ForestAddress getAddress(ForestRequest forestRequest) {
-        return new ForestAddress("","",Integer.valueOf(port),basePath);
+        return new ForestAddress("","",null,basePath);
     }
 }

+ 1 - 1
src/main/java/com/fdkankan/site/httpClient/address/FdkkAddressSource.java

@@ -17,6 +17,6 @@ public class FdkkAddressSource implements AddressSource {
 
     @Override
     public ForestAddress getAddress(ForestRequest forestRequest) {
-        return new ForestAddress("","",Integer.valueOf(port),basePath);
+        return new ForestAddress("","",null,basePath);
     }
 }

+ 1 - 1
src/main/java/com/fdkankan/site/httpClient/address/LaserAddressSource.java

@@ -17,6 +17,6 @@ public class LaserAddressSource implements AddressSource {
 
     @Override
     public ForestAddress getAddress(ForestRequest forestRequest) {
-        return new ForestAddress("","",Integer.valueOf(port),basePath);
+        return new ForestAddress("","",null,basePath);
     }
 }

+ 1 - 4
src/main/resources/application-local.yaml

@@ -31,15 +31,12 @@ spring:
 4dkk:
   fdService:
     #官网生产环境:https://www.4dkankan.com      http://test.4dkankan.com
-    basePath: http://test.4dkankan.com
-    port: 80
+    basePath: https://test.4dkankan.com
     #basePath: http://192.168.0.38/4dkankan_v2
     #port: 8080
   laserService:
     #深时(激光)地址 生产环境:https://laser.4dkankan.com/
     basePath: http://uat-laser.4dkankan.com
-    port: 80
   bimService:
     #bim 服务
     basePath: http://uat-bim.4dkankan.com
-    port: 80

+ 0 - 4
src/main/resources/application-prod.yaml

@@ -32,14 +32,10 @@ spring:
   fdService:
     #官网生产环境:https://www.4dkankan.com      http://test.4dkankan.com
     basePath: http://www.4dkankan.com
-    port: 80
     #basePath: http://192.168.0.38/4dkankan_v2
-    #port: 8080
   laserService:
     #深时(激光)地址 生产环境:https://laser.4dkankan.com/
     basePath: http://laser.4dkankan.com/backend
-    port: 80
   bimService:
     #bim 服务
     basePath: http://bim.4dkankan.com
-    port: 80