JavaWeb/biliob
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
yutou 2021-05-13 12:00:24 +08:00
parent 017a01a0b8
commit d3a3a6e6ba
3 changed files with 14 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/main/java/com/yutou/bilibili/BiliBili/Live.java
View File

@ -10,6 +10,7 @@ import com.yutou.bilibili.BiliBili.Tools.SaveLive;
import com.yutou.bilibili.QQBot.QQBotManager; import com.yutou.bilibili.QQBot.QQBotManager;
import com.yutou.bilibili.Tools.AppTools; import com.yutou.bilibili.Tools.AppTools;
import com.yutou.bilibili.Tools.Log; import com.yutou.bilibili.Tools.Log;
import com.yutou.bilibili.Tools.RedisTools;
import com.yutou.bilibili.Tools.Tools; import com.yutou.bilibili.Tools.Tools;
import com.yutou.bilibili.interfaces.DownloadInterface; import com.yutou.bilibili.interfaces.DownloadInterface;
import com.yutou.bilibili.mybatis.Bili.mybatis.model.BilibiliLiveData; import com.yutou.bilibili.mybatis.Bili.mybatis.model.BilibiliLiveData;
@ -613,21 +614,14 @@ public class Live implements ApplicationContextAware {
} }
public GiftData getGiftData(int id) { public GiftData getGiftData(int id) {
for (GiftData data : LiveUtils.LiveGiftConfig.giftDataList) { JSONObject item=JSONObject.parseObject(RedisTools.get("bili_gift_"+id,2));
if (data.getId() == id) {
return data;
}
}
GiftData data = new GiftData(); GiftData data = new GiftData();
BilibiliLiveData liveData = service.queryGiftOfId(id); data.setPrice(item.getInteger("price"));
if (liveData == null) { data.setName(item.getString("name"));
return null; data.setId(item.getInteger("id"));
} data.setRights(item.getString("rights"));
data.setName(liveData.getGiftname()); data.setIcon(item.getString("img_basic"));
data.setPrice(liveData.getPrice()); data.setDesc(item.getString("desc"));
data.setIcon("");
data.setDesc("这是阿B没有收录的礼物，金额可能不准（无法判别为免费礼物）");
data.setRights("?");
return data; return data;
} }
} }

15
src/main/java/com/yutou/bilibili/BiliBili/LiveUtils.java
View File

@ -9,6 +9,7 @@ import com.yutou.bilibili.BiliBili.Services.IBiliBiliLiveService;
import com.yutou.bilibili.BiliBili.Tools.SaveLive; import com.yutou.bilibili.BiliBili.Tools.SaveLive;
import com.yutou.bilibili.Tools.AppTools; import com.yutou.bilibili.Tools.AppTools;
import com.yutou.bilibili.Tools.Log; import com.yutou.bilibili.Tools.Log;
import com.yutou.bilibili.Tools.RedisTools;
import com.yutou.bilibili.mybatis.Bili.mybatis.model.BilibiliUpInfo; import com.yutou.bilibili.mybatis.Bili.mybatis.model.BilibiliUpInfo;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
@ -389,7 +390,6 @@ public class LiveUtils {
@Resource @Resource
IBiliBiliLiveService service; IBiliBiliLiveService service;
private static LiveGiftConfig config; private static LiveGiftConfig config;
public static List<GiftData> giftDataList = new ArrayList<>();
public static LiveGiftConfig getInstance() { public static LiveGiftConfig getInstance() {
if (config == null) { if (config == null) {
@ -403,19 +403,14 @@ public class LiveUtils {
} }
public void init() { public void init() {
giftDataList = new ArrayList<>();
JSONObject json = http_get("https://api.live.bilibili.com/xlive/web-room/v1/giftPanel/giftConfig?platform=pc"); JSONObject json = http_get("https://api.live.bilibili.com/xlive/web-room/v1/giftPanel/giftConfig?platform=pc");
if(json==null){
return;
}
JSONArray list = json.getJSONObject("data").getJSONArray("list"); JSONArray list = json.getJSONObject("data").getJSONArray("list");
for (Object o : list) { for (Object o : list) {
JSONObject item = (JSONObject) o; JSONObject item = (JSONObject) o;
GiftData data = new GiftData(); RedisTools.set(2,"bili_gift_"+item.getInteger("id"),item.toJSONString());
data.setPrice(item.getInteger("price"));
data.setName(item.getString("name"));
data.setId(item.getInteger("id"));
data.setRights(item.getString("rights"));
data.setIcon(item.getString("img_basic"));
data.setDesc(item.getString("desc"));
giftDataList.add(data);
} }
} }

2
src/main/java/com/yutou/bilibili/Tools/Log.java
View File

@ -27,7 +27,7 @@ public class Log {
} }
public static void i(String timer,int roomId,Object log){ public static void i(String timer,int roomId,Object log){
String logFlag=RedisTools.get("live-log",1); String logFlag=RedisTools.get("live-log",1);
if(logFlag!=null&&logFlag.equals("true")) { if("true".equals(logFlag)) {
getLogger("[" + timer.replace(":", "_") + "]" + roomId).log(Level.INFO, log.toString()); getLogger("[" + timer.replace(":", "_") + "]" + roomId).log(Level.INFO, log.toString());
} }
} }