Skip to content

Commit f6b7892

Browse files
atptroatptro
authored
Merge pull request #62 from aliyun/releaseJavaVersion
release version
2 parents 6ca4e75 + 16ba00b commit f6b7892

File tree

53 files changed

+1383
-137
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+1383
-137
lines changed

‎facebody-20191230/Teafile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"version": "0.0.1",
55
"main": "./main.tea",
66
"releases": {
7-
"java": "com.aliyun:facebody:0.0.6",
7+
"java": "com.aliyun:facebody:0.0.7",
88
"go": "github.com/aliyun/alibabacloud-sdk/facebody-20191230/golang/client:v0.1.3",
99
"csharp":"AlibabaCloud.SDK.Facebody:0.0.2"
1010
},

‎facebody-20191230/java/ChangeLog.txt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
2020-02-28 Version: 0.0.7
2+
1. Release version 0.0.7
3+
14
2020-02-20 Version: 0.0.6
25
1. Release version 0.0.6
36

‎facebody-20191230/java/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<groupId>com.aliyun</groupId>
66
<artifactId>facebody</artifactId>
7-
<version>0.0.6</version>
7+
<version>0.0.7</version>
88
<packaging>jar</packaging>
99
<name>facebody</name>
1010
<description>Aliyun FACEBODY SDK for Java

‎facebody-20191230/java/src/main/java/com/aliyun/facebody/Client.java‎

Lines changed: 114 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,120 @@ public java.util.Map<String, Object> _request(String action, String protocol, St
9090
throw new TeaUnretryableException(_lastRequest);
9191
}
9292

