Merge branch 'binarywang:develop' into develop

shuiyihan12 · web-flow · commit e5399fe32a73 · 2025-10-20T15:19:35.000+08:00
diff --git a/README.md b/README.md
@@ -106,6 +106,13 @@
   - 企业微信：`weixin-java-cp`
   - 微信视频号/微信小店：`weixin-java-channel`
 
+**注意**：
+- **移动应用开发**：如果你的移动应用（iOS/Android App）需要接入微信登录、分享等功能：
+  - 微信登录（网页授权）：使用 `weixin-java-open` 模块，在服务端处理 OAuth 授权
+  - 微信支付：使用 `weixin-java-pay` 模块
+  - 客户端集成：需使用微信官方提供的移动端SDK（iOS/Android），本项目为服务端SDK
+- **微信开放平台**（`weixin-java-open`）主要用于第三方平台，代公众号或小程序进行开发和管理
+
 
 ---------------------------------
 ### 版本说明
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.github.binarywang</groupId>
   <artifactId>wx-java</artifactId>
-  <version>4.7.7.B</version>
+  <version>4.7.8.B</version>
   <packaging>pom</packaging>
   <name>WxJava - Weixin/Wechat Java SDK</name>
   <description>微信开发Java SDK</description>
diff --git a/solon-plugins/pom.xml b/solon-plugins/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>wx-java</artifactId>
-    <version>4.7.7.B</version>
+    <version>4.7.8.B</version>
   </parent>
   <packaging>pom</packaging>
   <artifactId>wx-java-solon-plugins</artifactId>
diff --git a/solon-plugins/wx-java-channel-multi-solon-plugin/pom.xml b/solon-plugins/wx-java-channel-multi-solon-plugin/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>wx-java-solon-plugins</artifactId>
     <groupId>com.github.binarywang</groupId>
-    <version>4.7.7.B</version>
+    <version>4.7.8.B</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/solon-plugins/wx-java-channel-solon-plugin/pom.xml b/solon-plugins/wx-java-channel-solon-plugin/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>wx-java-solon-plugins</artifactId>
     <groupId>com.github.binarywang</groupId>
-    <version>4.7.7.B</version>
+    <version>4.7.8.B</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/solon-plugins/wx-java-cp-multi-solon-plugin/pom.xml b/solon-plugins/wx-java-cp-multi-solon-plugin/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>wx-java-solon-plugins</artifactId>
     <groupId>com.github.binarywang</groupId>
-    <version>4.7.7.B</version>
+    <version>4.7.8.B</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/solon-plugins/wx-java-cp-solon-plugin/pom.xml b/solon-plugins/wx-java-cp-solon-plugin/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>wx-java-solon-plugins</artifactId>
     <groupId>com.github.binarywang</groupId>
-    <version>4.7.7.B</version>
+    <version>4.7.8.B</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/solon-plugins/wx-java-miniapp-multi-solon-plugin/pom.xml b/solon-plugins/wx-java-miniapp-multi-solon-plugin/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>wx-java-solon-plugins</artifactId>
     <groupId>com.github.binarywang</groupId>
-    <version>4.7.7.B</version>
+    <version>4.7.8.B</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/solon-plugins/wx-java-miniapp-solon-plugin/pom.xml b/solon-plugins/wx-java-miniapp-solon-plugin/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>wx-java-solon-plugins</artifactId>
     <groupId>com.github.binarywang</groupId>
-    <version>4.7.7.B</version>
+    <version>4.7.8.B</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/solon-plugins/wx-java-mp-multi-solon-plugin/pom.xml b/solon-plugins/wx-java-mp-multi-solon-plugin/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>wx-java-solon-plugins</artifactId>
     <groupId>com.github.binarywang</groupId>
-    <version>4.7.7.B</version>
+    <version>4.7.8.B</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/solon-plugins/wx-java-mp-solon-plugin/pom.xml b/solon-plugins/wx-java-mp-solon-plugin/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>wx-java-solon-plugins</artifactId>
     <groupId>com.github.binarywang</groupId>
-    <version>4.7.7.B</version>
+    <version>4.7.8.B</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/solon-plugins/wx-java-open-solon-plugin/pom.xml b/solon-plugins/wx-java-open-solon-plugin/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>wx-java-solon-plugins</artifactId>
     <groupId>com.github.binarywang</groupId>
