登陆放开
This commit is contained in:
@@ -44,36 +44,39 @@ public class FileController extends BaseController {
|
||||
// 获取文件字节
|
||||
if (objectName.equals("musicFile")) {
|
||||
LoginUser userInfo = SecurityUtils.getLoginUser();
|
||||
if (userInfo == null){
|
||||
response.setStatus(HttpServletResponse.SC_BAD_REQUEST);
|
||||
response.setContentType("application/json;charset=UTF-8");
|
||||
response.getWriter().write("{\"code\":401,\"msg\":\"用户未登录\"}");
|
||||
return;
|
||||
}
|
||||
SysUser sysUser = userInfo.getUser();
|
||||
if (sysUser == null) {
|
||||
// if (userInfo == null){
|
||||
// response.setStatus(HttpServletResponse.SC_BAD_REQUEST);
|
||||
// response.setContentType("application/json;charset=UTF-8");
|
||||
// response.getWriter().write("{\"code\":401,\"msg\":\"用户未登录\"}");
|
||||
// return;
|
||||
// }
|
||||
// SysUser sysUser = userInfo.getUser();
|
||||
//if (sysUser == null) {
|
||||
// if (StrUtil.isBlank(musicId)) {
|
||||
// response.setStatus(HttpServletResponse.SC_BAD_REQUEST);
|
||||
// response.setContentType("application/json;charset=UTF-8");
|
||||
// response.getWriter().write("{\"code\":400,\"msg\":\"音乐ID不能为空\"}");
|
||||
// return;
|
||||
// }
|
||||
ShopUser shopUser = userInfo.getShopUser();
|
||||
if (shopUser == null) {
|
||||
response.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
|
||||
response.setContentType("application/json;charset=UTF-8");
|
||||
response.getWriter().write("{\"code\":401,\"msg\":\"用户未登录\"}");
|
||||
return;
|
||||
}else{
|
||||
// 检查会员时间
|
||||
if (!MusicUtil.getShopIsVip(shopUser)) {
|
||||
if (shopUser.getVip() == 1){
|
||||
// 会员已过期修改为非会员
|
||||
shopUser.setVip(2L);
|
||||
shopUserMapper.updateShopUser(shopUser);
|
||||
}
|
||||
}
|
||||
}
|
||||
//MusicInfo musicInfo = musicInfoMapper.selectByMusicId(musicId);
|
||||
|
||||
|
||||
//ShopUser shopUser = userInfo.getShopUser();
|
||||
// if (shopUser == null) {
|
||||
// response.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
|
||||
// response.setContentType("application/json;charset=UTF-8");
|
||||
// response.getWriter().write("{\"code\":401,\"msg\":\"用户未登录\"}");
|
||||
// return;
|
||||
// }else{
|
||||
// // 检查会员时间
|
||||
// if (!MusicUtil.getShopIsVip(shopUser)) {
|
||||
// if (shopUser.getVip() == 1){
|
||||
// // 会员已过期修改为非会员
|
||||
// shopUser.setVip(2L);
|
||||
// shopUserMapper.updateShopUser(shopUser);
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
//shopUser = shopUserMapper.selectShopUserByUserId(userId);
|
||||
// MusicInfo musicInfo = musicInfoMapper.selectByMusicId(musicId);
|
||||
//
|
||||
@@ -93,7 +96,7 @@ public class FileController extends BaseController {
|
||||
// return;
|
||||
// }
|
||||
// }
|
||||
}
|
||||
// }
|
||||
}
|
||||
|
||||
// 设置响应头
|
||||
|
||||
@@ -114,17 +114,20 @@ public class MusicController extends BaseController {
|
||||
@RequestMapping("/getMusicInfo/{musicId}")
|
||||
public AjaxResult getMusicInfo(@PathVariable String musicId){
|
||||
Long userId = SecurityUtils.getUserId();
|
||||
if (userId == null){
|
||||
return AjaxResult.error(401,"用户未登录或用户ID为空");
|
||||
}
|
||||
MusicInfo musicInfo = musicService.getMusicInfo(userId, musicId);
|
||||
if (musicInfo != null){
|
||||
// 增加历史
|
||||
musicService.addHistoryMusic(musicId);
|
||||
return AjaxResult.success(musicInfo);
|
||||
if (userId != null){
|
||||
MusicInfo musicInfo = musicService.getMusicInfo(userId, musicId);
|
||||
if (musicInfo != null){
|
||||
// 增加历史
|
||||
musicService.addHistoryMusic(musicId);
|
||||
return AjaxResult.success(musicInfo);
|
||||
}else {
|
||||
return new AjaxResult(HttpStatus.USER_VIP_EXPIRE, "请开通会员");
|
||||
}
|
||||
}else {
|
||||
return new AjaxResult(HttpStatus.USER_VIP_EXPIRE, "请开通会员");
|
||||
MusicInfo musicInfo = musicService.getMusicInfo(null, musicId);
|
||||
return AjaxResult.success(musicInfo);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
// 新增用户混音
|
||||
|
||||
Reference in New Issue
Block a user