🎨 【开放平台】重构小程序认证及备案相关接口

Author: qw8881569

spring-boot-starters/wx-java-open-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/open/properties/WxOpenProperties.java

@@ -108,6 +108,21 @@ public static class ConfigStorage implements Serializable {
      */
     private int maxRetryTimes = 5;
 
+    /**
+     * 连接超时时间，单位毫秒
+     */
+    private int connectionTimeout = 5000;
+
+    /**
+     * 读数据超时时间，即socketTimeout，单位毫秒
+     */
+    private int soTimeout = 1;
+
+    /**
+     * 从连接池获取链接的超时时间，单位毫秒
+     */
+    private int connectionRequestTimeout = 5000;
+
   }
 
   public enum StorageType {

weixin-java-open/src/main/java/me/chanjar/weixin/open/api/WxOpenMaAuthAndIcpService.java

@@ -0,0 +1,32 @@
+package me.chanjar.weixin.open.api;
+
+import me.chanjar.weixin.common.error.WxErrorException;
+import me.chanjar.weixin.open.bean.authandicp.WxOpenQueryAuthAndIcpResult;
+import me.chanjar.weixin.open.bean.authandicp.WxOpenSubmitAuthAndIcpParam;
+import me.chanjar.weixin.open.bean.authandicp.WxOpenSubmitAuthAndIcpResult;
+
+/**
+ * 微信第三方平台 小程序认证及备案
+ * @author 痴货
+ * @createTime 2025/06/18 23:00
+ */
+public interface WxOpenMaAuthAndIcpService {
+
+  String QUERY_AUTH_AND_ICP = "https://api.weixin.qq.com/wxa/sec/query_auth_and_icp";
+
+  String SUBMIT_AUTH_AND_ICP = "https://api.weixin.qq.com/wxa/sec/submit_auth_and_icp";
+
+  /**
+   * 查询小程序认证及备案进度。
+   * @param procedureId 小程序认证及备案任务流程id
+   * @return 小程序认证及备案进度
+   */
+  WxOpenQueryAuthAndIcpResult queryAuthAndIcp(String procedureId) throws WxErrorException;
+
+  /**
+   * 提交小程序认证及备案信息。
+   * @param param 提交小程序认证及备案信息参数
+   * @return 提交结果
+   */
+  WxOpenSubmitAuthAndIcpResult submitAuthAndIcp(WxOpenSubmitAuthAndIcpParam param) throws WxErrorException;
+}

weixin-java-open/src/main/java/me/chanjar/weixin/open/api/WxOpenMaBasicService.java

@@ -53,19 +53,23 @@ public interface WxOpenMaBasicService {
    */
   String OPEN_GET_ALL_CATEGORIES = "https://api.weixin.qq.com/cgi-bin/wxopen/getallcategories";
   /**
-   * 8.2 添加类目
+   * 8.2 获取不同类型主体可设置的类目
+   */
+  String OPEN_GET_ALL_CATEGORIES_BY_TYPE = "https://api.weixin.qq.com/cgi-bin/wxopen/getcategoriesbytype";
+  /**
+   * 8.3 添加类目
    */
   String OPEN_ADD_CATEGORY = "https://api.weixin.qq.com/cgi-bin/wxopen/addcategory";
   /**
-   * 8.3 删除类目
+   * 8.4 删除类目
    */
   String OPEN_DELETE_CATEGORY = "https://api.weixin.qq.com/cgi-bin/wxopen/deletecategory";
   /**
-   * 8.4 获取账号已经设置的所有类目
+   * 8.5 获取账号已经设置的所有类目
    */
   String OPEN_GET_CATEGORY = "https://api.weixin.qq.com/cgi-bin/wxopen/getcategory";
   /**
-   * 8.5 修改类目
+   * 8.6 修改类目
    */
   String OPEN_MODIFY_CATEGORY = "https://api.weixin.qq.com/cgi-bin/wxopen/modifycategory";
 
@@ -167,7 +171,12 @@ WxFastMaSetNickameResult setNickname(String nickname, String idCard, String lice
   String getAllCategories() throws WxErrorException;
 
   /**
-   * 8.2添加类目
+   * 8.2获取不同类型主体可设置的类目
+   */
+  WxOpenGetAllCategoriesByTypeResult getAllCategoriesByType(String verifyType) throws WxErrorException;
+
+  /**
+   * 8.3添加类目
    *
    * @param categoryList 类目列表
    * @return .
@@ -176,7 +185,7 @@ WxFastMaSetNickameResult setNickname(String nickname, String idCard, String lice
   WxOpenResult addCategory(List<WxFastMaCategory> categoryList) throws WxErrorException;
 
   /**
-   * 8.3删除类目
+   * 8.4删除类目
    *
    * @param first  一级类目ID
    * @param second 二级类目ID
@@ -186,15 +195,15 @@ WxFastMaSetNickameResult setNickname(String nickname, String idCard, String lice
   WxOpenResult deleteCategory(int first, int second) throws WxErrorException;
 
   /**
-   * 8.4获取账号已经设置的所有类目
+   * 8.5获取账号已经设置的所有类目
    *
    * @return .
    * @throws WxErrorException .
    */
   WxFastMaBeenSetCategoryResult getCategory() throws WxErrorException;
 
   /**
-   * 8.5修改类目
+   * 8.6修改类目
    *
    * @param category 实体
    * @return .

weixin-java-open/src/main/java/me/chanjar/weixin/open/api/WxOpenMaIcpService.java

@@ -119,14 +119,6 @@ public interface WxOpenMaIcpService {
    */
   WxOpenIcpVerifyTaskResult queryIcpVerifyTask(String taskId) throws WxErrorException;
 
-  /**
-   * 发起小程序管理员人脸核身
-   *
-   * @return 人脸核验任务结果
-   * @throws WxErrorException e
-   */
-  WxOpenIcpCreateIcpVerifyTaskResult createIcpVerifyTask() throws WxErrorException;
-
   /**
    * 发起小程序管理员人脸核身
    *
@@ -227,21 +219,4 @@ public interface WxOpenMaIcpService {
    */
   File getIcpMedia(String mediaId) throws WxErrorException;
 
-  /**
-   * 申请小程序认证及备案
-   *
-   * @param param 参数
-   * @return r
-   * @throws WxErrorException e
-   */
-  WxOpenSubmitAuthAndIcpResult submitAuthAndIcp(WxOpenSubmitAuthAndIcpParam param) throws WxErrorException;
-
-  /**
-   * 查询小程序认证及备案进度
-   * @param procedureId 小程序认证及备案任务流程id
-   * @return r
-   * @throws WxErrorException e
-   */
-  WxOpenQueryAuthAndIcpResult queryAuthAndIcp(String procedureId) throws WxErrorException;
-
 }

weixin-java-open/src/main/java/me/chanjar/weixin/open/api/WxOpenMaService.java

@@ -731,6 +731,13 @@ WxOpenMaDomainResult modifyDomain(String action, List<String> requestDomains, Li
    */
   WxOpenMaIcpService getIcpService();
 
+  /**
+   * 小程序认证及备案服务
+   *
+   * @return 小程序认证及备案服务
+   */
+  WxOpenMaAuthAndIcpService getAuthAndIcpService();
+
   /**
    * 小程序用户隐私保护指引服务
    *

weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/WxOpenFastMaServiceImpl.java

@@ -112,6 +112,11 @@ public String getAllCategories() throws WxErrorException {
     return get(OPEN_GET_ALL_CATEGORIES, "");
   }
 
+  @Override
+  public WxOpenGetAllCategoriesByTypeResult getAllCategoriesByType(String verifyType)  {
+    return null;
+  }
+
   @Override
   public WxOpenResult addCategory(List<WxFastMaCategory> categoryList) throws WxErrorException {
     Map<String, Object> map = new HashMap<>();

weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/WxOpenMaAuthAndIcpServiceImpl.java

@@ -0,0 +1,40 @@
+package me.chanjar.weixin.open.api.impl;
+
+import cn.binarywang.wx.miniapp.api.WxMaService;
+import cn.binarywang.wx.miniapp.json.WxMaGsonBuilder;
+import com.google.gson.JsonObject;
+import me.chanjar.weixin.common.error.WxErrorException;
+import me.chanjar.weixin.open.api.WxOpenMaAuthAndIcpService;
+import me.chanjar.weixin.open.bean.authandicp.WxOpenQueryAuthAndIcpResult;
+import me.chanjar.weixin.open.bean.authandicp.WxOpenSubmitAuthAndIcpParam;
+import me.chanjar.weixin.open.bean.authandicp.WxOpenSubmitAuthAndIcpResult;
+import me.chanjar.weixin.open.util.json.WxOpenGsonBuilder;
+
+/**
+ * 微信第三方平台 小程序认证及备案
+ *
+ * @author 痴货
+ * @createTime 2025/06/18 23:00
+ */
+public class WxOpenMaAuthAndIcpServiceImpl implements WxOpenMaAuthAndIcpService {
+
+  private final WxMaService wxMaService;
+
+  public WxOpenMaAuthAndIcpServiceImpl(WxMaService wxMaService) {
+    this.wxMaService = wxMaService;
+  }
+
+  @Override
+  public WxOpenQueryAuthAndIcpResult queryAuthAndIcp(String procedureId) throws WxErrorException {
+    JsonObject params = new JsonObject();
+    params.addProperty("procedure_id", procedureId);
+    String response = wxMaService.post(QUERY_AUTH_AND_ICP, params);
+    return WxOpenGsonBuilder.create().fromJson(response, WxOpenQueryAuthAndIcpResult.class);
+  }
+
+  @Override
+  public WxOpenSubmitAuthAndIcpResult submitAuthAndIcp(WxOpenSubmitAuthAndIcpParam param) throws WxErrorException {
+    String response = wxMaService.post(SUBMIT_AUTH_AND_ICP, param);
+    return WxMaGsonBuilder.create().fromJson(response, WxOpenSubmitAuthAndIcpResult.class);
+  }
+}

weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/WxOpenMaBasicServiceImpl.java

@@ -94,6 +94,14 @@ public String getAllCategories() throws WxErrorException {
     return wxMaService.get(OPEN_GET_ALL_CATEGORIES, "");
   }
 
+  @Override
+  public WxOpenGetAllCategoriesByTypeResult getAllCategoriesByType(String verifyType) throws WxErrorException {
+    JsonObject params = new JsonObject();
+    params.addProperty("verify_type", verifyType);
+    String response = wxMaService.post(OPEN_GET_ALL_CATEGORIES_BY_TYPE, params);
+    return WxOpenGsonBuilder.create().fromJson(response, WxOpenGetAllCategoriesByTypeResult.class);
+  }
+
   @Override
   public WxOpenResult addCategory(List<WxFastMaCategory> categoryList) throws WxErrorException {
     Map<String, Object> map = new HashMap<>();

weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/WxOpenMaIcpServiceImpl.java

@@ -46,17 +46,6 @@ public WxOpenIcpVerifyTaskResult queryIcpVerifyTask(String taskId) throws WxErro
     return WxOpenGsonBuilder.create().fromJson(response, WxOpenIcpVerifyTaskResult.class);
   }
 
-  /**
-   * 发起小程序管理员人脸核身
-   *
-   * @return 人脸核验任务结果
-   * @throws WxErrorException e
-   */
-  @Override
-  public WxOpenIcpCreateIcpVerifyTaskResult createIcpVerifyTask() throws WxErrorException {
-    return createIcpVerifyTask(false);
-  }
-
   /**
    * 发起小程序管理员人脸核身
    *
@@ -227,31 +216,4 @@ public File getIcpMedia(String mediaId) throws WxErrorException {
     }
   }
 
-  /**
-   * 申请小程序认证及备案
-   *
-   * @param param 参数
-   * @return r
-   * @throws WxErrorException e
-   */
-  @Override
-  public WxOpenSubmitAuthAndIcpResult submitAuthAndIcp(WxOpenSubmitAuthAndIcpParam param) throws WxErrorException {
-    String response = wxMaService.post(SUBMIT_AUTH_AND_ICP, param);
-    return WxMaGsonBuilder.create().fromJson(response, WxOpenSubmitAuthAndIcpResult.class);
-  }
-
-  /**
-   * 查询小程序认证及备案进度
-   *
-   * @param procedureId 小程序认证及备案任务流程id
-   * @return r
-   * @throws WxErrorException e
-   */
-  @Override
-  public WxOpenQueryAuthAndIcpResult queryAuthAndIcp(String procedureId) throws WxErrorException {
-    JsonObject params = new JsonObject();
-    params.addProperty("procedure_id", procedureId);
-    String response = wxMaService.post(QUERY_AUTH_AND_ICP, params);
-    return WxOpenGsonBuilder.create().fromJson(response, WxOpenQueryAuthAndIcpResult.class);
-  }
 }

weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/WxOpenMaServiceImpl.java

@@ -56,6 +56,8 @@ public class WxOpenMaServiceImpl extends WxMaServiceImpl implements WxOpenMaServ
   private final WxOpenMaShoppingOrdersService shoppingOrdersService;
   @Getter
   private final WxOpenMaEmbeddedService embeddedService;
+  @Getter
+  private final WxOpenMaAuthAndIcpService authAndIcpService;
 
   public WxOpenMaServiceImpl(WxOpenComponentService wxOpenComponentService, String appId, WxMaConfig wxMaConfig) {
     this.wxOpenComponentService = wxOpenComponentService;
@@ -67,6 +69,7 @@ public WxOpenMaServiceImpl(WxOpenComponentService wxOpenComponentService, String
     this.privacyService = new WxOpenMaPrivacyServiceImpl(this);
     this.shoppingOrdersService = new WxOpenMaShoppingOrdersServiceImpl(this);
     this.embeddedService = new WxOpenMaEmbeddedServiceImpl(this);
+    this.authAndIcpService = new WxOpenMaAuthAndIcpServiceImpl(this);
     initHttp();
   }