mirror of
https://github.com/201206030/novel-plus.git
synced 2025-06-24 04:46:37 +00:00
Merge branch 'release_3.5.3' into develop_xxy
This commit is contained in:
@ -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);
|
||||
|
@ -41,7 +41,7 @@ public class ThreadLocalUtil {
|
||||
/**
|
||||
* 设置当前访问线程的客户端ID
|
||||
* */
|
||||
public static void setCientId(String id){
|
||||
public static void setClientId(String id){
|
||||
clientId.set(id);
|
||||
}
|
||||
|
||||
|
@ -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";
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user