diff --git a/src/main/java/com/yaoyuan/jiscuss/config/WebSecurityConfig.java b/src/main/java/com/yaoyuan/jiscuss/config/WebSecurityConfig.java index e72d1a1..23f0b3e 100644 --- a/src/main/java/com/yaoyuan/jiscuss/config/WebSecurityConfig.java +++ b/src/main/java/com/yaoyuan/jiscuss/config/WebSecurityConfig.java @@ -42,8 +42,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter{ "/css/**", "/js/**", "/images/**", - "/static/**", - "/index/**" + "/static/**" ); } /** @@ -69,7 +68,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter{ .loginProcessingUrl("/login") //登录POST请求路径 .usernameParameter("username") //登录用户名参数 .passwordParameter("password") //登录密码参数 - .defaultSuccessUrl("/main") //默认登录成功页面 + .defaultSuccessUrl("/index") //默认登录成功页面 .and() .exceptionHandling() .accessDeniedHandler(customAccessDeniedHandler) //无权限处理器 diff --git a/src/main/java/com/yaoyuan/jiscuss/controller/UserPostController.java b/src/main/java/com/yaoyuan/jiscuss/controller/UserPostController.java index 73a6443..e591b6f 100644 --- a/src/main/java/com/yaoyuan/jiscuss/controller/UserPostController.java +++ b/src/main/java/com/yaoyuan/jiscuss/controller/UserPostController.java @@ -5,7 +5,9 @@ import java.util.Map; import javax.servlet.http.HttpServletRequest; +import com.yaoyuan.jiscuss.entity.Posts; import com.yaoyuan.jiscuss.entity.UserInfo; +import com.yaoyuan.jiscuss.service.IPostsService; import org.json.JSONObject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -39,8 +41,9 @@ public class UserPostController extends BaseController { @Autowired private ITagsService tagsService; - + @Autowired + private IPostsService postsService; //首页查看主题列表（各种条件筛选，最热最新标签等） @@ -92,6 +95,28 @@ public class UserPostController extends BaseController { //删除主题 //新建评论 + @PostMapping(value = "/newpost") + @ResponseBody + public String newPosts(@RequestBody Posts posts) { + logger.info(">>> newpost"+posts); + + ServletRequestAttributes servletRequestAttributes = (ServletRequestAttributes)RequestContextHolder.getRequestAttributes(); + HttpServletRequest request = servletRequestAttributes.getRequest(); + + UserInfo user = getUserInfo(request); + if(user != null){ + posts.setCreate_id( user.getId()); + } + posts.setCreate_time(new Date()); + + Posts savePost = postsService.insert(posts); + JSONObject resultobj = new JSONObject(); + + logger.info(">>>{}",savePost ); + resultobj.put("msg", "添加成功"); + resultobj.put("flag", true); + return resultobj.toString(); // + } //删除评论 diff --git a/src/main/java/com/yaoyuan/jiscuss/controller/UserSystemController.java b/src/main/java/com/yaoyuan/jiscuss/controller/UserSystemController.java index 4d8978a..78be5a5 100644 --- a/src/main/java/com/yaoyuan/jiscuss/controller/UserSystemController.java +++ b/src/main/java/com/yaoyuan/jiscuss/controller/UserSystemController.java @@ -39,17 +39,23 @@ public class UserSystemController extends BaseController { private ITagsService tagsService; //首页 - @RequestMapping("/") - public String home(HttpServletRequest request, ModelMap map) { + @RequestMapping({"/","/main","/index"}) + public String home(@RequestParam(defaultValue = "all") String tag, @RequestParam(defaultValue = "all") String type,@RequestParam(defaultValue = "1") Integer + pageNum, HttpServletRequest request, ModelMap map) { logger.info(">>> index"); + logger.info(">>> tag:" + tag); + logger.info(">>> pageNum:" + pageNum); List userall = usersService.getAllList(); logger.info(">>> 第一遍的全部用户："+userall); List useral2 = usersService.getAllList(); logger.info(">>> 第二遍的全部用户："+useral2); + int pageSiz = 5; + int pageNumNew = pageNum - 1; + //分页获取主题帖子 - Page allDiscussionsPage = discussionsService.queryAllDiscussionsList(0,20); + Page allDiscussionsPage = discussionsService.queryAllDiscussionsList(pageNumNew,pageSiz); List allDiscussions =allDiscussionsPage.getContent(); @@ -67,6 +73,10 @@ public class UserSystemController extends BaseController { map.put("allDiscussions", allDiscussions); map.put("pageDiscussions", pageNumList); map.put("allTags", allTags); + + map.put("tag", tag); + map.put("pageNum", pageNum); + map.put("pageNumAll", pageNumList.size()); UserInfo user = getUserInfo(request); if(user != null){ map.put("username", user.getUsername()); @@ -76,52 +86,43 @@ public class UserSystemController extends BaseController { } - //首页main - @RequestMapping("/main") - public String homePage(HttpServletRequest request, ModelMap map) { - logger.info(">>> index"); - - //分页获取主题帖子 - Page allDiscussionsPage = discussionsService.queryAllDiscussionsList(0,20); - - List allDiscussions =allDiscussionsPage.getContent(); - - logger.info("全部主题==>：{}",allDiscussions); - - //获取主题帖子的分页数据 - List pageNumList = getPageNumList(allDiscussionsPage.getTotalPages()); - - //获取所有标签（以后尝试去缓存中取） - List allTags = tagsService.getAllList(); - logger.info("全部标签==>：{}",allTags); - - map.put("data", "Jiscuss 用户"); - map.put("allDiscussions", allDiscussions); - map.put("pageDiscussions", pageNumList); - map.put("allTags", allTags); - UserInfo user = getUserInfo(request); - if(user != null){ - map.put("username", user.getUsername()); - map.put("data", "Jiscuss 用户:" + user.getUsername()); - } - return "index"; - } +// //首页main +// @RequestMapping("/main") +// public String homePage(HttpServletRequest request, ModelMap map) { +// logger.info(">>> index"); +// +// //分页获取主题帖子 +// Page allDiscussionsPage = discussionsService.queryAllDiscussionsList(0,20); +// +// List allDiscussions =allDiscussionsPage.getContent(); +// +// logger.info("全部主题==>：{}",allDiscussions); +// +// //获取主题帖子的分页数据 +// List pageNumList = getPageNumList(allDiscussionsPage.getTotalPages()); +// +// //获取所有标签（以后尝试去缓存中取） +// List allTags = tagsService.getAllList(); +// logger.info("全部标签==>：{}",allTags); +// +// map.put("data", "Jiscuss 用户"); +// map.put("allDiscussions", allDiscussions); +// map.put("pageDiscussions", pageNumList); +// map.put("allTags", allTags); +// UserInfo user = getUserInfo(request); +// if(user != null){ +// map.put("username", user.getUsername()); +// map.put("data", "Jiscuss 用户:" + user.getUsername()); +// } +// return "index"; +// } private List getPageNumList(int size) { List pageNumList = new ArrayList(); - if(size>5) { - pageNumList.add("1"); - pageNumList.add("2"); - pageNumList.add("..."); - pageNumList.add(""+(size-1)); - pageNumList.add(""+(size)); - - }else { - for(int i = 0;i 0){ + pageUrl= '/index'; + } + console.log('当前页码：'+data) + pageNum = parseInt(data) // pageNum + pageAll = parseInt(allList) +} + +$("#upPage").click(function () { + console.log("点击 upPage"); + console.log('当前页码：'+pageNum); + if(pageNum > 1){ + let page = pageNum - 1 + window.location.href=pageUrl + "?pageNum=" + page; + }else{ + massage('已经是首页!',''); + } +}); + +$("#nextPage").click(function () { + console.log("点击 nextPage"); + console.log('当前页码：'+pageNum); + console.log('当前pageAll页码：'+pageAll); + if((pageNum + 1) <= pageAll){ + let page = pageNum + 1 + window.location.href=pageUrl + "?pageNum=" + page; + }else{ + massage('已经是尾页!',''); + } +}); + $("#createNewDiccuss").click(function () { console.log("点击 createNewDiccuss"); console.log(username); @@ -46,6 +85,7 @@ $("#newdiscussions").click(function(){ if(data.flag){ window.alert(title+',添加成功!'); $('.ui.modal.createNewDiccuss').modal('hide'); + location.reload(); }else{ window.alert(data.msg); return false; diff --git a/src/main/resources/templates/discussions.ftl b/src/main/resources/templates/discussions.ftl index 4127c01..70d8e7e 100644 --- a/src/main/resources/templates/discussions.ftl +++ b/src/main/resources/templates/discussions.ftl @@ -151,35 +151,11 @@ -
- - - - - 1 - - - 2 - -
- ... -
- - 10 - - - 11 - - - -
- -
- +
-
+
添加评论
@@ -301,10 +277,12 @@ <#if username??> console.log('已经登陆：' + username); + setDiscussionsId('${discussions.id}'); + }); - + diff --git a/src/main/resources/templates/footer.ftl b/src/main/resources/templates/footer.ftl index 58d22b7..ed70bb1 100644 --- a/src/main/resources/templates/footer.ftl +++ b/src/main/resources/templates/footer.ftl @@ -43,4 +43,9 @@ 隐私政策
- \ No newline at end of file + + \ No newline at end of file diff --git a/src/main/resources/templates/header.ftl b/src/main/resources/templates/header.ftl index 128ad85..46b777f 100644 --- a/src/main/resources/templates/header.ftl +++ b/src/main/resources/templates/header.ftl @@ -28,7 +28,10 @@
<#if username??> - ${username} 注销 + + ${username} 注销 <#else> 登录 & 注册 diff --git a/src/main/resources/templates/index.ftl b/src/main/resources/templates/index.ftl index 16e6158..00ed8bd 100644 --- a/src/main/resources/templates/index.ftl +++ b/src/main/resources/templates/index.ftl @@ -32,7 +32,7 @@
-
欢迎来到这里，${data},主题数： ${allDiscussions?size} ，主题页数：${pageDiscussions?size} +
欢迎来到这里，${data},当前页主题数： ${allDiscussions?size} ，主题页数：${pageDiscussions?size} ，标签数 ${allTags?size}
  • JAVA + DISCUSS = JISCUSS 。
    • @@ -377,15 +377,21 @@
    - + <#list pageDiscussions as page> - - ${page} - + <#if page == pageNum > + + ${page} + + <#else> + + ${page} + + - +
    @@ -435,6 +441,10 @@ setusername('${username}'); console.log('已经登陆：' + username); + console.log('pageNum：' + '${pageNum}'); + console.log('pageNumAll：' + '${pageNumAll}'); + + setpageNum('${pageNum}','${pageNumAll}'); var token = $("meta[name='_csrf']").attr("content"); if(token == '' && username && username != null){ @@ -443,9 +453,6 @@ } }); - function massage(msg,type){ - window.alert(msg); - }