Merge branch 'develop' of gitadmin/tuoheng_freeway into release

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/constant/SystemConstant.java

@@ -22,37 +22,42 @@ public interface SystemConstant {
     /**
      * 机场平台：获取机场列表接口
      */
-   String API_AIRPORT_LIST = "/api/airportInterface/airportList";
+   String API_AIRPORT_LIST = "/airportInterface/airportList";
 
     /**
      * 机场平台：获取机场路线列表接口
      */
-   String API_AIRPORT_LINE_LIST = "/api/airportInterface/taskByDroneId";
+   String API_AIRPORT_LINE_LIST = "/airportInterface/taskByDroneId";
 
     /**
      * 机场平台：执行接口
      */
-    String API_AIRPORT_EXECUTE_TASK = "/api/airportInterface/executeTaskAnsy";
+    String API_AIRPORT_EXECUTE_TASK = "/airportInterface/executeTaskAnsy";
 
     /**
      * 机场平台：定点飞行
      */
-    String API_AIRPORT_POINT_FLIGH = "/api/airportInterface/createPointLine";
+    String API_AIRPORT_POINT_FLIGH = "/airportInterface/createPointLine";
 
     /**
      * 机场平台：获取天气
      */
-    String API_AIRPORT_GET_WEATHER = "/api/airportInterface/getWeather";
+    String API_AIRPORT_GET_WEATHER = "/airportInterface/getWeather";
 
     /**
      * 机场平台：控制无人机
      */
-    String API_AIRPORT_DRONE_CONTROL = "/api/airportInterface/droneCommand";
+    String API_AIRPORT_DRONE_CONTROL = "/airportInterface/droneCommand";
 
     /**
      * 机场平台：获取机场状态
      */
-    String API_AIRPORT_STATUS_BY_AIRPORT_ID = "/api/airportInterface/getAirportStatusByAirportId";
+    String API_AIRPORT_STATUS = "/airportInterface/getAirportStatus";
+
+    /**
+     * 机场平台：获取机场状态
+     */
+    String API_AIRPORT_STATUS_BY_AIRPORT_ID = "/airportInterface/getAirportStatusByAirportId";
 
     // 飞手平台不同接口url
     /**

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/index/IndexServiceImpl.java

@@ -3,6 +3,7 @@ package com.tuoheng.admin.service.index;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.google.gson.JsonObject;
+import com.tuoheng.admin.constant.SystemConstant;
 import com.tuoheng.admin.vo.AirportMsgVo;
 import com.tuoheng.common.core.config.common.CommonConfig;
 import com.tuoheng.common.core.utils.HttpUtils;
@@ -25,7 +26,7 @@ public class IndexServiceImpl implements IndexService{
 
     @Override
     public JsonResult getAirportMsg(Integer airportId) {
-        String url = CommonConfig.airportURL + "/api/airportInterface/getAirportStatus";
+        String url = CommonConfig.airportURL + SystemConstant.API_AIRPORT_STATUS;
         String param = "airportId=" + airportId;
         String result = HttpUtils.sendGet(url, param);
         JsonResult jsonResult = JacksonUtil.json2pojo(result, JsonResult.class);

tuoheng-service/tuoheng-admin/src/main/resources/application-prod.yml

@@ -145,7 +145,7 @@ tuoheng:
   #飞手平台地址
   pilot-url: https://pilot.t-aaron.com/pilot/web/
   #airport配置地址
-  airport-url: https://airport.t-aaron.com/api
+  airport-url: https://airport.t-aaron.com/airport/admin
   # 文件配置
   uploads:
     #上传的服务器上的映射文件夹

tuoheng-service/tuoheng-miniprogram/src/main/java/com/tuoheng/miniprogram/service/impl/AirportServiceImpl.java

@@ -20,8 +20,8 @@ import java.util.Objects;
 @Service
 public class AirportServiceImpl implements AirportService {
 
-    private final static String API_AIRPORT_LIST = "/api/airportInterface/airportList";
-    private final static String API_AIRPORT_LINE_LIST = "/api/airportInterface/taskByDroneId";
+    private final static String API_AIRPORT_LIST = "/airportInterface/airportList";
+    private final static String API_AIRPORT_LINE_LIST = "/airportInterface/taskByDroneId";
 
     @Autowired
     private TenantMapper tenantMapper;

tuoheng-service/tuoheng-miniprogram/src/main/resources/application-prod.yml

@@ -80,7 +80,7 @@ tuoheng:
   #飞手平台地址
   pilot-url: http://192.168.11.11:7011/pilot/web/
   #airport配置地址
-  airport-url: https://airport.t-aaron.com
+  airport-url: https://airport.t-aaron.com/airport/admin
   # 文件配置
   uploads:
     #上传的服务器上的映射文件夹

tuoheng-service/tuoheng-miniprogram/src/main/resources/application-test.yml

@@ -80,7 +80,7 @@ tuoheng:
   #飞手平台地址
   pilot-url: http://192.168.11.11:7011/pilot/web/
   #airport配置地址
-  airport-url: https://airport-test.t-aaron.com
+  airport-url: https://airport-test.t-aaron.com/airport/admin
   # 文件配置
   uploads:
     #上传的服务器上的映射文件夹