From a103eb16bdb4cfcee2613923e50f7503d914cf89 Mon Sep 17 00:00:00 2001 From: jinyu Date: Mon, 28 Mar 2016 23:33:32 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=B3=A8=E9=87=8A=E4=B8=8A?= =?UTF-8?q?=E7=9A=84link?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGE.md | 2 +- .../java/com/foxinmy/weixin4j/mp/message/NotifyMessage.java | 2 +- .../com/foxinmy/weixin4j/mp/message/TemplateMessage.java | 2 +- .../main/java/com/foxinmy/weixin4j/mp/model/QRParameter.java | 5 ++++- .../main/java/com/foxinmy/weixin4j/mp/model/SemResult.java | 2 +- .../com/foxinmy/weixin4j/mp/token/WeixinTicketCreator.java | 2 +- .../com/foxinmy/weixin4j/mp/token/WeixinTokenCreator.java | 2 +- .../main/java/com/foxinmy/weixin4j/mp/type/IndustryType.java | 4 +--- 8 files changed, 11 insertions(+), 10 deletions(-) diff --git a/CHANGE.md b/CHANGE.md index df71efe7..06143567 100644 --- a/CHANGE.md +++ b/CHANGE.md @@ -669,6 +669,6 @@ + weixin4j-base:添加日志支持 - * 2016-03-28 +* 2016-03-28 + weixin4j-mp:新增邀请绑定客服帐号接口以及客服接口命名调整 \ No newline at end of file diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/message/NotifyMessage.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/message/NotifyMessage.java index 0bbec34b..983fe839 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/message/NotifyMessage.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/message/NotifyMessage.java @@ -17,7 +17,7 @@ import com.foxinmy.weixin4j.tuple.NotifyTuple; * @see com.foxinmy.weixin4j.tuple.Music * @see com.foxinmy.weixin4j.tuple.News * @see 发送客服消息 + * href="https://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1421140547&token=&lang=zh_CN">发送客服消息 */ public class NotifyMessage implements Serializable { diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/message/TemplateMessage.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/message/TemplateMessage.java index 86374231..6248abcc 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/message/TemplateMessage.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/message/TemplateMessage.java @@ -16,7 +16,7 @@ import com.foxinmy.weixin4j.util.NameValue; * @date 2014年9月29日 * @since JDK 1.6 * @see 模板消息 + * href="https://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1433751277&token=&lang=zh_CN">模板消息 */ public class TemplateMessage implements Serializable { diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/model/QRParameter.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/model/QRParameter.java index 1cda47ce..869e5d0f 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/model/QRParameter.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/model/QRParameter.java @@ -15,7 +15,10 @@ import com.foxinmy.weixin4j.type.QRType; * @author jy.hu * @date 2014年4月8日 * @since JDK 1.6 - * + * @see #createPermanenceInt(int) 创建整型永久二维码 + * @see #createPermanenceStr(String) 创建字符串型永久二维码 + * @see #createTemporary(long) 创建整型默认30秒有效期临时二维码 + * @see #createTemporary(int, long) 创建整型有效期临时二维码 */ public class QRParameter implements Serializable { diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/model/SemResult.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/model/SemResult.java index 3e8a3769..a02ea2fe 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/model/SemResult.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/model/SemResult.java @@ -12,7 +12,7 @@ import com.foxinmy.weixin4j.http.weixin.JsonResult; * @date 2014年11月7日 * @since JDK 1.6 * @see 语义理解 + * href="https://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1421141241&token=&lang=zh_CN">语义理解 */ public class SemResult extends JsonResult { diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/token/WeixinTicketCreator.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/token/WeixinTicketCreator.java index c9e4be43..bfb4ca03 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/token/WeixinTicketCreator.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/token/WeixinTicketCreator.java @@ -18,7 +18,7 @@ import com.foxinmy.weixin4j.type.TicketType; * @date 2015年1月10日 * @since JDK 1.6 * @see JS + * href="https://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1421141115&token=&lang=zh_CN">JS * TICKET */ public class WeixinTicketCreator implements TokenCreator { diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/token/WeixinTokenCreator.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/token/WeixinTokenCreator.java index ec9acbc5..78ad77bc 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/token/WeixinTokenCreator.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/token/WeixinTokenCreator.java @@ -16,7 +16,7 @@ import com.foxinmy.weixin4j.token.TokenCreator; * @date 2015年1月10日 * @since JDK 1.6 * @see 微信公众平台获取token说明 + * href="https://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1421140183&token=&lang=zh_CN">微信公众平台获取token说明 * @see com.foxinmy.weixin4j.model.Token */ public class WeixinTokenCreator implements TokenCreator { diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/type/IndustryType.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/type/IndustryType.java index db606f4e..21ff9030 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/type/IndustryType.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/type/IndustryType.java @@ -10,9 +10,6 @@ import java.util.Map; * @author jy * @date 2014年12月12日 * @since JDK 1.6 - * @see所处行业 */ public enum IndustryType { ITKEJI_HULIANWANG$DIANZISHANGWU("IT科技", "互联网/电子商务", 1), ITKEJI_ITRUANJIANYUFUWU( @@ -73,6 +70,7 @@ public enum IndustryType { type.getSecondary()), type); } } + public static IndustryType getIndustry(String primary, String secondary) { return INDUSTRYTYPEMAP.get(String.format("%s%s%s", primary, SEPARATOR, secondary));