Merge pull request #4 from HeartAge/master

Update
This commit is contained in:
s-yh-china authored and GitHub committed 2021-02-06 16:09:57 +08:00
commit fcde7ac7cd
5 files changed
+86 -13

No files matched your search

+39 -2
View File
@@ -12,13 +12,50 @@
>`fabric:1.14 1.15 1.16`
>复制`[forge-1.1x]AllMusic-2.3.0(hotfix)`到你的`mods`文件夹
>fabric同理
>3. 启动外置API(可选)
>3. 启动外置API-VPS推荐开启(可选)
>下载群文件的`NeteaseCloudMusicApi.7z`并解压到一个地方
>请不要放在本机启动
>请不要放在本机启动
>请不要放在本机启动
>请不要放在本机启动
>请不要放在本机启动
>请不要放在本机启动
>请不要放在本机启动
>请不要开了又关掉或者点中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`为启动成功
>配置文件的`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(不推荐)
## 播放VIP歌曲
1. 使用外置API
+2 -2
View File
@@ -3,7 +3,7 @@ plugins {
id 'maven-publish'
id 'com.github.johnrengelman.shadow' version '6.1.0'
}
version = "2.9.0"
version = "2.9.2"
repositories {
jcenter()
@@ -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'])}
@@ -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<String, SearchPage> SearchSave = new HashMap<>();
private static final List<String> VotePlayer = new ArrayList<>();
@@ -5,22 +5,56 @@ 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.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 java.io.ByteArrayOutputStream;
import java.io.InputStream;
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
import java.security.KeyStore;
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).setDefaultCookieStore(new BasicCookieStore()).build();
} catch (Exception e) {
e.printStackTrace();
}
}
public static Res realData(String path, String data) {
@@ -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(), "");