From 6a27b838b67c96e01d8551fa545d637a49816484 Mon Sep 17 00:00:00 2001 From: Binary Wang Date: Sun, 26 Jul 2020 23:20:24 +0800 Subject: [PATCH] =?UTF-8?q?:bug:=20=E4=BF=AE=E5=A4=8D=E5=85=AC=E4=BC=97?= =?UTF-8?q?=E5=8F=B7=E5=92=8C=E5=B0=8F=E7=A8=8B=E5=BA=8F=E7=9A=84OCR?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3=E8=AF=B7=E6=B1=82=E6=96=B9?= =?UTF-8?q?=E5=BC=8F=E4=B8=BApost?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wx/miniapp/api/impl/WxMaOcrServiceImpl.java | 12 ++++++------ .../weixin/mp/api/impl/WxMpOcrServiceImpl.java | 12 ++++++------ .../weixin/mp/api/impl/WxMpOcrServiceImplTest.java | 14 +++++++------- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaOcrServiceImpl.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaOcrServiceImpl.java index b7df6849e..0bddb0ff6 100644 --- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaOcrServiceImpl.java +++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaOcrServiceImpl.java @@ -43,7 +43,7 @@ public class WxMaOcrServiceImpl implements WxOcrService { // ignore cannot happen } - final String result = this.mainService.get(String.format(IDCARD, imgUrl), null); + final String result = this.mainService.post(String.format(IDCARD, imgUrl), null); return WxOcrIdCardResult.fromJson(result); } @@ -62,7 +62,7 @@ public class WxMaOcrServiceImpl implements WxOcrService { // ignore cannot happen } - final String result = this.mainService.get(String.format(BANK_CARD, imgUrl), null); + final String result = this.mainService.post(String.format(BANK_CARD, imgUrl), null); return WxOcrBankCardResult.fromJson(result); } @@ -81,7 +81,7 @@ public class WxMaOcrServiceImpl implements WxOcrService { // ignore cannot happen } - final String result = this.mainService.get(String.format(DRIVING, imgUrl), null); + final String result = this.mainService.post(String.format(DRIVING, imgUrl), null); return WxOcrDrivingResult.fromJson(result); } @@ -100,7 +100,7 @@ public class WxMaOcrServiceImpl implements WxOcrService { // ignore cannot happen } - final String result = this.mainService.get(String.format(DRIVING_LICENSE, imgUrl), null); + final String result = this.mainService.post(String.format(DRIVING_LICENSE, imgUrl), null); return WxOcrDrivingLicenseResult.fromJson(result); } @@ -119,7 +119,7 @@ public class WxMaOcrServiceImpl implements WxOcrService { // ignore cannot happen } - final String result = this.mainService.get(String.format(BIZ_LICENSE, imgUrl), null); + final String result = this.mainService.post(String.format(BIZ_LICENSE, imgUrl), null); return WxOcrBizLicenseResult.fromJson(result); } @@ -138,7 +138,7 @@ public class WxMaOcrServiceImpl implements WxOcrService { // ignore cannot happen } - final String result = this.mainService.get(String.format(COMM, imgUrl), null); + final String result = this.mainService.post(String.format(COMM, imgUrl), null); return WxOcrCommResult.fromJson(result); } diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpOcrServiceImpl.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpOcrServiceImpl.java index 6b40c9822..6cd8cf146 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpOcrServiceImpl.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpOcrServiceImpl.java @@ -48,7 +48,7 @@ public class WxMpOcrServiceImpl implements WxOcrService { // ignore cannot happen } - final String result = this.mainService.get(String.format(IDCARD.getUrl(this.mainService.getWxMpConfigStorage()), + final String result = this.mainService.post(String.format(IDCARD.getUrl(this.mainService.getWxMpConfigStorage()), imgUrl), null); return WxOcrIdCardResult.fromJson(result); } @@ -68,7 +68,7 @@ public class WxMpOcrServiceImpl implements WxOcrService { // ignore cannot happen } - final String result = this.mainService.get(String.format(BANK_CARD.getUrl(this.mainService.getWxMpConfigStorage()), + final String result = this.mainService.post(String.format(BANK_CARD.getUrl(this.mainService.getWxMpConfigStorage()), imgUrl), null); return WxOcrBankCardResult.fromJson(result); } @@ -88,7 +88,7 @@ public class WxMpOcrServiceImpl implements WxOcrService { // ignore cannot happen } - final String result = this.mainService.get(String.format(DRIVING.getUrl(this.mainService.getWxMpConfigStorage()), + final String result = this.mainService.post(String.format(DRIVING.getUrl(this.mainService.getWxMpConfigStorage()), imgUrl), null); return WxOcrDrivingResult.fromJson(result); } @@ -108,7 +108,7 @@ public class WxMpOcrServiceImpl implements WxOcrService { // ignore cannot happen } - final String result = this.mainService.get(String.format(DRIVING_LICENSE.getUrl(this.mainService.getWxMpConfigStorage()), + final String result = this.mainService.post(String.format(DRIVING_LICENSE.getUrl(this.mainService.getWxMpConfigStorage()), imgUrl), null); return WxOcrDrivingLicenseResult.fromJson(result); } @@ -128,7 +128,7 @@ public class WxMpOcrServiceImpl implements WxOcrService { // ignore cannot happen } - final String result = this.mainService.get(String.format(BIZ_LICENSE.getUrl(this.mainService.getWxMpConfigStorage()), + final String result = this.mainService.post(String.format(BIZ_LICENSE.getUrl(this.mainService.getWxMpConfigStorage()), imgUrl), null); return WxOcrBizLicenseResult.fromJson(result); } @@ -148,7 +148,7 @@ public class WxMpOcrServiceImpl implements WxOcrService { // ignore cannot happen } - final String result = this.mainService.get(String.format(COMM.getUrl(this.mainService.getWxMpConfigStorage()), + final String result = this.mainService.post(String.format(COMM.getUrl(this.mainService.getWxMpConfigStorage()), imgUrl), null); return WxOcrCommResult.fromJson(result); } diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpOcrServiceImplTest.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpOcrServiceImplTest.java index 5f7178668..b3f45eb8d 100644 --- a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpOcrServiceImplTest.java +++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpOcrServiceImplTest.java @@ -153,13 +153,13 @@ public class WxMpOcrServiceImplTest { } public static class MockTest { - private WxMpService wxService = mock(WxMpService.class); + private final WxMpService wxService = mock(WxMpService.class); @Test public void testIdCard() throws Exception { String returnJson = "{\"type\":\"Back\",\"name\":\"张三\",\"id\":\"110101199909090099\",\"valid_date\":\"20110101-20210201\"}"; - when(wxService.get(anyString(), anyString())).thenReturn(returnJson); + when(wxService.post(anyString(), anyString())).thenReturn(returnJson); final WxMpOcrServiceImpl wxMpOcrService = new WxMpOcrServiceImpl(wxService); final WxOcrIdCardResult result = wxMpOcrService.idCard("abc"); @@ -171,7 +171,7 @@ public class WxMpOcrServiceImplTest { public void testBankCard() throws Exception { String returnJson = "{\"number\":\"24234234345234\"}"; - when(wxService.get(anyString(), anyString())).thenReturn(returnJson); + when(wxService.post(anyString(), anyString())).thenReturn(returnJson); final WxMpOcrServiceImpl wxMpOcrService = new WxMpOcrServiceImpl(wxService); final WxOcrBankCardResult result = wxMpOcrService.bankCard("abc"); @@ -246,7 +246,7 @@ public class WxMpOcrServiceImplTest { " }\n" + "}"; - when(wxService.get(anyString(), anyString())).thenReturn(returnJson); + when(wxService.post(anyString(), anyString())).thenReturn(returnJson); final WxMpOcrServiceImpl wxMpOcrService = new WxMpOcrServiceImpl(wxService); final WxOcrDrivingResult result = wxMpOcrService.driving("abc"); @@ -271,7 +271,7 @@ public class WxMpOcrServiceImplTest { " \"valid_to\": \"2020-07-01\", //有效期限终止日\n" + " \"official_seal\": \"xx市公安局公安交通管理局\" //印章文字\n" + "}"; - when(wxService.get(anyString(), anyString())).thenReturn(returnJson); + when(wxService.post(anyString(), anyString())).thenReturn(returnJson); final WxMpOcrServiceImpl wxMpOcrService = new WxMpOcrServiceImpl(wxService); final WxOcrDrivingLicenseResult result = wxMpOcrService.drivingLicense("abc"); @@ -321,7 +321,7 @@ public class WxMpOcrServiceImplTest { " \"h\": 728\n" + " }\n" + "}"; - when(wxService.get(anyString(), anyString())).thenReturn(returnJson); + when(wxService.post(anyString(), anyString())).thenReturn(returnJson); final WxMpOcrServiceImpl wxMpOcrService = new WxMpOcrServiceImpl(wxService); final WxOcrBizLicenseResult result = wxMpOcrService.bizLicense("abc"); @@ -383,7 +383,7 @@ public class WxMpOcrServiceImplTest { " \"h\": 720\n" + " }\n" + "}"; - when(wxService.get(anyString(), anyString())).thenReturn(returnJson); + when(wxService.post(anyString(), anyString())).thenReturn(returnJson); final WxMpOcrServiceImpl wxMpOcrService = new WxMpOcrServiceImpl(wxService); final WxOcrCommResult result = wxMpOcrService.comm("abc");