Skip to content

Commit ac311d1

Browse files
committed
TRADEMARK SDK Auto Released By shenshi,Version:1.0.6
发布日志: 1, Update Dependency
1 parent b2cc8c7 commit ac311d1

File tree

79 files changed

+4427
-379
lines changed

Some content is hidden

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

79 files changed

+4427
-379
lines changed

aliyun-java-sdk-trademark/ChangeLog.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
2019-03-18 Version: 1.0.6
2+
1, Update Dependency
3+
14
2018-11-06 Version: 1.0.5
25
1, This is an example of release-log.
36
2, Please strictly follow this format to edit in English.

aliyun-java-sdk-trademark/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<groupId>com.aliyun</groupId>
44
<artifactId>aliyun-java-sdk-trademark</artifactId>
55
<packaging>jar</packaging>
6-
<version>1.0.5</version>
6+
<version>1.0.6</version>
77
<name>aliyun-java-sdk-trademark</name>
88
<url>http://www.aliyun.com</url>
99
<description>Aliyun Open API SDK for Java
@@ -31,7 +31,7 @@ http://www.aliyun.com</description>
3131
<groupId>com.aliyun</groupId>
3232
<artifactId>aliyun-java-sdk-core</artifactId>
3333
<optional>true</optional>
34-
<version>4.1.1</version>
34+
<version>[4.3.2,5.0.0)</version>
3535
</dependency>
3636
</dependencies>
3737
<licenses>

aliyun-java-sdk-trademark/src/main/java/com/aliyuncs/trademark/model/v20180724/CheckLoaFillResponse.java

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@
1414

1515
package com.aliyuncs.trademark.model.v20180724;
1616

