From 84aaf79bea389bf90dcad6e1ffd9da96ae002104 Mon Sep 17 00:00:00 2001
From: lixiangrong <lixiangrong@shuzijiayuan.com>
Date: Fri, 23 Sep 2016 12:07:10 +0800
Subject: [PATCH] d

---
 README.md                                        |  2 +-
 src/main/java/osc/git/eh3/test/TestCode.java     | 10 ++++++----
 .../java/osc/git/eh3/test/TestDecodeHex.java     | 16 ++++++++++++++++
 .../java/osc/git/eh3/test/TestException.java     | 11 +++++++++++
 4 files changed, 34 insertions(+), 5 deletions(-)
 create mode 100644 src/main/java/osc/git/eh3/test/TestDecodeHex.java
 create mode 100644 src/main/java/osc/git/eh3/test/TestException.java

diff --git a/README.md b/README.md
index 1964d1b..aa14504 100644
--- a/README.md
+++ b/README.md
@@ -1 +1 @@
-# 工作中常用代码集合
\ No newline at end of file
+# 工作中常用代码集合
diff --git a/src/main/java/osc/git/eh3/test/TestCode.java b/src/main/java/osc/git/eh3/test/TestCode.java
index da4640a..7b5d81a 100644
--- a/src/main/java/osc/git/eh3/test/TestCode.java
+++ b/src/main/java/osc/git/eh3/test/TestCode.java
@@ -1,5 +1,7 @@
 package osc.git.eh3.test;
 
+import org.apache.commons.codec.binary.Hex;
+
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Arrays;
@@ -248,12 +250,12 @@ public class TestCode {
 //		System.out.println(s1);
 //		System.out.println(new String(s1.getBytes("gbk")));
 //		System.out.println();
-//		
+////
 //		String s2 = URLEncoder.encode(str, "utf-8");
 //		System.out.println(s2);
 //		System.out.println(URLDecoder.decode(s2,"utf-8"));
 
-
+        System.out.println(new String(Hex.decodeHex("E8AFB7E6B182E5A4B1E8B4A5EFBC8CE8AFB7E7A88DE5908EE9878DE8AF95".toCharArray()), "utf-8"));
 //		Object object = null;
 //		JSONObject creativeGroupObj = JSONObject.fromObject(object);
 //		System.out.println(creativeGroupObj.isEmpty());
@@ -370,8 +372,8 @@ public class TestCode {
         //int size = list.size();
         //String[] arr = list.toArray(new String[size]);//使用了第二种接口，返回值和参数均为结果
 
-        String str = null;
-        System.out.println((String)str == null);
+        //String str = null;
+        //System.out.println((String)str == null);
 
     }
 
diff --git a/src/main/java/osc/git/eh3/test/TestDecodeHex.java b/src/main/java/osc/git/eh3/test/TestDecodeHex.java
new file mode 100644
index 0000000..c200aa2
--- /dev/null
+++ b/src/main/java/osc/git/eh3/test/TestDecodeHex.java
@@ -0,0 +1,16 @@
+package osc.git.eh3.test;
+
+import org.apache.commons.codec.binary.Hex;
+
+/**
+ * Created by lixiangrong on 2016/9/12.
+ */
+public class TestDecodeHex {
+    // 十六进制转字符串
+    public static void main(String[] args) throws Exception {
+        String data = "E7A7AFE69E81E58AA0E5BFABE7A791E68A80";
+        System.out.println(new String(Hex.decodeHex(data.toCharArray()), "utf-8"));
+
+        System.out.println(Hex.encodeHexString("测试粗我".getBytes()));
+    }
+}
diff --git a/src/main/java/osc/git/eh3/test/TestException.java b/src/main/java/osc/git/eh3/test/TestException.java
new file mode 100644
index 0000000..57c5a55
--- /dev/null
+++ b/src/main/java/osc/git/eh3/test/TestException.java
@@ -0,0 +1,11 @@
+package osc.git.eh3.test;
+
+/**
+ * Created by lixiangrong on 2016/8/31.
+ */
+public class TestException {
+
+    public static void main(String[] args) {
+        System.out.println("0000");
+    }
+}