Skip to content

Commit c9b68b5

Browse files
authored
🎨 移除已废弃接口【getPhoneNoInfo】和【getNewPhoneNoInfo(code)】
1 parent a35720c commit c9b68b5

File tree

3 files changed

+17
-41
lines changed

3 files changed

+17
-41
lines changed

weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/WxMaUserService.java

Lines changed: 11 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -45,36 +45,26 @@ public interface WxMaUserService {
4545
void setUserStorage(Map<String, String> kvMap, String sessionKey, String openid) throws WxErrorException;
4646

4747
/**
48-
* 解密用户手机号信息.
48+
* 获取手机号信息,2023年8月28日起
4949
*
50-
* @param sessionKey 会话密钥
51-
* @param encryptedData 消息密文
52-
* @param ivStr 加密算法的初始向量
53-
* @return .
54-
* @deprecated 请使用替代方法 {@link #getPhoneNoInfo(String)}
55-
*/
56-
@Deprecated
57-
WxMaPhoneNumberInfo getPhoneNoInfo(String sessionKey, String encryptedData, String ivStr);
58-
59-
/**
60-
* 获取手机号信息,基础库:2.21.2及以上
61-
*
62-
* @param code 动态令牌
63-
* @return .
50+
* @param code 每个code只能使用一次,code的有效期为5min。code获取方式参考<a href="https://developers.weixin.qq.com/miniprogram/dev/framework/open-ability/getPhoneNumber.html">手机号快速验证组件</a>
51+
* @return 用户手机号信息
6452
* @throws WxErrorException .
53+
* @apiNote 该接口用于将code换取用户手机号。
6554
*/
66-
WxMaPhoneNumberInfo getPhoneNoInfo(String code) throws WxErrorException;
55+
WxMaPhoneNumberInfo getPhoneNumber(String code) throws WxErrorException;
6756

6857
/**
69-
* 获取手机号信息,基础库:2.21.2及以上
58+
* 获取手机号信息,2023年8月28日起
7059
*
71-
* @param code 动态令牌
72-
* @return .
60+
* @param code 每个code只能使用一次,code的有效期为5min。code获取方式参考<a href="https://developers.weixin.qq.com/miniprogram/dev/framework/open-ability/getPhoneNumber.html">手机号快速验证组件</a>
61+
* @return 用户手机号信息
7362
* @throws WxErrorException .
74-
* @deprecated 命名有些复杂,请使用替代方法 {@link #getPhoneNoInfo(String)}
63+
* @apiNote 该接口用于将code换取用户手机号。
64+
* @implNote 为保持命名风格一致,此方法将更名,推荐使用{@link WxMaUserService#getPhoneNumber(String)}
7565
*/
7666
@Deprecated
77-
WxMaPhoneNumberInfo getNewPhoneNoInfo(String code) throws WxErrorException;
67+
WxMaPhoneNumberInfo getPhoneNoInfo(String code) throws WxErrorException;
7868

7969
/**
8070
* 验证用户信息完整性.

weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaUserServiceImpl.java

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -58,12 +58,7 @@ public void setUserStorage(Map<String, String> kvMap, String sessionKey, String
5858
}
5959

6060
@Override
61-
public WxMaPhoneNumberInfo getPhoneNoInfo(String sessionKey, String encryptedData, String ivStr) {
62-
return WxMaPhoneNumberInfo.fromJson(WxMaCryptUtils.decrypt(sessionKey, encryptedData, ivStr));
63-
}
64-
65-
@Override
66-
public WxMaPhoneNumberInfo getPhoneNoInfo(String code) throws WxErrorException {
61+
public WxMaPhoneNumberInfo getPhoneNumber(String code) throws WxErrorException {
6762
JsonObject param = new JsonObject();
6863
param.addProperty("code", code);
6964
String responseContent = this.service.post(GET_PHONE_NUMBER_URL, param.toString());
@@ -77,8 +72,8 @@ public WxMaPhoneNumberInfo getPhoneNoInfo(String code) throws WxErrorException {
7772
}
7873

7974
@Override
80-
public WxMaPhoneNumberInfo getNewPhoneNoInfo(String code) throws WxErrorException {
81-
return this.getPhoneNoInfo(code);
75+
public WxMaPhoneNumberInfo getPhoneNoInfo(String code) throws WxErrorException {
76+
return this.getPhoneNumber(code);
8277
}
8378

8479
@Override

weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/api/impl/WxMaUserServiceImplTest.java

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,10 @@ public void testCheckUserInfo() {
4747
"75e81ceda165f4ffa64f4068af58c64b8f54b88c"));
4848
}
4949

50-
/**
51-
* TODO 测试数据有问题,需要替换为正确的数据
52-
*/
50+
5351
@Test
54-
public void testGetPhoneNoInfo() {
55-
WxMaPhoneNumberInfo phoneNoInfo = this.wxService.getUserService().getPhoneNoInfo("tiihtNczf5v6AKRyjwEUhQ==",
56-
"CiyLU1Aw2KjvrjMdj8YKliAjtP4gsMZMQmRzooG2xrDcvSnxIMXFufNstNGTyaGS9uT5geRa0W4oTOb1WT7fJlAC+oNPdbB+3hVbJSRgv+4lGOETKUQz6OYStslQ142dNCuabNPGBzlooOmB231qMM85d2/fV6ChevvXvQP8Hkue1poOFtnEtpyxVLW1zAo6/1Xx1COxFvrc2d7UL/lmHInNlxuacJXwu0fjpXfz/YqYzBIBzD6WUfTIF9GRHpOn/Hz7saL8xz+W//FRAUid1OksQaQx4CMs8LOddcQhULW4ucetDf96JcR3g0gfRK4PC7E/r7Z6xNrXd2UIeorGj5Ef7b1pJAYB6Y5anaHqZ9J6nKEBvB4DnNLIVWSgARns/8wR2SiRS7MNACwTyrGvt9ts8p12PKFdlqYTopNHR1Vf7XjfhQlVsAJdNiKdYmYVoKlaRv85IfVunYzO0IKXsyl7JCUjCpoG20f0a04COwfneQAGGwd5oa+T8yO5hzuyDb/XcxxmK01EpqOyuxINew==",
57-
"r7BXXKkLb8qrSNn05n0qiA==");
52+
public void testGetPhoneNoInfo() throws WxErrorException {
53+
WxMaPhoneNumberInfo phoneNoInfo = this.wxService.getUserService().getPhoneNumber("tiihtNczf5v6AKRyjwEUhQ==");
5854
assertNotNull(phoneNoInfo);
5955
System.out.println(phoneNoInfo.toString());
6056
}
@@ -72,11 +68,6 @@ public void testSetUserStorage() throws WxErrorException {
7268
"r7BXXKkLb8qrSNn05n0qiA",((TestConfig)this.wxService.getWxMaConfig()).getOpenid());
7369
}
7470

75-
@Test
76-
public void testGetNewPhoneNoInfo() throws Exception{
77-
assertNotNull(wxService.getUserService().getNewPhoneNoInfo("test"));
78-
}
79-
8071
@Test
8172
public void testGetAccessToken() throws Exception{
8273
assertNotNull(wxService.getAccessToken(true));

0 commit comments

Comments
 (0)