v3.4 修复部分问题; 前端页面更新

gdpl2112 · Jul 12, 2024 · 00a6a9a · 00a6a9a
1 parent dc5660f
commit 00a6a9a
Show file tree

Hide file tree

Showing 11 changed files with 17,526 additions and 131 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -4,25 +4,37 @@ plugins {
     val kotlinVersion = "1.7.22"
     kotlin("jvm") version kotlinVersion
     kotlin("plugin.serialization") version kotlinVersion
-    id("net.mamoe.mirai-console") version "2.15.0"
+    id("net.mamoe.mirai-console") version "2.16.0"
 }
 
 group = "io.github.gdpl2112"
-version = "3.3"
+version = "3.4"
 
 repositories {
     maven("https://repo1.maven.org/maven2/")
+	maven("https://s01.oss.sonatype.org/content/repositories/snapshots")
     mavenLocal()
     mavenCentral()
 }
 
+mirai {
+    noTestCore = true
+    setupConsoleTestRuntime {
+        // 移除 mirai-core 依赖
+        classpath = classpath.filter {
+            !it.nameWithoutExtension.startsWith("mirai-core-jvm")
+        }
+    }
+}
+
 dependencies {
     testImplementation(kotlin("test"))
 
-    compileOnly("net.mamoe:mirai-core:2.15.0")
-    compileOnly("net.mamoe:mirai-console-compiler-common:2.15.0")
-    implementation(platform("net.mamoe:mirai-bom:2.15.0"))
-    testImplementation("net.mamoe:mirai-core-mock:2.15.0")
+//    compileOnly("net.mamoe:mirai-core:2.15.0")
+	testConsoleRuntime("top.mrxiaom:overflow-core:2.16.0-db61867-SNAPSHOT")
+//    compileOnly("net.mamoe:mirai-console-compiler-common:2.15.0")
+//    implementation(platform("net.mamoe:mirai-bom:2.15.0"))
+//    testImplementation("net.mamoe:mirai-core-mock:2.15.0")
     testImplementation("net.mamoe:mirai-logging-slf4j:2.15.0")
 
     implementation(platform("org.slf4j:slf4j-parent:2.0.6"))
@@ -37,7 +49,3 @@ dependencies {
     implementation("io.github.Kloping:spt-web:0.2.0")
 }
 
-mirai {
-    jvmTarget = JavaVersion.VERSION_11
-}
-
diff --git a/src/main/java/io/github/gdpl2112/mirai/p1/CallApiPlugin.java b/src/main/java/io/github/gdpl2112/mirai/p1/CallApiPlugin.java
@@ -27,7 +27,7 @@ public class CallApiPlugin extends JavaPlugin {
     public static Conf conf = null;
 
     public CallApiPlugin() {
-        super(new JvmPluginDescriptionBuilder("io.github.Kloping.mirai.p1.CallApiPlugin", "3.3")
+        super(new JvmPluginDescriptionBuilder("io.github.Kloping.mirai.p1.CallApiPlugin", "3.4")
                 .info("调用自定义API插件").build());
     }
 

diff --git a/src/main/java/io/github/gdpl2112/mirai/p1/Converter.java b/src/main/java/io/github/gdpl2112/mirai/p1/Converter.java
@@ -84,12 +84,12 @@ public static Object get(Connection t1, String t0, AtomicReference<Document> doc
         if (t0.equals(ALL)) {
             return ReadUtils.readAll(t1.execute().bodyStream(), "utf-8");
         }
-        if (t0.equals(PAR_URL)) {
-            return t1.get().location();
-        }
         if (doc0.get() == null) {
             doc0.set(t1.get());
         }
+        if (t0.equals(PAR_URL)) {
+            return doc0.get().location();
+        }
         return get0(doc0.get().body().text(), t0);
     }
 

diff --git a/src/main/java/io/github/gdpl2112/mirai/p1/Worker.java b/src/main/java/io/github/gdpl2112/mirai/p1/Worker.java
@@ -133,7 +133,7 @@ private static Message parse(Connection connection, CallTemplate template, Bot b
                     try {
                         JSON json = (JSON) JSON.parse(o1);
                     } catch (Exception e) {
-                        o1 = o1.replaceAll(",", ";");
+                        System.err.println("json parse error.");
                     }
                     end = end.replaceFirst(String.format(CHAR0, i++), o1);
                 }
@@ -143,7 +143,7 @@ private static Message parse(Connection connection, CallTemplate template, Bot b
         } catch (Exception e) {
             if (e instanceof NullPointerException) {
                 e.printStackTrace();
-            }
+            }else e.printStackTrace();
             if (template.err != null && !template.err.isEmpty()) {
                 end = template.err;
             } else {

diff --git a/...ources/static/css/[email protected]_min.css → ...s/static/css/libs/[email protected]_min.css b/...ources/static/css/[email protected]_min.css → ...s/static/css/libs/[email protected]_min.css