From c45d61fcaee3c249a1e51a42e279ab43993ddf81 Mon Sep 17 00:00:00 2001 From: coloryr <402067010@qq.com> Date: Sat, 23 Jan 2021 12:43:40 +0800 Subject: [PATCH 1/6] 2.9.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 使用https验证 修复内置API错误 --- build.gradle | 2 +- src/main/java/Color_yr/AllMusic/AllMusic.java | 2 +- .../java/Color_yr/AllMusic/Http/HttpGet.java | 54 ++++++++++++++++--- 3 files changed, 50 insertions(+), 8 deletions(-) diff --git a/build.gradle b/build.gradle index ce3b245e..eb59b6d6 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ plugins { id 'maven-publish' id 'com.github.johnrengelman.shadow' version '6.1.0' } -version = "2.9.0" +version = "2.9.1" repositories { jcenter() diff --git a/src/main/java/Color_yr/AllMusic/AllMusic.java b/src/main/java/Color_yr/AllMusic/AllMusic.java index b937b057..531271aa 100644 --- a/src/main/java/Color_yr/AllMusic/AllMusic.java +++ b/src/main/java/Color_yr/AllMusic/AllMusic.java @@ -24,7 +24,7 @@ import java.util.logging.Logger; public class AllMusic { public static final String channel = "allmusic:channel"; - public static final String Version = "2.9.0"; + public static final String Version = "2.9.1"; private static final Map SearchSave = new HashMap<>(); private static final List VotePlayer = new ArrayList<>(); diff --git a/src/main/java/Color_yr/AllMusic/Http/HttpGet.java b/src/main/java/Color_yr/AllMusic/Http/HttpGet.java index 12c0f535..7432a288 100644 --- a/src/main/java/Color_yr/AllMusic/Http/HttpGet.java +++ b/src/main/java/Color_yr/AllMusic/Http/HttpGet.java @@ -5,22 +5,64 @@ import org.apache.http.HttpResponse; import org.apache.http.client.HttpClient; import org.apache.http.client.config.CookieSpecs; import org.apache.http.client.config.RequestConfig; +import org.apache.http.config.Registry; +import org.apache.http.config.RegistryBuilder; +import org.apache.http.conn.ClientConnectionManager; +import org.apache.http.conn.scheme.Scheme; +import org.apache.http.conn.scheme.SchemeRegistry; +import org.apache.http.conn.scheme.SchemeSocketFactory; +import org.apache.http.conn.socket.ConnectionSocketFactory; +import org.apache.http.conn.socket.LayeredConnectionSocketFactory; +import org.apache.http.conn.socket.PlainConnectionSocketFactory; +import org.apache.http.conn.ssl.SSLConnectionSocketFactory; +import org.apache.http.conn.ssl.TrustStrategy; import org.apache.http.impl.client.HttpClientBuilder; +import org.apache.http.impl.conn.PoolingHttpClientConnectionManager; +import org.apache.http.ssl.SSLContexts; +import javax.net.ssl.SSLContext; +import javax.net.ssl.SSLSocketFactory; +import javax.net.ssl.TrustManager; +import javax.net.ssl.X509TrustManager; import java.io.ByteArrayOutputStream; import java.io.InputStream; import java.net.URLEncoder; import java.nio.charset.StandardCharsets; +import java.security.KeyManagementException; +import java.security.KeyStore; +import java.security.cert.CertificateException; +import java.security.cert.X509Certificate; public class HttpGet { - private static final HttpClient client; - private static final RequestConfig defaultConfig; + private static HttpClient client; + private static RequestConfig defaultConfig; static { - client = HttpClientBuilder.create().build(); - defaultConfig = RequestConfig.custom().setCookieSpec(CookieSpecs.STANDARD) - .setConnectTimeout(2000).setSocketTimeout(2000) - .setConnectionRequestTimeout(2000).build(); + try { + defaultConfig = RequestConfig.custom().setCookieSpec(CookieSpecs.STANDARD) + .setConnectTimeout(2000).setSocketTimeout(2000) + .setConnectionRequestTimeout(2000).build(); + class AnyTrustStrategy implements TrustStrategy { + @Override + public boolean isTrusted(X509Certificate[] chain, String authType) { + return true; + } + } + RegistryBuilder registryBuilder = RegistryBuilder.create(); + ConnectionSocketFactory plainSF = new PlainConnectionSocketFactory(); + registryBuilder.register("http", plainSF); + KeyStore trustStore = KeyStore.getInstance(KeyStore.getDefaultType()); + SSLContext sslContext = SSLContexts.custom().loadTrustMaterial(trustStore, new AnyTrustStrategy()).build(); + LayeredConnectionSocketFactory sslSF = new SSLConnectionSocketFactory(sslContext); + registryBuilder.register("https", sslSF); + Registry registry = registryBuilder.build(); + PoolingHttpClientConnectionManager connManager = new PoolingHttpClientConnectionManager(registry); + connManager.setMaxTotal(200); + connManager.setDefaultMaxPerRoute(200); + client = HttpClientBuilder.create().setConnectionManager(connManager).build(); + } catch (Exception e) { + e.printStackTrace(); + } } public static Res realData(String path, String data) { From e97dc3cb3bee57bdd3c686368195da2574ac3a58 Mon Sep 17 00:00:00 2001 From: s_yh_china Date: Sat, 23 Jan 2021 21:05:20 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=87=8D=E5=A4=8D?= =?UTF-8?q?=E7=99=BB=E5=BD=95=E8=A6=86=E7=9B=96token=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 2 +- .../java/Color_yr/AllMusic/MusicAPI/MusicAPI1/API1.java | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index ce3b245e..c4edf9ac 100644 --- a/build.gradle +++ b/build.gradle @@ -21,7 +21,7 @@ repositories { } dependencies { - compileOnly 'org.spigotmc:spigot-api:1.16.4-R0.1-SNAPSHOT' + compileOnly 'org.spigotmc:spigot-api:1.16.5-R0.1-SNAPSHOT' compileOnly 'net.md-5:bungeecord-api:1.16-R0.4-SNAPSHOT' compileOnly "com.github.MilkBowl:VaultAPI:1.7" dependencies { compile fileTree(dir:'lib',include:['*.jar'])} diff --git a/src/main/java/Color_yr/AllMusic/MusicAPI/MusicAPI1/API1.java b/src/main/java/Color_yr/AllMusic/MusicAPI/MusicAPI1/API1.java index c43f854f..2258e02b 100644 --- a/src/main/java/Color_yr/AllMusic/MusicAPI/MusicAPI1/API1.java +++ b/src/main/java/Color_yr/AllMusic/MusicAPI/MusicAPI1/API1.java @@ -31,9 +31,11 @@ public class API1 implements IMusicAPI { public API1() { AllMusic.log.info("§d[AllMusic]§e使用外置本地爬虫"); if (!AllMusic.getConfig().getLoginPass().isEmpty() && !AllMusic.getConfig().getLoginUser().isEmpty()) { - HttpGet.realData(AllMusic.getConfig().getMusic_Url() + "/login/cellphone?phone=" + if (!AllMusic.getConfig().getLoginUser().contains("@")) + HttpGet.realData(AllMusic.getConfig().getMusic_Url() + "/login/cellphone?phone=" + AllMusic.getConfig().getLoginUser() + "&password=", AllMusic.getConfig().getLoginPass()); - HttpGet.realData(AllMusic.getConfig().getMusic_Url() + "/login?email=" + else + HttpGet.realData(AllMusic.getConfig().getMusic_Url() + "/login?email=" + AllMusic.getConfig().getLoginUser() + "&password=", AllMusic.getConfig().getLoginPass()); } Res res = HttpGet.realData(AllMusic.getConfig().getMusic_Url(), ""); From e906696e8b9ead3c6ae2770631f24989031f23d0 Mon Sep 17 00:00:00 2001 From: Color_yr <402067010@qq.com> Date: Sat, 23 Jan 2021 22:49:52 +0800 Subject: [PATCH 3/6] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index a4b85cb8..dca55f49 100644 --- a/README.md +++ b/README.md @@ -20,6 +20,8 @@ >配置文件的`Music_Api`设置`2` >重载插件 +[外置API友链](https://github.com/s-yh-china/AllMusicApi) + ## 播放VIP歌曲 1. 使用外置API 2. 在插件配置文件的`LoginUser`和`LoginPass`填写账户密码 From daf4faaea1bc6a38d0733f612759878da24c3570 Mon Sep 17 00:00:00 2001 From: Color_yr <402067010@qq.com> Date: Wed, 27 Jan 2021 23:01:14 +0800 Subject: [PATCH 4/6] Update README.md --- README.md | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index dca55f49..175a9710 100644 --- a/README.md +++ b/README.md @@ -12,15 +12,29 @@ >`fabric:1.14 1.15 1.16` >复制`[forge-1.1x]AllMusic-2.3.0(hotfix)`到你的`mods`文件夹 >fabric同理 ->3. 启动外置API(可选) +>3. 启动外置API-VPS推荐开启(可选) >下载群文件的`NeteaseCloudMusicApi.7z`并解压到一个地方 +>请不要放在本机启动 +>请不要放在本机启动 +>请不要放在本机启动 +>请不要放在本机启动 +>请不要放在本机启动 +>请不要放在本机启动 +>请不要放在本机启动 >windows双击`start.cmd` >Linux`$ sudo ./start.sh` >出现`server running @ http://localhost:4000`为启动成功 >配置文件的`Music_Api`设置`2` ->重载插件 +>配置文件的`Music_Api`设置`2` +>配置文件的`Music_Api`设置`2` +>配置文件的`Music_Api`设置`2` +>配置文件的`Music_Api`设置`2` +>配置文件的`Music_Api`设置`2` +>配置文件的`Music_Api`设置`2` +>重载插件 +>面板服可以尝试使用[外置API友链](https://github.com/s-yh-china/AllMusicApi) +>或者使用/music initapi尝试自建API -[外置API友链](https://github.com/s-yh-china/AllMusicApi) ## 播放VIP歌曲 1. 使用外置API From d538e8c4f47583fa7aeeca479482fd51b02f585b Mon Sep 17 00:00:00 2001 From: coloryr <402067010@qq.com> Date: Thu, 28 Jan 2021 18:11:35 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E4=B8=8D=E7=9F=A5=E9=81=93=E7=AE=97?= =?UTF-8?q?=E4=B8=8D=E7=AE=97=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 2 +- src/main/java/Color_yr/AllMusic/Http/HttpGet.java | 12 ++---------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/build.gradle b/build.gradle index 3a5c16ba..ad04c612 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ plugins { id 'maven-publish' id 'com.github.johnrengelman.shadow' version '6.1.0' } -version = "2.9.1" +version = "2.9.2" repositories { jcenter() diff --git a/src/main/java/Color_yr/AllMusic/Http/HttpGet.java b/src/main/java/Color_yr/AllMusic/Http/HttpGet.java index 7432a288..236e53e3 100644 --- a/src/main/java/Color_yr/AllMusic/Http/HttpGet.java +++ b/src/main/java/Color_yr/AllMusic/Http/HttpGet.java @@ -7,30 +7,22 @@ import org.apache.http.client.config.CookieSpecs; import org.apache.http.client.config.RequestConfig; import org.apache.http.config.Registry; import org.apache.http.config.RegistryBuilder; -import org.apache.http.conn.ClientConnectionManager; -import org.apache.http.conn.scheme.Scheme; -import org.apache.http.conn.scheme.SchemeRegistry; -import org.apache.http.conn.scheme.SchemeSocketFactory; import org.apache.http.conn.socket.ConnectionSocketFactory; import org.apache.http.conn.socket.LayeredConnectionSocketFactory; import org.apache.http.conn.socket.PlainConnectionSocketFactory; import org.apache.http.conn.ssl.SSLConnectionSocketFactory; import org.apache.http.conn.ssl.TrustStrategy; +import org.apache.http.impl.client.BasicCookieStore; import org.apache.http.impl.client.HttpClientBuilder; import org.apache.http.impl.conn.PoolingHttpClientConnectionManager; import org.apache.http.ssl.SSLContexts; import javax.net.ssl.SSLContext; -import javax.net.ssl.SSLSocketFactory; -import javax.net.ssl.TrustManager; -import javax.net.ssl.X509TrustManager; import java.io.ByteArrayOutputStream; import java.io.InputStream; import java.net.URLEncoder; import java.nio.charset.StandardCharsets; -import java.security.KeyManagementException; import java.security.KeyStore; -import java.security.cert.CertificateException; import java.security.cert.X509Certificate; public class HttpGet { @@ -59,7 +51,7 @@ public class HttpGet { PoolingHttpClientConnectionManager connManager = new PoolingHttpClientConnectionManager(registry); connManager.setMaxTotal(200); connManager.setDefaultMaxPerRoute(200); - client = HttpClientBuilder.create().setConnectionManager(connManager).build(); + client = HttpClientBuilder.create().setConnectionManager(connManager).setDefaultCookieStore(new BasicCookieStore()).build(); } catch (Exception e) { e.printStackTrace(); } From f11fa7530e9539ede5929d7485b2e80d921d8161 Mon Sep 17 00:00:00 2001 From: Color_yr <402067010@qq.com> Date: Fri, 29 Jan 2021 15:39:02 +0800 Subject: [PATCH 6/6] Update README.md --- README.md | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 175a9710..a8ea6da5 100644 --- a/README.md +++ b/README.md @@ -21,6 +21,27 @@ >请不要放在本机启动 >请不要放在本机启动 >请不要放在本机启动 +>请不要开了又关掉或者点中cmd窗口然后在群里说为什么外置API连不上 +>请不要开了又关掉或者点中cmd窗口然后在群里说为什么外置API连不上 +>请不要开了又关掉或者点中cmd窗口然后在群里说为什么外置API连不上 +>请不要开了又关掉或者点中cmd窗口然后在群里说为什么外置API连不上 +>请不要开了又关掉或者点中cmd窗口然后在群里说为什么外置API连不上 +>请不要开了又关掉或者点中cmd窗口然后在群里说为什么外置API连不上 +>请不要开了又关掉或者点中cmd窗口然后在群里说为什么外置API连不上 +>请不要开了又关掉或者点中cmd窗口然后在群里说为什么外置API连不上 +>请不要开了又关掉或者点中cmd窗口然后在群里说为什么外置API连不上 +>请不要开了又关掉或者点中cmd窗口然后在群里说为什么外置API连不上 +>请不要开了又关掉或者点中cmd窗口然后在群里说为什么外置API连不上 +>请不要开了又关掉或者点中cmd窗口然后在群里说为什么外置API连不上 +>请不要开了又关掉或者点中cmd窗口然后在群里说为什么外置API连不上 +>请不要开了又关掉或者点中cmd窗口然后在群里说为什么外置API连不上 +>请不要开了又关掉或者点中cmd窗口然后在群里说为什么外置API连不上 +>请不要开了又关掉或者点中cmd窗口然后在群里说为什么外置API连不上 +>请不要开了又关掉或者点中cmd窗口然后在群里说为什么外置API连不上 +>请不要开了又关掉或者点中cmd窗口然后在群里说为什么外置API连不上 +>请不要开了又关掉或者点中cmd窗口然后在群里说为什么外置API连不上 +>请不要开了又关掉或者点中cmd窗口然后在群里说为什么外置API连不上 +>请不要开了又关掉或者点中cmd窗口然后在群里说为什么外置API连不上 >windows双击`start.cmd` >Linux`$ sudo ./start.sh` >出现`server running @ http://localhost:4000`为启动成功 @@ -33,7 +54,7 @@ >配置文件的`Music_Api`设置`2` >重载插件 >面板服可以尝试使用[外置API友链](https://github.com/s-yh-china/AllMusicApi) ->或者使用/music initapi尝试自建API +>或者使用/music initapi尝试自建API(不推荐) ## 播放VIP歌曲