Merge branch 'develop' of gitadmin/tuoheng_lc into release

tuoheng-admin/src/main/java/com/tuoheng/admin/service/mission/query/QueryEmergencyListService.java

@@ -91,7 +91,7 @@ public class QueryEmergencyListService {
         for (ThMission mission : missionList) {
             airportIds += mission.getAirportId() + ",";
         }
-        airportIds.substring(0, airportIds.length() - 1);
+        airportIds = airportIds.substring(0, airportIds.length() - 1);
 
         String url = CommonConfig.airportURL + SystemConstant.API_AIRPORT_STATUS_BY_AIRPORT_ID;
         JSONObject jsonObject = new JSONObject();

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

@@ -13,7 +13,7 @@ tuoheng:
   # OSS域名
   oss-url: https://ta-tech-image.oss-cn-shanghai.aliyuncs.com
   # 机场域名
-  airport-url: http://192.168.11.22:9060/
+  airport-url: http://192.168.11.22:9060
   # 视频域名
   video-url: https://vod.play.t-aaron.com/
   # 高德Key

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

@@ -13,7 +13,7 @@ tuoheng:
   # OSS域名
   oss-url: https://ta-tech-image.oss-cn-shanghai.aliyuncs.com
   # 机场域名
-  airport-url: http://192.168.11.22:9060/
+  airport-url: http://192.168.11.22:9060
   # 视频域名
   video-url: http://vod.play.t-aaron.com/
   # 高德Key

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

@@ -13,7 +13,7 @@ tuoheng:
   # OSS域名
   oss-url: https://ta-tech-image.oss-cn-shanghai.aliyuncs.com
   # 机场域名
-  airport-url: https://airport.t-aaron.com/
+  airport-url: https://airport.t-aaron.com
   # 视频域名
   video-url: https://vod.play.t-aaron.com/
   # 高德Key

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

@@ -13,7 +13,7 @@ tuoheng:
   # OSS域名
   oss-url: https://ta-tech-image.oss-cn-shanghai.aliyuncs.com
   # 机场域名
-  airport-url: https://airport-test.t-aaron.com/
+  airport-url: https://airport-test.t-aaron.com
   # 视频域名
   video-url: https://vod.play.t-aaron.com/
   # 高德Key