直播状态改为人气值判断

日志系统支持过滤
其他
This commit is contained in:
yutou
2021-05-26 18:37:46 +08:00
parent 5a49fc831a
commit efcb7e5ac2
10 changed files with 62 additions and 52 deletions

View File

@@ -9,6 +9,7 @@ import com.yutou.bilibili.BiliBili.Tools.BiliTools;
import com.yutou.bilibili.Services.IUserService;
import com.yutou.bilibili.Tools.AppTools;
import com.yutou.bilibili.Tools.Config;
import com.yutou.bilibili.Tools.RedisTools;
import com.yutou.bilibili.mybatis.Bili.mybatis.model.BilibiliUpInfo;
import com.yutou.bilibili.mybatis.model.UBiliUp;
import com.yutou.bilibili.mybatis.model.UUser;
@@ -50,6 +51,7 @@ public class UserController {
user.setPower("[1,2,3,5,6,7]");
user.setSubtime(new Date());
user.setLogintoken(UUID.randomUUID().toString());
RedisTools.set(user.getLogintoken(),user.getId()+"",30*24*60);
AppTools.setCookie(response, "login", user.getLogintoken(), -1);
boolean flag = service.reg(user);
if (flag) {
@@ -69,8 +71,8 @@ public class UserController {
json.put("code", 0);
if (service.login(user.getUser(), user.getPassword())) {
user = service.getUser(user.getUser());
user.setLogintoken(UUID.randomUUID().toString());
service.update(user);
//user.setLogintoken(UUID.randomUUID().toString());
RedisTools.set(user.getLogintoken(),user.getId()+"",30*24*60);
AppTools.setCookie(response, "login", user.getLogintoken(), -1);
json.put("msg", "登陆成功");
json.put("power", user.getPower());
@@ -92,6 +94,7 @@ public class UserController {
} else {
UUser user = service.getUserToToken(token);
if (user != null) {
RedisTools.remove(user.getLogintoken());
user.setLogintoken("");
service.update(user);
AppTools.deleteCookie(request, response, "login");
@@ -114,7 +117,7 @@ public class UserController {
json.put("code", -1);
json.put("msg", "未登录");
} else {
UUser loginUser = service.getUserToToken(token);
UUser loginUser = service.getUserToUid(Integer.parseInt(RedisTools.get(token)));
if (loginUser != null) {
user.setLogintoken("");
user.setId(loginUser.getId());
@@ -144,8 +147,7 @@ public class UserController {
} else {
json.put("code", 0);
json.put("msg", "ok");
UUser user = service.getUserToToken(token);
json.put("data", service.getUserUp(user.getId()));
json.put("data", service.getUserUp(Integer.parseInt(RedisTools.get(token))));
}
return json;
}
@@ -159,7 +161,6 @@ public class UserController {
json.put("code", "-1");
json.put("msg", "未登录");
} else {
UUser user = service.getUserToToken(token);
int roomid = 0;
if (!info.getUrl().startsWith("http")) {
info.setUrl("https://live.bilibili.com/" + info.getUrl());
@@ -181,7 +182,7 @@ public class UserController {
return json;
}
UBiliUp up = new UBiliUp();
up.setUid(user.getId());
up.setUid(Integer.parseInt(RedisTools.get(token)));
up.setRoomid(roomid);
json.put("code", 0);
json.put("msg", service.addUp(up) ? "添加成功" : "添加失败");
@@ -198,7 +199,7 @@ public class UserController {
json.put("code", -1);
json.put("msg", "未登录");
} else {
UUser user = service.getUserToToken(token);
UUser user = service.getUserToUid(Integer.parseInt(RedisTools.get(token)));;
if (user == null) {
json.put("code", -2);
json.put("msg", "未登录");