-    <version>4.7.7.B</version>
+    <version>4.7.8.B</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/solon-plugins/wx-java-pay-solon-plugin/pom.xml b/solon-plugins/wx-java-pay-solon-plugin/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>wx-java-solon-plugins</artifactId>
     <groupId>com.github.binarywang</groupId>
-    <version>4.7.7.B</version>
+    <version>4.7.8.B</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/solon-plugins/wx-java-qidian-solon-plugin/pom.xml b/solon-plugins/wx-java-qidian-solon-plugin/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>wx-java-solon-plugins</artifactId>
     <groupId>com.github.binarywang</groupId>
-    <version>4.7.7.B</version>
+    <version>4.7.8.B</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-boot-starters/pom.xml b/spring-boot-starters/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>wx-java</artifactId>
-    <version>4.7.7.B</version>
+    <version>4.7.8.B</version>
   </parent>
   <packaging>pom</packaging>
   <artifactId>wx-java-spring-boot-starters</artifactId>
diff --git a/spring-boot-starters/wx-java-channel-multi-spring-boot-starter/pom.xml b/spring-boot-starters/wx-java-channel-multi-spring-boot-starter/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>wx-java-spring-boot-starters</artifactId>
     <groupId>com.github.binarywang</groupId>
-    <version>4.7.7.B</version>
+    <version>4.7.8.B</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-boot-starters/wx-java-channel-spring-boot-starter/pom.xml b/spring-boot-starters/wx-java-channel-spring-boot-starter/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>wx-java-spring-boot-starters</artifactId>
     <groupId>com.github.binarywang</groupId>
-    <version>4.7.7.B</version>
+    <version>4.7.8.B</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-boot-starters/wx-java-cp-multi-spring-boot-starter/pom.xml b/spring-boot-starters/wx-java-cp-multi-spring-boot-starter/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>wx-java-spring-boot-starters</artifactId>
     <groupId>com.github.binarywang</groupId>
-    <version>4.7.7.B</version>
+    <version>4.7.8.B</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-boot-starters/wx-java-cp-spring-boot-starter/pom.xml b/spring-boot-starters/wx-java-cp-spring-boot-starter/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>wx-java-spring-boot-starters</artifactId>
     <groupId>com.github.binarywang</groupId>
-    <version>4.7.7.B</version>
+    <version>4.7.8.B</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-boot-starters/wx-java-cp-tp-multi-spring-boot-starter/pom.xml b/spring-boot-starters/wx-java-cp-tp-multi-spring-boot-starter/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>wx-java-spring-boot-starters</artifactId>
     <groupId>com.github.binarywang</groupId>
-    <version>4.7.7.B</version>
+    <version>4.7.8.B</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-boot-starters/wx-java-miniapp-multi-spring-boot-starter/pom.xml b/spring-boot-starters/wx-java-miniapp-multi-spring-boot-starter/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>wx-java-spring-boot-starters</artifactId>
     <groupId>com.github.binarywang</groupId>
-    <version>4.7.7.B</version>
+    <version>4.7.8.B</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-boot-starters/wx-java-miniapp-spring-boot-starter/pom.xml b/spring-boot-starters/wx-java-miniapp-spring-boot-starter/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>wx-java-spring-boot-starters</artifactId>
     <groupId>com.github.binarywang</groupId>
-    <version>4.7.7.B</version>
+    <version>4.7.8.B</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-boot-starters/wx-java-mp-multi-spring-boot-starter/pom.xml b/spring-boot-starters/wx-java-mp-multi-spring-boot-starter/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>wx-java-spring-boot-starters</artifactId>
     <groupId>com.github.binarywang</groupId>
-    <version>4.7.7.B</version>
+    <version>4.7.8.B</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-boot-starters/wx-java-mp-spring-boot-starter/pom.xml b/spring-boot-starters/wx-java-mp-spring-boot-starter/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>wx-java-spring-boot-starters</artifactId>
     <groupId>com.github.binarywang</groupId>
-    <version>4.7.7.B</version>
+    <version>4.7.8.B</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-boot-starters/wx-java-open-spring-boot-starter/pom.xml b/spring-boot-starters/wx-java-open-spring-boot-starter/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>wx-java-spring-boot-starters</artifactId>
     <groupId>com.github.binarywang</groupId>
