Merge branch '2.0.x'

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2017 Erwin Feng
+Copyright (c) 2020 Erwin Feng
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.fengwenyi</groupId>
     <artifactId>JavaLib</artifactId>
-    <version>2.0.3.RELEASE</version>
+    <version>2.0.4.RELEASE</version>
     <packaging>jar</packaging>
     <name>JavaLib</name>
     <description>JAVA开发常用工具集</description>
@@ -55,13 +55,6 @@
             <scope>provided</scope>
         </dependency>
 
-        <!-- 用于JSON的封装和解析 -->
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>fastjson</artifactId>
-            <version>${fastjson.version}</version>
-        </dependency>
-
         <!-- 默认的jackson支持 -->
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
@@ -70,14 +63,6 @@
             <scope>provided</scope>
         </dependency>
 
-        <!-- 网络请求支持 -->
-        <dependency>
-            <groupId>com.squareup.okhttp3</groupId>
-            <artifactId>okhttp</artifactId>
-            <version>${okhttp.version}</version>
-            <!-- <scope>provided</scope> -->
-        </dependency>
-
         <!-- 图片压缩 Google -->
         <dependency>
             <groupId>net.coobird</groupId>

src/main/java/com/fengwenyi/javalib/constant/Charset.java → src/main/java/com/fengwenyi/javalib/constant/CharsetConstant.java

@@ -5,7 +5,7 @@
  * @author Wenyi Feng
  * @since 2018-10-28
  */
-public class Charset {
+public class CharsetConstant {
 
     /**
      * UTF-8

src/main/java/com/fengwenyi/javalib/constant/EncryptionType.java → src/main/java/com/fengwenyi/javalib/constant/EncryptionTypeConstant.java

@@ -5,7 +5,7 @@
  * @author Wenyi Feng
  * @since 2018-10-16
  */
-public class EncryptionType {
+public class EncryptionTypeConstant {
 
     /**
      * md5

src/main/java/com/fengwenyi/javalib/constant/HttpHeaderKeyConstant.java

@@ -0,0 +1,13 @@
+package com.fengwenyi.javalib.constant;
+
+/**
+ * Http header key
+ * @author Erwin Feng
+ * @since 2020/5/11 12:11 上午
+ */
+public class HttpHeaderKeyConstant {
+
+    /** Content-Type */
+    public static final String KEY_CONTENT_TYPE = "Content-Type";
+
+}

src/main/java/com/fengwenyi/javalib/constant/LogLevel.java → src/main/java/com/fengwenyi/javalib/constant/LogLevelConstant.java

@@ -18,7 +18,7 @@
  * @author Erwin Feng
  * @since 2019-03-14 10:58
  */
-public class LogLevel {
+public class LogLevelConstant {
 
     /** 各级包括自定义级别 */
     public static final String ALL = "ALL";

src/main/java/com/fengwenyi/javalib/constant/MediaTypeConstant.java

@@ -0,0 +1,16 @@
+package com.fengwenyi.javalib.constant;
+
+/**
+ * Http Media Type
+ * @author Erwin Feng
+ * @since 2020/5/11 12:08 上午
+ */
+public class MediaTypeConstant {
+
+    /** application/json */
+    public static final String APPLICATION_JSON_VALUE = "application/json";
+
+    /** application/...form... */
+    public static final String APPLICATION_FORM_VALUE = "application/x-www-form-urlencoded;";
+
+}

src/main/java/com/fengwenyi/javalib/constant/RequestMethod.java → src/main/java/com/fengwenyi/javalib/constant/RequestMethodConstant.java

@@ -5,7 +5,7 @@
  * @author Wenyi Feng
  * @since 2018-09-25
  */
-public class RequestMethod {
+public class RequestMethodConstant {
 
     /**
      * get

src/main/java/com/fengwenyi/javalib/constant/URL.java → src/main/java/com/fengwenyi/javalib/constant/URLConstant.java

@@ -4,7 +4,7 @@
  * @author Wenyi Feng
  * @since 2018-10-28
  */
-public class URL {
+public class URLConstant {
 
     /**
      * 获取ip地址的信息的uri

src/main/java/com/fengwenyi/javalib/constant/UserAgent.java → src/main/java/com/fengwenyi/javalib/constant/UserAgentConstant.java

@@ -4,7 +4,7 @@
  * @author Wenyi Feng
  * @since 2018-11-17
  */
-public class UserAgent {
+public class UserAgentConstant {
 
     private static final String MAC_ = "Mozilla/5.0 (Macintosh; PPC Mac OS X) AppleWebKit/535.1 (KHTML, like Gecko) Chrome/14.0.835.163 Safari/535.1";