Merge remote-tracking branch 'origin/master'

2020-07-24 12:57:19 +08:00
parent 7fd6db2758 ee627cee44
commit c7395e4a74
76 changed files with 2863 additions and 220 deletions
@@ -74,7 +74,13 @@
 		<dependency>
 			<groupId>org.bouncycastle</groupId>
 			<artifactId>bcprov-jdk16</artifactId>
-			<version>1.46</version>
+		</dependency>
+		<!-- 兼容 JDK 9+ 后的maven环境编译 -->
+		<dependency>
+			<groupId>javax.xml.bind</groupId>
+			<artifactId>jaxb-api</artifactId>
+			<version>2.2.11</version>
+			<scope>provided</scope>
 		</dependency>
 	</dependencies>
 </project>
@@ -68,6 +68,10 @@ public class XmlResult implements Serializable {
 		return resultCode;
 	}

+	public void setReturnCode(String returnCode) {
+		this.returnCode = returnCode;
+	}
+
 	public String getErrCode() {
 		return errCode;
 	}
@@ -84,6 +88,10 @@ public class XmlResult implements Serializable {
 		return returnMsg;
 	}

+	public void setReturnMsg(String returnMsg) {
+		this.returnMsg = returnMsg;
+	}
+
 	public void setResultCode(String resultCode) {
 		this.resultCode = resultCode;
 	}
@@ -15,23 +15,41 @@ package com.foxinmy.weixin4j.jssdk;
 *      企业号JSSDK</a>
 */
 public enum JSSDKAPI {
+	/**
+	 * <a href=
+	 * "https://developers.weixin.qq.com/doc/offiaccount/OA_Web_Apps/JS-SDK.html#111">
+	 * 自定义“分享给朋友”及“分享到QQ”按钮的分享内容（1.4.0）</a>
+	 */
+	updateAppMessageShareData,
+	/**
+	 * <a href=
+	 * "https://developers.weixin.qq.com/doc/offiaccount/OA_Web_Apps/JS-SDK.html#112">
+	 * 自定义“分享给朋友”及“分享到QQ”按钮的分享内容（1.4.0）</a>
+	 */
+	updateTimelineShareData,
 	/***
 	 * <a href=
 	 * "http://mp.weixin.qq.com/wiki/11/74ad127cc054f6b80759c40f77ec03db.html#.E8.8E.B7.E5.8F.96.E2.80.9C.E5.88.86.E4.BA.AB.E5.88.B0.E6.9C.8B.E5.8F.8B.E5.9C.88.E2.80.9D.E6.8C.89.E9.92.AE.E7.82.B9.E5.87.BB.E7.8A.B6.E6.80.81.E5.8F.8A.E8.87.AA.E5.AE.9A.E4.B9.89.E5.88.86.E4.BA.AB.E5.86.85.E5.AE.B9.E6.8E.A5.E5.8F.A3"
-	 * >分享接口-获取“分享到朋友圈”按钮点击状态及自定义分享内容接口</a>
+	 * >分享接口-获取“分享到朋友圈”按钮点击状态及自定义分享内容接口（即将废弃）</a>
+	 * @deprecated
 	 */
+	@Deprecated
 	onMenuShareTimeline,
 	/***
 	 * <a href=
 	 * "http://mp.weixin.qq.com/wiki/11/74ad127cc054f6b80759c40f77ec03db.html#.E8.8E.B7.E5.8F.96.E2.80.9C.E5.88.86.E4.BA.AB.E7.BB.99.E6.9C.8B.E5.8F.8B.E2.80.9D.E6.8C.89.E9.92.AE.E7.82.B9.E5.87.BB.E7.8A.B6.E6.80.81.E5.8F.8A.E8.87.AA.E5.AE.9A.E4.B9.89.E5.88.86.E4.BA.AB.E5.86.85.E5.AE.B9.E6.8E.A5.E5.8F.A3"
-	 * >分享接口-获取“分享给朋友”按钮点击状态及自定义分享内容接口</a>
+	 * >分享接口-获取“分享给朋友”按钮点击状态及自定义分享内容接口（即将废弃）</a>
+	 * @deprecated
 	 */
+	@Deprecated
 	onMenuShareAppMessage,
 	/***
 	 * <a href=
 	 * "http://mp.weixin.qq.com/wiki/11/74ad127cc054f6b80759c40f77ec03db.html#.E8.8E.B7.E5.8F.96.E2.80.9C.E5.88.86.E4.BA.AB.E5.88.B0QQ.E2.80.9D.E6.8C.89.E9.92.AE.E7.82.B9.E5.87.BB.E7.8A.B6.E6.80.81.E5.8F.8A.E8.87.AA.E5.AE.9A.E4.B9.89.E5.88.86.E4.BA.AB.E5.86.85.E5.AE.B9.E6.8E.A5.E5.8F.A3"
-	 * >分享接口-获取“分享到QQ”按钮点击状态及自定义分享内容接口</a>
+	 * >分享接口-获取“分享到QQ”按钮点击状态及自定义分享内容接口（即将废弃）</a>
+	 * @deprecated
 	 */
+	@Deprecated
 	onMenuShareQQ,
 	/***
 	 * <a href=
@@ -270,8 +288,12 @@ public enum JSSDKAPI {
 	/**
 	 * 分享接口集合
 	 */
+	@Deprecated
 	public final static JSSDKAPI[] SHARE_APIS = { onMenuShareTimeline, onMenuShareAppMessage, onMenuShareQQ,
 			onMenuShareWeibo, onMenuShareQZone };
+
+	public final static JSSDKAPI[] ALL_SHARE_APIS = { updateAppMessageShareData, updateTimelineShareData,
+			onMenuShareWeibo, onMenuShareQZone };
 	/**
 	 * 图像接口集合
 	 */
@@ -8,7 +8,6 @@ package com.foxinmy.weixin4j.type.mch;
 * @date 2015年4月1日
 * @since JDK 1.6
 * @see
- * @deprecated 迁移到子模块weixin4j-pay
 */
@Deprecated
 public enum CorpPaymentCheckNameType {