diff --git a/core/AllMusic.java b/core/AllMusic.java index f5770959..7a553314 100644 --- a/core/AllMusic.java +++ b/core/AllMusic.java @@ -36,7 +36,7 @@ public class AllMusic { /** * 插件版本号 */ - public static final String version = "3.2.7"; + public static final String version = "3.3.0"; /** * 配置文件版本号 */ @@ -44,7 +44,7 @@ public class AllMusic { /** * 语言文件配置版本号 */ - public static final String messageVersion = "205"; + public static final String messageVersion = "206"; /** * 搜歌结果 * 玩家名 结果 diff --git a/core/command/CommandCode.java b/core/command/CommandCode.java deleted file mode 100644 index b82e4152..00000000 --- a/core/command/CommandCode.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.coloryr.allmusic.server.core.command; - -import com.coloryr.allmusic.server.core.AllMusic; - -public class CommandCode extends ACommand { - @Override - public void ex(Object sender, String name, String[] args) { - if (args.length != 2) { - AllMusic.side.sendMessage(sender, AllMusic.getMessage().command.error); - return; - } - AllMusic.getMusicApi().sendCode(sender, args[1]); - } -} diff --git a/core/command/CommandCookie.java b/core/command/CommandCookie.java new file mode 100644 index 00000000..7a35f289 --- /dev/null +++ b/core/command/CommandCookie.java @@ -0,0 +1,49 @@ +package com.coloryr.allmusic.server.core.command; + +import com.coloryr.allmusic.server.core.AllMusic; +import com.coloryr.allmusic.server.core.objs.UserCookie; +import com.google.gson.reflect.TypeToken; +import okhttp3.Cookie; + +import java.util.ArrayList; +import java.util.List; + + +public class CommandCookie extends ACommand { + @Override + public void ex(Object sender, String name, String[] args) { + if (args.length != 2) { + AllMusic.side.sendMessage(sender, "§d[AllMusic3]§c没有手机验证码"); + return; + } + AllMusic.side.sendMessage(sender, "§d[AllMusic3]§d登录网易云账户"); + try { + String cookie = args[1]; + String[] cookies = cookie.split(";"); + ArrayList list1 = new ArrayList<>(); + for(String item : cookies) { + String[] cookieitem = item.split("="); + if (cookieitem.length == 1) { + list1.add(new Cookie.Builder() + .name(cookieitem[0]) + .domain("163.com") + .expiresAt(Long.MAX_VALUE) + .build()); + } else { + list1.add(new Cookie.Builder() + .name(cookieitem[0]) + .value(cookieitem[1]) + .domain("163.com") + .expiresAt(Long.MAX_VALUE) + .build()); + } + } + AllMusic.cookie.cookieStore.put("music.163.com", list1); + + AllMusic.saveCookie(); + } catch (Exception e) { + AllMusic.side.sendMessage(sender, "§d[AllMusic3]§c错误的cookie"); + e.printStackTrace(); + } + } +} diff --git a/core/command/CommandEX.java b/core/command/CommandEX.java index e9437d4a..3943dc07 100644 --- a/core/command/CommandEX.java +++ b/core/command/CommandEX.java @@ -36,8 +36,7 @@ public class CommandEX { this.add("delete"); this.add("addlist"); this.add("clearlist"); - this.add("login"); - this.add("code"); + this.add("cookie"); this.add("test"); }}; /** @@ -71,8 +70,7 @@ public class CommandEX { commandAdminList.put("delete", new CommandDelete()); commandAdminList.put("addlist", new CommandAddList()); commandAdminList.put("clearlist", new CommandClearList()); - commandAdminList.put("code", new CommandCode()); - commandAdminList.put("login", new CommandLogin()); + commandAdminList.put("cookie", new CommandCookie()); commandAdminList.put("test", new CommandTest()); } diff --git a/core/command/CommandHelp.java b/core/command/CommandHelp.java index 7b128df8..f3e204ad 100644 --- a/core/command/CommandHelp.java +++ b/core/command/CommandHelp.java @@ -69,11 +69,9 @@ public class CommandHelp extends ACommand { AllMusic.getMessage().click.clickCheck, "/music addlist "); AllMusic.side.sendMessageRun(sender, AllMusic.getMessage().help.admin.clearList, AllMusic.getMessage().click.clickRun, "/music clearlist"); - AllMusic.side.sendMessageSuggest(sender, AllMusic.getMessage().help.admin.login, - AllMusic.getMessage().click.clickCheck, "/music login "); - AllMusic.side.sendMessageSuggest(sender, AllMusic.getMessage().help.admin.code, - AllMusic.getMessage().click.clickCheck, "/music code "); - AllMusic.side.sendMessageSuggest(sender, AllMusic.getMessage().help.admin.code, + AllMusic.side.sendMessageSuggest(sender, AllMusic.getMessage().help.admin.cookie, + AllMusic.getMessage().click.clickCheck, "/music cookie "); + AllMusic.side.sendMessageSuggest(sender, AllMusic.getMessage().help.admin.test, AllMusic.getMessage().click.clickCheck, "/music test "); } } diff --git a/core/command/CommandLogin.java b/core/command/CommandLogin.java deleted file mode 100644 index c0e1e05c..00000000 --- a/core/command/CommandLogin.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.coloryr.allmusic.server.core.command; - -import com.coloryr.allmusic.server.core.AllMusic; - -public class CommandLogin extends ACommand { - @Override - public void ex(Object sender, String name, String[] args) { - if (args.length != 2) { - AllMusic.side.sendMessage(sender, "§d[AllMusic3]§c没有手机验证码"); - return; - } - AllMusic.side.sendMessage(sender, "§d[AllMusic3]§d登录网易云账户"); - AllMusic.getMusicApi().login(sender, args[1]); - } -} diff --git a/core/music/api/APIMain.java b/core/music/api/APIMain.java index 5c95608d..f0d8780c 100644 --- a/core/music/api/APIMain.java +++ b/core/music/api/APIMain.java @@ -29,7 +29,6 @@ import java.util.concurrent.CopyOnWriteArrayList; public class APIMain { private boolean isUpdate; - private String phone; public APIMain() { AllMusic.log.info("§d[AllMusic3]§e正在初始化网络爬虫"); @@ -44,85 +43,6 @@ public class APIMain { return isUpdate; } - /** - * 获取手机验证码 - * - * @param sender 发送者 - */ - public void sendCode(Object sender, String code) { - phone = code; - JsonObject params = new JsonObject(); - params.addProperty("ctcode", "86"); - params.addProperty("cellphone", code); - HttpResObj res = HttpClientUtil.post("https://music.163.com/api/sms/captcha/sent", params, EncryptType.WEAPI, null); - if (res != null && res.ok) { - AllMusic.side.sendMessage(sender, "§d[AllMusic3]§d已发送验证码\n" + res.data); - } else { - AllMusic.side.sendMessage(sender, "§d[AllMusic3]§c验证码发送失败"); - } - } - - /** - * 登录 - * - * @param sender 发送者 - * @param code 手机验证码 - */ - public void login(Object sender, String code) { - if (phone == null) { - if (sender == null) - AllMusic.log.info("§d[AllMusic3]§c没有发送过验证码"); - else - AllMusic.side.sendMessage(sender, "§d[AllMusic3]§c没有发送过验证码"); - return; - } - JsonObject params = new JsonObject(); - params.addProperty("rememberLogin", "true"); - if (AllMusic.cookie.cookieStore.containsKey("music.163.com")) { - List cookies = AllMusic.cookie.cookieStore.get("music.163.com"); - for (Cookie item : cookies) { - if (item.name().equalsIgnoreCase("os")) { - cookies.remove(item); - break; - } - } - for (Cookie item : cookies) { - if (item.name().equalsIgnoreCase("appver")) { - cookies.remove(item); - break; - } - } - List cookies1 = new CopyOnWriteArrayList<>(); - cookies1.addAll(cookies); - cookies1.add(new Cookie.Builder().name("os").value("pc").domain("music.163.com").build()); - cookies1.add(new Cookie.Builder().name("appver").value("2.10.6").domain("music.163.com").build()); - AllMusic.cookie.cookieStore.put("music.163.com", cookies1); - AllMusic.saveCookie(); - } - params.addProperty("countrycode", "86"); - params.addProperty("phone", phone); - params.addProperty("captcha", code); - HttpResObj res = HttpClientUtil.post("https://music.163.com/eapi/w/login/cellphone", params, EncryptType.WEAPI, null); - if (res == null || !res.ok) { - if (sender == null) - AllMusic.log.info("§d[AllMusic3]§c登录失败"); - else - AllMusic.side.sendMessage(sender, "§d[AllMusic3]§c登录失败"); - return; - } - if (res.data.contains("200")) { - if (sender == null) - AllMusic.log.info("§d[AllMusic3]§d已登录"); - else - AllMusic.side.sendMessage(sender, "§d[AllMusic3]§d已登录"); - } else { - if (sender == null) - AllMusic.log.info("§d[AllMusic3]§c登录失败:账号或密码错误\n" + res.data); - else - AllMusic.side.sendMessage(sender, "§d[AllMusic3]§c登录失败:账号或密码错误\n" + res.data); - } - } - /** * 获取音乐详情 * diff --git a/core/music/api/HttpClientUtil.java b/core/music/api/HttpClientUtil.java index 7c25c827..f388d004 100644 --- a/core/music/api/HttpClientUtil.java +++ b/core/music/api/HttpClientUtil.java @@ -24,6 +24,8 @@ public class HttpClientUtil { private static final int READ_TIMEOUT = 7; private static OkHttpClient client; + private static final String UserAgent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0 Safari/537.36 Edg/130.0.0.0"; + public static void init() { try { synchronized (OkHttpClient.class) { @@ -43,7 +45,7 @@ public class HttpClientUtil { Request request = new Request.Builder().url(path + data) .addHeader("referer", "https://music.163.com") .addHeader("content-type", "application/json;charset=UTF-8") - .addHeader("user-agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.77 Safari/537.36 Edg/91.0.864.41") + .addHeader("user-agent", UserAgent) .get() .build(); Response response = client.newCall(request).execute(); @@ -80,12 +82,18 @@ public class HttpClientUtil { request = request.addHeader("Content-Type", "application/x-www-form-urlencoded"); request = request.addHeader("Referer", "https://music.163.com"); EncResObj res; - List cookies = new ArrayList<>(); - if (AllMusic.cookie.cookieStore.containsKey("music.163.com")) { - cookies = AllMusic.cookie.cookieStore.get("music.163.com"); + List cookies = AllMusic.cookie.cookieStore.get("music.163.com"); + if (cookies == null) { + cookies = new ArrayList<>(); } +// StringBuilder cookie = new StringBuilder(); +// for (Cookie item : cookies) { +// cookie.append(item.name()).append("=").append(item.value()).append(";"); +// } +// cookie.append("cookie="); +// request.header("Cookie", cookie.toString()); if (type == EncryptType.WEAPI) { - request = request.addHeader("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/42.0.2311.135 Safari/537.36 Edge/13.10586"); + request = request.addHeader("User-Agent", UserAgent); String csrfToken = ""; for (Cookie item : cookies) { if (item.name().equalsIgnoreCase("__csrf")) { diff --git a/core/music/api/MyCookieJar.java b/core/music/api/MyCookieJar.java index a5ba6b2b..f7adfe3a 100644 --- a/core/music/api/MyCookieJar.java +++ b/core/music/api/MyCookieJar.java @@ -4,35 +4,36 @@ import com.coloryr.allmusic.server.core.AllMusic; import okhttp3.Cookie; import okhttp3.CookieJar; import okhttp3.HttpUrl; +import org.checkerframework.checker.units.qual.A; import org.jetbrains.annotations.NotNull; +import java.util.ArrayList; import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; public class MyCookieJar implements CookieJar { @Override public void saveFromResponse(HttpUrl httpUrl, @NotNull List list) { - if (AllMusic.cookie.cookieStore.containsKey(httpUrl.host())) { - List cookies = AllMusic.cookie.cookieStore.get(httpUrl.host()); - for (Cookie item : list) { - for (Cookie item1 : cookies) { - if (item.name().equalsIgnoreCase(item1.name())) { - cookies.remove(item1); - break; - } - } - cookies.add(item); - } - AllMusic.cookie.cookieStore.put(httpUrl.host(), cookies); - } else { - AllMusic.cookie.cookieStore.put(httpUrl.host(), list); + ArrayList cookies = AllMusic.cookie.cookieStore.get("music.163.com"); + if (cookies == null) { + cookies = new ArrayList<>(); } + for (Cookie item : list) { + for (Cookie item1 : cookies) { + if (item.name().equalsIgnoreCase(item1.name())) { + cookies.remove(item1); + break; + } + } + cookies.add(item); + } + AllMusic.cookie.cookieStore.put("music.163.com", cookies); AllMusic.saveCookie(); } @Override public @NotNull List loadForRequest(HttpUrl httpUrl) { - List cookies = AllMusic.cookie.cookieStore.get(httpUrl.host()); - return cookies != null ? cookies : new CopyOnWriteArrayList<>(); + List cookies = AllMusic.cookie.cookieStore.get("music.163.com"); + return cookies != null ? cookies : new ArrayList<>(); } } diff --git a/core/objs/CookieObj.java b/core/objs/CookieObj.java index 4fc609e3..d931d992 100644 --- a/core/objs/CookieObj.java +++ b/core/objs/CookieObj.java @@ -2,9 +2,10 @@ package com.coloryr.allmusic.server.core.objs; import okhttp3.Cookie; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; public class CookieObj { - public HashMap> cookieStore = new HashMap<>(); + public HashMap> cookieStore = new HashMap<>(); } diff --git a/core/objs/UserCookie.java b/core/objs/UserCookie.java new file mode 100644 index 00000000..15661328 --- /dev/null +++ b/core/objs/UserCookie.java @@ -0,0 +1,12 @@ +package com.coloryr.allmusic.server.core.objs; + +public class UserCookie { + public String domain; + public double expires; + public String name; + public boolean partitioned; + public String path; + public String sameSite; + public boolean secure; + public String value; +} diff --git a/core/objs/message/HelpAdminObj.java b/core/objs/message/HelpAdminObj.java index 81dd0350..3a093487 100644 --- a/core/objs/message/HelpAdminObj.java +++ b/core/objs/message/HelpAdminObj.java @@ -9,8 +9,7 @@ public class HelpAdminObj { public String delete; public String addList; public String clearList; - public String login; - public String code; + public String cookie; public String test; public static HelpAdminObj make() { @@ -35,13 +34,11 @@ public class HelpAdminObj { return true; if (clearList == null) return true; - if (code == null) - return true; if (banPlayer == null) return true; if (test == null) return true; - return login == null; + return cookie == null; } public void init() { @@ -53,8 +50,7 @@ public class HelpAdminObj { delete = "§d[AllMusic3]§e使用/music delete [序号] 删除队列中的歌曲"; addList = "§d[AllMusic3]§e使用/music addlist [歌单ID] 添加歌单到空闲列表"; clearList = "§d[AllMusic3]§e使用/music clearlist 清空空闲歌单"; - login = "§d[AllMusic3]§e使用/music login [验证码] 登录账户"; - code = "§d[AllMusic3]§e使用/music code [手机号] 获取短信验证码"; + cookie = "§d[AllMusic3]§e使用/music cookie [cookie] 填写cookie"; test = "§d[AllMusic3]§e使用/music test [音乐ID] 测试解析音乐"; } } diff --git a/version b/version index 6a3913b0..0fa4ae48 100644 --- a/version +++ b/version @@ -1 +1 @@ -3.2.7 \ No newline at end of file +3.3.0 \ No newline at end of file