fix: 支持长整型企业微信应用ID

spring-boot-starters/wx-java-cp-multi-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/cp/configuration/services/AbstractWxCpConfiguration.java

@@ -125,7 +125,7 @@ private WxCpService wxCpService(WxCpConfigStorage wxCpConfigStorage, WxCpMultiPr
   private void configCorp(WxCpDefaultConfigImpl config, WxCpSingleProperties wxCpSingleProperties) {
     String corpId = wxCpSingleProperties.getCorpId();
     String corpSecret = wxCpSingleProperties.getCorpSecret();
-    Integer agentId = wxCpSingleProperties.getAgentId();
+    Long agentId = wxCpSingleProperties.getAgentId();
     String token = wxCpSingleProperties.getToken();
     String aesKey = wxCpSingleProperties.getAesKey();
     // 企业微信，私钥，会话存档路径

spring-boot-starters/wx-java-cp-multi-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/cp/properties/WxCpSingleProperties.java

@@ -52,7 +52,7 @@ public class WxCpSingleProperties implements Serializable {
    * <p>使用自建应用 Secret 时，需要填写对应应用的 AgentId。</p>
    * <p>使用通讯录同步 Secret 时，无需填写此字段。</p>
    */
-  private Integer agentId;
+  private Long agentId;
   /**
    * 微信企业号应用 EncodingAESKey
    */

spring-boot-starters/wx-java-cp-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/cp/properties/WxCpProperties.java

@@ -34,7 +34,7 @@ public class WxCpProperties {
   /**
    * 微信企业号应用 ID
    */
-  private Integer agentId;
+  private Long agentId;
   /**
    * 微信企业号应用 EncodingAESKey
    */

spring-boot-starters/wx-java-cp-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/cp/storage/AbstractWxCpConfigStorageConfiguration.java

@@ -15,7 +15,7 @@ public abstract class AbstractWxCpConfigStorageConfiguration {
   protected WxCpDefaultConfigImpl config(WxCpDefaultConfigImpl config, WxCpProperties properties) {
     String corpId = properties.getCorpId();
     String corpSecret = properties.getCorpSecret();
-    Integer agentId = properties.getAgentId();
+    Long agentId = properties.getAgentId();
     String token = properties.getToken();
     String aesKey = properties.getAesKey();
     // 企业微信，私钥，会话存档路径

weixin-java-common/src/main/java/me/chanjar/weixin/common/util/DataUtils.java

@@ -17,8 +17,10 @@ public class DataUtils {
    */
   public static <E> E handleDataWithSecret(E data) {
     E dataForLog = data;
-    if (data instanceof String && StringUtils.contains((String) data, "secret=")) {
-      dataForLog = (E) RegExUtils.replaceAll((String) data, "(^|[?&])secret=[^&]*", "$1secret=******");
+    if (data instanceof String) {
+      String stringData = (String) data;
+      stringData = RegExUtils.replaceAll(stringData, "(^|[?&])secret=[^&]*", "$1secret=******");
+      dataForLog = (E) RegExUtils.replaceAll(stringData, "(\\\"openid\\\"\\s*:\\s*\\\")[^\\\"]*(\\\")", "$1******$2");
     }
     return dataForLog;
   }

weixin-java-common/src/test/java/me/chanjar/weixin/common/util/DataUtilsTest.java

@@ -47,4 +47,14 @@ public void testHandleDataWithSecretEncodedValue() {
     assertFalse(s.contains("%2F"), "Encoded characters in the secret must be masked too");
     assertTrue(s.contains("&secret=******&"), "Secret should be replaced with asterisks");
   }
+
+  @Test
+  public void testHandleDataWithOpenidInJson() {
+    String data = "{\"code\":\"phone-code\",\"openid\":\"user-openid\"}";
+
+    String result = DataUtils.handleDataWithSecret(data);
+
+    assertFalse(result.contains("user-openid"));
+    assertTrue(result.contains("\"openid\":\"******\""));
+  }
 }

weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpAgentService.java

@@ -27,7 +27,7 @@ public interface WxCpAgentService {
    * @return wx cp agent
    * @throws WxErrorException the wx error exception
    */
-  WxCpAgent get(Integer agentId) throws WxErrorException;
+  WxCpAgent get(Long agentId) throws WxErrorException;
 
   /**
    * <pre>
@@ -65,6 +65,6 @@ public interface WxCpAgentService {
    * @return admin list
    * @throws WxErrorException the wx error exception
    */
-  WxCpTpAdmin getAdminList(Integer agentId) throws WxErrorException;
+  WxCpTpAdmin getAdminList(Long agentId) throws WxErrorException;
 
 }

weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpCorpGroupService.java

@@ -23,5 +23,5 @@ public interface WxCpCorpGroupService {
    * @return the list
    * @throws WxErrorException the wx error exception
    */
-  List<WxCpCorpGroupCorp> listAppShareInfo(Integer agentId, Integer businessType, String corpId, Integer limit, String cursor) throws WxErrorException;
+  List<WxCpCorpGroupCorp> listAppShareInfo(Long agentId, Integer businessType, String corpId, Integer limit, String cursor) throws WxErrorException;
 }

weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpMenuService.java

@@ -40,7 +40,7 @@ public interface WxCpMenuService {
    * @throws WxErrorException the wx error exception
    * @see #create(me.chanjar.weixin.common.bean.menu.WxMenu) #create(me.chanjar.weixin.common.bean.menu.WxMenu)
    */
-  void create(Integer agentId, WxMenu menu) throws WxErrorException;
+  void create(Long agentId, WxMenu menu) throws WxErrorException;
 
   /**
    * <pre>
@@ -67,7 +67,7 @@ public interface WxCpMenuService {
    * @throws WxErrorException the wx error exception
    * @see #delete() #delete()
    */
-  void delete(Integer agentId) throws WxErrorException;
+  void delete(Long agentId) throws WxErrorException;
 
   /**
    * <pre>
@@ -96,5 +96,5 @@ public interface WxCpMenuService {
    * @throws WxErrorException the wx error exception
    * @see #get() #get()
    */
-  WxMenu get(Integer agentId) throws WxErrorException;
+  WxMenu get(Long agentId) throws WxErrorException;
 }

weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpOAuth2Service.java

@@ -85,7 +85,7 @@ public interface WxCpOAuth2Service {
    * @throws WxErrorException 异常
    * @see #getUserInfo(String) #getUserInfo(String)
    */
-  WxCpOauth2UserInfo getUserInfo(Integer agentId, String code) throws WxErrorException;
+  WxCpOauth2UserInfo getUserInfo(Long agentId, String code) throws WxErrorException;
 
   /**
    * 获取家校访问用户身份

weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpAgentServiceImpl.java

@@ -34,7 +34,7 @@ public class WxCpAgentServiceImpl implements WxCpAgentService {
   private final WxCpService mainService;
 
   @Override
-  public WxCpAgent get(Integer agentId) throws WxErrorException {
+  public WxCpAgent get(Long agentId) throws WxErrorException {
     if (agentId == null) {
       throw new IllegalArgumentException("缺少agentid参数");
     }
@@ -67,7 +67,7 @@ public List<WxCpAgent> list() throws WxErrorException {
   }
 
   @Override
-  public WxCpTpAdmin getAdminList(Integer agentId) throws WxErrorException {
+  public WxCpTpAdmin getAdminList(Long agentId) throws WxErrorException {
     if (agentId == null) {
       throw new IllegalArgumentException("缺少agentid参数");
     }

weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpCorpGroupServiceImpl.java

@@ -25,7 +25,7 @@ public class WxCpCorpGroupServiceImpl implements WxCpCorpGroupService {
   private final WxCpService cpService;
 
   @Override
-  public List<WxCpCorpGroupCorp> listAppShareInfo(Integer agentId, Integer businessType, String corpId,
+  public List<WxCpCorpGroupCorp> listAppShareInfo(Long agentId, Integer businessType, String corpId,
                                                   Integer limit, String cursor) throws WxErrorException {
     final String url = this.cpService.getWxCpConfigStorage().getApiUrl(LIST_SHARE_APP_INFO);
     JsonObject jsonObject = new JsonObject();

weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpMenuServiceImpl.java

@@ -27,7 +27,7 @@ public void create(WxMenu menu) throws WxErrorException {
   }
 
   @Override
-  public void create(Integer agentId, WxMenu menu) throws WxErrorException {
+  public void create(Long agentId, WxMenu menu) throws WxErrorException {
     String url = String.format(this.mainService.getWxCpConfigStorage().getApiUrl(MENU_CREATE), agentId);
     this.mainService.post(url, menu.toJson());
   }
@@ -38,7 +38,7 @@ public void delete() throws WxErrorException {
   }
 
   @Override
-  public void delete(Integer agentId) throws WxErrorException {
+  public void delete(Long agentId) throws WxErrorException {
     String url = String.format(this.mainService.getWxCpConfigStorage().getApiUrl(MENU_DELETE), agentId);
     this.mainService.get(url, null);
   }
@@ -49,7 +49,7 @@ public WxMenu get() throws WxErrorException {
   }
 
   @Override
-  public WxMenu get(Integer agentId) throws WxErrorException {
+  public WxMenu get(Long agentId) throws WxErrorException {
     String url = String.format(this.mainService.getWxCpConfigStorage().getApiUrl(MENU_GET), agentId);
     try {
       String resultContent = this.mainService.get(url, null);

weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpMessageServiceImpl.java

@@ -21,7 +21,7 @@ public class WxCpMessageServiceImpl implements WxCpMessageService {
 
   @Override
   public WxCpMessageSendResult send(WxCpMessage message) throws WxErrorException {
-    Integer agentId = message.getAgentId();
+    Long agentId = message.getAgentId();
     if (null == agentId) {
       message.setAgentId(this.cpService.getWxCpConfigStorage().getAgentId());
     }
@@ -38,7 +38,7 @@ public WxCpMessageSendStatistics getStatistics(int timeType) throws WxErrorExcep
 
   @Override
   public WxCpLinkedCorpMessageSendResult sendLinkedCorpMessage(WxCpLinkedCorpMessage message) throws WxErrorException {
-    Integer agentId = message.getAgentId();
+    Long agentId = message.getAgentId();
     if (null == agentId) {
       message.setAgentId(this.cpService.getWxCpConfigStorage().getAgentId());
     }

weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpOAuth2ServiceImpl.java

@@ -69,7 +69,7 @@ public WxCpOauth2UserInfo getUserInfo(String code) throws WxErrorException {
   }
 
   @Override
-  public WxCpOauth2UserInfo getUserInfo(Integer agentId, String code) throws WxErrorException {
+  public WxCpOauth2UserInfo getUserInfo(Long agentId, String code) throws WxErrorException {
     String responseText =
       this.mainService.get(String.format(this.mainService.getWxCpConfigStorage().getApiUrl(GET_USER_INFO), code,
         agentId), null);

weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpTaskCardServiceImpl.java

@@ -28,7 +28,7 @@ public class WxCpTaskCardServiceImpl implements WxCpTaskCardService {
 
   @Override
   public void update(List<String> userIds, String taskId, String replaceName) throws WxErrorException {
-    Integer agentId = this.mainService.getWxCpConfigStorage().getAgentId();
+    Long agentId = this.mainService.getWxCpConfigStorage().getAgentId();
 
     Map<String, Object> data = new HashMap<>(4);
     data.put("userids", userIds);
@@ -45,7 +45,7 @@ public void update(List<String> userIds, String taskId, String replaceName) thro
   public void updateTemplateCardButton(List<String> userIds, List<Integer> partyIds,
                                        List<Integer> tagIds, Integer atAll,
                                        String responseCode, String replaceName) throws WxErrorException {
-    Integer agentId = this.mainService.getWxCpConfigStorage().getAgentId();
+    Long agentId = this.mainService.getWxCpConfigStorage().getAgentId();
     Map<String, Object> data = new HashMap<>(7);
     data.put("userids", userIds);
     data.put("partyids", partyIds);

weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpAgent.java

@@ -32,7 +32,7 @@ public class WxCpAgent implements Serializable {
   private String errMsg;
 
   @SerializedName("agentid")
-  private Integer agentId;
+  private Long agentId;
 
   @SerializedName("name")
   private String name;

weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpAgentJsapiSignature.java

@@ -21,7 +21,7 @@ public class WxCpAgentJsapiSignature implements Serializable {
 
   private String corpid;
 
-  private Integer agentid;
+  private Long agentid;
 
   private long timestamp;
 

weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/corpgroup/WxCpCorpGroupCorpGetTokenReq.java

@@ -17,5 +17,5 @@ public class WxCpCorpGroupCorpGetTokenReq implements Serializable {
   @SerializedName("business_type")
   private int businessType;
   @SerializedName("agentid")
-  private int agentId;
+  private long agentId;
 }

weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/message/WxCpLinkedCorpMessage.java

@@ -55,7 +55,15 @@ public class WxCpLinkedCorpMessage implements Serializable {
   /**
    * 企业应用的id，整型。可在应用的设置页面查看
    */
-  private Integer agentId;
+  private Long agentId;
+
+  public void setAgentId(long agentId) {
+    this.agentId = Long.valueOf(agentId);
+  }
+
+  public void setAgentId(Long agentId) {
+    this.agentId = agentId;
+  }
   private String msgType;
   /**
    * 消息内容，最长不超过2048个字节

weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/message/WxCpMessage.java

@@ -45,7 +45,15 @@ public class WxCpMessage implements Serializable {
   /**
    * 企业应用的id，整型。企业内部开发，可在应用的设置页面查看；第三方服务商，可通过接口 获取企业授权信息 获取该参数值
    */
-  private Integer agentId;
+  private Long agentId;
+
+  public void setAgentId(long agentId) {
+    this.agentId = Long.valueOf(agentId);
+  }
+
+  public void setAgentId(Long agentId) {
+    this.agentId = agentId;
+  }
   /**
    * 消息类型
    * 文本消息: text

weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/message/WxCpSchoolContactMessage.java

@@ -74,7 +74,15 @@ public class WxCpSchoolContactMessage implements Serializable {
    * 企业应用的id，整型。可在应用的设置页面查看
    */
   @SerializedName("agentid")
-  private Integer agentId;
+  private Long agentId;
+
+  public void setAgentId(long agentId) {
+    this.agentId = Long.valueOf(agentId);
+  }
+
+  public void setAgentId(Long agentId) {
+    this.agentId = agentId;
+  }
 
   /**
    * 消息内容，最长不超过2048个字节（支持id转译）

weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/messagebuilder/BaseBuilder.java

@@ -15,7 +15,7 @@ public abstract class BaseBuilder<T> {
   /**
    * The Agent id.
    */
-  protected Integer agentId;
+  protected Long agentId;
   /**
    * The To user.
    */
@@ -39,11 +39,15 @@ public abstract class BaseBuilder<T> {
    * @param agentId the agent id
    * @return the t
    */
-  public T agentId(Integer agentId) {
+  public T agentId(Long agentId) {
     this.agentId = agentId;
     return (T) this;
   }
 
+  public T agentId(long agentId) {
+    return this.agentId(Long.valueOf(agentId));
+  }
+
   /**
    * To user t.
    *

weixin-java-cp/src/main/java/me/chanjar/weixin/cp/config/WxCpConfigStorage.java

@@ -158,7 +158,7 @@ public interface WxCpConfigStorage {
    *
    * @return the agent id
    */
-  Integer getAgentId();
+  Long getAgentId();
 
   /**
    * Gets token.

weixin-java-cp/src/main/java/me/chanjar/weixin/cp/config/WxCpCorpGroupConfigStorage.java

@@ -36,7 +36,7 @@ public interface WxCpCorpGroupConfigStorage {
    * @param corpAccessToken  the corp access token
    * @param expiresInSeconds the expires in seconds
    */
-  void updateCorpAccessToken(String corpId, Integer agentId, String corpAccessToken, int expiresInSeconds);
+  void updateCorpAccessToken(String corpId, Long agentId, String corpAccessToken, int expiresInSeconds);
 
   /**
    * 授权企业的access token相关
@@ -45,7 +45,7 @@ public interface WxCpCorpGroupConfigStorage {
    * @param agentId 应用ID
    * @return the access token
    */
-  String getCorpAccessToken(String corpId, Integer agentId);
+  String getCorpAccessToken(String corpId, Long agentId);
 
   /**
    * Gets access token entity.
@@ -54,7 +54,7 @@ public interface WxCpCorpGroupConfigStorage {
    * @param agentId 应用ID
    * @return the access token entity
    */
-  WxAccessToken getCorpAccessTokenEntity(String corpId, Integer agentId);
+  WxAccessToken getCorpAccessTokenEntity(String corpId, Long agentId);
 
   /**
    * Is access token expired boolean.
@@ -63,15 +63,15 @@ public interface WxCpCorpGroupConfigStorage {
    * @param agentId 应用ID
    * @return the boolean
    */
-  boolean isCorpAccessTokenExpired(String corpId, Integer agentId);
+  boolean isCorpAccessTokenExpired(String corpId, Long agentId);
 
   /**
    * Expire access token.
    *
    * @param corpId  企业ID
    * @param agentId 应用ID
    */
-  void expireCorpAccessToken(String corpId, Integer agentId);
+  void expireCorpAccessToken(String corpId, Long agentId);
 
   /**
    * 网络代理相关
@@ -122,11 +122,11 @@ public interface WxCpCorpGroupConfigStorage {
    * @param agentId 应用ID
    * @return the access token lock
    */
-  Lock getCorpAccessTokenLock(String corpId, Integer agentId);
+  Lock getCorpAccessTokenLock(String corpId, Long agentId);
 
   void setCorpId(String corpId);
 
-  void setAgentId(Integer agentId);
+  void setAgentId(Long agentId);
 
   /**
    * Gets corp id.
@@ -140,5 +140,5 @@ public interface WxCpCorpGroupConfigStorage {
    *
    * @return the agent id
    */
-  Integer getAgentId();
+  Long getAgentId();
 }