Skip to content

Commit 92118c2

Browse files
94zhaoyueranbinarywang
authored andcommitted
#1167 增加File类型身份证OCR识别方法
1 parent 156fc77 commit 92118c2

File tree

6 files changed

+112
-24
lines changed

6 files changed

+112
-24
lines changed

.gitee/ISSUE_TEMPLATE.md

+9-20
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,19 @@
1-
强烈建议大家到 github 相关页面提交问题,方便统一查询管理,具体页面地址: https://github.com/Wechat-Group/WxJava/issues
1+
强烈建议大家到 `github` 相关页面提交问题,方便统一查询管理,具体页面地址:https://github.com/Wechat-Group/WxJava/issues
22

33
当然如果必须在这里提问,请务必按以下格式填写,谢谢配合~
44

5-
# 问题标题(提问前,请确保阅读过项目首页说明以及wiki文档相关内容)
5+
# 提问前,请确保阅读过项目首页说明以及wiki开发文档相关内容,尤其是常见问题部分。完成内容后,请务必移除包括本句在内的无用内容,以免影响阅读,谢谢合作~
6+
# 另外如果确认属于bug,而且已明确如何修复,请参考贡献指南直接提交PR,省的浪费时间在这里描述问题,非常感谢配合
67

78
### 简要描述
8-
__明确描述下你所遇到的问题,(友情提示,如果确认属于bug,请参考贡献指南直接提交PR,省的花费时间在这里描述问题,非常感谢配合)__
9-
9+
__简单概括描述下你所遇到的问题。__
1010

1111
### 模块版本情况
12+
* `WxJava` 模块名:
13+
* `WxJava` 版本号:
1214

13-
* WxJava 模块名:
14-
* WxJava 版本号:
15-
16-
17-
### 期待结果
18-
__尽量详细描述__
19-
20-
### 实际情况
21-
__尽量详细描述__
22-
23-
### 重现步骤
24-
1.
25-
2.
26-
3.
27-
15+
### 详细描述
16+
__尽量详细描述。请不要使用截图,尽量使用文字描述,代码直接贴上来,日志则请附在后面所示区域。__
2817

