Skip to content

Commit d520e4f

Browse files
author
BG317958
committed
Spring MVC practise with bootstrap-update
1 parent 61e2d2d commit d520e4f

File tree

614 files changed

+72696
-506
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

614 files changed

+72696
-506
lines changed

‎.idea/workspace.xml

Lines changed: 991 additions & 476 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎log4j.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ log4j.rootLogger=info,stdout,D
44
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
55
log4j.appender.stdout.Target=System.out
66
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
7-
log4j.appender.stdout.layout.ConversionPattern=%-d{yyyy-MM-dd HH:mm:ss} [ %t:%r ] - [ %p ] %m%n
7+
log4j.appender.stdout.layout.ConversionPattern=%-d{yyyy-MM-dd HH:mm:ss} %d %-5p %m%n
88

99
log4j.appender.D=org.apache.log4j.DailyRollingFileAppender
1010
log4j.appender.D.File=logs/log.log
1111
log4j.appender.D.Append=true
1212
log4j.appender.D.Threshold=INFO
1313
log4j.appender.D.layout=org.apache.log4j.PatternLayout
14-
log4j.appender.D.layout.ConversionPattern=%-d{yyyy-MM-dd HH:mm:ss} [ %t:%r ] - [ %p ] %m%n
14+
log4j.appender.D.layout.ConversionPattern=%-d{yyyy-MM-dd HH:mm:ss} %d %-5p %m%n

‎src/main/java/controller/LoginController.java

Lines changed: 30 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
package controller;
22

3+
import com.alibaba.fastjson.JSON;
34
import domain.UserInfo;
45
import org.apache.log4j.Logger;
56
import org.springframework.beans.factory.annotation.Autowired;
67
import org.springframework.stereotype.Controller;
78
import org.springframework.ui.ModelMap;
8-
import org.springframework.web.bind.annotation.RequestMapping;
9-
import org.springframework.web.bind.annotation.RequestMethod;
10-
import org.springframework.web.bind.annotation.RequestParam;
11-
import org.springframework.web.bind.annotation.SessionAttributes;
9+
import org.springframework.web.bind.annotation.*;
10+
import org.springframework.web.bind.support.SessionStatus;
1211
import service.LoginService;
1312

