Merge pull request #12 from chengn/master

1.1.1
sword-org · Jan 13, 2015 · 45355e9 · 45355e9
2 parents b679d9f + ebb0c7e
commit 45355e9
Show file tree

Hide file tree

Showing 11 changed files with 7 additions and 339 deletions.
diff --git a/.classpath b/.classpath
@@ -13,5 +13,6 @@
 	<classpathentry kind="lib" path="lib/fluent-hc-4.3.6.jar"/>
 	<classpathentry kind="lib" path="lib/httpclient-4.3.6.jar"/>
 	<classpathentry kind="lib" path="lib/httpcore-4.3.3.jar"/>
+	<classpathentry kind="lib" path="lib/sword-lang-1.2.0.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/src/org/sword/wechat4j/WechatSupport.java b/src/org/sword/wechat4j/WechatSupport.java
@@ -11,6 +11,8 @@
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.log4j.Logger;
+import org.sword.lang.JaxbParser;
+import org.sword.lang.StreamUtils;
 import org.sword.wechat4j.common.Config;
 import org.sword.wechat4j.common.ValidateSignature;
 import org.sword.wechat4j.event.EventType;
@@ -23,8 +25,6 @@
 import org.sword.wechat4j.response.VideoResponse;
 import org.sword.wechat4j.response.VoiceResponse;
 import org.sword.wechat4j.response.WechatResponse;
-import org.sword.wechat4j.util.JaxbParser;
-import org.sword.wechat4j.util.StreamUtils;
 
 
 

diff --git a/src/org/sword/wechat4j/message/CustomerMsg.java b/src/org/sword/wechat4j/message/CustomerMsg.java
@@ -9,13 +9,13 @@
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.log4j.Logger;
+import org.sword.lang.HttpUtils;
 import org.sword.wechat4j.event.MsgType;
 import org.sword.wechat4j.response.ArticleResponse;
 import org.sword.wechat4j.response.MusicResponse;
 import org.sword.wechat4j.response.VideoResponse;
 import org.sword.wechat4j.token.AccessToken;
 import org.sword.wechat4j.token.AccessTokenProxy;
-import org.sword.wechat4j.util.HttpUtils;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;

diff --git a/src/org/sword/wechat4j/message/TemplateMsg.java b/src/org/sword/wechat4j/message/TemplateMsg.java
@@ -5,10 +5,10 @@
 package org.sword.wechat4j.message;
 
 import org.apache.log4j.Logger;
+import org.sword.lang.HttpUtils;
 import org.sword.wechat4j.message.template.TemplateMsgBody;
 import org.sword.wechat4j.message.template.TemplateMsgData;
 import org.sword.wechat4j.token.AccessTokenProxy;
-import org.sword.wechat4j.util.HttpUtils;
 
 import com.alibaba.fastjson.JSONObject;
 

diff --git a/src/org/sword/wechat4j/token/AccessToken.java b/src/org/sword/wechat4j/token/AccessToken.java
@@ -7,8 +7,8 @@
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.log4j.Logger;
+import org.sword.lang.HttpUtils;
 import org.sword.wechat4j.common.Config;
-import org.sword.wechat4j.util.HttpUtils;
 
 import com.alibaba.fastjson.JSONObject;
 

diff --git a/src/org/sword/wechat4j/user/UserManager.java b/src/org/sword/wechat4j/user/UserManager.java
@@ -8,8 +8,8 @@
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.log4j.Logger;
+import org.sword.lang.HttpUtils;
 import org.sword.wechat4j.token.AccessTokenProxy;
-import org.sword.wechat4j.util.HttpUtils;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;

diff --git a/src/org/sword/wechat4j/util/HttpUtils.java b/src/org/sword/wechat4j/util/HttpUtils.java
diff --git a/src/org/sword/wechat4j/util/JaxbParser.java b/src/org/sword/wechat4j/util/JaxbParser.java
diff --git a/src/org/sword/wechat4j/util/StreamUtils.java b/src/org/sword/wechat4j/util/StreamUtils.java
diff --git a/test/org/sword/wechat4j/util/ConfigTest.java b/test/org/sword/wechat4j/util/ConfigTest.java