去掉使用ip2region库；关闭文件没有关闭的流

Author: fengwenyi

README.md

@@ -42,22 +42,22 @@ JavaLib，是一个Java开发基础工具类库，对项目开发中常用的工
 第一步，添加远程仓库：
 
 ```xml
-    <repositories>
-        <repository>
-            <id>jitpack.io</id>
-            <url>https://jitpack.io</url>
-        </repository>
-    </repositories>
+<repositories>
+    <repository>
+        <id>jitpack.io</id>
+        <url>https://jitpack.io</url>
+    </repository>
+</repositories>
 ```
 
 第二步，添加依赖：
 
 ```xml
-	<dependency>
-	    <groupId>com.github.iutil</groupId>
-	    <artifactId>JavaLib</artifactId>
-	    <version>1.0.1</version>
-	</dependency>
+<dependency>
+    <groupId>com.github.iutil</groupId>
+    <artifactId>JavaLib</artifactId>
+    <version>1.0.2</version>
+</dependency>
 ```
 
 ## Wiki

bak/文件读写.md

@@ -0,0 +1,21 @@
+```java
+/**
+ * 根据文件路径读取文件内容
+ * [仅做参考]
+ * @param path 文件路径
+ * @return 文件内容
+ * @throws IOException 读取失败
+ */
+private String read(String path) throws IOException {
+    StringBuffer sb = new StringBuffer();
+    String tempStr;
+    File file = new File(path);
+    // 如果文件不存在，读取失败
+    if (!file.exists()) throw new FileNotFoundException();
+    FileInputStream fis = new FileInputStream(file);
+    BufferedReader br = new BufferedReader(new InputStreamReader(fis));
+    while ((tempStr = br.readLine()) != null) sb.append(tempStr);
+    br.close();
+    return sb.toString();
+}
+```

doc/DOC-V1.0.2.md

@@ -68,6 +68,8 @@
 
 `Instant parseDate(String source)`: 日期字符串转化为Instant
 
+`Instant parseDateTime(String source, String format)`: 将 时间字符串 转为 Instant
+
 ## 进制转换工具类(HexUtils)
 
 `String _2_16(byte[] bytes)`: 二进制转十六进制

pom.xml

@@ -89,11 +89,11 @@
         </dependency>
 
         <!-- ip地址 -->
-        <dependency>
+        <!--<dependency>
             <groupId>org.lionsoul</groupId>
             <artifactId>ip2region</artifactId>
             <version>1.7.2</version>
-        </dependency>
+        </dependency>-->
     </dependencies>
 
     <parent>

src/main/java/net/iutil/javalib/util/DateTimeUtils.java

@@ -579,4 +579,16 @@ public static Instant parseDate(String source) {
         return date.atStartOfDay(ZoneId.systemDefault()).toInstant();
     }
 
+    /**
+     * 将 时间字符串 转为 Instant
+     * @param source 时间字符串
+     * @param format 格式
+     * @return Instant
+     */
+    public static Instant parseDateTime(String source, String format) {
+        DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern(format);
+        LocalDateTime dateTime = LocalDateTime.parse(source, dateTimeFormatter);
+        return dateTime.atZone(ZoneOffset.systemDefault()).toInstant();
+    }
+
 }

src/main/java/net/iutil/javalib/util/FileUtils.java

@@ -28,23 +28,4 @@ public static void write(String path, String str, boolean isNewMode) throws IOEx
         out.close();
     }
 
-    /**
-     * 根据文件路径读取文件内容
-     * [仅做参考]
-     * @param path 文件路径
-     * @return 文件内容
-     * @throws IOException 读取失败
-     */
-    private String read(String path) throws IOException {
-        StringBuffer sb = new StringBuffer();
-        String tempStr;
-        File file = new File(path);
-        // 如果文件不存在，读取失败
-        if (!file.exists()) throw new FileNotFoundException();
-        FileInputStream fis = new FileInputStream(file);
-        BufferedReader br = new BufferedReader(new InputStreamReader(fis));
-        while ((tempStr = br.readLine()) != null) sb.append(tempStr);
-        return sb.toString();
-    }
-
 }

src/main/java/net/iutil/javalib/util/IpUtils.java

@@ -7,13 +7,10 @@
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.Response;
-import org.lionsoul.ip2region.*;
 
-import java.io.File;
-import java.io.FileNotFoundException;
 import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
+
+//import org.lionsoul.ip2region.*;
 
 /**
  * @author Wenyi Feng
@@ -89,7 +86,7 @@ private static String getIpInfoByIp(String url) throws IOException {
     }
 
     // 有问题  还在测试
-    public static String getCityInfo(int algorithm, String ip) throws
+    /*public static String getCityInfo(int algorithm, String ip) throws
             DbMakerConfigException,
             FileNotFoundException,
             NoSuchMethodException,
@@ -117,6 +114,6 @@ public static String getCityInfo(int algorithm, String ip) throws
             }
             DataBlock dataBlock = (DataBlock) method.invoke(searcher, ip);
             return dataBlock.getRegion();
-    }
+    }*/
 
 }

src/main/java/net/iutil/javalib/util/RequestUtils.java

@@ -86,6 +86,7 @@ public static String getPostData(HttpServletRequest request) throws IOException
             sb.append(line);
         }
         //return URLDecoder.decode(sb.toString(), Constant.DEFAULT_CHATSET);
+        br.close();
         return sb.toString();
     }
 }

src/main/resources/ip2region.db

@@ -19,4 +19,18 @@ public void instantFormat() {
         PrintUtils.info(format);
     }
 
+    @Test
+    public void date2Instant() {
+        String date = "2019-07-09";
+        Instant instant = DateTimeUtils.parseDate(date);
+        PrintUtils.info(instant);
+    }
+
+    @Test
+    public void dateTime2Instant() {
+        String dateTime = "2019-07-09 18:00:00";
+        Instant instant = DateTimeUtils.parseDateTime(dateTime, "yyyy-MM-dd HH:mm:ss");
+        PrintUtils.info(instant);
+    }
+
 }