Skip to content

Commit a5af30b

Browse files
author
jianhui.zhang
committed
Merge branch 'codezhang-dev' into 'master'
修改param转json逻辑，避免转义问题 See merge request esl_ipdd/ucloud-sdk-java!68
2 parents 42d456f + 39fbc70 commit a5af30b

File tree

21 files changed

+65
-62
lines changed

21 files changed

+65
-62
lines changed

‎README.md‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ ucloud开发者工具套件（SDK）。<br/>
3232
<dependency>
3333
<groupId>cn.ucloud</groupId>
3434
<artifactId>ucloud-sdk-java-udisk</artifactId>
35-
<version>0.8.4.0-release</version>
35+
<version>0.8.4.1-release</version>
3636
</dependency>
3737

3838
方式二、官网下载（暂时无效）
@@ -201,4 +201,7 @@ public class Main {
201201
- 0.8.4.0-release
202202

203203
新增业务模块UCDN
204-
204+
205+
- 0.8.4.1-release
206+
207+
修改参数转json逻辑，避免转义问题

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<groupId>cn.ucloud</groupId>
88
<artifactId>ucloud-sdk-java</artifactId>
99
<packaging>pom</packaging>
10-
<version>0.8.4.0-release</version>
10+
<version>0.8.4.1-release</version>
1111
<modules>
1212
<module>ucloud-sdk-java-uhost</module>
1313
<module>ucloud-sdk-java-unet</module>

‎ucloud-sdk-java-censor/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,18 @@
55
<parent>
66
<artifactId>ucloud-sdk-java</artifactId>
77
<groupId>cn.ucloud</groupId>
8-
<version>0.8.4.0-release</version>
8+
<version>0.8.4.1-release</version>
99
</parent>
1010

1111
<modelVersion>4.0.0</modelVersion>
1212
<artifactId>ucloud-sdk-java-censor</artifactId>
13-
<version>0.8.4.0-release</version>
13+
<version>0.8.4.1-release</version>
1414

1515
<dependencies>
1616
<dependency>
1717
<groupId>cn.ucloud</groupId>
1818
<artifactId>ucloud-sdk-java-common</artifactId>
19-
<version>0.8.4.0-release</version>
19+
<version>0.8.4.1-release</version>
2020
</dependency>
2121

2222

‎ucloud-sdk-java-common/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
<parent>
66
<artifactId>ucloud-sdk-java</artifactId>
77
<groupId>cn.ucloud</groupId>
8-
<version>0.8.4.0-release</version>
8+
<version>0.8.4.1-release</version>
99
</parent>
1010

1111
<modelVersion>4.0.0</modelVersion>
1212
<artifactId>ucloud-sdk-java-common</artifactId>
13-
<version>0.8.4.0-release</version>
13+
<version>0.8.4.1-release</version>
1414

1515
<dependencies>
1616

‎ucloud-sdk-java-common/src/main/java/cn/ucloud/common/http/Http.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public Http(Class<? extends BaseResponseResult> resultClass) {
3131

3232
private static Logger logger = LoggerFactory.getLogger(Http.class);
3333

34-
private static final String SDK_VERSION = "0.8.4.0-release";
34+
private static final String SDK_VERSION = "0.8.4.1-release";
3535

3636
private static final String USER_AGENT;
3737

‎ucloud-sdk-java-common/src/main/java/cn/ucloud/common/util/ParamConstructor.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,12 @@
33
import cn.ucloud.common.pojo.Account;
44
import cn.ucloud.common.pojo.BaseRequestParam;
55
import cn.ucloud.common.pojo.Param;
6+
import com.google.gson.Gson;
67
import org.apache.commons.lang3.StringUtils;
78

9+
import java.util.HashMap;
810
import java.util.List;
11+
import java.util.Map;
912

1013
/**
1114
* @description: http请求参数构造器
@@ -39,7 +42,7 @@ public static String getHttpGetParamString(BaseRequestParam baseRequestParam, Ac
3942
// 构造url参数
4043
StringBuilder builder = new StringBuilder();
4144
for (Param param : paramList) {
42-
if (StringUtils.isBlank(param.getParamKey())){
45+
if (StringUtils.isBlank(param.getParamKey())) {
4346
continue;
4447
}
4548
builder.append(param.getParamKey() + "=" + param.getParamValue() + "&");
@@ -71,16 +74,13 @@ public static String getHttpPostParamString(BaseRequestParam baseRequestParam, A
7174
// url编码
7275
//Signature.urlEncodeParams(paramList);
7376
// 设置签名
74-
paramList.add(new Param("Signature",signature));
77+
paramList.add(new Param("Signature", signature));
7578
// 构造参数
76-
StringBuilder builder = new StringBuilder();
77-
builder.append("{");
78-
for (Param param : paramList){
79-
builder.append("\""+param.getParamKey()+"\":\""+param.getParamValue()+"\",");
79+
Map<String, Object> paramMap = new HashMap<>();
80+
for (Param param : paramList) {
81+
paramMap.put(param.getParamKey(), param.getParamValue());
8082
}
81-
String substring = builder.substring(0, builder.toString().length()-1);
82-
substring+="}";
83-
return substring;
83+
return new Gson().toJson(paramMap);
8484
}
8585

8686
}

‎ucloud-sdk-java-ocr/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,18 @@
55
<parent>
66
<artifactId>ucloud-sdk-java</artifactId>
77
<groupId>cn.ucloud</groupId>
8-
<version>0.8.4.0-release</version>
8+
<version>0.8.4.1-release</version>
99
</parent>
1010

1111
<modelVersion>4.0.0</modelVersion>
12-
<version>0.8.4.0-release</version>
12+
<version>0.8.4.1-release</version>
1313
<artifactId>ucloud-sdk-java-ocr</artifactId>
1414

1515
<dependencies>
1616
<dependency>
1717
<groupId>cn.ucloud</groupId>
1818
<artifactId>ucloud-sdk-java-common</artifactId>
19-
<version>0.8.4.0-release</version>
19+
<version>0.8.4.1-release</version>
2020
</dependency>
2121

2222

‎ucloud-sdk-java-pathx/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,18 @@
55
<parent>
66
<artifactId>ucloud-sdk-java</artifactId>
77
<groupId>cn.ucloud</groupId>
8-
<version>0.8.4.0-release</version>
8+
<version>0.8.4.1-release</version>
99
</parent>
1010

1111
<modelVersion>4.0.0</modelVersion>
12-
<version>0.8.4.0-release</version>
12+
<version>0.8.4.1-release</version>
1313
<artifactId>ucloud-sdk-java-pathx</artifactId>
1414

1515
<dependencies>
1616
<dependency>
1717
<groupId>cn.ucloud</groupId>
1818
<artifactId>ucloud-sdk-java-common</artifactId>
19-
<version>0.8.4.0-release</version>
19+
<version>0.8.4.1-release</version>
2020
</dependency>
2121

2222
<dependency>

‎ucloud-sdk-java-ubill/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>ucloud-sdk-java</artifactId>
77
<groupId>cn.ucloud</groupId>
8-
<version>0.8.4.0-release</version>
8+
<version>0.8.4.1-release</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

@@ -15,7 +15,7 @@
1515
<dependency>
1616
<groupId>cn.ucloud</groupId>
1717
<artifactId>ucloud-sdk-java-common</artifactId>
18-
<version>0.8.4.0-release</version>
18+
<version>0.8.4.1-release</version>
1919
</dependency>
2020

2121

‎ucloud-sdk-java-ucdn/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,18 @@
55
<parent>
66
<artifactId>ucloud-sdk-java</artifactId>
77
<groupId>cn.ucloud</groupId>
8-
<version>0.8.4.0-release</version>
8+
<version>0.8.4.1-release</version>
99
</parent>
1010

1111
<modelVersion>4.0.0</modelVersion>
1212
<artifactId>ucloud-sdk-java-ucdn</artifactId>
13-
<version>0.8.4.0-release</version>
13+
<version>0.8.4.1-release</version>
1414

1515
<dependencies>
1616
<dependency>
1717
<groupId>cn.ucloud</groupId>
1818
<artifactId>ucloud-sdk-java-common</artifactId>
19-
<version>0.8.4.0-release</version>
19+
<version>0.8.4.1-release</version>
2020
</dependency>
2121

2222
<dependency>

0 commit comments

Comments
 (0)