Merge remote-tracking branch 'origin/master'

4dkankan-utils-rubber-sheeting/pom.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>4dkankan-utils</artifactId>
+        <groupId>com.fdkankan</groupId>
+        <version>2.0.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>4dkankan-utils-rubber-sheeting</artifactId>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.fdkankan</groupId>
+            <artifactId>4dkankan-common-utils</artifactId>
+            <version>2.0.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+
+</project>

4dkankan-common-utils/src/main/java/com/fdkankan/common/util/RubberSheetingUtil.java

@@ -1,5 +1,6 @@
-package com.fdkankan.common.util;
+package com.fdkankan.rubbersheeting;
 
+import com.fdkankan.common.util.OkHttpUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;

pom.xml

@@ -15,6 +15,7 @@
         <module>4dkankan-utils-mongodb</module>
         <module>4dkankan-utils-email</module>
         <module>4dkankan-utils-rabbitmq</module>
+        <module>4dkankan-utils-rubber-sheeting</module>
     </modules>
 
     <groupId>com.fdkankan</groupId>