优化微信配置类

weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/WeixinProxy.java

@@ -58,6 +58,7 @@ import com.foxinmy.weixin4j.tuple.MpVideo;
 import com.foxinmy.weixin4j.tuple.Tuple;
 import com.foxinmy.weixin4j.type.MediaType;
 import com.foxinmy.weixin4j.type.TicketType;
+import com.foxinmy.weixin4j.util.Weixin4jConfigUtil;
 
 /**
  * 微信公众平台接口实现
@@ -125,13 +126,14 @@ public class WeixinProxy {
 	/**
 	 * 配置信息
 	 */
-	private Weixin4jSettings settings;
+	private Weixin4jSettings<WeixinAccount> settings;
 
 	/**
 	 * 默认使用文件方式保存token、使用weixin4j.properties配置的账号信息
 	 */
 	public WeixinProxy() {
-		this(new Weixin4jSettings());
+		this(new Weixin4jSettings<WeixinAccount>(
+				Weixin4jConfigUtil.getWeixinAccount()));
 	}
 
 	/**
@@ -140,7 +142,7 @@ public class WeixinProxy {
 	 *            微信配置信息
 	 * @see com.foxinmy.weixin4j.setting.Weixin4jSettings
 	 */
-	public WeixinProxy(Weixin4jSettings settings) {
+	public WeixinProxy(Weixin4jSettings<WeixinAccount> settings) {
 		this(new TokenManager(new WeixinTokenCreator(settings.getAccount()
 				.getId(), settings.getAccount().getSecret()),
 				settings.getCacheStorager0()));
@@ -152,6 +154,7 @@ public class WeixinProxy {
 	 *
 	 * @see com.foxinmy.weixin4j.mp.token.WeixinTokenCreator
 	 * @param tokenManager
+	 *            token管理
 	 */
 	private WeixinProxy(TokenManager tokenManager) {
 		this.tokenManager = tokenManager;

weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/MediaApi.java

@@ -17,7 +17,6 @@ import com.foxinmy.weixin4j.http.ContentType;
 import com.foxinmy.weixin4j.http.HttpClientException;
 import com.foxinmy.weixin4j.http.HttpHeaders;
 import com.foxinmy.weixin4j.http.HttpMethod;
-import com.foxinmy.weixin4j.http.HttpParams;
 import com.foxinmy.weixin4j.http.HttpRequest;
 import com.foxinmy.weixin4j.http.HttpResponse;
 import com.foxinmy.weixin4j.http.apache.ByteArrayBody;
@@ -252,8 +251,7 @@ public class MediaApi extends MpApi {
 				request = new HttpRequest(HttpMethod.GET, String.format(
 						meida_download_uri, token.getAccessToken(), mediaId));
 			}
-			HttpParams params = weixinExecutor.getExecuteParams();
-			request.setParams(params);
+			request.setParams(weixinExecutor.getExecuteParams());
 			logger.info("weixin request >> " + request.getMethod() + " "
 					+ request.getURI().toString());
 			HttpResponse response = weixinExecutor.getExecuteClient().execute(

weixin4j-mp/src/test/java/com/foxinmy/weixin4j/mp/test/TokenTest.java

@@ -5,9 +5,11 @@ import org.junit.Before;
 import org.junit.Test;
 
 import com.foxinmy.weixin4j.exception.WeixinException;
+import com.foxinmy.weixin4j.model.WeixinAccount;
 import com.foxinmy.weixin4j.mp.token.WeixinTokenCreator;
 import com.foxinmy.weixin4j.setting.Weixin4jSettings;
 import com.foxinmy.weixin4j.token.TokenManager;
+import com.foxinmy.weixin4j.util.Weixin4jConfigUtil;
 
 /**
  * token测试
@@ -20,11 +22,12 @@ import com.foxinmy.weixin4j.token.TokenManager;
 public class TokenTest {
 
 	protected TokenManager tokenManager;
-	protected Weixin4jSettings settings;
+	protected Weixin4jSettings<WeixinAccount> settings;
 
 	@Before
 	public void setUp() {
-		this.settings = new Weixin4jSettings();
+		this.settings = new Weixin4jSettings<WeixinAccount>(
+				Weixin4jConfigUtil.getWeixinAccount());
 		tokenManager = new TokenManager(new WeixinTokenCreator(settings
 				.getAccount().getId(), settings.getAccount().getSecret()),
 				settings.getCacheStorager0());