17-
import java.util.List;
18-
import java.util.Map;
17+
import java.util.List;
1918
import com.aliyuncs.AcsResponse;
2019
import com.aliyuncs.trademark.transform.v20180724.CheckLoaFillResponseUnmarshaller;
2120
import com.aliyuncs.transform.UnmarshallerContext;
@@ -60,6 +59,8 @@ public static class Data {
6059

6160
private Boolean materialNameFill;
6261

62+
private String templateUrl;
63+
6364
private List<String> errorMsgs;
6465

6566
public Boolean getStampFill() {
@@ -110,6 +111,14 @@ public void setMaterialNameFill(Boolean materialNameFill) {
110111
this.materialNameFill = materialNameFill;
111112
}
112113

114+
public String getTemplateUrl() {
115+
return this.templateUrl;
116+
}
117+
118+
public void setTemplateUrl(String templateUrl) {
119+
this.templateUrl = templateUrl;
120+
}
121+
113122
public List<String> getErrorMsgs() {
114123
return this.errorMsgs;
115124
}

aliyun-java-sdk-trademark/src/main/java/com/aliyuncs/trademark/model/v20180724/CombineLoaRequest.java

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,6 @@ public CombineLoaRequest() {
3838

3939
private String materialId;
4040

41-
private String loaName;
42-
4341
public String getTrademarkName() {
4442
return this.trademarkName;
4543
}
@@ -104,17 +102,6 @@ public void setMaterialId(String materialId) {
104102
if(materialId != null){
105103
putQueryParameter("MaterialId", materialId);
106104
}
107-
}
108-
109-
public String getLoaName() {
110-
return this.loaName;
111-
}
112-
113-
public void setLoaName(String loaName) {
114-
this.loaName = loaName;
115-
if(loaName != null){
116-
putQueryParameter("LoaName", loaName);
117-
}
118105
}
119106

120107
@Override
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
/*
2+
* Licensed under the Apache License, Version 2.0 (the "License");
3+
* you may not use this file except in compliance with the License.
4+
* You may obtain a copy of the License at
5+
*
6+
* http://www.apache.org/licenses/LICENSE-2.0
7+
*
8+
* Unless required by applicable law or agreed to in writing, software
9+
* distributed under the License is distributed on an "AS IS" BASIS,
10+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
11+
* See the License for the specific language governing permissions and
12+
* limitations under the License.
13+
*/
14+
15+
package com.aliyuncs.trademark.model.v20180724;
16+
17+
import com.aliyuncs.RpcAcsRequest;
18+
19+
/**
20+
* @author auto create
21+
* @version
22+
*/
23+
public class ConvertImageToGrayRequest extends RpcAcsRequest<ConvertImageToGrayResponse> {
24+
25+
public ConvertImageToGrayRequest() {
26+
super("Trademark", "2018-07-24", "ConvertImageToGray", "trademark");
27+
}
28+
29+
private String ossKey;
30+
31+
public String getOssKey() {
32+
return this.ossKey;
33+
}
34+
35+
public void setOssKey(String ossKey) {
36+
this.ossKey = ossKey;
37+
if(ossKey != null){
38+
putQueryParameter("OssKey", ossKey);
39+
}
40+
}
41+
42+
@Override
43+
public Class<ConvertImageToGrayResponse> getResponseClass() {
44+
return ConvertImageToGrayResponse.class;
45+
}
46+
47+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
/*
2+
* Licensed under the Apache License, Version 2.0 (the "License");
3+
* you may not use this file except in compliance with the License.
4+
* You may obtain a copy of the License at
5+
*
6+
* http://www.apache.org/licenses/LICENSE-2.0
7+
*
8+
* Unless required by applicable law or agreed to in writing, software
9+
* distributed under the License is distributed on an "AS IS" BASIS,
10+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
11+
* See the License for the specific language governing permissions and
12+
* limitations under the License.
13+
*/
14+
15+
package com.aliyuncs.trademark.model.v20180724;
16+
17+
import com.aliyuncs.AcsResponse;
18+
import com.aliyuncs.trademark.transform.v20180724.ConvertImageToGrayResponseUnmarshaller;
19+
import com.aliyuncs.transform.UnmarshallerContext;
20+
21+
/**
22+
* @author auto create
23+
* @version
24+
*/
25+
public class ConvertImageToGrayResponse extends AcsResponse {
26+
27+
private String requestId;
28+
29+
private String signatureUrl;
30+
31+
public String getRequestId() {
32+
return this.requestId;
33+
}
34+
35+
public void setRequestId(String requestId) {
36+
this.requestId = requestId;
37+
}
38+
39+
public String getSignatureUrl() {
40+
return this.signatureUrl;
41+
}
42+
43+
public void setSignatureUrl(String signatureUrl) {
44+
this.signatureUrl = signatureUrl;
45+
}
46+
47+
@Override
48+
public ConvertImageToGrayResponse getInstance(UnmarshallerContext context) {
49+
return ConvertImageToGrayResponseUnmarshaller.unmarshall(this, context);
50+
}
51+
}

aliyun-java-sdk-trademark/src/main/java/com/aliyuncs/trademark/model/v20180724/CreateTrademarkOrderRequest.java

Lines changed: 111 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -28,19 +28,31 @@ public CreateTrademarkOrderRequest() {
2828

2929
private String tmName;
3030

31-
private String tmIcon;
32-
33-
private Boolean isBlackIcon;
34-
3531
private String orderData;
3632

33+
private String channel;
34+
3735
private Integer type;
3836

3937
private String materialId;
4038

39+
private Long userId;
40+
41+
private String registerName;
42+
43+
private String tmNameType;
44+
45+
private String tmIcon;
46+
47+
private Boolean isBlackIcon;
48+
49+
private String renewInfoId;
50+
51+
private String rootCode;
52+
4153
private String loaOssKey;
4254

43-
private Long userId;
55+
private String registerNumber;
4456

4557
public String getTmName() {
4658
return this.tmName;
@@ -53,28 +65,6 @@ public void setTmName(String tmName) {
5365
}
5466
}
5567

56-
public String getTmIcon() {
57-
return this.tmIcon;
58-
}
59-
60-
public void setTmIcon(String tmIcon) {
61-
this.tmIcon = tmIcon;
62-
if(tmIcon != null){
63-
putQueryParameter("TmIcon", tmIcon);
64-
}
65-
}
66-
67-
public Boolean getIsBlackIcon() {
68-
return this.isBlackIcon;
69-
}
70-
71-
public void setIsBlackIcon(Boolean isBlackIcon) {
72-
this.isBlackIcon = isBlackIcon;
73-
if(isBlackIcon != null){
74-
putQueryParameter("IsBlackIcon", isBlackIcon.toString());
75-
}
76-
}
77-
7868
public String getOrderData() {
7969
return this.orderData;
8070
}
@@ -86,6 +76,17 @@ public void setOrderData(String orderData) {
8676
}
8777
}
8878

79+
public String getChannel() {
80+
return this.channel;
81+
}
82+
83+
public void setChannel(String channel) {
84+
this.channel = channel;
85+
if(channel != null){
86+
putQueryParameter("Channel", channel);
87+
}
88+
}
89+
8990
public Integer getType() {
9091
return this.type;
9192
}
@@ -108,6 +109,83 @@ public void setMaterialId(String materialId) {
108109
}
109110
}
110111

112+
public Long getUserId() {
113+
return this.userId;
114+
}
115+
116+
public void setUserId(Long userId) {
117+
this.userId = userId;
118+
if(userId != null){
119+
putQueryParameter("UserId", userId.toString());
120+
}
121+
}
122+
123+
public String getRegisterName() {
124+
return this.registerName;
125+
}
126+
127+
public void setRegisterName(String registerName) {
128+
this.registerName = registerName;
129+
if(registerName != null){
130+
putQueryParameter("RegisterName", registerName);
131+
}
132+
}
133+
134+
public String getTmNameType() {
135+
return this.tmNameType;
136+
}
137+
138+
public void setTmNameType(String tmNameType) {
139+
this.tmNameType = tmNameType;
140+
if(tmNameType != null){
141+
putQueryParameter("TmNameType", tmNameType);
142+
}
143+
}
144+
145+
public String getTmIcon() {
146+
return this.tmIcon;
147+
}
148+
149+
public void setTmIcon(String tmIcon) {
150+
this.tmIcon = tmIcon;
151+
if(tmIcon != null){
152+
putQueryParameter("TmIcon", tmIcon);
153+
}
154+
}
155+
156+
public Boolean getIsBlackIcon() {
157+
return this.isBlackIcon;
158+
}
159+
160+
public void setIsBlackIcon(Boolean isBlackIcon) {
161+
this.isBlackIcon = isBlackIcon;
162+
if(isBlackIcon != null){
163+
putQueryParameter("IsBlackIcon", isBlackIcon.toString());
164+
}
165+
}
166+
167+
public String getRenewInfoId() {
168+
return this.renewInfoId;
169+
}
170+
171+
public void setRenewInfoId(String renewInfoId) {
172+
this.renewInfoId = renewInfoId;
173+
if(renewInfoId != null){
174+
putQueryParameter("RenewInfoId", renewInfoId);
175+
}
176+
}
177+
178+
public String getRootCode() {
179+
return this.rootCode;
180+
}
181+
182+
public void setRootCode(String rootCode) {
183+
this.rootCode = rootCode;
184+
if(rootCode != null){
185+
putQueryParameter("RootCode", rootCode);
186+
}
187+
}
188+
111189
public String getLoaOssKey() {
112190
return this.loaOssKey;
113191
}
@@ -119,14 +197,14 @@ public void setLoaOssKey(String loaOssKey) {
119197
}
120198
}
121199

122-
public Long getUserId() {
123-
return this.userId;
200+
public String getRegisterNumber() {
201+
return this.registerNumber;
124202
}
125203

126-
public void setUserId(Long userId) {
127-
this.userId = userId;
128-
if(userId != null){
129-
putQueryParameter("UserId", userId.toString());
204+
public void setRegisterNumber(String registerNumber) {
205+
this.registerNumber = registerNumber;
206+
if(registerNumber != null){
207+
putQueryParameter("RegisterNumber", registerNumber);
130208
}
131209
}
132210

0 commit comments

Comments
 (0)