93+
public RecognizeExpressionResponse recognizeExpression(RecognizeExpressionRequest request, com.aliyun.common.models.RuntimeObject runtime) throws Exception {
94+
return TeaModel.toModel(this._request("RecognizeExpression", "HTTPS", "POST", TeaModel.buildMap(request), runtime), new RecognizeExpressionResponse());
95+
}
96+
97+
public RecognizeExpressionResponse recognizeExpressionAdvance(RecognizeExpressionAdvanceRequest request, com.aliyun.common.models.RuntimeObject runtime) throws Exception {
98+
com.aliyun.openplatform.models.Config authConfig = com.aliyun.openplatform.models.Config.build(TeaConverter.buildMap(
99+
new TeaPair("accessKeyId", _getAccessKeyId()),
100+
new TeaPair("accessKeySecret", _getAccessKeySecret()),
101+
new TeaPair("type", "access_key"),
102+
new TeaPair("endpoint", "openplatform.aliyuncs.com"),
103+
new TeaPair("protocol", _protocol),
104+
new TeaPair("regionId", _regionId)
105+
));
106+
com.aliyun.openplatform.Client authClient = new com.aliyun.openplatform.Client(authConfig);
107+
com.aliyun.openplatform.models.AuthorizeFileUploadRequest authRequest = com.aliyun.openplatform.models.AuthorizeFileUploadRequest.build(TeaConverter.buildMap(
108+
new TeaPair("product", "facebody"),
109+
new TeaPair("regionId", _regionId)
110+
));
111+
com.aliyun.openplatform.models.AuthorizeFileUploadResponse authResponse = authClient.authorizeFileUpload(authRequest, runtime);
112+
com.aliyun.oss.models.Config ossConfig = com.aliyun.oss.models.Config.build(TeaConverter.buildMap(
113+
new TeaPair("accessKeyId", authResponse.accessKeyId),
114+
new TeaPair("accessKeySecret", _getAccessKeySecret()),
115+
new TeaPair("type", "access_key"),
116+
new TeaPair("endpoint", com.aliyun.common.Common.getEndpoint(authResponse.endpoint, authResponse.useAccelerate, _endpointType)),
117+
new TeaPair("protocol", _protocol),
118+
new TeaPair("regionId", _regionId)
119+
));
120+
com.aliyun.oss.Client ossClient = new com.aliyun.oss.Client(ossConfig);
121+
com.aliyun.oss.models.PostObjectRequest.PostObjectRequestHeaderFile fileObj = com.aliyun.oss.models.PostObjectRequest.PostObjectRequestHeaderFile.build(TeaConverter.buildMap(
122+
new TeaPair("fileName", authResponse.objectKey),
123+
new TeaPair("content", request.imageURLObject),
124+
new TeaPair("contentType", "")
125+
));
126+
com.aliyun.oss.models.PostObjectRequest.PostObjectRequestHeader ossHeader = com.aliyun.oss.models.PostObjectRequest.PostObjectRequestHeader.build(TeaConverter.buildMap(
127+
new TeaPair("accessKeyId", authResponse.accessKeyId),
128+
new TeaPair("policy", authResponse.encodedPolicy),
129+
new TeaPair("signature", authResponse.signature),
130+
new TeaPair("key", authResponse.objectKey),
131+
new TeaPair("file", fileObj),
132+
new TeaPair("successActionStatus", "201")
133+
));
134+
com.aliyun.oss.models.PostObjectRequest uploadRequest = com.aliyun.oss.models.PostObjectRequest.build(TeaConverter.buildMap(
135+
new TeaPair("bucketName", authResponse.bucket),
136+
new TeaPair("header", ossHeader)
137+
));
138+
ossClient.postObject(uploadRequest, runtime);
139+
RecognizeExpressionRequest recognizeExpressionreq = new RecognizeExpressionRequest();
140+
com.aliyun.common.Common.convert(request, recognizeExpressionreq);
141+
recognizeExpressionreq.imageURL = "http://" + authResponse.bucket + "." + authResponse.endpoint + "/" + authResponse.objectKey + "";
142+
RecognizeExpressionResponse recognizeExpressionResp = this.recognizeExpression(recognizeExpressionreq, runtime);
143+
return recognizeExpressionResp;
144+
}
145+
146+
public RecognizePublicFaceResponse recognizePublicFace(RecognizePublicFaceRequest request, com.aliyun.common.models.RuntimeObject runtime) throws Exception {
147+
return TeaModel.toModel(this._request("RecognizePublicFace", "HTTPS", "POST", TeaModel.buildMap(request), runtime), new RecognizePublicFaceResponse());
148+
}
149+
150+
public DetectLivingFaceResponse detectLivingFace(DetectLivingFaceRequest request, com.aliyun.common.models.RuntimeObject runtime) throws Exception {
151+
return TeaModel.toModel(this._request("DetectLivingFace", "HTTPS", "POST", TeaModel.buildMap(request), runtime), new DetectLivingFaceResponse());
152+
}
153+
154+
public DetectBodyCountResponse detectBodyCount(DetectBodyCountRequest request, com.aliyun.common.models.RuntimeObject runtime) throws Exception {
155+
return TeaModel.toModel(this._request("DetectBodyCount", "HTTPS", "POST", TeaModel.buildMap(request), runtime), new DetectBodyCountResponse());
156+
}
157+
158+
public DetectBodyCountResponse detectBodyCountAdvance(DetectBodyCountAdvanceRequest request, com.aliyun.common.models.RuntimeObject runtime) throws Exception {
159+
com.aliyun.openplatform.models.Config authConfig = com.aliyun.openplatform.models.Config.build(TeaConverter.buildMap(
160+
new TeaPair("accessKeyId", _getAccessKeyId()),
161+
new TeaPair("accessKeySecret", _getAccessKeySecret()),
162+
new TeaPair("type", "access_key"),
163+
new TeaPair("endpoint", "openplatform.aliyuncs.com"),
164+
new TeaPair("protocol", _protocol),
165+
new TeaPair("regionId", _regionId)
166+
));
167+
com.aliyun.openplatform.Client authClient = new com.aliyun.openplatform.Client(authConfig);
168+
com.aliyun.openplatform.models.AuthorizeFileUploadRequest authRequest = com.aliyun.openplatform.models.AuthorizeFileUploadRequest.build(TeaConverter.buildMap(
169+
new TeaPair("product", "facebody"),
170+
new TeaPair("regionId", _regionId)
171+
));
172+
com.aliyun.openplatform.models.AuthorizeFileUploadResponse authResponse = authClient.authorizeFileUpload(authRequest, runtime);
173+
com.aliyun.oss.models.Config ossConfig = com.aliyun.oss.models.Config.build(TeaConverter.buildMap(
174+
new TeaPair("accessKeyId", authResponse.accessKeyId),
175+
new TeaPair("accessKeySecret", _getAccessKeySecret()),
176+
new TeaPair("type", "access_key"),
177+
new TeaPair("endpoint", com.aliyun.common.Common.getEndpoint(authResponse.endpoint, authResponse.useAccelerate, _endpointType)),
178+
new TeaPair("protocol", _protocol),
179+
new TeaPair("regionId", _regionId)
180+
));
181+
com.aliyun.oss.Client ossClient = new com.aliyun.oss.Client(ossConfig);
182+
com.aliyun.oss.models.PostObjectRequest.PostObjectRequestHeaderFile fileObj = com.aliyun.oss.models.PostObjectRequest.PostObjectRequestHeaderFile.build(TeaConverter.buildMap(
183+
new TeaPair("fileName", authResponse.objectKey),
184+
new TeaPair("content", request.imageURLObject),
185+
new TeaPair("contentType", "")
186+
));
187+
com.aliyun.oss.models.PostObjectRequest.PostObjectRequestHeader ossHeader = com.aliyun.oss.models.PostObjectRequest.PostObjectRequestHeader.build(TeaConverter.buildMap(
188+
new TeaPair("accessKeyId", authResponse.accessKeyId),
189+
new TeaPair("policy", authResponse.encodedPolicy),
190+
new TeaPair("signature", authResponse.signature),
191+
new TeaPair("key", authResponse.objectKey),
192+
new TeaPair("file", fileObj),
193+
new TeaPair("successActionStatus", "201")
194+
));
195+
com.aliyun.oss.models.PostObjectRequest uploadRequest = com.aliyun.oss.models.PostObjectRequest.build(TeaConverter.buildMap(
196+
new TeaPair("bucketName", authResponse.bucket),
197+
new TeaPair("header", ossHeader)
198+
));
199+
ossClient.postObject(uploadRequest, runtime);
200+
DetectBodyCountRequest detectBodyCountreq = new DetectBodyCountRequest();
201+
com.aliyun.common.Common.convert(request, detectBodyCountreq);
202+
detectBodyCountreq.imageURL = "http://" + authResponse.bucket + "." + authResponse.endpoint + "/" + authResponse.objectKey + "";
203+
DetectBodyCountResponse detectBodyCountResp = this.detectBodyCount(detectBodyCountreq, runtime);
204+
return detectBodyCountResp;
205+
}
206+
93207
public DetectMaskResponse detectMask(DetectMaskRequest request, com.aliyun.common.models.RuntimeObject runtime) throws Exception {
94208
return TeaModel.toModel(this._request("DetectMask", "HTTPS", "POST", TeaModel.buildMap(request), runtime), new DetectMaskResponse());
95209
}

