Merge branch 'develop' of gitadmin/tuoheng_telecomumale into release

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

@@ -27,37 +27,37 @@ 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_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_POINT_FLIGH = "/api/airportInterface/createPointLine";
+    String API_AIRPORT_POINT_FLIGH = "/airportInterface/createPointLine";
 
     /**
      * 机场平台：获取天气温湿度及挂载状态
      */
-    String API_AIRPORT_GET_WEATHER_STATUS = "/api/airportInterface/getAirportStatus";
+    String API_AIRPORT_GET_WEATHER_STATUS = "/airportInterface/getAirportStatus";
 
     // 飞手平台不同接口url
     /**
@@ -68,11 +68,11 @@ public interface SystemConstant {
     /**
      * 机场平台：获取机场状态
      */
-    String API_AIRPORT_STATUS_BY_AIRPORT_ID = "/api/airportInterface/getAirportStatusByAirportId";
+    String API_AIRPORT_STATUS_BY_AIRPORT_ID = "/airportInterface/getAirportStatusByAirportId";
 
     /**
      * 机场平台：获取航点文件坐标
      */
-    String API_AIRPORT_LOCATION = "/api/airportInterface/getLocationById";
+    String API_AIRPORT_LOCATION = "/airportInterface/getLocationById";
 
 }

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

@@ -157,7 +157,7 @@ tuoheng:
   #飞手平台地址
   pilot-url: http://192.168.11.11:7011/pilot/web/
   #airport配置地址
-  airport-url: http://192.168.11.22:9060
+  airport-url: http://192.168.11.22:9060/airport/admin
   #小程序配置地址
   wechat-url: http://192.168.11.11:9151
   # 文件配置

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

@@ -169,7 +169,7 @@ tuoheng:
   #飞手平台地址
   pilot-url: http://192.168.11.241:7011/pilot/web/
   #airport配置地址
-  airport-url: http://192.168.11.22:9060
+  airport-url: http://192.168.11.22:9060/airport/admin
   #小程序配置地址
   wechat-url: http://192.168.11.11:9151
   # 文件配置

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

@@ -158,7 +158,7 @@ tuoheng:
   #飞手平台地址
   pilot-url: https://pilot.t-aaron.com/pilot/web/
   #airport配置地址
-  airport-url: https://airport.t-aaron.com
+  airport-url: https://airport.t-aaron.com/api
   #小程序配置地址
   wechat-url: https://telecomumale-miniprogram.t-aaron.com
   # 文件配置

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

@@ -158,7 +158,7 @@ tuoheng:
   #飞手平台地址
   pilot-url: http://172.15.1.11:7011/pilot/web/
   #airport配置地址
-  airport-url: https://airport-test.t-aaron.com
+  airport-url: https://airport-test.t-aaron.com/airport/admin
   #小程序配置地址
   wechat-url: https://telecomumale-miniprogram-test.t-aaron.com
   # 文件配置