JavaWeb/nas-service
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复fastjson的代码

Browse Source
This commit is contained in:
Yutousama
2022-05-03 20:08:51 +08:00
parent 4bcf56207d
commit 9bfe05b119
25 changed files with 90 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/com/yutou/nas/Controllers/MusicController.java
View File

@@ -1,7 +1,8 @@
package com.yutou.nas.Controllers;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson2.JSONObject;
import com.yutou.nas.Services.impl.MusicToolsServiceImpl;
import com.yutou.nas.mybatis.model.MusicData;
import com.yutou.nas.utils.ConfigTools;
@@ -37,7 +38,7 @@ public class MusicController {
json.put("code", 0);
json.put("scan", musicTools.isScan());
json.put("size", musicTools.getLength());
json.put("data", JSONArray.toJSON(musicTools.getMusicList(true)));
json.put("data", JSON.toJSON(musicTools.getMusicList(true)));
return json.toJSONString();
}
@@ -59,7 +60,7 @@ public class MusicController {
json.put("code", 0);
json.put("scan", musicTools.isScan());
json.put("size", musicTools.getLength());
json.put("data", JSONArray.toJSON(musicTools.getPath(path, type, true)));
json.put("data", JSON.toJSON(musicTools.getPath(path, type, true)));
return json.toJSONString();
}
@@ -70,9 +71,9 @@ public class MusicController {
JSONObject json = new JSONObject();
json.put("code", 0);
if (StringUtils.isEmpty(album)) {
json.put("data", JSONArray.toJSON(musicTools.getAllAlbum()));
json.put("data", JSON.toJSON(musicTools.getAllAlbum()));
} else {
json.put("data", JSONArray.toJSON(musicTools.selectAlbum(album, true)));
json.put("data", JSON.toJSON(musicTools.selectAlbum(album, true)));
}
return json.toJSONString();
}
@@ -84,9 +85,9 @@ public class MusicController {
JSONObject json = new JSONObject();
json.put("code", 0);
if (StringUtils.isEmpty(artist)) {
json.put("data", JSONArray.toJSON(musicTools.getAllArtist()));
json.put("data", JSON.toJSON(musicTools.getAllArtist()));
} else {
json.put("data", JSONArray.toJSON(musicTools.selectArtist(artist, true)));
json.put("data", JSON.toJSON(musicTools.selectArtist(artist, true)));
}
return json.toJSONString();
}