Merge pull request #4 from chengn/master

修改入口
sword-org · Dec 12, 2014 · 005db5c · 005db5c
2 parents 1622c31 + e625f13
commit 005db5c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/org/sword/wechat4j/WechatSupport.java b/src/org/sword/wechat4j/WechatSupport.java
@@ -21,6 +21,7 @@
 import org.sword.wechat4j.response.VideoResponse;
 import org.sword.wechat4j.response.VoiceResponse;
 import org.sword.wechat4j.response.WechatResponse;
+import org.sword.wechat4j.util.Config;
 import org.sword.wechat4j.util.JaxbParser;
 import org.sword.wechat4j.util.StreamUtils;
 
@@ -36,7 +37,6 @@ public abstract class WechatSupport {
 	Logger logger = Logger.getLogger(WechatSupport.class);
 
 	private HttpServletRequest request;
-	private String token;
 
 	protected WechatRequest wechatRequest;
 	protected WechatResponse wechatResponse;
@@ -47,9 +47,8 @@ public abstract class WechatSupport {
 	 * @param request   微信服务发过来的http请求
 	 * @param token     token
 	 */
-	public WechatSupport(HttpServletRequest request,String token){
+	public WechatSupport(HttpServletRequest request){
 		this.request = request;
-		this.token = token;
 		this.wechatRequest = new WechatRequest();
 		this.wechatResponse = new WechatResponse();
 	}
@@ -65,9 +64,10 @@ public String execute(){
 		String timestamp = param.getTimestamp();
 		String nonce = param.getNonce();
 		String echostr = param.getEchostr();
+		String token = Config.instance().getToken();
 
 		ValidateSignature validateSignature = new ValidateSignature(signature, 
-				timestamp, nonce, this.token);
+				timestamp, nonce, token);
 		if(!validateSignature.check()){
 			return "error";
 		}

diff --git a/test/org/sword/wechat4j/Wechat.java b/test/org/sword/wechat4j/Wechat.java
@@ -11,8 +11,8 @@
  */
 public class Wechat extends WechatSupport{
 
-	public Wechat(HttpServletRequest request, String token) {
-		super(request, token);
+	public Wechat(HttpServletRequest request) {
+		super(request);
 	}
 
 	@Override