1413
import javax.servlet.http.HttpSession;
@@ -38,7 +37,7 @@ public String get(HttpSession session) {
3837
//public String login(@RequestParam("name") String name, String password, ModelMap model){
3938
//public String login(String name, String password, ModelMap model){
4039

41-
@RequestMapping(value = "/loginHere", method = RequestMethod.POST)
40+
@RequestMapping(value = "/loginHere")
4241
public String login(@RequestParam("name") String name, String password, ModelMap model) {
4342
logger.info("Login controller begin service");
4443

@@ -54,7 +53,7 @@ public String login(@RequestParam("name") String name, String password, ModelMap
5453
user.setPassword("");
5554
model.addAttribute("user", user);
5655

57-
return "redirect:homePage";
56+
return "redirect:/homePage";
5857
} else {
5958
return "login";
6059
}
@@ -72,4 +71,29 @@ public String visitStaticPage() {
7271
}
7372

7473

74+
//Return to previous path
75+
@ResponseBody
76+
@RequestMapping(value = "/getUserSession")
77+
public String getUserSession( HttpSession session) {
78+
String result="";
79+
80+
Object obj=session.getAttribute("user");
81+
if (obj instanceof String){
82+
result= (String) obj;
83+
}else if (obj instanceof UserInfo){
84+
result=((UserInfo) obj).getName();
85+
}
86+
87+
result= JSON.toJSONString(result);
88+
89+
return result;
90+
}
91+
92+
@RequestMapping("/logOut")
93+
@ResponseBody
94+
public String logout( SessionStatus status){
95+
status.setComplete();
96+
return "logout";
97+
}
98+
7599
}

‎src/main/webapp/WEB-INF/js/common.js

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
function checkrst(data) {
2+
dataobj=JSON.parse(data);
3+
if(dataobj.rst_code === 0){
4+
return dataobj.rst_data;
5+
}
6+
$.messager.alert('Warning', dataobj.rst_msg);
7+
return false;
8+
}

‎src/main/webapp/WEB-INF/jsp/homePage.jsp

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -275,13 +275,8 @@
275275
</body>
276276
<!-- Bootstrap core JavaScript================================================== -->
277277
<!-- Placed at the end of the document so the pages load faster -->
278-
<script src="https://code.jquery.com/jquery-3.1.1.slim.min.js"
279-
integrity="sha384-A7FZj7v+d/sdmMqp/nOQwliLvUsJfDHW+k9Omg/a/EheAdgtzNs3hpfag6Ed950n"
280-
crossorigin="anonymous"></script>
278+
281279
<script>window.jQuery || document.write('<script src="../../assets/js/vendor/jquery.min.js"><\/script>')</script>
282-
<script src="https://cdnjs.cloudflare.com/ajax/libs/tether/1.4.0/js/tether.min.js"
283-
integrity="sha384-DztdAPBWPRXSA/3eYEEUWrWCy7G5KFbe8fFjk5JAIxUYHKkDx6Qin1DkWx51bBrb"
284-
crossorigin="anonymous"></script>
285280
<script src="http://cdn.static.runoob.com/libs/jquery/2.1.1/jquery.min.js"></script>
286281
<script src="http://cdn.static.runoob.com/libs/bootstrap/3.3.7/js/bootstrap.min.js"></script>
287282
</html>

‎src/main/webapp/index.jsp

Lines changed: 82 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,54 @@
55
<head>
66
<meta charset="utf-8">
77
<meta name="viewport" content="width=device-width, initial-scale=1">
8+
<script src="./lib/jQuery/jquery-3.2.1.min.js"></script>
89
<link rel="stylesheet" href="./lib/bootstrap-3.3.7-dist/css/bootstrap.min.css">
9-
<script src="http://cdn.static.runoob.com/libs/jquery/2.1.1/jquery.min.js"></script>
10-
<script src="http://cdn.static.runoob.com/libs/bootstrap/3.3.7/js/bootstrap.min.js"></script>
11-
<%--<link href="https://cdn.bootcss.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet">--%>
12-
<%--<link href="https://static.bootcss.com/www/assets/css/site.min.css?1517600071369" rel="stylesheet">--%>
10+
<script src="./lib/bootstrap-3.3.7-dist/js/bootstrap.min.js"></script>
11+
<script>
12+
13+
$(function () {
14+
15+
checkLogin();
16+
17+
});
18+
19+
function checkLogin() {
20+
$.ajax("/getUserSession", {
21+
data: null,
22+
async: false,
23+
success: function (d) {
24+
var data = d;
25+
if (data != "" && data != "\"\"") {
26+
$("#login").html("注销");
27+
}
28+
},
29+
error: function (a, b, c) {
30+
console.log(a, b, c);
31+
}
32+
});
33+
}
34+
35+
function logControl() {
36+
var currentStatus = $("#login").html();
37+
38+
if (currentStatus == "登录") {
39+
$('#myModal').modal('show');
40+
} else {
41+
$.ajax({
42+
url: 'logOut',
43+
data: null,
44+
async: false,
45+
success: function (d) {
46+
$("#login").html("登录");
47+
$("#alert").modal('show');
48+
console.log("User log off success!");
49+
}
50+
});
51+
}
52+
}
53+
54+
55+
</script>
1356

1457
</head>
1558

@@ -40,12 +83,12 @@
4083
<li><a href="eastAlabo/home">中东站</a></li>
4184
</ul>
4285
</li>
43-
<li><a href="#">我的旅行</a></li>
86+
<li><a href="/homePage">我的旅行</a></li>
4487
</ul>
4588

4689

4790
<p class="navbar-text navbar-right" style="margin-right: 10px">
48-
<button class="btn btn-primary btn-xs" data-toggle="modal" data-target="#myModal">登录</button>
91+
<button class="btn btn-primary btn-xs" data-toggle="modal" id="login" onclick="logControl()">登录</button>
4992
</p>
5093

5194
<ul class="nav navbar-nav navbar-right">
@@ -60,32 +103,36 @@
60103
</nav>
61104

62105
<div class="container">
63-
<div class="jumbotron " style="text-align: center">
106+
<div class="jumbotron blue" style="text-align: center">
64107
<h1>Horizon Index Page</h1>
65-
<p class="lead">CL'aube arrive, l'horizon sera partout. Les rivières et les lacs, selon le soleil et la lune sont tous des sols Han.
108+
<p class="lead">CL'aube arrive, l'horizon sera partout. Les rivières et les lacs, selon le soleil et la lune
109+
sont tous des sols Han.
66110
Dawn is coming, horizon is everywhere</p>
67111
<p><a class="btn btn-lg btn-success" href="#" role="button">Get started today</a></p>
68112
</div>
69113
<div class="row">
70-
<div class="col-sm-4">
114+
<div class="col-md-4">
71115
<h3>大漠孤烟</h3>
72116
<p>再牛逼的梦想,也抵不住你傻逼似的坚持！</p>
73117
</div>
74-
<div class="col-sm-4">
118+
<div class="col-md-4">
75119
<h3>极地风情</h3>
76120
<p>再牛逼的梦想,也抵不住你傻逼似的坚持！</p>
77121
</div>
78-
<div class="col-sm-4">
122+
<div class="col-md-4">
79123
<h3>星辰大海</h3>
80124
<p>再牛逼的梦想,也抵不住你傻逼似的坚持！</p>
81125
</div>
82126
</div>
83127

128+
129+
84130
</div>
85131

86132
<!-- 模态框（Modal） -->
87-
<div class="modal fade" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true" style="margin-top: 120px">
88-
<form class="bs-example bs-example-form" role="form" action="/loginHere" method="post">
133+
<div class="modal fade" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"
134+
style="margin-top: 120px">
135+
<form class="bs-example bs-example-form" role="form" action="/loginHere" method="get">
89136
<div class="modal-dialog">
90137
<div class="modal-content">
91138
<div class="modal-header">
@@ -108,15 +155,17 @@
108155
<br>
109156
<div class="input-group">
110157
<span class="input-group-addon">密码</span>
111-
<input type="password" id="password" name="password" class="form-control" placeholder="Your password">
158+
<input type="password" id="password" name="password" class="form-control"
159+
placeholder="Your password">
112160
</div>
113161
<br>
114162
</div>
115163
</div>
116164

117165
<div class="modal-footer">
118-
<input type="button" class="btn btn-primary" value="注册" style="text-align: left">
119-
<input type="submit" value="登录" class="btn btn-primary" style="margin-right: 10px"/>
166+
<input type="button" class="btn btn-primary" value="注册" style="margin-right: 10px">
167+
<input type="submit" value="登录" class="btn btn-primary" style="margin-right: 10px"
168+
/>
120169
<button type="button" class="btn btn-primary" data-dismiss="modal">关闭</button>
121170
</div>
122171
</div><!-- /.modal-content -->
@@ -126,6 +175,23 @@
126175

127176
</div>
128177

178+
<div class="modal fade" id="alert" tabindex="-1" role="dialog" aria-labelledby="myModalLabel1" aria-hidden="true"
179+
style="margin-top: 120px" >
180+
<div class="modal-dialog">
181+
<div class="modal-content">
182+
<div class="modal-header">
183+
<p >提示</p>
184+
</div>
185+
186+
<div class="modal-body">
187+
<br>
188+
<p><h3 class="text-success text-center bg-success">Logout 成功！</h3></p>
189+
<br>
190+
</div>
191+
</div>
192+
</div>
193+
</div>
194+
129195

130196
</body>
131197
<%--<script src="/lib/jQuery/jquery-3.2.1.min.js"/>--%>

0 commit comments

Comments
 (0)