Merge pull request #11 from chengn/master

调整说明及客户消息发送

README.md

@@ -12,7 +12,7 @@ wechat develop framework for java(微信开发框架JAVA版，最简单易用微
  1. 创建一个web工程，导入jdk和相关的web工程jar包。 
  2. 下载wechat4j.jar包，下载地址[wechat4j下载](https://github.com/sword-org/wechat4j/releases)。 
  3. 创建wechat4j配置文件，在src目录下（java根目录）创建wechat4j.properties文件，配置你微信公众号的相关信息。内容如下：
-```java
+```properties
 #you server url
 wechat.url=
 #you wechat token

src/org/sword/wechat4j/message/CustomerMsg.java

@@ -14,6 +14,7 @@
 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;
@@ -29,7 +30,7 @@ public class CustomerMsg {
 
 	private static final String MSG_URL = "https://api.weixin.qq.com/cgi-bin/message/custom/send?access_token=";
 
-	private String accessToken;
+//	private String accessToken;
 	private String toUserOpenId;
 	private String msgType;   //msgtype
 	private String msgBody;   //发送的消息post数据
@@ -41,22 +42,10 @@ public class CustomerMsg {
 	 * 然后使用SendMsg(String toUserOpenId,String accessToken)来替代本方法
 	 * @param toUserOpenId
 	 */
-	@Deprecated
 	public CustomerMsg(String toUserOpenId){
 		this.toUserOpenId = toUserOpenId;
 	}
 
-	/**
-	 * 使用现有的access_token
-	 * 由中控服务器获取之后保存，2个小时有效
-	 * @param toUserOpenId
-	 * @param accessToken
-	 */
-	public CustomerMsg(String toUserOpenId,String accessToken){
-		this.toUserOpenId = toUserOpenId;
-		this.accessToken = accessToken;
-	}
-
 //	
 //	public String getMsgBody() {
 //		return msgBody;
@@ -67,17 +56,17 @@ public CustomerMsg(String toUserOpenId,String accessToken){
 	 * @param msgBody
 	 */
 	private void send(){
+		String accessToken = AccessTokenProxy.token();
 		if(StringUtils.isBlank(this.toUserOpenId))
 			return;
 		//token不存在则重新刷新token
-		if(StringUtils.isBlank(this.accessToken)){
-			AccessToken token = new AccessToken();
-			token.request();
-			this.accessToken = token.getAccessToken();
+		if(StringUtils.isBlank(accessToken)){
+			logger.error("发送失败，无法得到accessToken");
+			return;
 		}
 		//需要判断一下，防止上面刷新token失败
-		if(StringUtils.isNotBlank(this.accessToken)){
-			String url = MSG_URL + this.accessToken;
+		if(StringUtils.isNotBlank(accessToken)){
+			String url = MSG_URL + accessToken;
 			HttpUtils.post(url, msgBody);
 		}
 	}

src/org/sword/wechat4j/message/TemplateMsg.java

@@ -7,10 +7,10 @@
 import org.apache.log4j.Logger;
 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;
-import com.alibaba.fastjson.JSONPObject;
 
 /**
  * 模板消息接口
@@ -30,8 +30,8 @@ public class TemplateMsg {
 
 	private String accessToken;
 
-	public TemplateMsg(String accessToken){
-		this.accessToken = accessToken;
+	public TemplateMsg(){
+		this.accessToken = AccessTokenProxy.token();
 	}
 
 	/**

src/org/sword/wechat4j/token/AccessTokenTimer.java

@@ -30,7 +30,7 @@ public void run() {
 		if(accessToken.request()){
 			AccessTokenServer accessTokenServer = new AccessTokenServer();
 			DbAccessTokenServer customerServer = (DbAccessTokenServer)accessTokenServer.customerServer();
-			customerServer.save();
+			customerServer.save(accessToken);
 		}
 	}
 

src/org/sword/wechat4j/token/DbAccessTokenServer.java

@@ -21,7 +21,7 @@ public String getAccessToken() {
 	 * 由客户自己实现数据库插入或者更新操作
 	 * @return
 	 */
-	public abstract boolean save();
+	public abstract boolean save(AccessToken accessToken);
 	/**
 	 * 从数据库得到accessToken
 	 * 由客户自己实现数据库的查询操作

src/org/sword/wechat4j/user/UserManager.java

@@ -8,7 +8,7 @@
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.log4j.Logger;
-import org.sword.wechat4j.token.AccessTokenServer;
+import org.sword.wechat4j.token.AccessTokenProxy;
 import org.sword.wechat4j.util.HttpUtils;
 
 import com.alibaba.fastjson.JSONArray;
@@ -32,8 +32,8 @@ public class UserManager {
 	private long total = 0;
 
 
-	public UserManager(String accessToken){
-		this.accessToken = accessToken;
+	public UserManager(){
+		this.accessToken = AccessTokenProxy.token();
 	}
 
 	/**