|
@@ -238,18 +238,22 @@ public class NewsApi {
|
|
|
|
|
|
String token = request.getHeader("Authorization");
|
|
|
|
|
|
- if (org.springframework.util.StringUtils.isEmpty(token)) {
|
|
|
- token = (String) request.getSession().getAttribute("token");
|
|
|
- }
|
|
|
+ if(!"undefined".equals(token)) {
|
|
|
|
|
|
- if (org.springframework.util.StringUtils.isEmpty(token)) {
|
|
|
- token = request.getParameter("token");
|
|
|
- }
|
|
|
+ if (org.springframework.util.StringUtils.isEmpty(token)) {
|
|
|
+ token = (String) request.getSession().getAttribute("token");
|
|
|
+ }
|
|
|
+
|
|
|
+ if (org.springframework.util.StringUtils.isEmpty(token)) {
|
|
|
+ token = request.getParameter("token");
|
|
|
+ }
|
|
|
|
|
|
- if (org.apache.commons.lang3.StringUtils.isNotEmpty(token)) {
|
|
|
- String regUserId = JwtUtil.decodeToken(jwtSecret, token);
|
|
|
- if (org.apache.commons.lang3.StringUtils.isNotEmpty(regUserId)) {
|
|
|
- searchParams.put("likeUserId", regUserId);
|
|
|
+
|
|
|
+ if (org.apache.commons.lang3.StringUtils.isNotEmpty(token)) {
|
|
|
+ String regUserId = JwtUtil.decodeToken(jwtSecret, token);
|
|
|
+ if (org.apache.commons.lang3.StringUtils.isNotEmpty(regUserId)) {
|
|
|
+ searchParams.put("likeUserId", regUserId);
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
|