JDK改为1.6

wukonggg · Dec 16, 2015 · 2698a10 · 2698a10
1 parent 3f47145
commit 2698a10
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 17 deletions.
diff --git a/VERSION.TXT b/VERSION.TXT
@@ -1,13 +1,19 @@
 
+
+wukong-util-0.1.2          [2015.1217]
+======================================
+1.增加ReflectUtil
+2.JDK改为1.6
+3.更新POM文件
+
+
 wukong-util-0.1.1.2015.1129
 ======================================
-1.更新PropertiesUtil。
+1.更新PropertiesUtil.
   注意：API变更！！！
 
 
 wukong-util-0.1.0.2015.0717
 ======================================
 1、基于TestJava.2014.0809.1638.zip重构，整理出band.wukong.util
 2、对所有类、方法做了若干调整，增加缺少的单元测试用例
-
-
diff --git a/pom.xml b/pom.xml
@@ -4,11 +4,18 @@
 
     <groupId>band.wukong</groupId>
     <artifactId>wukong-util</artifactId>
-    <version>0.1.1</version>
+    <version>0.1.2</version>
     <packaging>jar</packaging>
     <name>wukong-util</name>
     <url>http://www.wukong.band/code/wukong-util</url>
 
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <maven.compiler.encoding>UTF-8</maven.compiler.encoding>
+        <maven.javadoc.encoding>UTF-8</maven.javadoc.encoding>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>junit</groupId>
@@ -19,15 +26,15 @@
     </dependencies>
 
     <build>
-        <finalName>wukong-util-${version}</finalName>
+        <finalName>${project.artifactId}-${project.version}</finalName>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.1</version>
                 <configuration>
-                    <source>1.7</source>
-                    <target>1.7</target>
+                    <source>1.6</source>
+                    <target>1.6</target>
                 </configuration>
             </plugin>
             <plugin>
@@ -38,11 +45,4 @@
         </plugins>
     </build>
 
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <maven.compiler.encoding>UTF-8</maven.compiler.encoding>
-        <maven.javadoc.encoding>UTF-8</maven.javadoc.encoding>
-    </properties>
-
 </project>
diff --git a/src/main/java/band/wukong/util/EncryptionUtil.java b/src/main/java/band/wukong/util/EncryptionUtil.java
@@ -26,13 +26,18 @@ public static String encrypt(String source, Algorithm algorithm) {
         if (algorithm == Algorithm.MD5) {
             try {
                 return md5(source);
-            } catch (UnsupportedEncodingException | NoSuchAlgorithmException e) {
+            } catch (UnsupportedEncodingException e) {
+                throw new RuntimeException(e);
+            } catch (NoSuchAlgorithmException e) {
                 throw new RuntimeException(e);
             }
+
         } else if (algorithm == Algorithm.SHA1) {
             try {
                 return sha1(source);
-            } catch (UnsupportedEncodingException | NoSuchAlgorithmException e) {
+            } catch (UnsupportedEncodingException e) {
+                throw new RuntimeException(e);
+            } catch (NoSuchAlgorithmException e) {
                 throw new RuntimeException(e);
             }
         }

diff --git a/src/main/java/band/wukong/util/FileUtil.java b/src/main/java/band/wukong/util/FileUtil.java
@@ -45,7 +45,7 @@ public static String getFileNameWithoutExtension(String fileName) {
     }
 
     public static List<String> readLines(String file) {
-        List<String> slist = new ArrayList<>();
+        List<String> slist = new ArrayList<String>();
 
         BufferedReader in;
         try {