2918
### 日志
30-
__将日志放在 [pastebin](https://paste.ubuntu.com/) 或者其他地方,并将url地址贴在这里__
19+
__将日志放在 [`Pastebin`](https://paste.ubuntu.com/) 或者其他地方,并将其url地址贴在这里__

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
1. 入群技术交流:若想获得QQ群/微信群/企业微信/钉钉企业群等信息的,请使用微信扫描上面的微信公众号二维码关注 `WxJava` 后点击相关菜单即可,同时也可以在微信中搜索 `weixin-java-tools``WxJava` 后选择正确的公众号进行关注,该公众号会及时通知SDK相关更新信息,并不定期分享微信Java开发相关技术知识;
4444
1. 付费QQ群:(**注意:刚入群会有5分钟禁言,稍等片刻即可正常发言**[![加入QQ群](https://img.shields.io/badge/QQ群-343954419-blue.svg)](http://shang.qq.com/wpa/qunwpa?idkey=731dc3e7ea31ebe25376cc1a791445468612c63fd0e9e05399b088ec81fd9e15)[![加入QQ群](https://img.shields.io/badge/QQ群-343954419-blue.svg)](http://jq.qq.com/?_wv=1027&k=40lRskK),或者请自行搜索群号`343954419`进行添加;当然由于某种原因无法入群的,可关注公众号后获取其他群的加入方式;
4545
1. 钉钉企业群:[请点击链接申请加入](https://h5.dingtalk.com/inviteColleague/index.html#/invite/9ed100cc4a/E1DF918E32E398D191E7FE61FE0552A6) 或者 [用手机钉钉APP扫码](https://gitee.com/binary/weixin-java-tools/raw/master/images/qrcodes/ding.jpg) 申请加入。
46-
1. 微信开发新手或者Java开发新手在群内提问或新开Issue提问前,请先阅读[【提问的智慧】](http://www.binarywang.com/article/smart-questions),并确保已查阅过 [【开发文档Wiki】](https://github.com/wechat-group/WxJava/wiki) ,避免浪费大家的宝贵时间;
46+
1. 微信开发新手或者Java开发新手在群内提问或新开Issue提问前,请先阅读[【提问的智慧】](https://github.com/ryanhanwu/How-To-Ask-Questions-The-Smart-Way/blob/master/README-zh_CN.md),并确保已查阅过 [【开发文档Wiki】](https://github.com/wechat-group/WxJava/wiki) ,避免浪费大家的宝贵时间;
4747
1. 寻求帮助时需贴代码或大长串异常信息的,请利用 http://paste.ubuntu.com
4848

4949
--------------------------------

weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpOcrServiceImpl.java

+6-2
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,14 @@
55
import me.chanjar.weixin.mp.api.WxMpOcrService;
66
import me.chanjar.weixin.mp.api.WxMpService;
77
import me.chanjar.weixin.mp.bean.ocr.WxMpOcrIdCardResult;
8+
import me.chanjar.weixin.mp.util.requestexecuter.ocr.OcrDiscernRequestExecutor;
89

910
import java.io.File;
1011
import java.io.UnsupportedEncodingException;
1112
import java.net.URLEncoder;
1213
import java.nio.charset.StandardCharsets;
1314

15+
import static me.chanjar.weixin.mp.enums.WxMpApiUrl.Ocr.FILEIDCARD;
1416
import static me.chanjar.weixin.mp.enums.WxMpApiUrl.Ocr.IDCARD;
1517

1618
/**
@@ -37,7 +39,9 @@ public WxMpOcrIdCardResult idCard(ImageType imgType, String imgUrl) throws WxErr
3739
}
3840

3941
@Override
40-
public WxMpOcrIdCardResult idCard(ImageType imgType, File imgFile) {
41-
return null;
42+
public WxMpOcrIdCardResult idCard(ImageType imgType, File imgFile) throws WxErrorException {
43+
String result = this.wxMpService.execute(OcrDiscernRequestExecutor.create(this.wxMpService.getRequestHttp()), String.format(FILEIDCARD.getUrl(this.wxMpService.getWxMpConfigStorage()),
44+
imgType.getType()), imgFile);
45+
return WxMpOcrIdCardResult.fromJson(result);
4246
}
4347
}

weixin-java-mp/src/main/java/me/chanjar/weixin/mp/enums/WxMpApiUrl.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -440,7 +440,9 @@ enum Ocr implements WxMpApiUrl {
440440
/**
441441
* 身份证识别.
442442
*/
443-
IDCARD(API_DEFAULT_HOST_URL, "/cv/ocr/idcard?type=%s&img_url=%s");
443+
IDCARD(API_DEFAULT_HOST_URL, "/cv/ocr/idcard?type=%s&img_url=%s"),
444+
445+
FILEIDCARD(API_DEFAULT_HOST_URL, "/cv/ocr/idcard?type=%s");
444446

445447
private String prefix;
446448
private String path;
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
package me.chanjar.weixin.mp.util.requestexecuter.ocr;
2+
3+
import me.chanjar.weixin.common.error.WxError;
4+
import me.chanjar.weixin.common.error.WxErrorException;
5+
import me.chanjar.weixin.common.util.http.RequestHttp;
6+
import me.chanjar.weixin.common.util.http.apache.Utf8ResponseHandler;
7+
import org.apache.http.HttpEntity;
8+
import org.apache.http.HttpHost;
9+
import org.apache.http.client.config.RequestConfig;
10+
import org.apache.http.client.methods.CloseableHttpResponse;
11+
import org.apache.http.client.methods.HttpPost;
12+
import org.apache.http.entity.mime.HttpMultipartMode;
13+
import org.apache.http.entity.mime.MultipartEntityBuilder;
14+
import org.apache.http.impl.client.CloseableHttpClient;
15+
16+
import java.io.File;
17+
import java.io.IOException;
18+
19+
/**
20+
* @author : zhayueran
21+
* @Date: 2019/6/27 14:06
22+
* @Description:
23+
*/
24+
public class OcrDiscernApacheHttpRequestExecutor extends OcrDiscernRequestExecutor<CloseableHttpClient, HttpHost> {
25+
26+
27+
public OcrDiscernApacheHttpRequestExecutor(RequestHttp requestHttp) {
28+
super(requestHttp);
29+
}
30+
31+
@Override
32+
public String execute(String uri, File file) throws WxErrorException, IOException {
33+
HttpPost httpPost = new HttpPost(uri);
34+
if (requestHttp.getRequestHttpProxy() != null) {
35+
RequestConfig config = RequestConfig.custom().setProxy(requestHttp.getRequestHttpProxy()).build();
36+
httpPost.setConfig(config);
37+
}
38+
if (file != null) {
39+
HttpEntity entity = MultipartEntityBuilder
40+
.create()
41+
.addBinaryBody("file", file)
42+
.setMode(HttpMultipartMode.RFC6532)
43+
.build();
44+
httpPost.setEntity(entity);
45+
}
46+
try (CloseableHttpResponse response = requestHttp.getRequestHttpClient().execute(httpPost)) {
47+
String responseContent = Utf8ResponseHandler.INSTANCE.handleResponse(response);
48+
WxError error = WxError.fromJson(responseContent);
49+
if (error.getErrorCode() != 0) {
50+
throw new WxErrorException(error);
51+
}
52+
return responseContent;
53+
} finally {
54+
httpPost.releaseConnection();
55+
}
56+
}
57+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
package me.chanjar.weixin.mp.util.requestexecuter.ocr;
2+
3+
import me.chanjar.weixin.common.error.WxErrorException;
4+
import me.chanjar.weixin.common.util.http.RequestExecutor;
5+
import me.chanjar.weixin.common.util.http.RequestHttp;
6+
import me.chanjar.weixin.common.util.http.ResponseHandler;
7+
8+
import java.io.File;
9+
import java.io.IOException;
10+
11+
/**
12+
* @author : zhayueran
13+
* @Date: 2019/6/27 15:06
14+
* @Description:
15+
*/
16+
public abstract class OcrDiscernRequestExecutor<H, P> implements RequestExecutor<String, File> {
17+
protected RequestHttp<H, P> requestHttp;
18+
19+
public OcrDiscernRequestExecutor(RequestHttp requestHttp) {
20+
this.requestHttp = requestHttp;
21+
}
22+
23+
@Override
24+
public void execute(String uri, File data, ResponseHandler<String> handler) throws WxErrorException, IOException {
25+
handler.handle(this.execute(uri, data));
26+
}
27+
28+
public static RequestExecutor<String, File> create(RequestHttp requestHttp) {
29+
switch (requestHttp.getRequestType()) {
30+
case APACHE_HTTP:
31+
return new OcrDiscernApacheHttpRequestExecutor(requestHttp);
32+
default:
33+
return null;
34+
}
35+
}
36+
}

0 commit comments

Comments
 (0)