This is an automated email from the ASF dual-hosted git repository.
likeguo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shenyu.git
The following commit(s) were added to refs/heads/master by this push:
new a9ae18a35 [bugfix]fix sign (#4242)
a9ae18a35 is described below
commit a9ae18a3503c6595250c50707127aacee790ad47
Author: 愿凌飞 <[email protected]>
AuthorDate: Wed Dec 7 22:31:08 2022 +0800
[bugfix]fix sign (#4242)
---
.../apache/shenyu/integrated/test/http/combination/SignPluginTest.java | 2 +-
.../java/org/apache/shenyu/plugin/sign/service/DefaultSignService.java | 2 +-
.../org/apache/shenyu/plugin/sign/service/DefaultSignServiceTest.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git
a/shenyu-integrated-test/shenyu-integrated-test-http/src/test/java/org/apache/shenyu/integrated/test/http/combination/SignPluginTest.java
b/shenyu-integrated-test/shenyu-integrated-test-http/src/test/java/org/apache/shenyu/integrated/test/http/combination/SignPluginTest.java
index edc19529a..6fee72618 100644
---
a/shenyu-integrated-test/shenyu-integrated-test-http/src/test/java/org/apache/shenyu/integrated/test/http/combination/SignPluginTest.java
+++
b/shenyu-integrated-test/shenyu-integrated-test-http/src/test/java/org/apache/shenyu/integrated/test/http/combination/SignPluginTest.java
@@ -273,7 +273,7 @@ public final class SignPluginTest extends
AbstractPluginDataInit {
.collect(Collectors.joining()).trim())
.orElse("");
- final String extSignKey = String.join("", Constants.PATH, path,
Constants.TIMESTAMP, timeStamp, Constants.VERSION, version, signKey);
+ final String extSignKey = String.join("", Constants.TIMESTAMP,
timeStamp, Constants.PATH, path, Constants.VERSION, version, signKey);
final String data = String.join("", jsonSign, querySign);
return SignUtils.sign(SignUtils.SIGN_MD5, extSignKey,
data).toUpperCase();
}
diff --git
a/shenyu-plugin/shenyu-plugin-sign/src/main/java/org/apache/shenyu/plugin/sign/service/DefaultSignService.java
b/shenyu-plugin/shenyu-plugin-sign/src/main/java/org/apache/shenyu/plugin/sign/service/DefaultSignService.java
index 11762196d..571059e10 100644
---
a/shenyu-plugin/shenyu-plugin-sign/src/main/java/org/apache/shenyu/plugin/sign/service/DefaultSignService.java
+++
b/shenyu-plugin/shenyu-plugin-sign/src/main/java/org/apache/shenyu/plugin/sign/service/DefaultSignService.java
@@ -172,7 +172,7 @@ public class DefaultSignService implements SignService {
}
private String buildExtSignKey(final String signKey, final SignParameters
signParameters) {
- return String.join("", Constants.PATH, signParameters.path,
Constants.TIMESTAMP, signParameters.timestamp, Constants.VERSION, "1.0.0",
signKey);
+ return String.join("", Constants.TIMESTAMP, signParameters.timestamp,
Constants.PATH, signParameters.path, Constants.VERSION, "1.0.0", signKey);
}
private static final class SignParameters {
diff --git
a/shenyu-plugin/shenyu-plugin-sign/src/test/java/org/apache/shenyu/plugin/sign/service/DefaultSignServiceTest.java
b/shenyu-plugin/shenyu-plugin-sign/src/test/java/org/apache/shenyu/plugin/sign/service/DefaultSignServiceTest.java
index 3a14af378..b655ed002 100644
---
a/shenyu-plugin/shenyu-plugin-sign/src/test/java/org/apache/shenyu/plugin/sign/service/DefaultSignServiceTest.java
+++
b/shenyu-plugin/shenyu-plugin-sign/src/test/java/org/apache/shenyu/plugin/sign/service/DefaultSignServiceTest.java
@@ -293,7 +293,7 @@ public final class DefaultSignServiceTest {
.collect(Collectors.joining()).trim())
.orElse("");
- final String extSignKey = String.join("", Constants.PATH, path,
Constants.TIMESTAMP, timeStamp, Constants.VERSION, "1.0.0", signKey);
+ final String extSignKey = String.join("", Constants.TIMESTAMP,
timeStamp, Constants.PATH, path, Constants.VERSION, "1.0.0", signKey);
final String data = String.join("", jsonSign, querySign);
return SignUtils.sign(SignUtils.SIGN_MD5, extSignKey,
data).toUpperCase();
}