Merge branch 'feature-ip2region'

2020-09-04 12:29:18 +08:00
parent baf5b1bbb7 38621bcfa4
commit 3c69baa4ad
6 changed files with 124 additions and 57 deletions
--- a/pom.xml
+++ b/pom.xml
@@ -180,19 +180,16 @@
            <artifactId>jaxb-api</artifactId>
            <version>2.3.0</version>
        </dependency>
-
        <dependency>
            <groupId>com.sun.xml.bind</groupId>
            <artifactId>jaxb-impl</artifactId>
            <version>2.3.0</version>
        </dependency>
-
        <dependency>
            <groupId>com.sun.xml.bind</groupId>
            <artifactId>jaxb-core</artifactId>
            <version>2.3.0</version>
        </dependency>
-
        <dependency>
            <groupId>javax.activation</groupId>
            <artifactId>activation</artifactId>
@@ -200,6 +197,12 @@
        </dependency>


+        <dependency>
+            <groupId>org.lionsoul</groupId>
+            <artifactId>ip2region</artifactId>
+            <version>1.7.2</version>
+        </dependency>
+
    </dependencies>

    <build>