删除AuthResult类,将BaseApi移入到weixin4j-base工程

weixin4j-qy/weixin4j-qy-api/src/main/java/com/foxinmy/weixin4j/qy/api/BaseApi.java

@@ -1,57 +0,0 @@
-package com.foxinmy.weixin4j.qy.api;
-
-import java.util.Map;
-import java.util.ResourceBundle;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import com.foxinmy.weixin4j.http.HttpRequest;
-import com.foxinmy.weixin4j.xml.Map2ObjectConverter;
-import com.foxinmy.weixin4j.xml.XStream;
-import com.thoughtworks.xstream.core.ClassLoaderReference;
-import com.thoughtworks.xstream.mapper.DefaultMapper;
-
-/**
- * 
- * @className BaseApi
- * @author jy.hu
- * @date 2014年11月18日
- * @since JDK 1.7
- * @see <a href="http://qydev.weixin.qq.com/wiki/index.php">api文档</a>
- */
-public class BaseApi {
-	protected final HttpRequest request = new HttpRequest();
-	protected final static XStream mapXstream = XStream.get();
-	private final static ResourceBundle weixinBundle;
-	static {
-		weixinBundle = ResourceBundle
-				.getBundle("com/foxinmy/weixin4j/qy/api/weixin");
-		mapXstream.alias("xml", Map.class);
-		mapXstream.registerConverter(new Map2ObjectConverter(new DefaultMapper(
-				new ClassLoaderReference(XStream.class.getClassLoader()))));
-	}
-
-	protected String map2xml(Map<?, ?> map) {
-		return mapXstream.toXML(map).replaceAll("__", "_");
-	}
-
-	@SuppressWarnings("unchecked")
-	protected Map<String, String> xml2map(String xml) {
-		return mapXstream.fromXML(xml, Map.class);
-	}
-
-	protected String getRequestUri(String key) {
-		String url = weixinBundle.getString(key);
-		Pattern p = Pattern.compile("(\\{[^\\}]*\\})");
-		Matcher m = p.matcher(url);
-		StringBuffer sb = new StringBuffer();
-		String sub = null;
-		while (m.find()) {
-			sub = m.group();
-			m.appendReplacement(sb,
-					getRequestUri(sub.substring(1, sub.length() - 1)));
-		}
-		m.appendTail(sb);
-		return sb.toString();
-	}
-}

weixin4j-qy/weixin4j-qy-api/src/main/java/com/foxinmy/weixin4j/qy/api/DepartApi.java

@@ -22,7 +22,7 @@ import com.foxinmy.weixin4j.token.TokenHolder;
  * @see <a
  *      href="http://qydev.weixin.qq.com/wiki/index.php?title=%E7%AE%A1%E7%90%86%E9%83%A8%E9%97%A8">管理部门说明</a>
  */
-public class DepartApi extends BaseApi {
+public class DepartApi extends QyApi {
 	private final TokenHolder tokenHolder;
 
 	public DepartApi(TokenHolder tokenHolder) {

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

@@ -29,7 +29,7 @@ import com.foxinmy.weixin4j.util.IOUtil;
  *      href="http://qydev.weixin.qq.com/wiki/index.php?title=%E7%AE%A1%E7%90%86%E5%A4%9A%E5%AA%92%E4%BD%93%E6%96%87%E4%BB%B6">管理多媒体文件</a>
  * @see com.foxinmy.weixin4j.type.MediaType
  */
-public class MediaApi extends BaseApi {
+public class MediaApi extends QyApi {
 
 	private final TokenHolder tokenHolder;
 

weixin4j-qy/weixin4j-qy-api/src/main/java/com/foxinmy/weixin4j/qy/api/MenuApi.java

@@ -20,7 +20,7 @@ import com.foxinmy.weixin4j.token.TokenHolder;
  * @since JDK 1.7
  * @see com.foxinmy.weixin4j.model.Button
  */
-public class MenuApi extends BaseApi {
+public class MenuApi extends QyApi {
 
 	private final TokenHolder tokenHolder;
 

weixin4j-qy/weixin4j-qy-api/src/main/java/com/foxinmy/weixin4j/qy/api/NotifyApi.java

@@ -26,7 +26,7 @@ import com.foxinmy.weixin4j.token.TokenHolder;
  * @see com.foxinmy.weixin4j.msg.model.News
  * @see com.foxinmy.weixin4j.msg.model.MpNews
  */
-public class NotifyApi extends BaseApi {
+public class NotifyApi extends QyApi {
 
 	private final TokenHolder tokenHolder;
 

weixin4j-qy/weixin4j-qy-api/src/main/java/com/foxinmy/weixin4j/qy/api/QyApi.java

@@ -0,0 +1,22 @@
+package com.foxinmy.weixin4j.qy.api;
+
+import java.util.ResourceBundle;
+
+import com.foxinmy.weixin4j.api.BaseApi;
+
+/**
+ * 微信企业号API
+ * 
+ * @className QyApi
+ * @author jy.hu
+ * @date 2014年11月18日
+ * @since JDK 1.7
+ * @see com.foxinmy.weixin4j.api.BaseApi
+ * @see <a href="http://qydev.weixin.qq.com/wiki/index.php">api文档</a>
+ */
+public class QyApi extends BaseApi {
+	static {
+		weixinBundle = ResourceBundle
+				.getBundle("com/foxinmy/weixin4j/qy/api/weixin");
+	}
+}

weixin4j-qy/weixin4j-qy-api/src/main/java/com/foxinmy/weixin4j/qy/api/TagApi.java

@@ -22,7 +22,7 @@ import com.foxinmy.weixin4j.token.TokenHolder;
  * @see <a
  *      href="http://qydev.weixin.qq.com/wiki/index.php?title=%E7%AE%A1%E7%90%86%E6%A0%87%E7%AD%BE">管理标签</a>
  */
-public class TagApi extends BaseApi {
+public class TagApi extends QyApi {
 	private final TokenHolder tokenHolder;
 
 	public TagApi(TokenHolder tokenHolder) {

weixin4j-qy/weixin4j-qy-api/src/main/java/com/foxinmy/weixin4j/qy/api/UserApi.java

@@ -23,7 +23,7 @@ import com.foxinmy.weixin4j.token.TokenHolder;
  * @see <a
  *      href="http://qydev.weixin.qq.com/wiki/index.php?title=%E7%AE%A1%E7%90%86%E6%88%90%E5%91%98">管理成员说明</a>
  */
-public class UserApi extends BaseApi {
+public class UserApi extends QyApi {
 	private final TokenHolder tokenHolder;
 
 	public UserApi(TokenHolder tokenHolder) {