niko/aria2-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update:修复返回值为String时包含双引号的问题

Browse Source
This commit is contained in:
SparkZhang 2022-02-01 13:09:57 +08:00
parent 4b185511d0
commit 585edaf3b7
2 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/cn/montaro/aria2/client/websocket/Aria2WebSocketProxy.java
View File

@ -109,7 +109,7 @@ public class Aria2WebSocketProxy implements InvocationHandler {
} }
JsonElement result = returnResult.get("result"); JsonElement result = returnResult.get("result");
if (resultType.equals(String.class)) { if (resultType.equals(String.class)) {
return (T) result.toString(); return (T) result.getAsString();
} }
return gson.fromJson(result, resultType); return gson.fromJson(result, resultType);
} }
@ -152,7 +152,11 @@ public class Aria2WebSocketProxy implements InvocationHandler {
public void onMessage(String message) { public void onMessage(String message) {
log.debug("receive message:{}", message); log.debug("receive message:{}", message);
JsonObject jsonObject = JsonParser.parseString(message).getAsJsonObject(); JsonObject jsonObject = JsonParser.parseString(message).getAsJsonObject();
String id = jsonObject.get("id").getAsString(); JsonElement idObj = jsonObject.get("id");
if (idObj == null) {
return;
}
String id = idObj.getAsString();
if (id == null) { if (id == null) {
return; return;
} }

21
src/test/java/Aria2WebSocketClientTest.java
View File

@ -19,12 +19,14 @@ import java.util.Map;
*/ */
public class Aria2WebSocketClientTest { public class Aria2WebSocketClientTest {
Aria2WebSocketConfig config = new Aria2WebSocketConfig().setSecret("123456"); Aria2WebSocketConfig config = new Aria2WebSocketConfig()
.setHost("192.168.99.120")
.setSecret("montaro");
Aria2Client client = Aria2ClientFactory.webSocketClient(config); Aria2Client client = Aria2ClientFactory.webSocketClient(config);
@Test @Test
public void tellActive() { public void tellActive() {
String s = client.tellActive(); String s = client.tellActive("gid");
System.out.println(s); System.out.println(s);
} }
@ -47,4 +49,19 @@ public class Aria2WebSocketClientTest {
String result = client.changeUri("97d4d126a7263df8", 1, new ArrayList<String>(), addUris); String result = client.changeUri("97d4d126a7263df8", 1, new ArrayList<String>(), addUris);
System.out.println(result); System.out.println(result);
} }
@Test
public void tellStatus() {
String s = client.tellStatus("1bfe98b1bc6c47aa");
System.out.println("s = " + s);
}
@Test
public void addDownload() {
String magnet = "magnet:?xt=urn:btih:5e1464caced74be780397896d5a255a88b872542&tr=https%3A%2F%2Ftr.bangumi.moe%3A9696%2Fannounce&tr=http%3A%2F%2Ftr.bangumi.moe%3A6969%2Fannounce&tr=udp%3A%2F%2Ftr.bangumi.moe%3A6969%2Fannounce&tr=http%3A%2F%2Fopen.acgtracker.com%3A1096%2Fannounce&tr=http%3A%2F%2F208.67.16.113%3A8000%2Fannounce&tr=udp%3A%2F%2F208.67.16.113%3A8000%2Fannounce&tr=http%3A%2F%2Ftracker.ktxp.com%3A6868%2Fannounce&tr=http%3A%2F%2Ftracker.ktxp.com%3A7070%2Fannounce&tr=http%3A%2F%2Ft2.popgo.org%3A7456%2Fannonce&tr=http%3A%2F%2Fbt.sc-ol.com%3A2710%2Fannounce&tr=http%3A%2F%2Fshare.camoe.cn%3A8080%2Fannounce&tr=http%3A%2F%2F61.154.116.205%3A8000%2Fannounce&tr=http%3A%2F%2Fbt.rghost.net%3A80%2Fannounce&tr=http%3A%2F%2Ftracker.openbittorrent.com%3A80%2Fannounce&tr=http%3A%2F%2Ftracker.publicbt.com%3A80%2Fannounce&tr=http%3A%2F%2Ftracker.prq.to%2Fannounce&tr=http%3A%2F%2Fopen.nyaatorrents.info%3A6544%2Fannounce";
List<String> uris = new ArrayList<>();
uris.add(magnet);
String s = client.addUri(uris, null, null);
System.out.println(s);
}
} }