add cookie options for netease

khjxiaogu · Nov 7, 2024 · f55b71f · f55b71f
1 parent b34d9d4
commit f55b71f
Show file tree

Hide file tree

Showing 11 changed files with 18 additions and 69 deletions.
diff --git a/.classpath b/.classpath
diff --git a/.gitignore b/.gitignore
@@ -1 +1,3 @@
 /target/
+/.settings/
+/.classpath
diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.khjxiaogu</groupId>
 	<artifactId>MiraiSongPlugin</artifactId>
-	<version>1.2.1</version>
+	<version>1.2.2</version>
 	<name>MiraiSongPlugin</name>
 	<description>使用“#音乐 关键词”、“#QQ 关键词”、“#网易 关键词”等方式进行点歌的插件。</description>
 	<build>

diff --git a/src/main/java/com/khjxiaogu/MiraiSongPlugin/MiraiSongPlugin.java b/src/main/java/com/khjxiaogu/MiraiSongPlugin/MiraiSongPlugin.java
@@ -361,10 +361,10 @@ public void reload() {
 		YamlMap excs = (YamlMap) cfg.get(new YamlLiteral("extracommands"));
 		YamlMap exps = (YamlMap) cfg.get(new YamlLiteral("extraparsers"));
 		String addDefault = cfg.getStringOrNull("adddefault");
+		String neteaseCookie=cfg.getStringOrNull("neteasecookies");
+		NetEaseCrypto.cookie=neteaseCookie;
 		commands.clear();
 
-
-
 		if (addDefault == null || addDefault.equals("true")) {
 			urlMatchers.add(makeMatcher("music\\.163\\.com.*/song.*\\?.*id=([0-9]+)","网易","Mirai"));
 			urlMatchers.add(makeMatcher("i\\.y\\.qq\\.com/v8/playsong\\.html\\?.*songid=([0-9]+)","QQ音乐","Mirai"));

diff --git a/src/main/java/com/khjxiaogu/MiraiSongPlugin/NetEaseCrypto.java b/src/main/java/com/khjxiaogu/MiraiSongPlugin/NetEaseCrypto.java
@@ -99,7 +99,7 @@ public static String getUserAgent() {
 	 * 输入向量.
 	 */
 	private static String iv = "0102030405060708";
-
+	public static String cookie="";
 	/**
 	 * Create a AES secret key.<br>
 	 * 生成AES密钥

diff --git a/src/main/java/com/khjxiaogu/MiraiSongPlugin/musicsource/NetEaseHQMusicSource.java b/src/main/java/com/khjxiaogu/MiraiSongPlugin/musicsource/NetEaseHQMusicSource.java
@@ -35,6 +35,7 @@ public String queryRealUrl(String id) throws Exception {
 		.url("/weapi/song/enhance/player/url?csrf_token=")
 		.contenttype("application/x-www-form-urlencoded")
 		.referer("https://music.163.com")
+		.cookie(NetEaseCrypto.cookie)
 		.ua(NetEaseCrypto.getUserAgent())
 		.post()
 		.send(NetEaseCrypto.weapiEncryptParam(JsonBuilder.object().add("ids","[" + id + "]").add("br",999000).toString()))

diff --git a/src/main/java/com/khjxiaogu/MiraiSongPlugin/musicsource/NetEaseMusicSource.java b/src/main/java/com/khjxiaogu/MiraiSongPlugin/musicsource/NetEaseMusicSource.java
@@ -39,14 +39,17 @@ public String queryRealUrl(String id) throws Exception {
 	@Override
 	public MusicInfo get(String keyword) throws Exception {
 		String murl;
-		JsonArray ja=HttpRequestBuilder.create("music.163.com")
+		JsonObject jom=HttpRequestBuilder.create("music.163.com")
 		.url("/weapi/cloudsearch/get/web?csrf_token=")
 		.referer("http://music.163.com/")
-		.cookie("appver=1.5.0.75771;")
+		.cookie("appver=1.5.0.75771;"+NetEaseCrypto.cookie)
 		.contenttype("application/x-www-form-urlencoded")
 		.post()
 		.send(NetEaseCrypto.weapiEncryptParam(JsonBuilder.object().add("s", keyword).add("type", 1).add("offset", 0).add("limit", 3).toString()))
-		.readJson().get("result").getAsJsonObject().get("songs").getAsJsonArray();
+		.readJson();
+		System.out.println(jom);
+		JsonArray ja=jom
+		.get("result").getAsJsonObject().get("songs").getAsJsonArray();
 		JsonObject jo = ja.get(0).getAsJsonObject();
 		murl = queryRealUrl(jo.get("id").getAsString());
 		int i = 0;
@@ -66,7 +69,7 @@ public MusicInfo getId(String id) throws Exception {
 		JsonObject jo =HttpRequestBuilder.create("music.163.com")
 				.url("/weapi/song/detail?csrf_token=")
 				.referer("http://music.163.com/")
-				.cookie("appver=1.5.0.75771;")
+				.cookie("appver=1.5.0.75771;"+NetEaseCrypto.cookie)
 				.contenttype("application/x-www-form-urlencoded")
 				.post()
 				.send(NetEaseCrypto.weapiEncryptParam(JsonBuilder.object().array("ids").add(id).end().toString()))

diff --git a/src/main/java/com/khjxiaogu/MiraiSongPlugin/musicsource/NetEaseRadioSource.java b/src/main/java/com/khjxiaogu/MiraiSongPlugin/musicsource/NetEaseRadioSource.java
@@ -41,6 +41,7 @@ protected JsonObject getSlice(String id,int offset,int limit) throws IOException
 		return HttpRequestBuilder.create("music.163.com")
 				.url("/weapi/dj/program/byradio?csrf_token=")
 				.defUA()
+				.cookie(NetEaseCrypto.cookie)
 				.contenttype("application/x-www-form-urlencoded")
 				.referer("https://music.163.com")
 				.ua(NetEaseCrypto.getUserAgent())
@@ -57,6 +58,7 @@ protected JsonObject getProgramSong(String id) throws IOException {
 		JsonObject main=HttpRequestBuilder.create("music.163.com")
 		.url("/weapi/dj/program/detail?csrf_token=")
 		.defUA()
+		.cookie(NetEaseCrypto.cookie)
 		.contenttype("application/x-www-form-urlencoded")
 		.referer("https://music.163.com")
 		.ua(NetEaseCrypto.getUserAgent())
@@ -122,7 +124,7 @@ public MusicInfo get(String keyword, String songname) throws Exception {
 		JsonArray ja=HttpRequestBuilder.create("music.163.com")
 		.url("/weapi/cloudsearch/get/web?csrf_token=")
 		.ua(NetEaseCrypto.getUserAgent())
-		.cookie("appver=1.5.0.75771;")
+		.cookie("appver=1.5.0.75771;"+NetEaseCrypto.cookie)
 		.referer("http://music.163.com/")
 		.contenttype("application/x-www-form-urlencoded")
 		.post()

diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
@@ -14,6 +14,7 @@ hintsourcenotfound: "无法找到来源。"
 enableParser: 1
 admins: 
   - 0
+neteasecookies: MUSIC_U=<YourLoginToken>;
 extracommands: 
   "#分享": 
     source: all