Merge branch 'release_3.5.3' into develop_xxy

This commit is contained in:
xiaoyang
2021-05-28 11:54:24 +08:00
52 changed files with 134 additions and 3278 deletions

View File

@ -55,7 +55,7 @@ public class NovelFilter implements Filter {
userMark = UUIDUtil.getUUID32();
CookieUtil.setCookie(resp,Constants.USER_CLIENT_MARK_KEY,userMark);
}
ThreadLocalUtil.setCientId(userMark);
ThreadLocalUtil.setClientId(userMark);
//根据浏览器类型选择前端模板
String to = req.getParameter("to");
CacheService cacheService = SpringUtil.getBean(CacheService.class);

View File

@ -41,7 +41,7 @@ public class ThreadLocalUtil {
/**
* 设置当前访问线程的客户端ID
* */
public static void setCientId(String id){
public static void setClientId(String id){
clientId.set(id);
}

View File

@ -77,7 +77,8 @@ public class PageController extends BaseController {
* 首页
*/
@RequestMapping(path = {"/", "/index", "/index.html"})
public String index() {
public String index(Model model) {
model.addAttribute("bookMap",bookService.listBookSettingVO());
return ThreadLocalUtil.getTemplateDir() + "index";
}