From f0b2b16cdcc5c77e9f2b1cd192659e81bcbaa7b2 Mon Sep 17 00:00:00 2001
From: e <xfsy_2015@163.com>
Date: Tue, 24 Jul 2018 15:24:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=93=E5=8D=B0=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       | 25 ++++++++++++-------
 .../com/fengwenyi/javalib/util/Console.java   | 20 +++++++--------
 .../fengwenyi/javalib/util/RequestUtil.java   |  2 +-
 3 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/pom.xml b/pom.xml
index c1d5b8b..43dce4b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.fengwenyi</groupId>
     <artifactId>JavaLib</artifactId>
-    <version>1.0.0-alpha</version>
+    <version>1.0.0-beta</version>
 
     <parent>
         <groupId>org.sonatype.oss</groupId>
@@ -29,13 +29,17 @@
         <developer>
             <name>Wenyi Feng</name>
             <email>xfsy_2015@163.com</email>
-            <url>https://fengwenyi.com</url>
+            <url>http://fengwenyi.com</url>
         </developer>
     </developers>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <springversion>4.3.3.RELEASE</springversion>
+        <junit.version>4.12</junit.version>
+        <servlet_api.version>4.0.1</servlet_api.version>
+        <gson.version>2.8.5</gson.version>
+        <http_client.version>4.2</http_client.version>
     </properties>
 
 
@@ -53,31 +57,34 @@
     </build>
 
     <dependencies>
-        <!-- https://mvnrepository.com/artifact/org.apache.tomcat/servlet-api -->
+        <!-- https://mvnrepository.com/artifact/javax.servlet/javax.servlet-api -->
         <dependency>
-            <groupId>org.apache.tomcat</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>6.0.53</version>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <version>${servlet_api.version}</version>
+            <scope>provided</scope>
         </dependency>
 
         <!-- https://mvnrepository.com/artifact/com.google.code.gson/gson -->
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.8.1</version>
+            <version>${gson.version}</version>
         </dependency>
 
         <!-- https://mvnrepository.com/artifact/org.apache.httpcomponents/httpclient -->
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
-            <version>4.2</version>
+            <version>${http_client.version}</version>
         </dependency>
 
+        <!-- https://mvnrepository.com/artifact/junit/junit -->
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.10</version>
+            <version>${junit.version}</version>
+            <scope>test</scope>
         </dependency>
 
     </dependencies>
diff --git a/src/main/java/com/fengwenyi/javalib/util/Console.java b/src/main/java/com/fengwenyi/javalib/util/Console.java
index 73d16ec..2aa3800 100644
--- a/src/main/java/com/fengwenyi/javalib/util/Console.java
+++ b/src/main/java/com/fengwenyi/javalib/util/Console.java
@@ -9,7 +9,7 @@ public class Console {
     /**
      * 控制台：换行
      */
-    public static void log() {
+    public static void info() {
         System.out.println();
     }
 
@@ -17,7 +17,7 @@ public static void log() {
      * 控制台：打印
      * @param x Object
      */
-    public static void log(Object x) {
+    public static void info(Object x) {
         System.out.println(x);
     }
 
@@ -25,7 +25,7 @@ public static void log(Object x) {
      * 控制台：打印
      * @param x 布尔
      */
-    public static void log(boolean x) {
+    public static void info(boolean x) {
         System.out.println(x);
     }
 
@@ -33,7 +33,7 @@ public static void log(boolean x) {
      * 控制台：打印
      * @param x 字符
      */
-    public static void log(char x) {
+    public static void info(char x) {
         System.out.println(x);
     }
 
@@ -41,7 +41,7 @@ public static void log(char x) {
      * 控制台：打印
      * @param x 整型
      */
-    public static void log(int x) {
+    public static void info(int x) {
         System.out.println(x);
     }
 
@@ -49,7 +49,7 @@ public static void log(int x) {
      * 控制台：打印
      * @param x 长整型
      */
-    public static void log(long x) {
+    public static void info(long x) {
         System.out.println(x);
     }
 
@@ -57,7 +57,7 @@ public static void log(long x) {
      * 控制台：打印
      * @param x 浮点数
      */
-    public static void log(float x) {
+    public static void info(float x) {
         System.out.println(x);
     }
 
@@ -66,7 +66,7 @@ public static void log(float x) {
      * 控制台：打印
      * @param x 双精度浮点数
      */
-    public static void log(double x) {
+    public static void info(double x) {
         System.out.println(x);
     }
 
@@ -74,7 +74,7 @@ public static void log(double x) {
      * 控制台：打印
      * @param x 字符数组
      */
-    public static void log(char [] x) {
+    public static void info(char [] x) {
         System.out.println(x);
     }
 
@@ -82,7 +82,7 @@ public static void log(char [] x) {
      * 控制台：打印
      * @param x 字符数组
      */
-    public static void log(String x) {
+    public static void info(String x) {
         System.out.println(x);
     }
 }
diff --git a/src/main/java/com/fengwenyi/javalib/util/RequestUtil.java b/src/main/java/com/fengwenyi/javalib/util/RequestUtil.java
index 0fe410b..cb0d1f3 100644
--- a/src/main/java/com/fengwenyi/javalib/util/RequestUtil.java
+++ b/src/main/java/com/fengwenyi/javalib/util/RequestUtil.java
@@ -9,7 +9,7 @@
 import java.net.UnknownHostException;
 
 /**
- * 你可能想从{HttpServletRequest}获取一些信息
+ * 你可能想从{@link HttpServletRequest}获取一些信息
  * @author Wenyi Feng
  */
 public class RequestUtil {