update

gdpl2112 · Sep 19, 2022 · 394c19b · 394c19b
1 parent 56e7398
commit 394c19b
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 3 deletions.
diff --git a/conf/callApi/conf.hml b/conf/callApi/conf.hml
@@ -29,6 +29,16 @@
 			kName: "java.lang.String"
 			vName: "java.util.HashMap"
 			k: "/ping"
+			v: ->java.util.HashMap
+				0: ->io.github.kloping.serialize.HMLObject$Entry0
+					kName: "java.lang.String"
+					vName: "java.lang.Boolean"
+					k: "f930204019"
+					v: true
+		3: ->io.github.kloping.serialize.HMLObject$Entry0
+			kName: "java.lang.String"
+			vName: "java.util.HashMap"
+			k: "酷狗点歌"
 			v: ->java.util.HashMap
 				0: ->io.github.kloping.serialize.HMLObject$Entry0
 					kName: "java.lang.String"

diff --git a/src/main/java/io/github/gdpl2112/mirai/p1/Converter.java b/src/main/java/io/github/gdpl2112/mirai/p1/Converter.java
@@ -6,6 +6,9 @@
 import io.github.kloping.io.ReadUtils;
 import io.github.kloping.number.NumberUtils;
 import org.jsoup.Connection;
+import org.jsoup.nodes.Document;
+
+import java.util.concurrent.atomic.AtomicReference;
 
 /**
  * @author github.kloping
@@ -45,14 +48,17 @@ public static String filterId(String url, long gid, long qid, String... args) {
         return url;
     }
 
-    public static Object get(Connection t1, String t0) throws Exception {
+    public static Object get(Connection t1, String t0, AtomicReference<Document> doc0) throws Exception {
         if (t0.equals(ALL)) {
             return ReadUtils.readAll(t1.execute().bodyStream(), "utf-8");
         }
         if (t0.equals(PAR_URL)) {
             return t1.get().location();
         }
-        return get0(t1.get().body().text(), t0);
+        if (doc0.get() == null) {
+            doc0.set(t1.get());
+        }
+        return get0(doc0.get().body().text(), t0);
     }
 
     public static Object get0(String t1, String t0) throws Exception {

diff --git a/src/main/java/io/github/gdpl2112/mirai/p1/Worker.java b/src/main/java/io/github/gdpl2112/mirai/p1/Worker.java
@@ -20,6 +20,8 @@
 import java.security.NoSuchProviderException;
 import java.security.cert.CertificateException;
 import java.security.cert.X509Certificate;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicReference;
 
 import static io.github.gdpl2112.mirai.p1.CallApiPlugin.conf;
 import static io.github.gdpl2112.mirai.p1.Converter.*;
@@ -118,8 +120,9 @@ private static Message parse(Connection connection, CallTemplate template, Conta
         String end = template.out;
         try {
             int i = 1;
+            AtomicReference<Document> doc0 = new AtomicReference<>();
             for (String outArg : template.outArgs) {
-                Object o0 = get(connection, outArg);
+                Object o0 = get(connection, outArg,doc0);
                 if (o0 != null) {
                     String o1 = o0.toString();
                     try {