add index html page

Author: JoyChou93

src/main/java/org/joychou/controller/Index.java

@@ -3,6 +3,7 @@
 
 import com.alibaba.fastjson.JSON;
 import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
@@ -12,18 +13,19 @@
 
 
 /**
- * @author  JoyChou ([email protected])
- * @date    2018.05.28
- * @desc    Index Page
+ * Index page
+ *
+ * @author JoyChou @2018-05-28
  */
-
 @Controller
 public class Index {
-    @RequestMapping("/index")
+
+    @RequestMapping("/appInfo")
     @ResponseBody
-    public static String index(HttpServletRequest request) {
+    public static String appInfo(HttpServletRequest request) {
         String username = request.getUserPrincipal().getName();
-        Map m = new HashMap();
+        Map<String, String> m = new HashMap<>();
+
         m.put("username", username);
         m.put("login", "success");
         m.put("app_name", "java security code");
@@ -33,4 +35,16 @@ public static String index(HttpServletRequest request) {
         // covert map to string
         return JSON.toJSONString(m);
     }
+
+    @RequestMapping("/")
+    public String redirect() {
+        return "redirect:/index";
+    }
+
+    @RequestMapping("/index")
+    public static String index(Model model, HttpServletRequest request) {
+        String username = request.getUserPrincipal().getName();
+        model.addAttribute("user", username);
+        return "index";
+    }
 }

src/main/java/org/joychou/controller/Login.java

@@ -43,16 +43,12 @@ public String logoutPage (HttpServletRequest request, HttpServletResponse respon
         }
 
         if (null == request.getUserPrincipal()) {
-            logger.info("User " + username + " logout successfully.");
+            logger.info("USER " + username + " LOGOUT SUCCESS.");
         } else {
             logger.info("User " + username + " logout failed. Please try again.");
         }
 
         return "redirect:/login?logout";
     }
 
-    @RequestMapping("/")
-    public String redirect() {
-        return "redirect:/index";
-    }
 }

src/main/java/org/joychou/controller/jsonp/JSONP.java

@@ -6,7 +6,6 @@
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import java.security.Principal;
 import java.util.HashMap;
 import java.util.Map;
@@ -30,7 +29,7 @@ public static String getUserInfo(HttpServletRequest request) {
 
         String username = principal.getName();
 
-        Map m = new HashMap();
+        Map<String, String> m = new HashMap<>();
         m.put("Username", username);
 
         return JSON.toJSONString(m);
@@ -42,7 +41,7 @@ public static String getUserInfo(HttpServletRequest request) {
      *
      */
     @RequestMapping(value = "/referer", produces = "application/javascript")
-    private String referer(HttpServletRequest request, HttpServletResponse response) {
+    private String referer(HttpServletRequest request) {
         String callback = request.getParameter("callback");
         return callback + "(" + getUserInfo(request) + ")";
     }
@@ -55,7 +54,7 @@ private String referer(HttpServletRequest request, HttpServletResponse response)
      *
      */
     @RequestMapping(value = "/emptyReferer", produces = "application/javascript")
-    private String emptyReferer(HttpServletRequest request, HttpServletResponse response) {
+    private String emptyReferer(HttpServletRequest request) {
         String referer = request.getHeader("referer");
 
         if (null != referer && !SecurityUtil.checkURLbyEndsWith(referer, urlwhitelist)) {
@@ -85,7 +84,7 @@ public JSONObject advice(HttpServletRequest request) {
      * http://localhost:8080/jsonp/sec?callback=test
      */
     @RequestMapping(value = "/sec", produces = "application/javascript")
-    private String safecode(HttpServletRequest request, HttpServletResponse response) {
+    private String safecode(HttpServletRequest request) {
         String referer = request.getHeader("referer");
 
         if (!SecurityUtil.checkURLbyEndsWith(referer, urlwhitelist)) {

src/main/java/org/joychou/security/LoginFailureHandler.java

@@ -26,7 +26,7 @@ public void onAuthenticationFailure(HttpServletRequest request,
                 " password: " + request.getParameter("password") );
 
         response.setContentType(MediaType.APPLICATION_JSON_VALUE);
-        response.getWriter().write("{\"code\":0, \"message\":\"Login failed.\"}");
+        response.getWriter().write("{\"code\":1, \"message\":\"Login failed.\"}");
     }
 
 }

src/main/java/org/joychou/security/LoginSuccessHandler.java

@@ -21,10 +21,10 @@ public void onAuthenticationSuccess(HttpServletRequest request,
                                         HttpServletResponse response, Authentication authentication)
                                         throws ServletException, IOException {
 
-        logger.info("USER : " + authentication.getName()+ " LOGIN success!");
+        logger.info("USER " + authentication.getName()+ " LOGIN SUCCESS.");
 
         // google ajax and sendRedirect
         response.setContentType(MediaType.APPLICATION_JSON_VALUE);
-        response.getWriter().write("{\"code\":1,\"message\":\"Login success!\"}");
+        response.getWriter().write("{\"code\":0, \"message\":\"Login success\"}");
     }
 }

src/main/resources/templates/index.html

@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org">
+<head>
+    <meta charset="UTF-8" />
+    <title>Home Page</title>
+</head>
+<body>
+    <p>Hello <span th:text="${user}"></span>.</p>
+    <p>Welcome to login java-sec-code application.</p>
+    <a th:href="@{/logout}">logout</a>
+
+    <p></p>
+</body>
+</html>

src/main/resources/templates/login.html

@@ -28,7 +28,7 @@
                 data: {"username": username, "password": password, "remember-me": remember_me},
                 dataType: "json",
                 success: function (r) {
-                    if (r.code == 1) {
+                    if (r.code == 0) {
                         alert(r.message);
                         location.href = ctx + 'index';
                     } else {