去除导致日志冲突的依赖以及相关方法

pom.xml

@@ -143,12 +143,6 @@
             <version>20230227</version>
         </dependency>
 
-        <dependency>
-            <groupId>co.ipdata.client</groupId>
-            <artifactId>ipdata-java-client</artifactId>
-            <version>0.2.0</version>
-        </dependency>
-
         <dependency>
             <groupId>org.gavaghan</groupId>
             <artifactId>geodesy</artifactId>

src/main/java/com/welampiot/controller/DataController.java

@@ -9,7 +9,6 @@ import com.welampiot.utils.ToolUtils;
 import com.welampiot.utils.WeatherUtil;
 import com.welampiot.utils.WebUtils;
 import com.welampiot.vo.*;
-import io.ipdata.client.model.IpdataModel;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.CrossOrigin;
@@ -692,9 +691,9 @@ public class DataController {
                 latitude = dto.getLatitude();
             }
         } else {
-            IpdataModel ipDataModel = ToolUtils.getIpDataModel(ToolUtils.getPublicIp());
-            latitude = ipDataModel.latitude();
-            longitude = ipDataModel.longitude();
+//            IpdataModel ipDataModel = ToolUtils.getIpDataModel(ToolUtils.getPublicIp());
+//            latitude = ipDataModel.latitude();
+//            longitude = ipDataModel.longitude();
         }
 
         WeatherDTO weatherInfo = WeatherUtil.getTodayWeatherInfo(String.valueOf(longitude), String.valueOf(latitude));

src/main/java/com/welampiot/utils/ToolUtils.java

@@ -17,11 +17,6 @@ import com.welampiot.vo.DevEnumVO;
 import com.welampiot.vo.EventVO;
 import com.welampiot.vo.InductionConfigVO;
 import com.welampiot.vo.PanelConfigVO;
-//import io.ipdata.client.Ipdata;
-//import io.ipdata.client.error.IpdataException;
-//import io.ipdata.client.model.IpdataModel;
-//import io.ipdata.client.service.IpdataService;
-//import io.ipdata.client.service.IpdataService;
 import org.apache.commons.httpclient.HttpClient;
 import org.apache.commons.httpclient.methods.PostMethod;
 import org.eclipse.paho.client.mqttv3.MqttClient;
@@ -49,7 +44,6 @@ import java.text.DecimalFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
-import java.util.concurrent.TimeUnit;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import java.util.zip.CRC32;
@@ -2260,21 +2254,21 @@ System.out.println(res);
     /**
      * 获取IP数据
      */
-    public static IpdataModel getIpDataModel(String ipAddress) {
-        try {
-            URL url = new URL("https://api.ipdata.co");
-            IpdataService ipdataService = Ipdata.builder().url( url)
-                    .withCache()
-                    .timeout(30, TimeUnit.MINUTES)
-                    .maxSize(8 * 1024)
-                    .registerCacheConfig()
-                    .key("ca96d4ab11053ad63f4a7dbcf7cb8751394a0772abafdaa5d509ac55")
-                    .get();
-            return ipdataService.ipdata(ipAddress);
-        } catch (MalformedURLException | IpdataException e) {
-            throw new RuntimeException(e);
-        }
-    }
+//    public static IpdataModel getIpDataModel(String ipAddress) {
+//        try {
+//            URL url = new URL("https://api.ipdata.co");
+//            IpdataService ipdataService = Ipdata.builder().url( url)
+//                    .withCache()
+//                    .timeout(30, TimeUnit.MINUTES)
+//                    .maxSize(8 * 1024)
+//                    .registerCacheConfig()
+//                    .key("ca96d4ab11053ad63f4a7dbcf7cb8751394a0772abafdaa5d509ac55")
+//                    .get();
+//            return ipdataService.ipdata(ipAddress);
+//        } catch (MalformedURLException | IpdataException e) {
+//            throw new RuntimeException(e);
+//        }
+//    }
 
     /**
      * 获取公网IP