From b6fed26c03f261cbbbc97b98385944f80da62d4c Mon Sep 17 00:00:00 2001 From: Color_yr <402067010@qq.com> Date: Tue, 30 Nov 2021 13:40:22 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E5=91=BD=E5=90=8D=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AllMusic/{hudsave => hud}/DataSql.java | 6 ++--- .../AllMusic/{hudsave => hud}/HudSave.java | 4 +-- .../AllMusic/music/api/{web => }/APIMain.java | 25 +++++++++---------- .../api/{web => obj}/music/info/InfoOBJ.java | 2 +- .../api/{web => obj}/music/info/PlayOBJ.java | 2 +- .../api/{web => obj}/music/list/DataOBJ.java | 2 +- .../{web => obj}/music/lyric/WLyricOBJ.java | 2 +- .../music/search/SearchDataOBJ.java | 2 +- .../api/{web => obj}/music/search/songs.java | 2 +- .../music/trialinfo/TrialInfoObj.java | 2 +- .../music/trialinfo/freeTrialInfo.java | 2 +- .../{web => obj}/program/info/PrInfoOBJ.java | 2 +- .../music/{api/song => }/lyric/LyricDo.java | 4 +-- .../music/{api/song => }/lyric/LyricSave.java | 2 +- .../music/{api/song => }/lyric/ShowOBJ.java | 2 +- .../{api/song => }/search/SearchOBJ.java | 2 +- .../{api/song => }/search/SearchPage.java | 2 +- 17 files changed, 32 insertions(+), 33 deletions(-) rename src/main/java/Color_yr/AllMusic/{hudsave => hud}/DataSql.java (98%) rename src/main/java/Color_yr/AllMusic/{hudsave => hud}/HudSave.java (91%) rename src/main/java/Color_yr/AllMusic/music/api/{web => }/APIMain.java (93%) rename src/main/java/Color_yr/AllMusic/music/api/{web => obj}/music/info/InfoOBJ.java (98%) rename src/main/java/Color_yr/AllMusic/music/api/{web => obj}/music/info/PlayOBJ.java (89%) rename src/main/java/Color_yr/AllMusic/music/api/{web => obj}/music/list/DataOBJ.java (93%) rename src/main/java/Color_yr/AllMusic/music/api/{web => obj}/music/lyric/WLyricOBJ.java (93%) rename src/main/java/Color_yr/AllMusic/music/api/{web => obj}/music/search/SearchDataOBJ.java (91%) rename src/main/java/Color_yr/AllMusic/music/api/{web => obj}/music/search/songs.java (91%) rename src/main/java/Color_yr/AllMusic/music/api/{web => obj}/music/trialinfo/TrialInfoObj.java (94%) rename src/main/java/Color_yr/AllMusic/music/api/{web => obj}/music/trialinfo/freeTrialInfo.java (81%) rename src/main/java/Color_yr/AllMusic/music/api/{web => obj}/program/info/PrInfoOBJ.java (97%) rename src/main/java/Color_yr/AllMusic/music/{api/song => }/lyric/LyricDo.java (96%) rename src/main/java/Color_yr/AllMusic/music/{api/song => }/lyric/LyricSave.java (93%) rename src/main/java/Color_yr/AllMusic/music/{api/song => }/lyric/ShowOBJ.java (95%) rename src/main/java/Color_yr/AllMusic/music/{api/song => }/search/SearchOBJ.java (91%) rename src/main/java/Color_yr/AllMusic/music/{api/song => }/search/SearchPage.java (95%) diff --git a/src/main/java/Color_yr/AllMusic/hudsave/DataSql.java b/src/main/java/Color_yr/AllMusic/hud/DataSql.java similarity index 98% rename from src/main/java/Color_yr/AllMusic/hudsave/DataSql.java rename to src/main/java/Color_yr/AllMusic/hud/DataSql.java index 5d64cbaf..1e03680f 100644 --- a/src/main/java/Color_yr/AllMusic/hudsave/DataSql.java +++ b/src/main/java/Color_yr/AllMusic/hud/DataSql.java @@ -1,8 +1,8 @@ -package Color_yr.AllMusic.hudsave; +package Color_yr.AllMusic.hud; import Color_yr.AllMusic.AllMusic; -import Color_yr.AllMusic.music.play.sendHud.PosOBJ; -import Color_yr.AllMusic.music.play.sendHud.SaveOBJ; +import Color_yr.AllMusic.hud.obj.PosOBJ; +import Color_yr.AllMusic.hud.obj.SaveOBJ; import java.io.File; import java.sql.Connection; diff --git a/src/main/java/Color_yr/AllMusic/hudsave/HudSave.java b/src/main/java/Color_yr/AllMusic/hud/HudSave.java similarity index 91% rename from src/main/java/Color_yr/AllMusic/hudsave/HudSave.java rename to src/main/java/Color_yr/AllMusic/hud/HudSave.java index b63bd4ca..d090cfaf 100644 --- a/src/main/java/Color_yr/AllMusic/hudsave/HudSave.java +++ b/src/main/java/Color_yr/AllMusic/hud/HudSave.java @@ -1,7 +1,7 @@ -package Color_yr.AllMusic.hudsave; +package Color_yr.AllMusic.hud; import Color_yr.AllMusic.AllMusic; -import Color_yr.AllMusic.music.play.sendHud.SaveOBJ; +import Color_yr.AllMusic.hud.obj.SaveOBJ; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; diff --git a/src/main/java/Color_yr/AllMusic/music/api/web/APIMain.java b/src/main/java/Color_yr/AllMusic/music/api/APIMain.java similarity index 93% rename from src/main/java/Color_yr/AllMusic/music/api/web/APIMain.java rename to src/main/java/Color_yr/AllMusic/music/api/APIMain.java index ffb7edd8..0db3d57b 100644 --- a/src/main/java/Color_yr/AllMusic/music/api/web/APIMain.java +++ b/src/main/java/Color_yr/AllMusic/music/api/APIMain.java @@ -1,21 +1,20 @@ -package Color_yr.AllMusic.music.api.web; +package Color_yr.AllMusic.music.api; import Color_yr.AllMusic.AllMusic; import Color_yr.AllMusic.http.EncryptType; import Color_yr.AllMusic.http.HttpClientUtil; import Color_yr.AllMusic.http.Res; -import Color_yr.AllMusic.music.api.SongInfo; -import Color_yr.AllMusic.music.api.song.lyric.LyricDo; -import Color_yr.AllMusic.music.api.song.search.SearchOBJ; -import Color_yr.AllMusic.music.api.song.search.SearchPage; -import Color_yr.AllMusic.music.api.web.music.trialinfo.TrialInfoObj; -import Color_yr.AllMusic.music.api.web.program.info.PrInfoOBJ; -import Color_yr.AllMusic.music.api.web.music.info.InfoOBJ; -import Color_yr.AllMusic.music.api.web.music.list.DataOBJ; -import Color_yr.AllMusic.music.api.web.music.lyric.WLyricOBJ; -import Color_yr.AllMusic.music.api.web.music.search.SearchDataOBJ; -import Color_yr.AllMusic.music.api.web.music.search.songs; -import Color_yr.AllMusic.music.api.song.lyric.LyricSave; +import Color_yr.AllMusic.music.lyric.LyricDo; +import Color_yr.AllMusic.music.search.SearchOBJ; +import Color_yr.AllMusic.music.search.SearchPage; +import Color_yr.AllMusic.music.api.obj.music.trialinfo.TrialInfoObj; +import Color_yr.AllMusic.music.api.obj.program.info.PrInfoOBJ; +import Color_yr.AllMusic.music.api.obj.music.info.InfoOBJ; +import Color_yr.AllMusic.music.api.obj.music.list.DataOBJ; +import Color_yr.AllMusic.music.api.obj.music.lyric.WLyricOBJ; +import Color_yr.AllMusic.music.api.obj.music.search.SearchDataOBJ; +import Color_yr.AllMusic.music.api.obj.music.search.songs; +import Color_yr.AllMusic.music.lyric.LyricSave; import Color_yr.AllMusic.utils.logs; import com.google.gson.JsonObject; import okhttp3.Cookie; diff --git a/src/main/java/Color_yr/AllMusic/music/api/web/music/info/InfoOBJ.java b/src/main/java/Color_yr/AllMusic/music/api/obj/music/info/InfoOBJ.java similarity index 98% rename from src/main/java/Color_yr/AllMusic/music/api/web/music/info/InfoOBJ.java rename to src/main/java/Color_yr/AllMusic/music/api/obj/music/info/InfoOBJ.java index 62998932..020160b2 100644 --- a/src/main/java/Color_yr/AllMusic/music/api/web/music/info/InfoOBJ.java +++ b/src/main/java/Color_yr/AllMusic/music/api/obj/music/info/InfoOBJ.java @@ -1,4 +1,4 @@ -package Color_yr.AllMusic.music.api.web.music.info; +package Color_yr.AllMusic.music.api.obj.music.info; import java.util.List; diff --git a/src/main/java/Color_yr/AllMusic/music/api/web/music/info/PlayOBJ.java b/src/main/java/Color_yr/AllMusic/music/api/obj/music/info/PlayOBJ.java similarity index 89% rename from src/main/java/Color_yr/AllMusic/music/api/web/music/info/PlayOBJ.java rename to src/main/java/Color_yr/AllMusic/music/api/obj/music/info/PlayOBJ.java index 8b421a41..134ca3be 100644 --- a/src/main/java/Color_yr/AllMusic/music/api/web/music/info/PlayOBJ.java +++ b/src/main/java/Color_yr/AllMusic/music/api/obj/music/info/PlayOBJ.java @@ -1,4 +1,4 @@ -package Color_yr.AllMusic.music.api.web.music.info; +package Color_yr.AllMusic.music.api.obj.music.info; import java.util.List; diff --git a/src/main/java/Color_yr/AllMusic/music/api/web/music/list/DataOBJ.java b/src/main/java/Color_yr/AllMusic/music/api/obj/music/list/DataOBJ.java similarity index 93% rename from src/main/java/Color_yr/AllMusic/music/api/web/music/list/DataOBJ.java rename to src/main/java/Color_yr/AllMusic/music/api/obj/music/list/DataOBJ.java index 2a4ffe32..a9bbffb2 100644 --- a/src/main/java/Color_yr/AllMusic/music/api/web/music/list/DataOBJ.java +++ b/src/main/java/Color_yr/AllMusic/music/api/obj/music/list/DataOBJ.java @@ -1,4 +1,4 @@ -package Color_yr.AllMusic.music.api.web.music.list; +package Color_yr.AllMusic.music.api.obj.music.list; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/Color_yr/AllMusic/music/api/web/music/lyric/WLyricOBJ.java b/src/main/java/Color_yr/AllMusic/music/api/obj/music/lyric/WLyricOBJ.java similarity index 93% rename from src/main/java/Color_yr/AllMusic/music/api/web/music/lyric/WLyricOBJ.java rename to src/main/java/Color_yr/AllMusic/music/api/obj/music/lyric/WLyricOBJ.java index 80afdfc5..c4490591 100644 --- a/src/main/java/Color_yr/AllMusic/music/api/web/music/lyric/WLyricOBJ.java +++ b/src/main/java/Color_yr/AllMusic/music/api/obj/music/lyric/WLyricOBJ.java @@ -1,4 +1,4 @@ -package Color_yr.AllMusic.music.api.web.music.lyric; +package Color_yr.AllMusic.music.api.obj.music.lyric; public class WLyricOBJ { private lrc lrc; diff --git a/src/main/java/Color_yr/AllMusic/music/api/web/music/search/SearchDataOBJ.java b/src/main/java/Color_yr/AllMusic/music/api/obj/music/search/SearchDataOBJ.java similarity index 91% rename from src/main/java/Color_yr/AllMusic/music/api/web/music/search/SearchDataOBJ.java rename to src/main/java/Color_yr/AllMusic/music/api/obj/music/search/SearchDataOBJ.java index 628cfc5e..5ca72827 100644 --- a/src/main/java/Color_yr/AllMusic/music/api/web/music/search/SearchDataOBJ.java +++ b/src/main/java/Color_yr/AllMusic/music/api/obj/music/search/SearchDataOBJ.java @@ -1,4 +1,4 @@ -package Color_yr.AllMusic.music.api.web.music.search; +package Color_yr.AllMusic.music.api.obj.music.search; import java.util.List; diff --git a/src/main/java/Color_yr/AllMusic/music/api/web/music/search/songs.java b/src/main/java/Color_yr/AllMusic/music/api/obj/music/search/songs.java similarity index 91% rename from src/main/java/Color_yr/AllMusic/music/api/web/music/search/songs.java rename to src/main/java/Color_yr/AllMusic/music/api/obj/music/search/songs.java index ca4324fe..a5056558 100644 --- a/src/main/java/Color_yr/AllMusic/music/api/web/music/search/songs.java +++ b/src/main/java/Color_yr/AllMusic/music/api/obj/music/search/songs.java @@ -1,4 +1,4 @@ -package Color_yr.AllMusic.music.api.web.music.search; +package Color_yr.AllMusic.music.api.obj.music.search; import java.util.List; diff --git a/src/main/java/Color_yr/AllMusic/music/api/web/music/trialinfo/TrialInfoObj.java b/src/main/java/Color_yr/AllMusic/music/api/obj/music/trialinfo/TrialInfoObj.java similarity index 94% rename from src/main/java/Color_yr/AllMusic/music/api/web/music/trialinfo/TrialInfoObj.java rename to src/main/java/Color_yr/AllMusic/music/api/obj/music/trialinfo/TrialInfoObj.java index e6b5b4d3..7b4f76d0 100644 --- a/src/main/java/Color_yr/AllMusic/music/api/web/music/trialinfo/TrialInfoObj.java +++ b/src/main/java/Color_yr/AllMusic/music/api/obj/music/trialinfo/TrialInfoObj.java @@ -1,4 +1,4 @@ -package Color_yr.AllMusic.music.api.web.music.trialinfo; +package Color_yr.AllMusic.music.api.obj.music.trialinfo; import java.util.List; diff --git a/src/main/java/Color_yr/AllMusic/music/api/web/music/trialinfo/freeTrialInfo.java b/src/main/java/Color_yr/AllMusic/music/api/obj/music/trialinfo/freeTrialInfo.java similarity index 81% rename from src/main/java/Color_yr/AllMusic/music/api/web/music/trialinfo/freeTrialInfo.java rename to src/main/java/Color_yr/AllMusic/music/api/obj/music/trialinfo/freeTrialInfo.java index 5b29dff2..59feefef 100644 --- a/src/main/java/Color_yr/AllMusic/music/api/web/music/trialinfo/freeTrialInfo.java +++ b/src/main/java/Color_yr/AllMusic/music/api/obj/music/trialinfo/freeTrialInfo.java @@ -1,4 +1,4 @@ -package Color_yr.AllMusic.music.api.web.music.trialinfo; +package Color_yr.AllMusic.music.api.obj.music.trialinfo; public class freeTrialInfo { private int start; diff --git a/src/main/java/Color_yr/AllMusic/music/api/web/program/info/PrInfoOBJ.java b/src/main/java/Color_yr/AllMusic/music/api/obj/program/info/PrInfoOBJ.java similarity index 97% rename from src/main/java/Color_yr/AllMusic/music/api/web/program/info/PrInfoOBJ.java rename to src/main/java/Color_yr/AllMusic/music/api/obj/program/info/PrInfoOBJ.java index ea20f9a6..5c2bde53 100644 --- a/src/main/java/Color_yr/AllMusic/music/api/web/program/info/PrInfoOBJ.java +++ b/src/main/java/Color_yr/AllMusic/music/api/obj/program/info/PrInfoOBJ.java @@ -1,4 +1,4 @@ -package Color_yr.AllMusic.music.api.web.program.info; +package Color_yr.AllMusic.music.api.obj.program.info; public class PrInfoOBJ { diff --git a/src/main/java/Color_yr/AllMusic/music/api/song/lyric/LyricDo.java b/src/main/java/Color_yr/AllMusic/music/lyric/LyricDo.java similarity index 96% rename from src/main/java/Color_yr/AllMusic/music/api/song/lyric/LyricDo.java rename to src/main/java/Color_yr/AllMusic/music/lyric/LyricDo.java index 78a01101..05474693 100644 --- a/src/main/java/Color_yr/AllMusic/music/api/song/lyric/LyricDo.java +++ b/src/main/java/Color_yr/AllMusic/music/lyric/LyricDo.java @@ -1,8 +1,8 @@ -package Color_yr.AllMusic.music.api.song.lyric; +package Color_yr.AllMusic.music.lyric; import Color_yr.AllMusic.AllMusic; import Color_yr.AllMusic.utils.Function; -import Color_yr.AllMusic.music.api.web.music.lyric.WLyricOBJ; +import Color_yr.AllMusic.music.api.obj.music.lyric.WLyricOBJ; import java.util.*; diff --git a/src/main/java/Color_yr/AllMusic/music/api/song/lyric/LyricSave.java b/src/main/java/Color_yr/AllMusic/music/lyric/LyricSave.java similarity index 93% rename from src/main/java/Color_yr/AllMusic/music/api/song/lyric/LyricSave.java rename to src/main/java/Color_yr/AllMusic/music/lyric/LyricSave.java index 4097bc67..5fd024b9 100644 --- a/src/main/java/Color_yr/AllMusic/music/api/song/lyric/LyricSave.java +++ b/src/main/java/Color_yr/AllMusic/music/lyric/LyricSave.java @@ -1,4 +1,4 @@ -package Color_yr.AllMusic.music.api.song.lyric; +package Color_yr.AllMusic.music.lyric; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/Color_yr/AllMusic/music/api/song/lyric/ShowOBJ.java b/src/main/java/Color_yr/AllMusic/music/lyric/ShowOBJ.java similarity index 95% rename from src/main/java/Color_yr/AllMusic/music/api/song/lyric/ShowOBJ.java rename to src/main/java/Color_yr/AllMusic/music/lyric/ShowOBJ.java index c1b3bb36..ebb096d9 100644 --- a/src/main/java/Color_yr/AllMusic/music/api/song/lyric/ShowOBJ.java +++ b/src/main/java/Color_yr/AllMusic/music/lyric/ShowOBJ.java @@ -1,4 +1,4 @@ -package Color_yr.AllMusic.music.api.song.lyric; +package Color_yr.AllMusic.music.lyric; import Color_yr.AllMusic.AllMusic; diff --git a/src/main/java/Color_yr/AllMusic/music/api/song/search/SearchOBJ.java b/src/main/java/Color_yr/AllMusic/music/search/SearchOBJ.java similarity index 91% rename from src/main/java/Color_yr/AllMusic/music/api/song/search/SearchOBJ.java rename to src/main/java/Color_yr/AllMusic/music/search/SearchOBJ.java index de5f865d..6357d47a 100644 --- a/src/main/java/Color_yr/AllMusic/music/api/song/search/SearchOBJ.java +++ b/src/main/java/Color_yr/AllMusic/music/search/SearchOBJ.java @@ -1,4 +1,4 @@ -package Color_yr.AllMusic.music.api.song.search; +package Color_yr.AllMusic.music.search; public class SearchOBJ { private final String id; diff --git a/src/main/java/Color_yr/AllMusic/music/api/song/search/SearchPage.java b/src/main/java/Color_yr/AllMusic/music/search/SearchPage.java similarity index 95% rename from src/main/java/Color_yr/AllMusic/music/api/song/search/SearchPage.java rename to src/main/java/Color_yr/AllMusic/music/search/SearchPage.java index 5ed88a97..b71d9f79 100644 --- a/src/main/java/Color_yr/AllMusic/music/api/song/search/SearchPage.java +++ b/src/main/java/Color_yr/AllMusic/music/search/SearchPage.java @@ -1,4 +1,4 @@ -package Color_yr.AllMusic.music.api.song.search; +package Color_yr.AllMusic.music.search; import java.util.List;