dsx 2 years ago
parent
commit
18b8491792

+ 6 - 0
pom.xml

@@ -61,6 +61,12 @@
             </exclusions>
         </dependency>
 
+        <dependency>
+            <groupId>org.lionsoul</groupId>
+            <artifactId>ip2region</artifactId>
+            <version>2.6.5</version>
+        </dependency>
+
     </dependencies>
 
     <build>

+ 1 - 0
src/main/java/com/fdkankan/tracking/bean/TrackingBody.java

@@ -32,4 +32,5 @@ public class TrackingBody {
     private String endTime;
     private String language;
     private String type;
+    private String num;
 }

+ 9 - 0
src/main/java/com/fdkankan/tracking/controller/TrackingController.java

@@ -1,5 +1,6 @@
 package com.fdkankan.tracking.controller;
 
+import com.alibaba.fastjson.JSON;
 import com.fdkankan.tracking.service.TrackingService;
 import com.fdkankan.tracking.vo.TrackingParamVo;
 import com.fdkankan.web.controller.BaseController;
@@ -11,6 +12,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.util.Map;
 
 @RestController
 @RequestMapping("/log")
@@ -54,4 +57,10 @@ public class TrackingController extends BaseController {
 //        return ResultData.ok();
 //    }
 
+    @PostMapping("/saveBeacon")
+    public ResultData saveBeacon(@RequestBody String params) throws IOException {
+        TrackingParamVo param = JSON.parseObject(params, TrackingParamVo.class);
+        return trackingService.saveLog(param, request);
+    }
+
 }

+ 10 - 2
src/main/java/com/fdkankan/tracking/utils/IpUtils.java

@@ -1,10 +1,12 @@
 package com.fdkankan.tracking.utils;
 
 import com.alibaba.fastjson.JSONObject;
+import org.lionsoul.ip2region.xdb.Searcher;
 import org.springframework.http.*;
 import org.springframework.web.client.RestTemplate;
 
 import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
 
 public class IpUtils {
 
@@ -48,8 +50,14 @@ public class IpUtils {
         return ip;
     }
 
-    public static void main(String[] args) {
-        getUserAddress(null);
+    public static void main(String[] args) throws Exception {
+
+        String dbPath = "D:\\tools\\ip2region-master\\data\\ip2region.xdb";
+        byte[] vIndex = Searcher.loadVectorIndexFromFile(dbPath);
+        Searcher searcher = Searcher.newWithVectorIndex(dbPath, vIndex);
+        System.out.println(searcher.search("221.4.210.172"));
+
+
     }
 
     public static String getUserAddress(String ip) {

+ 2 - 2
src/main/resources/bootstrap-test.yml

@@ -24,8 +24,8 @@ spring:
             group: DEFAULT_GROUP
             refresh: true
       discovery:
-        namespace: ${spring.cloud.nacos.namespace}
-
+#        namespace: ${spring.cloud.nacos.namespace}
+        namespace: public