优化

src/main/java/com/sooka/module/web/cms/IndexController.java

@@ -2,7 +2,6 @@ package com.sooka.module.web.cms;
 
 import com.github.pagehelper.PageInfo;
 import com.google.common.collect.Maps;
-import com.sooka.ServletInitializer;
 import com.sooka.common.constant.CmsConst;
 import com.sooka.common.exception.CmsException;
 import com.sooka.common.utils.*;
@@ -20,7 +19,6 @@ import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
-import tk.mybatis.mapper.util.StringUtil;
 
 import javax.servlet.http.HttpServletRequest;
 import java.io.*;
@@ -174,7 +172,7 @@ public class IndexController {
      */
     @GetMapping("/${system.site.prefix}/{siteId}")
     public String index(@PathVariable("siteId") Integer siteId,
-                        Model model,HttpServletRequest request){
+                        Model model){
         log.debug("通过站点Id访问网站首页[{}]",siteId);
         SimpleDateFormat formatYear = new SimpleDateFormat("yyyy");
         SimpleDateFormat format = new SimpleDateFormat("yyyy-M-d");
@@ -207,13 +205,6 @@ public class IndexController {
         model.addAttribute("description",site.getDescription());
         model.addAttribute("site",site);
         model.addAttribute("xwdtList",xwdtList);
-        TCmsUser user = (TCmsUser) request.getSession().getAttribute(LOGIN_USER);
-        if (user == null) {
-            model.addAttribute("btnId", "login");
-        } else {
-            model.addAttribute("btnId", "exit");
-            model.addAttribute("nickname", user.getNickname());
-        }
         if(StrUtil.isBlank(site.getTemplate())) {
             return view(CmsConst.INDEX_TPL);
         }
@@ -224,18 +215,13 @@ public class IndexController {
     @GetMapping("/${system.site.prefix}/{siteId}/{categoryId}")
     public String category(@PathVariable("siteId") Integer siteId,
                            @PathVariable("categoryId") Long categoryId,
-                           Model model, HttpServletRequest request){
+                           Model model){
         log.debug("栏目");
         TCmsSite site = siteService.findById(siteId);
         if(CmsUtil.isNullOrEmpty(site)) {
             throw new CmsException(CmsConst.SITE_NOT_FOUND);
         }
         TCmsCategory category = categoryService.findById(categoryId);
-        if (request.getSession().getAttribute(LOGIN_USER) == null) {
-            model.addAttribute("showState", false);
-        } else {
-            model.addAttribute("showState", true);
-        }
         if(CmsUtil.isNullOrEmpty(category)) {
             throw new CmsException(CmsConst.CATEGORY_NOT_FOUND);
         }
@@ -247,13 +233,6 @@ public class IndexController {
         model.addAttribute("site",site);
         model.addAttribute("category",category);
         model.addAttribute("page",page);
-        TCmsUser user = (TCmsUser) request.getSession().getAttribute(LOGIN_USER);
-        if (user == null) {
-            model.addAttribute("btnId", "login");
-        } else {
-            model.addAttribute("btnId", "exit");
-            model.addAttribute("nickname", user.getNickname());
-        }
         if(StrUtil.isBlank(site.getTemplate())) {
             return view(category.getIndexTpl());
         }

src/main/java/com/sooka/module/web/cms/LoginController.java

@@ -12,8 +12,11 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
 import java.util.Map;
 
+import static com.sooka.common.constant.CmsConst.LOGIN_USER;
+
 /**
  * Description:用户管理
  *
@@ -41,4 +44,18 @@ public class LoginController {
     public String register(@Validated TCmsUser user) {
         return userService.insert(user);
     }
+
+    @PostMapping("/getInfo")
+    @ResponseBody
+    public Map<String, Object> getInfo(HttpServletRequest request) {
+        Map<String, Object> resultMap = new HashMap<>();
+        TCmsUser user = (TCmsUser) request.getSession().getAttribute(LOGIN_USER);
+        if (user == null) {
+            resultMap.put("status", false);
+        } else {
+            resultMap.put("status", true);
+            resultMap.put("nickname", user.getNickname());
+        }
+        return resultMap;
+    }
 }

src/main/resources/static/js/register/header.js

@@ -0,0 +1,13 @@
+// JavaScript Document
+var showState = false;
+$(function () {
+    $.post("/getInfo", function (data) {
+        var obj = eval(data);
+        showState = obj.status;
+        if (showState) {
+            $("#exit").prepend(obj.nickname).show();
+        } else {
+            $("#login").show();
+        }
+    });
+});

src/main/resources/static/js/register/login.js

@@ -11,7 +11,7 @@ $(function () {
         }, function (data) {
             var obj = eval(data);
             if (obj.success) {
-                show_msg(obj.message, "/");
+                show_msg(obj.message, "/tuiyijunren/4");
             } else {
                 show_err_msg(obj.message);
                 setTimeout(function () {
@@ -20,4 +20,8 @@ $(function () {
             }
         }, "json");
     });
-});
+});
+
+function changeCode() {
+    $("#captcha_img").attr("src", "${ctxPath}/verify?t=" + (new Date().getTime()));
+}

src/main/resources/templates/www/tuiyijunren/include/header-index.html

@@ -12,6 +12,7 @@
     <script src="${resPath}/tuiyijunren/images/dist/aos.js"></script>
     <script src="${resPath}/tuiyijunren/images/ft-carousel.min.js" type="text/javascript"></script>
     <script src="${resPath}/tuiyijunren/images/jquery.carouFredSel-6.0.4-packed.js" type="text/javascript"></script>
+    <script src="${ctxPath}/static/js/register/header.js"></script>
 </head>
 
 <body>
@@ -52,6 +53,3 @@
     </div>
 </div>
 <!--导航结束-->
-<script type="text/javascript">
-        $(${btnId}).show();
-</script>

src/main/resources/templates/www/tuiyijunren/include/header.html

@@ -7,6 +7,7 @@
     <link href="${resPath}/tuiyijunren/images/basic.css" rel="stylesheet"/>
     <link href="${resPath}/tuiyijunren/images/page.css" rel="stylesheet"/>
     <script type="text/javascript" language="javascript" src="${resPath}/tuiyijunren/images/jquery-1.7.2.min.js"></script>
+    <script src="${ctxPath}/static/js/register/header.js"></script>
 </head>
 
 <body>
@@ -47,7 +48,6 @@
     </div>
 </div>
 <script>
-    $(${btnId}).show();
     let ids = [
         [], // 网站首页
         [1217], // 最新动态

src/main/resources/templates/www/tuiyijunren/login.html

@@ -41,9 +41,4 @@
     </div>
 </div>
 </body>
-<script type="text/javascript">
-    function changeCode() {
-        $("#captcha_img").attr("src", "${ctxPath}/verify?t=" + (new Date().getTime()));
-    }
-</script>
 </html>