Merge branch 'Dev' into 'Test'

Dev

See merge request crowd-2019/crowd-test-service-backend!74

core/pom.xml

@@ -35,11 +35,11 @@
             <version>1.6.4</version>
         </dependency>
         <!--定位-->
-        <dependency>
-            <groupId>com.maxmind.geoip</groupId>
-            <artifactId>geoip-api</artifactId>
-            <version>1.3.1</version>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.maxmind.geoip</groupId>-->
+<!--            <artifactId>geoip-api</artifactId>-->
+<!--            <version>1.3.1</version>-->
+<!--        </dependency>-->
 
         <dependency>
             <groupId>org.jsoup</groupId>