Skip to content

Commit d058d24

Browse files
committed
feat: upgrade 1.4.3
优化签名逻辑,支持中文字符和+号
1 parent bea16fe commit d058d24

File tree

6 files changed

+12
-11
lines changed

6 files changed

+12
-11
lines changed

pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<groupId>com.tuya</groupId>
77
<artifactId>tuya-connector</artifactId>
88
<packaging>pom</packaging>
9-
<version>1.4.0</version>
9+
<version>1.4.3</version>
1010
<modules>
1111
<module>tuya-api</module>
1212
<module>tuya-messaging</module>
@@ -17,7 +17,7 @@
1717
<properties>
1818
<maven.compiler.source>1.8</maven.compiler.source>
1919
<maven.compiler.target>1.8</maven.compiler.target>
20-
<connector.version>1.3.6</connector.version>
20+
<connector.version>1.4.2</connector.version>
2121
<junit-jupiter.version>5.7.0</junit-jupiter.version>
2222
<lombok.version>1.18.26</lombok.version>
2323
<logback.version>1.2.3</logback.version>

tuya-api/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.tuya</groupId>
88
<artifactId>tuya-connector</artifactId>
9-
<version>1.4.0</version>
9+
<version>1.4.3</version>
1010
</parent>
1111

1212
<artifactId>tuya-api</artifactId>

tuya-api/src/main/java/com/tuya/connector/open/api/header/TuyaHeaderProcessor.java

+6-5
Original file line numberDiff line numberDiff line change
@@ -107,17 +107,18 @@ private String stringToSign(HttpRequest request, Map<String, String> headers) {
107107
lines.add(bodyHash);
108108
lines.add(headerLine);
109109
URL url = request.getUrl();
110-
String paramSortedPath = getPathAndSortParam(url);
110+
String paramSortedPath = getPathAndSortParam(request);
111111
lines.add(paramSortedPath);
112112
return String.join("\n", lines);
113113
}
114114

115115
@SneakyThrows
116-
private String getPathAndSortParam(URL url) {
116+
private String getPathAndSortParam(HttpRequest request) {
117+
String originalPath = request.originalPath();
118+
URL url = request.getUrl();
117119
String query = url.getQuery();
118-
String path = url.getPath();
119120
if(!StringUtils.hasText(query)){
120-
return decode(path);
121+
return originalPath;
121122
}
122123
Map<String,String> kvMap = new TreeMap<>();
123124
String[] kvs = query.split("\\&");
@@ -129,7 +130,7 @@ private String getPathAndSortParam(URL url) {
129130
kvMap.put(kvArr[0],"");
130131
}
131132
}
132-
return decode(path) + "?" + kvMap.entrySet().stream().map(it->it.getKey()+"="+ encode(it.getValue()))
133+
return originalPath + "?" + kvMap.entrySet().stream().map(it->it.getKey()+"="+ encode(it.getValue()))
133134
.collect(Collectors.joining("&"));
134135
}
135136

tuya-common/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.tuya</groupId>
88
<artifactId>tuya-connector</artifactId>
9-
<version>1.4.0</version>
9+
<version>1.4.3</version>
1010
</parent>
1111

1212
<artifactId>tuya-common</artifactId>

tuya-messaging/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.tuya</groupId>
88
<artifactId>tuya-connector</artifactId>
9-
<version>1.4.0</version>
9+
<version>1.4.3</version>
1010
</parent>
1111

1212
<artifactId>tuya-messaging</artifactId>

tuya-spring-boot-starter/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<artifactId>tuya-connector</artifactId>
88
<groupId>com.tuya</groupId>
9-
<version>1.4.0</version>
9+
<version>1.4.3</version>
1010
</parent>
1111

1212
<artifactId>tuya-spring-boot-starter</artifactId>

0 commit comments

Comments
 (0)