Skip to content

S
sequoia_score
Commit 9fd5a262 by lenx065@gmail.com
Options

登陆注册

parent c5c94525
Showing with 219 additions and 239 deletions
score-common/src/main/java/com/live/common/domain/request/RegisterRequest.java
......@@ -18,13 +18,17 @@ public class RegisterRequest {
@ApiModelProperty(value = "短信验证码")
private String smsCode;
@ApiModelProperty(value = "渠道ID")
private Integer channelId;
@Size(max = 15, min = 6, message = "请输入6-15位登录密码")
@ApiModelProperty(value = "登录密码")
private String password;
@ApiModelProperty(value = "用户昵称")
private String nickName;
// @ApiModelProperty(value = "渠道ID")
// private Integer channelId;
@ApiModelProperty(value = "用户头像地址 可 null")
private String userAvatar;
// @ApiModelProperty(value = "用户昵称")
// private String nickName;
// @ApiModelProperty(value = "用户头像地址 可 null")
// private String userAvatar;
}
score-common/src/main/java/com/live/common/service/impl/UserServiceImpl.java
......@@ -99,10 +99,6 @@ public class UserServiceImpl implements UserService {
return login(registerRequest.getPhone(), registerRequest.getSmsCode());
}
if (StringUtils.isBlank(registerRequest.getNickName())) {
return ResponseData.fail500Response("请输入昵称");
}
String cacheCode = redisUtilsService.getCacheStringInfo(RedisKeySplicing.getSmsCodeKey(registerRequest.getPhone()));
if (cacheCode == null) {
return ResponseData.fail400Response("验证码已过期,请重新获取");
......@@ -112,13 +108,6 @@ public class UserServiceImpl implements UserService {
}
String ip = IPUtils.getRealIP(request);
Integer channelId = registerRequest.getChannelId();
long exist = systemConfigMapper.selectCount(Wrappers.<SystemConfig>lambdaQuery()
.eq(SystemConfig::getConfigName, SystemConfigEnum.SOURCE_CHANNEL.getTitle())
.eq(SystemConfig::getDeleted, StatusEnum.ENABLE.getCode())
.eq(SystemConfig::getConfigValue, channelId)
);
String deviceId = null;
try {
deviceId = CommonMethod.getDeviceId(request);
......@@ -130,11 +119,11 @@ public class UserServiceImpl implements UserService {
.id(IdGen.uuid())
.phone(registerRequest.getPhone())
.ip(ip)
.userName(StringUtils.isBlank(registerRequest.getNickName()) ? registerRequest.getPhone() : registerRequest.getNickName())
.userName(registerRequest.getPhone())
.role(0)
.userIcon(registerRequest.getUserAvatar())
.userIcon("photo_2021-04-16_10-39-07.jpg")
.type(0)
.channel(exist > 0 ? channelId : 0)
.password(MD5Util.string2MD5(registerRequest.getPassword()))
.build();
createUser(accountDb, deviceId);
try {
......
score-server/src/main/java/com/live/server/controller/CommonController.java
......@@ -37,50 +37,37 @@ public class CommonController {
return commonService.checkVersion(versionRequest, request);
}
@RequestMapping(value = "/getAvatarUrl", method = {RequestMethod.POST})
@ApiOperation(value = "头像地址前缀")
@ApiResponses({
@ApiResponse(code = 200, message = "成功处理请求"),
@ApiResponse(code = 401, message = "没有权限访问该服务"),
@ApiResponse(code = 403, message = "权限不足无法访问该服务"),
@ApiResponse(code = 404, message = "未发现该服务"),
@ApiResponse(code = 500, message = "服务器内部错误")
})
public ResponseData<?> getAvatarUrl(HttpServletRequest request) throws Exception {
return commonService.getAvatarUrl(request);
}
@RequestMapping(value = "/getMessageList", method = {RequestMethod.POST})
@ApiOperation(value = "获取公告列表")
@ApiResponses({
@ApiResponse(code = 200, message = "成功处理请求"),
@ApiResponse(code = 401, message = "没有权限访问该服务"),
@ApiResponse(code = 403, message = "权限不足无法访问该服务"),
@ApiResponse(code = 404, message = "未发现该服务"),
@ApiResponse(code = 500, message = "服务器内部错误")
})
public ResponseData<?> getMessageList(@RequestBody CommonPage commonPage, HttpServletRequest request) {
return commonService.getMessageList(commonPage, request);
}
@RequestMapping(value = "/getShareConfig", method = {RequestMethod.POST})
@ApiOperation(value = "获取分享配置")
@ApiResponses({
@ApiResponse(code = 200, message = "成功处理请求"),
@ApiResponse(code = 401, message = "没有权限访问该服务"),
@ApiResponse(code = 403, message = "权限不足无法访问该服务"),
@ApiResponse(code = 404, message = "未发现该服务"),
@ApiResponse(code = 500, message = "服务器内部错误")
})
public ResponseData<?> getShareConfig(HttpServletRequest request) {
return commonService.getShareConfig(request);
}
@ApiIgnore
@RequestMapping(value = "/imageCallback", method = {RequestMethod.POST})
@ApiOperation(value = "腾讯直播截图回调")
public void imageCallback(@RequestBody ImageCallbackRequest callbackRequest, HttpServletRequest request) {
commonService.imageCallback(callbackRequest, request);
}
// @RequestMapping(value = "/getMessageList", method = {RequestMethod.POST})
// @ApiOperation(value = "获取公告列表")
// @ApiResponses({
// @ApiResponse(code = 200, message = "成功处理请求"),
// @ApiResponse(code = 401, message = "没有权限访问该服务"),
// @ApiResponse(code = 403, message = "权限不足无法访问该服务"),
// @ApiResponse(code = 404, message = "未发现该服务"),
// @ApiResponse(code = 500, message = "服务器内部错误")
// })
// public ResponseData<?> getMessageList(@RequestBody CommonPage commonPage, HttpServletRequest request) {
// return commonService.getMessageList(commonPage, request);
// }
//
// @RequestMapping(value = "/getShareConfig", method = {RequestMethod.POST})
// @ApiOperation(value = "获取分享配置")
// @ApiResponses({
// @ApiResponse(code = 200, message = "成功处理请求"),
// @ApiResponse(code = 401, message = "没有权限访问该服务"),
// @ApiResponse(code = 403, message = "权限不足无法访问该服务"),
// @ApiResponse(code = 404, message = "未发现该服务"),
// @ApiResponse(code = 500, message = "服务器内部错误")
// })
// public ResponseData<?> getShareConfig(HttpServletRequest request) {
// return commonService.getShareConfig(request);
// }
//
// @ApiIgnore
// @RequestMapping(value = "/imageCallback", method = {RequestMethod.POST})
// @ApiOperation(value = "腾讯直播截图回调")
// public void imageCallback(@RequestBody ImageCallbackRequest callbackRequest, HttpServletRequest request) {
// commonService.imageCallback(callbackRequest, request);
// }
}
score-server/src/main/java/com/live/server/controller/PcHomeController.java
package com.live.server.controller;
import com.live.common.domain.ResponseData;
import com.live.common.domain.request.CommonPage;
import com.live.common.domain.request.CommonStringId;
import com.live.common.domain.request.TopLiveRequest;
import com.live.common.domain.request.VideoRecommendRequest;
import com.live.common.service.LeaguePointsRankService;
import com.live.common.service.RoomService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiResponse;
import io.swagger.annotations.ApiResponses;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
@Slf4j
@CrossOrigin
@RestController
@RequestMapping("/pcHome")
@Api(tags = "PC版首页接口 API 文档")
public class PcHomeController {
@Resource
private LeaguePointsRankService leaguePointsRankService;
@PostMapping(value = "/getLeagueType")
@ApiOperation(value = "获取联赛类型 欧冠 - 德甲 等")
@ApiResponses({
@ApiResponse(code = 200, message = "成功处理请求"),
@ApiResponse(code = 401, message = "没有权限访问该服务"),
@ApiResponse(code = 403, message = "权限不足无法访问该服务"),
@ApiResponse(code = 404, message = "未发现该服务"),
@ApiResponse(code = 500, message = "服务器内部错误")
})
public ResponseData<?> getLeagueType(HttpServletRequest request) {
return leaguePointsRankService.getLeagueType(request);
}
@PostMapping(value = "/getLeaguePointsRank")
@ApiOperation(value = "获取联赛积分榜 足球 sportsId = 0")
@ApiResponses({
@ApiResponse(code = 200, message = "成功处理请求"),
@ApiResponse(code = 401, message = "没有权限访问该服务"),
@ApiResponse(code = 403, message = "权限不足无法访问该服务"),
@ApiResponse(code = 404, message = "未发现该服务"),
@ApiResponse(code = 500, message = "服务器内部错误")
})
public ResponseData<?> getLeaguePointsRank(@RequestBody CommonStringId commonStringId, HttpServletRequest request) {
return leaguePointsRankService.getLeaguePointsRank(commonStringId, request);
}
@PostMapping(value = "/getLeaguePointsRankBasketball")
@ApiOperation(value = "获取联赛积分榜 篮球 sportsId = 1")
@ApiResponses({
@ApiResponse(code = 200, message = "成功处理请求"),
@ApiResponse(code = 401, message = "没有权限访问该服务"),
@ApiResponse(code = 403, message = "权限不足无法访问该服务"),
@ApiResponse(code = 404, message = "未发现该服务"),
@ApiResponse(code = 500, message = "服务器内部错误")
})
public ResponseData<?> getLeaguePointsRankBasketball(@RequestBody CommonStringId commonStringId, HttpServletRequest request) {
return leaguePointsRankService.getLeaguePointsRankBasketball(commonStringId, request);
}
@PostMapping(value = "/getHotExpert")
@ApiOperation(value = "热门专家")
@ApiResponses({
@ApiResponse(code = 200, message = "成功处理请求"),
@ApiResponse(code = 401, message = "没有权限访问该服务"),
@ApiResponse(code = 403, message = "权限不足无法访问该服务"),
@ApiResponse(code = 404, message = "未发现该服务"),
@ApiResponse(code = 500, message = "服务器内部错误")
})
public ResponseData<?> getHotExpert(HttpServletRequest request) {
return leaguePointsRankService.getHotExpert(request);
}
@PostMapping(value = "/getAnchorRecommend")
@ApiOperation(value = "主播推荐")
@ApiResponses({
@ApiResponse(code = 200, message = "成功处理请求"),
@ApiResponse(code = 401, message = "没有权限访问该服务"),
@ApiResponse(code = 403, message = "权限不足无法访问该服务"),
@ApiResponse(code = 404, message = "未发现该服务"),
@ApiResponse(code = 500, message = "服务器内部错误")
})
public ResponseData<?> getAnchorRecommend(@RequestBody CommonPage commonPage, HttpServletRequest request) {
return leaguePointsRankService.getAnchorRecommend(commonPage, request);
}
}
//package com.live.server.controller;
//
//import com.live.common.domain.ResponseData;
//import com.live.common.domain.request.CommonPage;
//import com.live.common.domain.request.CommonStringId;
//import com.live.common.domain.request.TopLiveRequest;
//import com.live.common.domain.request.VideoRecommendRequest;
//import com.live.common.service.LeaguePointsRankService;
//import com.live.common.service.RoomService;
//import io.swagger.annotations.Api;
//import io.swagger.annotations.ApiOperation;
//import io.swagger.annotations.ApiResponse;
//import io.swagger.annotations.ApiResponses;
//import lombok.extern.slf4j.Slf4j;
//import org.springframework.web.bind.annotation.*;
//
//import javax.annotation.Resource;
//import javax.servlet.http.HttpServletRequest;
//
//@Slf4j
//@CrossOrigin
//@RestController
//@RequestMapping("/pcHome")
//@Api(tags = "PC版首页接口 API 文档")
//public class PcHomeController {
//
// @Resource
// private LeaguePointsRankService leaguePointsRankService;
//
// @PostMapping(value = "/getLeagueType")
// @ApiOperation(value = "获取联赛类型 欧冠 - 德甲 等")
// @ApiResponses({
// @ApiResponse(code = 200, message = "成功处理请求"),
// @ApiResponse(code = 401, message = "没有权限访问该服务"),
// @ApiResponse(code = 403, message = "权限不足无法访问该服务"),
// @ApiResponse(code = 404, message = "未发现该服务"),
// @ApiResponse(code = 500, message = "服务器内部错误")
// })
// public ResponseData<?> getLeagueType(HttpServletRequest request) {
// return leaguePointsRankService.getLeagueType(request);
// }
//
// @PostMapping(value = "/getLeaguePointsRank")
// @ApiOperation(value = "获取联赛积分榜 足球 sportsId = 0")
// @ApiResponses({
// @ApiResponse(code = 200, message = "成功处理请求"),
// @ApiResponse(code = 401, message = "没有权限访问该服务"),
// @ApiResponse(code = 403, message = "权限不足无法访问该服务"),
// @ApiResponse(code = 404, message = "未发现该服务"),
// @ApiResponse(code = 500, message = "服务器内部错误")
// })
// public ResponseData<?> getLeaguePointsRank(@RequestBody CommonStringId commonStringId, HttpServletRequest request) {
// return leaguePointsRankService.getLeaguePointsRank(commonStringId, request);
// }
//
// @PostMapping(value = "/getLeaguePointsRankBasketball")
// @ApiOperation(value = "获取联赛积分榜 篮球 sportsId = 1")
// @ApiResponses({
// @ApiResponse(code = 200, message = "成功处理请求"),
// @ApiResponse(code = 401, message = "没有权限访问该服务"),
// @ApiResponse(code = 403, message = "权限不足无法访问该服务"),
// @ApiResponse(code = 404, message = "未发现该服务"),
// @ApiResponse(code = 500, message = "服务器内部错误")
// })
// public ResponseData<?> getLeaguePointsRankBasketball(@RequestBody CommonStringId commonStringId, HttpServletRequest request) {
// return leaguePointsRankService.getLeaguePointsRankBasketball(commonStringId, request);
// }
//
// @PostMapping(value = "/getHotExpert")
// @ApiOperation(value = "热门专家")
// @ApiResponses({
// @ApiResponse(code = 200, message = "成功处理请求"),
// @ApiResponse(code = 401, message = "没有权限访问该服务"),
// @ApiResponse(code = 403, message = "权限不足无法访问该服务"),
// @ApiResponse(code = 404, message = "未发现该服务"),
// @ApiResponse(code = 500, message = "服务器内部错误")
// })
// public ResponseData<?> getHotExpert(HttpServletRequest request) {
// return leaguePointsRankService.getHotExpert(request);
// }
//
// @PostMapping(value = "/getAnchorRecommend")
// @ApiOperation(value = "主播推荐")
// @ApiResponses({
// @ApiResponse(code = 200, message = "成功处理请求"),
// @ApiResponse(code = 401, message = "没有权限访问该服务"),
// @ApiResponse(code = 403, message = "权限不足无法访问该服务"),
// @ApiResponse(code = 404, message = "未发现该服务"),
// @ApiResponse(code = 500, message = "服务器内部错误")
// })
// public ResponseData<?> getAnchorRecommend(@RequestBody CommonPage commonPage, HttpServletRequest request) {
// return leaguePointsRankService.getAnchorRecommend(commonPage, request);
// }
//
//}
score-server/src/main/java/com/live/server/controller/PlatformController.java
package com.live.server.controller;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.live.common.domain.ResponseData;
import com.live.common.domain.entity.Category;
import com.live.common.domain.entity.Room;
import com.live.common.domain.request.LiveCutImgNotifyDto;
import com.live.common.enums.StatusEnum;
import com.live.common.mapper.RoomMapper;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiResponse;
import io.swagger.annotations.ApiResponses;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
import java.nio.charset.StandardCharsets;
import java.util.Base64;
import java.util.List;
@Slf4j
@CrossOrigin
@RestController
@RequestMapping("/platform")
@Api(tags = "第三方回调接口")
public class PlatformController {
@Resource
private RoomMapper roomMapper;
@PostMapping(value = "/liveCutImgNotify")
@ApiResponses({
@ApiResponse(code = 200, message = "成功处理请求"),
@ApiResponse(code = 401, message = "没有权限访问该服务"),
@ApiResponse(code = 403, message = "权限不足无法访问该服务"),
@ApiResponse(code = 404, message = "未发现该服务"),
@ApiResponse(code = 500, message = "服务器内部错误")
})
public ResponseData<?> liveCutImgNotify(HttpServletRequest request) throws IOException {
BufferedReader reader = new BufferedReader(new InputStreamReader(request.getInputStream()));
String str = "";
StringBuilder wholeStr = new StringBuilder();
//一行一行的读取body体里面的内容；
while ((str = reader.readLine()) != null) {
wholeStr.append(str);
}
String jsonString = new String(Base64.getDecoder().decode(wholeStr.toString()), StandardCharsets.UTF_8);
LiveCutImgNotifyDto cutImgNotifyDto = JSONArray.parseObject(jsonString, LiveCutImgNotifyDto.class);
if (cutImgNotifyDto.getItems() == null) {
return ResponseData.successResponse();
} else {
List<Room> roomList = roomMapper.selectList(Wrappers.<Room>lambdaQuery()
.eq(Room::getDeleted, StatusEnum.ENABLE.getCode())
.eq(Room::getType, 1)
.like(Room::getLiveUrl, cutImgNotifyDto.getItems().get(0).getChannelname())
);
for (Room room : roomList) {
String cutImg = cutImgNotifyDto.getItems().get(0).getUrls().get(0);
if(!cutImg.equals(room.getRoomCover())){
room.setRoomCover(cutImgNotifyDto.getItems().get(0).getUrls().get(0));
roomMapper.updateById(room);
log.info("修改房间封面图成功:{}", room.getHuanXinRoomId());
}
}
}
return ResponseData.successResponse();
}
}
//package com.live.server.controller;
//
//import com.alibaba.fastjson.JSONArray;
//import com.alibaba.fastjson.JSONObject;
//import com.baomidou.mybatisplus.core.toolkit.Wrappers;
//import com.live.common.domain.ResponseData;
//import com.live.common.domain.entity.Category;
//import com.live.common.domain.entity.Room;
//import com.live.common.domain.request.LiveCutImgNotifyDto;
//import com.live.common.enums.StatusEnum;
//import com.live.common.mapper.RoomMapper;
//import io.swagger.annotations.Api;
//import io.swagger.annotations.ApiResponse;
//import io.swagger.annotations.ApiResponses;
//import lombok.extern.slf4j.Slf4j;
//import org.apache.commons.lang3.StringUtils;
//import org.springframework.web.bind.annotation.*;
//
//import javax.annotation.Resource;
//import javax.servlet.http.HttpServletRequest;
//import java.io.BufferedReader;
//import java.io.IOException;
//import java.io.InputStreamReader;
//import java.nio.charset.StandardCharsets;
//import java.util.Base64;
//import java.util.List;
//
//@Slf4j
//@CrossOrigin
//@RestController
//@RequestMapping("/platform")
//@Api(tags = "第三方回调接口")
//public class PlatformController {
//
// @Resource
// private RoomMapper roomMapper;
//
//
// @PostMapping(value = "/liveCutImgNotify")
// @ApiResponses({
// @ApiResponse(code = 200, message = "成功处理请求"),
// @ApiResponse(code = 401, message = "没有权限访问该服务"),
// @ApiResponse(code = 403, message = "权限不足无法访问该服务"),
// @ApiResponse(code = 404, message = "未发现该服务"),
// @ApiResponse(code = 500, message = "服务器内部错误")
// })
// public ResponseData<?> liveCutImgNotify(HttpServletRequest request) throws IOException {
// BufferedReader reader = new BufferedReader(new InputStreamReader(request.getInputStream()));
// String str = "";
// StringBuilder wholeStr = new StringBuilder();
// //一行一行的读取body体里面的内容；
// while ((str = reader.readLine()) != null) {
// wholeStr.append(str);
// }
// String jsonString = new String(Base64.getDecoder().decode(wholeStr.toString()), StandardCharsets.UTF_8);
//
// LiveCutImgNotifyDto cutImgNotifyDto = JSONArray.parseObject(jsonString, LiveCutImgNotifyDto.class);
// if (cutImgNotifyDto.getItems() == null) {
// return ResponseData.successResponse();
// } else {
// List<Room> roomList = roomMapper.selectList(Wrappers.<Room>lambdaQuery()
// .eq(Room::getDeleted, StatusEnum.ENABLE.getCode())
// .eq(Room::getType, 1)
// .like(Room::getLiveUrl, cutImgNotifyDto.getItems().get(0).getChannelname())
// );
//
// for (Room room : roomList) {
// String cutImg = cutImgNotifyDto.getItems().get(0).getUrls().get(0);
// if(!cutImg.equals(room.getRoomCover())){
// room.setRoomCover(cutImgNotifyDto.getItems().get(0).getUrls().get(0));
// roomMapper.updateById(room);
// log.info("修改房间封面图成功:{}", room.getHuanXinRoomId());
// }
// }
// }
// return ResponseData.successResponse();
// }
//
//}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment