This commit is contained in:
Color_yr committed 2021-11-18 22:02:50 +08:00
1 parent 99cb913563
commit 6e52090b1d
6 files changed
+51 -69

No files matched your search

+3 -1
View File
@@ -17,8 +17,10 @@
## 播放VIP歌曲
1. 在插件配置文件的`LoginUser`和`LoginPass`填写账户密码
1. 在插件配置文件的`LoginUser`填写手机号
2. 重载插件或者重启服务器
3. 输入/music code 获取手机验证码
4. 输入/music login 验证码 登录账户
如果登录失效,请删除`cookie.json`再打`/music reload`
+3 -3
View File
@@ -3,7 +3,7 @@ plugins {
id 'maven-publish'
id 'com.github.johnrengelman.shadow' version '6.1.0'
}
version = "2.14.0"
version = "2.14.1"
repositories {
mavenCentral()
@@ -30,10 +30,10 @@ dependencies {
compileOnly "com.github.MilkBowl:VaultAPI:1.7"
compileOnly 'com.velocitypowered:velocity-api:1.1.4'
compileOnly 'me.clip:placeholderapi:2.10.6'
compileOnly fileTree(dir:'lib',include:['*.jar'])
// compileOnly fileTree(dir:'lib',include:['*.jar'])
implementation 'org.xerial:sqlite-jdbc:3.36.0.3'
compile 'com.squareup.okhttp3:okhttp:4.9.1'
compile 'com.squareup.okhttp3:okhttp:4.9.2'
annotationProcessor 'com.velocitypowered:velocity-api:1.1.4'
}
@@ -35,7 +35,6 @@ public class ConfigOBJ {
private int DefaultAddMusic;
private String LoginUser;
private String LoginPass;
private String MusicBR;
public ConfigOBJ() {
@@ -61,7 +60,6 @@ public class ConfigOBJ {
DefaultAddMusic = 0;
LoginUser = "";
LoginPass = "";
MusicBR = "320000";
@@ -80,10 +78,6 @@ public class ConfigOBJ {
return LoginUser;
}
public String getLoginPass() {
return LoginPass;
}
public int getDefaultAddMusic() {
return DefaultAddMusic;
}
@@ -366,9 +366,15 @@ public class CommandEX {
AllMusic.save();
AllMusic.Side.sendMessage(sender, "§d[AllMusic]§2添加空闲音乐列表已清空");
return;
} else if (args[0].equalsIgnoreCase("code")) {
AllMusic.getMusicApi().sendCode(sender);
return;
} else if (args[0].equalsIgnoreCase("login")) {
if (args.length != 2) {
AllMusic.Side.sendMessage(sender, "§d[AllMusic]§没有手机验证码");
}
AllMusic.Side.sendMessage(sender, "§d[AllMusic]§d重新登录网易云账户");
AllMusic.getMusicApi().login(sender);
AllMusic.getMusicApi().login(sender, args[1]);
return;
}
}
@@ -29,17 +29,16 @@ public class HttpClientUtil {
if (AllMusic.Cookie.cookieStore.containsKey(httpUrl.host())) {
List<Cookie> 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;
}
}
for(Cookie item1 : cookies)
{
if (item.name().equalsIgnoreCase(item1.name())) {
cookies.remove(item1);
break;
}
}
cookies.add(item);
}
List<Cookie> cookies1 = new CopyOnWriteArrayList<>();
cookies1.addAll(cookies);
cookies1.addAll(list);
AllMusic.Cookie.cookieStore.put(httpUrl.host(), cookies1);
AllMusic.Cookie.cookieStore.put(httpUrl.host(), cookies);
} else {
AllMusic.Cookie.cookieStore.put(httpUrl.host(), list);
}
@@ -39,16 +39,19 @@ public class APIMain {
AllMusic.log.info("§d[AllMusic]§c使用本地爬虫连接失败");
return;
}
if (!AllMusic.getConfig().getLoginPass().isEmpty() && !AllMusic.getConfig().getLoginUser().isEmpty()) {
AllMusic.log.info("§d[AllMusic]§e登陆中");
login(null);
}
}
public void login(Object sender) {
public void sendCode(Object sender) {
JsonObject params = new JsonObject();
params.addProperty("ctcode", "86");
params.addProperty("cellphone", AllMusic.getConfig().getLoginUser());
Res res = HttpClientUtil.post("https://music.163.com/api/sms/captcha/sent", params, EncryptType.weapi, null);
AllMusic.Side.sendMessage(sender, "§d[AllMusic]§d已发送验证码\n" + res.getData());
}
public void login(Object sender, String code) {
JsonObject params = new JsonObject();
params.addProperty("rememberLogin", "true");
params.addProperty("password", CryptoUtil.getMd5(AllMusic.getConfig().getLoginPass()).toLowerCase());
if (AllMusic.Cookie.cookieStore.containsKey("music.163.com")) {
List<Cookie> cookies = AllMusic.Cookie.cookieStore.get("music.163.com");
for (Cookie item : cookies) {
@@ -63,49 +66,27 @@ public class APIMain {
AllMusic.Cookie.cookieStore.put("music.163.com", cookies1);
AllMusic.saveCookie();
}
if (AllMusic.getConfig().getLoginUser().contains("@")) {
params.addProperty("username", AllMusic.getConfig().getLoginUser());
Res res = HttpClientUtil.post("https://music.163.com/weapi/login", params, EncryptType.weapi, null);
if (res == null || !res.isOk()) {
if (sender == null)
AllMusic.log.info("§d[AllMusic]§c登录失败");
else
AllMusic.Side.sendMessage(sender, "§d[AllMusic]§c登录失败");
return;
}
if (res.getData().contains("502")) {
if (sender == null)
AllMusic.log.info("§d[AllMusic]§c登录失败:账号或密码错误");
else
AllMusic.Side.sendMessage(sender, "§d[AllMusic]§c登录失败:账号或密码错误");
} else {
if (sender == null)
AllMusic.log.info("§d[AllMusic]§d已登录");
else
AllMusic.Side.sendMessage(sender, "§d[AllMusic]§d已登录");
}
params.addProperty("countrycode", "86");
params.addProperty("phone", AllMusic.getConfig().getLoginUser());
params.addProperty("captcha", code);
Res res = HttpClientUtil.post("https://music.163.com/weapi/login/cellphone", params, EncryptType.weapi, null);
if (res == null || !res.isOk()) {
if (sender == null)
AllMusic.log.info("§d[AllMusic]§c登录失败");
else
AllMusic.Side.sendMessage(sender, "§d[AllMusic]§c登录失败");
return;
}
if (res.getData().contains("200")) {
if (sender == null)
AllMusic.log.info("§d[AllMusic]§d已登录");
else
AllMusic.Side.sendMessage(sender, "§d[AllMusic]§d已登录");
} else {
params.addProperty("countrycode", "86");
params.addProperty("phone", AllMusic.getConfig().getLoginUser());
Res res = HttpClientUtil.post("https://music.163.com/weapi/login/cellphone", params, EncryptType.weapi, null);
if (res == null || !res.isOk()) {
if (sender == null)
AllMusic.log.info("§d[AllMusic]§c登录失败");
else
AllMusic.Side.sendMessage(sender, "§d[AllMusic]§c登录失败");
return;
}
if (res.getData().contains("502")) {
if (sender == null)
AllMusic.log.info("§d[AllMusic]§c登录失败:账号或密码错误");
else
AllMusic.Side.sendMessage(sender, "§d[AllMusic]§c登录失败:账号或密码错误");
} else {
if (sender == null)
AllMusic.log.info("§d[AllMusic]§d已登录");
else
AllMusic.Side.sendMessage(sender, "§d[AllMusic]§d已登录");
}
if (sender == null)
AllMusic.log.info("§d[AllMusic]§c登录失败:账号或密码错误\n" + res.getData());
else
AllMusic.Side.sendMessage(sender, "§d[AllMusic]§c登录失败:账号或密码错误\n" + res.getData());
}
}