‎facebody-20191230/java/src/main/java/com/aliyun/facebody/models/CompareFaceRequest.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@
44
import com.aliyun.tea.*;
55

66
public class CompareFaceRequest extends TeaModel {
7-
@NameInMap("ImageType")
8-
public Integer imageType;
9-
107
@NameInMap("ImageURLA")
118
@Validation(required = true)
129
public String imageURLA;

‎facebody-20191230/java/src/main/java/com/aliyun/facebody/models/Config.java‎

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,77 +5,63 @@
55

66
public class Config extends TeaModel {
77
@NameInMap("accessKeyId")
8+
@Validation(required = true)
89
public String accessKeyId;
910

1011
@NameInMap("accessKeySecret")
1112
public String accessKeySecret;
1213

1314
@NameInMap("type")
14-
@Validation(required = true)
1515
public String type;
1616

1717
@NameInMap("securityToken")
18-
@Validation(required = true)
1918
public String securityToken;
2019

2120
@NameInMap("endpoint")
2221
@Validation(required = true)
2322
public String endpoint;
2423

2524
@NameInMap("protocol")
26-
@Validation(required = true)
2725
public String protocol;
2826

2927
@NameInMap("regionId")
3028
@Validation(required = true)
3129
public String regionId;
3230

3331
@NameInMap("userAgent")
34-
@Validation(required = true)
3532
public String userAgent;
3633

3734
@NameInMap("readTimeout")
38-
@Validation(required = true)
3935
public Integer readTimeout;
4036

4137
@NameInMap("connectTimeout")
42-
@Validation(required = true)
4338
public Integer connectTimeout;
4439

4540
@NameInMap("localAddr")
46-
@Validation(required = true)
4741
public String localAddr;
4842

4943
@NameInMap("httpProxy")
50-
@Validation(required = true)
5144
public String httpProxy;
5245

5346
@NameInMap("httpsProxy")
54-
@Validation(required = true)
5547
public String httpsProxy;
5648

5749
@NameInMap("noProxy")
58-
@Validation(required = true)
5950
public String noProxy;
6051

6152
@NameInMap("socks5Proxy")
62-
@Validation(required = true)
6353
public String socks5Proxy;
6454

6555
@NameInMap("socks5NetWork")
66-
@Validation(required = true)
6756
public String socks5NetWork;
6857

6958
@NameInMap("maxIdleConns")
70-
@Validation(required = true)
7159
public Integer maxIdleConns;
7260

7361
@NameInMap("endpointType")
74-
@Validation(required = true)
7562
public String endpointType;
7663

7764
@NameInMap("openPlatformEndpoint")
78-
@Validation(required = true)
7965
public String openPlatformEndpoint;
8066

8167
public static Config build(java.util.Map<String, ?> map) throws Exception {

‎facebody-20191230/java/src/main/java/com/aliyun/facebody/models/DetectFaceAdvanceRequest.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@ public class DetectFaceAdvanceRequest extends TeaModel {
88
@Validation(required = true)
99
public java.io.InputStream imageURLObject;
1010

11-
@NameInMap("ImageType")
12-
public Integer imageType;
13-
1411
public static DetectFaceAdvanceRequest build(java.util.Map<String, ?> map) throws Exception {
1512
DetectFaceAdvanceRequest self = new DetectFaceAdvanceRequest();
1613
return TeaModel.build(map, self);

‎facebody-20191230/java/src/main/java/com/aliyun/facebody/models/DetectFaceRequest.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@
44
import com.aliyun.tea.*;
55

66
public class DetectFaceRequest extends TeaModel {
7-
@NameInMap("ImageType")
8-
public Integer imageType;
9-
107
@NameInMap("ImageURL")
118
@Validation(required = true)
129
public String imageURL;

‎facebody-20191230/java/src/main/java/com/aliyun/facebody/models/RecognizeFaceAdvanceRequest.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@ public class RecognizeFaceAdvanceRequest extends TeaModel {
88
@Validation(required = true)
99
public java.io.InputStream imageURLObject;
1010

11-
@NameInMap("ImageType")
12-
public Integer imageType;
13-
1411
public static RecognizeFaceAdvanceRequest build(java.util.Map<String, ?> map) throws Exception {
1512
RecognizeFaceAdvanceRequest self = new RecognizeFaceAdvanceRequest();
1613
return TeaModel.build(map, self);

‎facebody-20191230/java/src/main/java/com/aliyun/facebody/models/RecognizeFaceRequest.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@
44
import com.aliyun.tea.*;
55

66
public class RecognizeFaceRequest extends TeaModel {
7-
@NameInMap("ImageType")
8-
public Integer imageType;
9-
107
@NameInMap("ImageURL")
118
@Validation(required = true)
129
public String imageURL;

0 commit comments

Comments
 (0)