This commit is contained in:
Color_yr committed 2020-08-07 22:08:23 +08:00
1 parent 09202f8aa1
commit e4697eaa20
5 files changed
+12 -18

No files matched your search

+1 -1
View File
@@ -2,7 +2,7 @@ plugins {
id 'java'
id 'maven-publish'
}
version = "2.3.0"
version = "2.4.0"
repositories {
jcenter()
@@ -22,7 +22,7 @@ import java.util.logging.Logger;
public class AllMusic {
public static final String channel = "allmusic:channel";
public static final String Version = "2.3.0";
public static final String Version = "2.4.0";
private static final Map<String, SearchPage> SearchSave = new HashMap<>();
private static final List<String> VotePlayer = new ArrayList<>();
+4 -10
View File
@@ -8,8 +8,7 @@ import java.util.List;
import java.util.Map;
public class ConfigOBJ {
private String Music_Api1;
private String Music_Api2;
private String Music_Url;
private int Music_Api;
@@ -34,8 +33,7 @@ public class ConfigOBJ {
private String Version;
public ConfigOBJ() {
Music_Api1 = "https://api.imjad.cn/cloudmusic/";
Music_Api2 = "http://localhost:4000";
Music_Url = "http://localhost:4000";
Music_Api = 1;
MaxList = 10;
MinVote = 3;
@@ -61,18 +59,14 @@ public class ConfigOBJ {
return DefaultHud;
}
public String getMusic_Api2() {
return Music_Api2;
public String getMusic_Url() {
return Music_Url;
}
public int getMusic_Api() {
return Music_Api;
}
public String getMusic_Api1() {
return Music_Api1;
}
public boolean isNeedPermission() {
return NeedPermission;
}
@@ -32,7 +32,7 @@ public class API1 implements IMusicAPI {
@Override
public SongInfo GetMusic(String ID, String player, boolean isList) {
Res res = HttpGet.realData(AllMusic.getConfig().getMusic_Api2() + "/song/detail?ids=", ID);
Res res = HttpGet.realData(AllMusic.getConfig().getMusic_Url() + "/song/detail?ids=", ID);
SongInfo info = null;
if (res != null && res.isOk()) {
InfoOBJ temp = new Gson().fromJson(res.getData(), InfoOBJ.class);
@@ -48,7 +48,7 @@ public class API1 implements IMusicAPI {
@Override
public String GetPlayUrl(String ID) {
Res res = HttpGet.realData(AllMusic.getConfig().getMusic_Api2() + "/song/url?id=", ID);
Res res = HttpGet.realData(AllMusic.getConfig().getMusic_Url() + "/song/url?id=", ID);
if (res != null && res.isOk()) {
try {
PlayOBJ obj = new Gson().fromJson(res.getData(), PlayOBJ.class);
@@ -69,7 +69,7 @@ public class API1 implements IMusicAPI {
public void SetList(String ID, Object sender) {
Thread thread = new Thread(() ->
{
Res res = HttpGet.realData(AllMusic.getConfig().getMusic_Api2() + "/playlist/detail?id=", ID);
Res res = HttpGet.realData(AllMusic.getConfig().getMusic_Url() + "/playlist/detail?id=", ID);
if (res != null && res.isOk())
try {
isUpdata = true;
@@ -89,7 +89,7 @@ public class API1 implements IMusicAPI {
@Override
public LyricSave getLyric(String ID) {
LyricSave Lyric = new LyricSave();
Res res = HttpGet.realData(AllMusic.getConfig().getMusic_Api2() + "/lyric?id=", ID);
Res res = HttpGet.realData(AllMusic.getConfig().getMusic_Url() + "/lyric?id=", ID);
if (res != null && res.isOk()) {
try {
LyricOBJ obj = new Gson().fromJson(res.getData(), LyricOBJ.class);
@@ -126,7 +126,7 @@ public class API1 implements IMusicAPI {
}
String MusicName = name1.toString();
MusicName = MusicName.substring(0, MusicName.length() - 1);
Res res = HttpGet.realData(AllMusic.getConfig().getMusic_Api2() + "/search?keywords=", MusicName);
Res res = HttpGet.realData(AllMusic.getConfig().getMusic_Url() + "/search?keywords=", MusicName);
if (res != null && res.isOk()) {
SearchDataOBJ obj = new Gson().fromJson(res.getData(), SearchDataOBJ.class);
if (obj != null && obj.isok()) {
+1 -1
View File
@@ -1,5 +1,5 @@
{
"Music_Api2": "http://localhost:4000",
"Music_Url": "http://localhost:4000",
"Music_Api": 1,
"MaxList": 10,
"MinVote": 3,