diff --git a/core/command/CommandEX.java b/core/command/CommandEX.java index 1d0be420..e9437d4a 100644 --- a/core/command/CommandEX.java +++ b/core/command/CommandEX.java @@ -153,13 +153,14 @@ public class CommandEX { public static void addMusic(Object sender, String name, String[] args) { String musicID; if (args[0].contains("id=") && !args[0].contains("/?userid")) { - if (args[0].contains("&user")) + if (args[0].contains("&uct2")) { + musicID = Function.getString(args[0], "id=", "&uct2"); + } + else if (args[0].contains("&user")) musicID = Function.getString(args[0], "id=", "&user"); else musicID = Function.getString(args[0], "id=", null); - } else if (args[0].contains("id=") && args[0].contains("&uct2")) { - musicID = Function.getString(args[0], "id=", "&uct2"); - } else if (args[0].contains("song/")) { + } else if (args[0].contains("song/")) { if (args[0].contains("/?userid")) musicID = Function.getString(args[0], "song/", "/?userid"); else diff --git a/core/objs/api/music/info/InfoObj.java b/core/objs/api/music/info/InfoObj.java index 5cf45e6f..b9e35ef2 100644 --- a/core/objs/api/music/info/InfoObj.java +++ b/core/objs/api/music/info/InfoObj.java @@ -6,18 +6,18 @@ public class InfoObj { private List songs; public boolean isOk() { - return (songs != null && songs.size() != 0); + return (songs != null && !songs.isEmpty()); } public String getName() { - if (songs == null || songs.size() == 0) + if (songs == null || songs.isEmpty()) return ""; return songs.get(0).getName(); } public String getAuthor() { StringBuilder Author = new StringBuilder(); - if (songs.size() == 0) + if (songs.isEmpty()) return ""; for (ar ar : songs.get(0).getAr()) { Author.append(ar.getName()).append(","); diff --git a/core/sql/DataSql.java b/core/sql/DataSql.java index fbcd14b6..59967a32 100644 --- a/core/sql/DataSql.java +++ b/core/sql/DataSql.java @@ -310,10 +310,13 @@ public class DataSql { if (connection.isReadOnly() || connection.isClosed()) { init(); } - String arrayAsString = String.join(",", list); PreparedStatement pstmt = connection.prepareStatement("INSERT INTO allmusic_list (sid) VALUES (?)"); - pstmt.setString(1, arrayAsString); - pstmt.execute(); + // 遍历 List 并插入每个字符串 + for (String str : list) { + pstmt.setString(1, str); // 设置参数 + pstmt.addBatch(); // 添加到批处理 + } + pstmt.executeBatch(); pstmt.close(); } catch (Exception e) { e.printStackTrace(); diff --git a/server_top/build.gradle b/server_top/build.gradle index a96218f0..1c2e0729 100644 --- a/server_top/build.gradle +++ b/server_top/build.gradle @@ -50,7 +50,7 @@ dependencies { compileOnly 'net.md-5:bungeecord-api:1.20-R0.1-SNAPSHOT' compileOnly "com.github.MilkBowl:VaultAPI:1.7.1" compileOnly 'com.velocitypowered:velocity-api:3.0.0' - compileOnly 'me.clip:placeholderapi:2.10.10' + compileOnly 'me.clip:placeholderapi:2.11.6' //compileOnly 'net.citizensnpcs:citizens-main:2.0.30-SNAPSHOT' // compileOnly fileTree(dir:'lib',include:['*.jar']) diff --git a/version b/version index 9b7a431d..448ada3b 100644 --- a/version +++ b/version @@ -1 +1 @@ -3.2.4 \ No newline at end of file +3.2.5 \ No newline at end of file