-    <version>4.7.7.B</version>
+    <version>4.7.8.B</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-boot-starters/wx-java-open-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/open/config/WxOpenServiceAutoConfiguration.java b/spring-boot-starters/wx-java-open-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/open/config/WxOpenServiceAutoConfiguration.java
@@ -28,6 +28,7 @@ public WxOpenService wxOpenService(WxOpenConfigStorage wxOpenConfigStorage) {
   }
 
   @Bean
+  @ConditionalOnMissingBean
   public WxOpenMessageRouter wxOpenMessageRouter(WxOpenService wxOpenService) {
     return new WxOpenMessageRouter(wxOpenService);
   }
diff --git a/spring-boot-starters/wx-java-pay-spring-boot-starter/pom.xml b/spring-boot-starters/wx-java-pay-spring-boot-starter/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>wx-java-spring-boot-starters</artifactId>
     <groupId>com.github.binarywang</groupId>
-    <version>4.7.7.B</version>
+    <version>4.7.8.B</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-boot-starters/wx-java-qidian-spring-boot-starter/pom.xml b/spring-boot-starters/wx-java-qidian-spring-boot-starter/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>wx-java-spring-boot-starters</artifactId>
     <groupId>com.github.binarywang</groupId>
-    <version>4.7.7.B</version>
+    <version>4.7.8.B</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/weixin-graal/pom.xml b/weixin-graal/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>wx-java</artifactId>
-    <version>4.7.7.B</version>
+    <version>4.7.8.B</version>
   </parent>
 
   <artifactId>weixin-graal</artifactId>
diff --git a/weixin-java-channel/pom.xml b/weixin-java-channel/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>wx-java</artifactId>
-    <version>4.7.7.B</version>
+    <version>4.7.8.B</version>
   </parent>
 
   <artifactId>weixin-java-channel</artifactId>
diff --git a/weixin-java-common/pom.xml b/weixin-java-common/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>wx-java</artifactId>
-    <version>4.7.7.B</version>
+    <version>4.7.8.B</version>
   </parent>
 
   <artifactId>weixin-java-common</artifactId>
