Merge remote-tracking branch 'origin/additional' into additional

xwj-vic · Apr 20, 2017 · b8879d8 · b8879d8
2 parents 72ae262 + f37f597
commit b8879d8
Show file tree

Hide file tree

Showing 106 changed files with 513 additions and 6 deletions.
diff --git a/src/main/java/web/WebController/HomepageController.java b/src/main/java/web/WebController/HomepageController.java
@@ -11,9 +11,10 @@
  * Created by xuweijie on 2017/3/11.
  */
 @Controller
-public class HomepageController {
+@RequestMapping("/home")
+public class HomepageController{
 
-    @RequestMapping(value = "/homepage")
+    @RequestMapping(value = "homepage")
     public String loginsuccess( Model model) throws Exception{
         Subject subject= SecurityUtils.getSubject();
         String username= (String) subject.getPrincipal();

diff --git a/src/main/resources/spring/spring-shiro.xml b/src/main/resources/spring/spring-shiro.xml
@@ -9,7 +9,7 @@
         <property name="securityManager" ref="securityManager"/>
         <!--loginUrl认证提交地址，如果没有认证将会请求此地址进行认证，请求此地址将由formAuthenticationFilter进行表单认证-->
         <property name="loginUrl" value="/login"/>
-        <property name="successUrl" value="/homepage"/>
+        <property name="successUrl" value="/home/homepage"/>
 
         <!--自定义的filter-->
         <property name="filters">

diff --git a/src/main/webapp/WEB-INF/jsp/Homepage.jsp b/src/main/webapp/WEB-INF/jsp/Homepage.jsp
@@ -8,11 +8,82 @@
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
 <html>
 <head>
-    <title>成功登录</title>
+    <meta charset="utf-8">
+    <title>Home</title>
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <link rel="stylesheet" href="../resources/layui/css/layui.css"  media="all">
+    <link rel="stylesheet" href="//res.layui.com/css/global.css?t=1490981130731" media="all">
+    <script src="../resources/layui/layui.js" charset="utf-8"></script>
+    <script>
+        layui.use('element', function(){
+            var element = layui.element();
+            element.on('nav(demo)', function(elem){
+                layer.msg(elem.text());
+            });
+        });
+    </script>
 </head>
 <body>
-    <div align="center">
-        <h1>用户名：${username}</h1>
+
+
+    <div class="layui-layout layui-layout-admin">
+        <div class="layui-header header header-demo">
+            <div class="layui-main">
+                <a class="logo" href="#">
+                    <img src="//res.layui.com/images/layui/logo.png" alt="layui">
+                </a>
+
+                <ul class="layui-nav" lay-filter="">
+                    <li class="layui-nav-item"><a href="">最新活动</a></li>
+                    <li class="layui-nav-item layui-this"><a href="">产品</a></li>
+                    <li class="layui-nav-item"><a href="">大数据</a></li>
+                    <li class="layui-nav-item">
+                        <a href="javascript:;">解决方案</a>
+                        <dl class="layui-nav-child"> <!-- 二级菜单 -->
+                            <dd><a href="">移动模块</a></dd>
+                            <dd><a href="">后台模版</a></dd>
+                            <dd><a href="">电商平台</a></dd>
+                        </dl>
+                    </li>
+                    <li class="layui-nav-item"><a href="">社区</a></li>
+                </ul>
+                    <span class="layui-nav-bar" style="left: 44px; top: 55px; width: 0px; opacity: 0;"></span></ul>
+            </div>
+        </div>
+
+    <div class="layui-side layui-bg-black">
+        <div class="layui-side-scroll">
+            <ul class="layui-nav layui-nav-tree site-demo-nav">
+                <li class="layui-nav-item layui-nav-itemed">
+                    <a href="javascript:;">默认展开</a>
+                    <dl class="layui-nav-child">
+                        <dd><a href="javascript:;">选项1</a></dd>
+                        <dd><a href="javascript:;">选项2</a></dd>
+                        <dd><a href="">跳转</a></dd>
+                    </dl>
+                </li>
+                <li class="layui-nav-item">
+                    <a href="javascript:;">解决方案</a>
+                    <dl class="layui-nav-child">
+                        <dd><a href="javascript:;">移动模块</a></dd>
+                        <dd><a href="javascript:;">后台模版</a></dd>
+                        <dd><a href="javascript:;">电商平台</a></dd>
+                    </dl>
+                </li>
+                <li class="layui-nav-item"><a href="">产品</a></li>
+                <li class="layui-nav-item"><a href="">大数据</a></li>
+            </ul>
+        </div>
+    </div>
+
+    <div class="layui-body layui-tab-content site-demo site-demo-body">
+        <ul class="layui-tab-title site-demo-title">
+            <li>预览</li>
+            <li>查看代码</li>
+            <li>帮助</li>
+        </ul>
+    </div>
     </div>
 
 </body>

diff --git a/src/main/webapp/resources/layui/css/layui.css b/src/main/webapp/resources/layui/css/layui.css
diff --git a/src/main/webapp/resources/layui/css/layui.mobile.css b/src/main/webapp/resources/layui/css/layui.mobile.css
diff --git a/src/main/webapp/resources/layui/css/modules/code.css b/src/main/webapp/resources/layui/css/modules/code.css
diff --git a/src/main/webapp/resources/layui/css/modules/laydate/icon.png b/src/main/webapp/resources/layui/css/modules/laydate/icon.png