Commit 5594c14e authored by liuyang's avatar liuyang

fixbug

parent 178b7146
...@@ -22,6 +22,7 @@ import com.qkdata.common.jwt.JWTService; ...@@ -22,6 +22,7 @@ import com.qkdata.common.jwt.JWTService;
import com.qkdata.common.oauth.AuthorizedUser; import com.qkdata.common.oauth.AuthorizedUser;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpHeaders; import org.springframework.http.HttpHeaders;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
...@@ -34,6 +35,7 @@ import java.util.List; ...@@ -34,6 +35,7 @@ import java.util.List;
@Api(tags = "首页数据获取-手机端") @Api(tags = "首页数据获取-手机端")
@RestController @RestController
@RequestMapping("/api/web/mainPage") @RequestMapping("/api/web/mainPage")
@Slf4j
public class MainPageController { public class MainPageController {
@Autowired @Autowired
private SwiperConfigService swiperConfigService; private SwiperConfigService swiperConfigService;
...@@ -67,17 +69,22 @@ public class MainPageController { ...@@ -67,17 +69,22 @@ public class MainPageController {
@ApiOperation("首页推存课程列表") @ApiOperation("首页推存课程列表")
@PostMapping("/course/recommend/list") @PostMapping("/course/recommend/list")
@SysLog("首页推存课程列表") @SysLog("首页推存课程列表")
public PageResult<SearchCourseResultModel> recommendCourseList(@RequestBody SearchCourseConditionModel model,HttpServletRequest request) throws IOException { public PageResult<SearchCourseResultModel> recommendCourseList(@RequestBody SearchCourseConditionModel model,HttpServletRequest request) {
return courseService.mainPageRecommendList(model,getUserFromToken(request)); return courseService.mainPageRecommendList(model,getUserFromToken(request));
} }
private AuthorizedUser getUserFromToken(HttpServletRequest request) throws IOException { private AuthorizedUser getUserFromToken(HttpServletRequest request){
AuthorizedUser authUser = null; AuthorizedUser authUser = null;
String token = getRequestToken(request); String token = getRequestToken(request);
if (StrUtil.isNotBlank(token)){ if (StrUtil.isNotBlank(token) && !"null".equals(token)){
DecodedJWT decodedJWT = jwtService.decode(token); try{
String userJson = decodedJWT.getClaim("user").asString(); DecodedJWT decodedJWT = jwtService.decode(token);
ObjectMapper mapper = new ObjectMapper(); String userJson = decodedJWT.getClaim("user").asString();
authUser = mapper.readValue(userJson,AuthorizedUser.class); ObjectMapper mapper = new ObjectMapper();
authUser = mapper.readValue(userJson,AuthorizedUser.class);
}catch (IOException e){
log.error(e.getMessage(),e);
}
} }
return authUser; return authUser;
} }
......
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