diff --git a/weixin-java-cp/pom.xml b/weixin-java-cp/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>wx-java</artifactId>
-    <version>4.7.7.B</version>
+    <version>4.7.8.B</version>
   </parent>
 
   <artifactId>weixin-java-cp</artifactId>
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpGroupRobotService.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpGroupRobotService.java
@@ -70,6 +70,23 @@ public interface WxCpGroupRobotService {
    */
   void sendMarkdown(String webhookUrl, String content) throws WxErrorException;
 
+  /**
+   * 发送markdown_v2类型的消息
+   *
+   * @param content markdown内容，最长不超过4096个字节，必须是utf8编码
+   * @throws WxErrorException 异常
+   */
+  void sendMarkdownV2(String content) throws WxErrorException;
+
+  /**
+   * 发送markdown_v2类型的消息
+   *
+   * @param webhookUrl webhook地址
+   * @param content    markdown内容，最长不超过4096个字节，必须是utf8编码
+   * @throws WxErrorException 异常
+   */
+  void sendMarkdownV2(String webhookUrl, String content) throws WxErrorException;
+
   /**
    * 发送image类型的消息
    *
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpGroupRobotServiceImpl.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpGroupRobotServiceImpl.java
@@ -42,6 +42,11 @@ public void sendMarkdown(String content) throws WxErrorException {
     this.sendMarkdown(this.getWebhookUrl(), content);
   }
 
+  @Override
+  public void sendMarkdownV2(String content) throws WxErrorException {
+    this.sendMarkdownV2(this.getWebhookUrl(), content);
+  }
+
   @Override
   public void sendImage(String base64, String md5) throws WxErrorException {
     this.sendImage(this.getWebhookUrl(), base64, md5);
@@ -70,6 +75,14 @@ public void sendMarkdown(String webhookUrl, String content) throws WxErrorExcept
       .toJson());
   }
 
+  @Override
+  public void sendMarkdownV2(String webhookUrl, String content) throws WxErrorException {
+    this.cpService.postWithoutToken(webhookUrl, new WxCpGroupRobotMessage()
+      .setMsgType(GroupRobotMsgType.MARKDOWN_V2)
+      .setContent(content)
+      .toJson());
+  }
+
   @Override
   public void sendImage(String webhookUrl, String base64, String md5) throws WxErrorException {
     this.cpService.postWithoutToken(webhookUrl, new WxCpGroupRobotMessage()
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/message/WxCpGroupRobotMessage.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/message/WxCpGroupRobotMessage.java
@@ -252,6 +252,12 @@ public String toJson() {
         messageJson.add("markdown", text);
         break;
       }
+      case MARKDOWN_V2: {
+        JsonObject text = new JsonObject();
+        text.addProperty("content", this.getContent());
+        messageJson.add("markdown_v2", text);
+        break;
+      }
       case IMAGE: {
         JsonObject text = new JsonObject();
         text.addProperty("base64", this.getBase64());
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/message/WxCpXmlMessage.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/message/WxCpXmlMessage.java
@@ -92,7 +92,7 @@ public class WxCpXmlMessage implements Serializable {
   private String content;
 
   @XStreamAlias("MsgId")
-  private Long msgId;
+  private String msgId;
 
   @XStreamAlias("PicUrl")
   @XStreamConverter(value = XStreamCDataConverter.class)
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/constant/WxCpConsts.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/constant/WxCpConsts.java
@@ -630,6 +630,11 @@ public static class GroupRobotMsgType {
      */
     public static final String MARKDOWN = "markdown";
 
+    /**
+     * markdown_v2消息.
+     */
+    public static final String MARKDOWN_V2 = "markdown_v2";
+
     /**
      * 图文消息（点击跳转到外链）.
      */
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/util/json/WxCpUserGsonAdapter.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/util/json/WxCpUserGsonAdapter.java
@@ -281,7 +281,12 @@ public JsonElement serialize(WxCpUser user, Type typeOfSrc, JsonSerializationCon
     }
     addProperty(o, MAIN_DEPARTMENT, user.getMainDepartment());
 
-    addArrayProperty(o, DIRECT_LEADER, user.getDirectLeader());
+    // Special handling for directLeader: include empty arrays to support WeChat Work API reset functionality
+    if (user.getDirectLeader() != null) {
+      JsonArray directLeaderArray = new JsonArray();
+      Arrays.stream(user.getDirectLeader()).forEach(directLeaderArray::add);
+      o.add(DIRECT_LEADER, directLeaderArray);
+    }
 
     if (!user.getExtAttrs().isEmpty()) {
       JsonArray attrsJsonArray = new JsonArray();
diff --git a/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/impl/WxCpGroupRobotServiceImplTest.java b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/impl/WxCpGroupRobotServiceImplTest.java
diff --git a/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/bean/message/WxCpXmlMessageTest.java b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/bean/message/WxCpXmlMessageTest.java
diff --git a/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/util/json/WxCpUserGsonAdapterTest.java b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/util/json/WxCpUserGsonAdapterTest.java
diff --git a/weixin-java-miniapp/pom.xml b/weixin-java-miniapp/pom.xml
diff --git a/weixin-java-mp/pom.xml b/weixin-java-mp/pom.xml
diff --git a/weixin-java-open/README.md b/weixin-java-open/README.md
diff --git a/weixin-java-open/pom.xml b/weixin-java-open/pom.xml
diff --git a/weixin-java-pay/OVERSEAS_PAY.md b/weixin-java-pay/OVERSEAS_PAY.md
diff --git a/weixin-java-pay/pom.xml b/weixin-java-pay/pom.xml
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayUnifiedOrderV3GlobalRequest.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayUnifiedOrderV3GlobalRequest.java
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/enums/GlobalTradeTypeEnum.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/enums/GlobalTradeTypeEnum.java
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/WxPayService.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/WxPayService.java
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceImpl.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceImpl.java
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/ProfitSharingServiceImpl.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/ProfitSharingServiceImpl.java
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/v3/util/AesUtils.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/v3/util/AesUtils.java
diff --git a/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceGlobalImplTest.java b/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceGlobalImplTest.java
diff --git a/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/OverseasWxPayExample.java b/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/OverseasWxPayExample.java
diff --git a/weixin-java-qidian/pom.xml b/weixin-java-qidian/pom.xml
