Merge branch 'master' into 'v2.0.9_dev'

Master

See merge request DDOSAQ/phoenix_ddos_handle!19
This commit is contained in:
黄昕 2021-09-01 10:01:27 +08:00
commit a3abe76d1b
2 changed files with 2 additions and 2 deletions

View File

@ -34,7 +34,7 @@ public class ProtocolReqDTO<T> extends BaseProtocolDTO<T> {
try { try {
String authString = Objects.requireNonNull(headers.get("Authorization")).get(0); String authString = Objects.requireNonNull(headers.get("Authorization")).get(0);
if (authString.length() == 0 || !authString.startsWith(ConstValue.STRING_HTTP_AUTH_HEAD)) { if (!authString.startsWith(ConstValue.STRING_HTTP_AUTH_HEAD)) {
log.error("Input Authorization header error: [{}]", authString); log.error("Input Authorization header error: [{}]", authString);
return ""; return "";
} }

View File

@ -809,7 +809,7 @@ public class P2DeviceAdd {
Assert.assertEquals(dev.getModel(), "UMC"); Assert.assertEquals(dev.getModel(), "UMC");
Assert.assertEquals(dev.getVersion(), "5.7.13"); Assert.assertEquals(dev.getVersion(), "5.7.13");
Assert.assertEquals(dev.getUserName(), "test"); Assert.assertEquals(dev.getUserName(), "test");
Assert.assertEquals(dev.getPassword(), "testpassword"); Assert.assertEquals(dev.getPassword(), "dGVzdHBhc3N3b3Jk");
Assert.assertEquals(dev.getReadme(), "实验室测试设备"); Assert.assertEquals(dev.getReadme(), "实验室测试设备");
Assert.assertEquals(dev.getUrlType(), HttpType.HTTP); Assert.assertEquals(dev.getUrlType(), HttpType.HTTP);