201206030/novel-plus
1
0
Fork 0
mirror of https://github.com/201206030/novel-plus.git synced 2025-07-04 00:16:39 +00:00
Code Issues Packages Releases Wiki Activity

bug修复

Browse Source
This commit is contained in:
xxy
2020-05-02 18:26:18 +08:00
parent daa38c0df9
commit ca798314e3
8 changed files with 81 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
novel-front/src/main/java/com/java2nb/novel/controller/BaseController.java
View File

@ -1,6 +1,7 @@
package com.java2nb.novel.controller;
import com.java2nb.novel.core.bean.UserDetails;
import com.java2nb.novel.core.utils.CookieUtil;
import com.java2nb.novel.core.utils.JwtTokenUtil;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@ -17,13 +18,9 @@ public class BaseController {
protected String getToken(HttpServletRequest request){
Cookie[] cookies = request.getCookies();
if(cookies != null) {
for (Cookie cookie : cookies) {
if (cookie.getName().equals("Authorization")) {
return cookie.getValue();
}
}
String token = CookieUtil.getCookie(request,"Authorization");
if(token != null){
return token;
}
return request.getHeader("Authorization");
}

12
novel-front/src/main/java/com/java2nb/novel/controller/PageController.java
View File

@ -1,6 +1,6 @@
package com.java2nb.novel.controller;
import com.java2nb.novel.core.utils.TemplateUtil;
import com.java2nb.novel.core.utils.ThreadLocalUtil;
import com.java2nb.novel.entity.Book;
import com.java2nb.novel.entity.BookContent;
import com.java2nb.novel.entity.BookIndex;
@ -49,7 +49,7 @@ public class PageController{
* */
@RequestMapping(path = {"/", "/index", "/index.html"})
public String index() {
return TemplateUtil.getTemplateDir()+"index";
return ThreadLocalUtil.getTemplateDir()+"index";
}
/**
@ -66,7 +66,7 @@ public class PageController{
@RequestMapping("book/book_ranking.html")
public String bookRank() {
return TemplateUtil.getTemplateDir()+"book/book_ranking";
return ThreadLocalUtil.getTemplateDir()+"book/book_ranking";
}
@ -80,7 +80,7 @@ public class PageController{
//查询首章目录ID
Long firstBookIndexId = bookService.queryFirstBookIndexId(bookId);
model.addAttribute("firstBookIndexId",firstBookIndexId);
return TemplateUtil.getTemplateDir()+"book/book_detail";
return ThreadLocalUtil.getTemplateDir()+"book/book_detail";
}
/**
@ -93,7 +93,7 @@ public class PageController{
List<BookIndex> bookIndexList = bookService.queryIndexList(bookId,null,null);
model.addAttribute("bookIndexList",bookIndexList);
model.addAttribute("bookIndexCount",bookIndexList.size());
return TemplateUtil.getTemplateDir()+"book/book_index";
return ThreadLocalUtil.getTemplateDir()+"book/book_index";
}
/**
@ -116,7 +116,7 @@ public class PageController{
//查询内容
BookContent bookContent = bookService.queryBookContent(bookIndex.getId());
model.addAttribute("bookContent",bookContent);
return TemplateUtil.getTemplateDir()+"book/book_content";
return ThreadLocalUtil.getTemplateDir()+"book/book_content";
}
/**