Merge branch 'v34.0-weilan-20241108' into test_jdk17

clx-performance-web/src/main/java/com/clx/performance/service/impl/OrderChildServiceImpl.java

@@ -3390,7 +3390,12 @@ public class OrderChildServiceImpl implements OrderChildService {
         if (longitude == null || latitude == null) {
             return new OrderChildLoadRangeCheckResultVO(OrderChildEnum.NeedAlertEnum.FAIL.getCode(), TRUCK_LOCATION_ERROR.getCode(), TRUCK_LOCATION_ERROR.getMsg());
         }
-        Integer distance = gdService.getShortestRouteDistance(longitude, latitude, sendLongitude, sendLatitude);
+        Integer distance = null;
+        try {
+            distance = gdService.getShortestRouteDistance(longitude, latitude, sendLongitude, sendLatitude);
+        } catch (Exception e) {
+            return new OrderChildLoadRangeCheckResultVO(OrderChildEnum.NeedAlertEnum.FAIL.getCode(), TRUCK_LOCATION_ERROR.getCode(), TRUCK_LOCATION_ERROR.getMsg());
+        }
         if (distance != null) {
             log.info("truckNo:{} 高德计算距离:{} curr:{},{}, 货源地:{},{}", orderChild.getTruckNo(), distance, longitude, latitude, sendLongitude, sendLatitude);
             if (distance > config.allowUploadDistanceMeter()) {

clx-performance-web/src/main/java/com/nbopen/api/NBOpenSDK.java

@@ -347,26 +347,6 @@ public final class NBOpenSDK {
         }
     }
 
-    private static void deleteFile(File file) {
-        if (file.exists()) {
-            if (file.isFile()) {
-                file.delete();
-            } else {
-                File[] listFiles = file.listFiles();
-                File[] var2 = listFiles;
-                int var3 = listFiles.length;
-
-                for(int var4 = 0; var4 < var3; ++var4) {
-                    File f = var2[var4];
-                    deleteFile(f);
-                }
-            }
-
-            file.delete();
-        }
-
-    }
-
     private static void printMsg(String data) {
         String debuged = System.getProperty("nbsdk.sys.debug", "false");
         if (Boolean.parseBoolean(debuged)) {