Skip to content

Commit c690671

Browse files
tomatogithub123tomatogithub123
committed
Merge remote-tracking branch 'origin/master'
2 parents 2b9fae4 + 6de6b46 commit c690671

File tree

11 files changed

+65
-12
lines changed

11 files changed

+65
-12
lines changed

‎src/main/java/com/tencent/security/CustomLogoutSuccessHandler.java‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
package com.tencent.security;
2+
3+
import org.slf4j.Logger;
4+
import org.slf4j.LoggerFactory;
5+
import org.springframework.security.core.Authentication;
6+
import org.springframework.security.core.userdetails.User;
7+
import org.springframework.security.web.authentication.logout.LogoutSuccessHandler;
8+
import org.springframework.stereotype.Component;
9+
10+
import javax.servlet.ServletException;
11+
import javax.servlet.http.HttpServletRequest;
12+
import javax.servlet.http.HttpServletResponse;
13+
import java.io.IOException;
14+
15+
@Component
16+
public class CustomLogoutSuccessHandler implements LogoutSuccessHandler {
17+
Logger log = LoggerFactory.getLogger(getClass());
18+
19+
@Override
20+
public void onLogoutSuccess(HttpServletRequest request, HttpServletResponse response, Authentication authentication) throws IOException, ServletException {
21+
String username = ((User) authentication.getPrincipal()).getUsername();
22+
log.info("退出成功，用户名：{}", username);
23+
24+
// 重定向到登录页
25+
response.sendRedirect("/login");
26+
}
27+
}

‎src/main/java/com/tencent/security/WebSecurityConfig.java‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,9 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
4040
@Autowired
4141
private CustomAuthenticationFailureHandler customAuthenticationFailureHandler;
4242

43+
@Autowired
44+
private CustomLogoutSuccessHandler logoutSuccessHandler;
45+
4346
@Bean
4447
public PersistentTokenRepository persistentTokenRepository(){
4548
JdbcTokenRepositoryImpl tokenRepository = new JdbcTokenRepositoryImpl();
@@ -79,6 +82,10 @@ protected void configure(AuthenticationManagerBuilder auth) throws Exception {
7982

8083
@Override
8184
protected void configure(HttpSecurity http) throws Exception {
85+
http.logout()
86+
.logoutUrl("/signout")
87+
.deleteCookies("JSESSIONID")
88+
.logoutSuccessHandler(logoutSuccessHandler);
8289
http.authorizeRequests()
8390
// 如果有允许匿名的url，填在下面
8491
.antMatchers("/getVerifyCode").permitAll()

‎src/main/resources/mapper/TsmcpProductMapper.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,8 @@
147147
#{productNum,jdbcType=VARCHAR}, #{productName,jdbcType=VARCHAR}, #{productImgUrl,jdbcType=VARCHAR},
148148
#{factoryId,jdbcType=INTEGER})
149149
</insert>
150+
151+
<!--插入产品，拼接语句-->
150152
<insert id="insertSelective" parameterType="com.tencent.pojo.TsmcpProduct">
151153
insert into tsmcp_product
152154
<trim prefix="(" suffix=")" suffixOverrides=",">

‎src/main/resources/static/index.html‎

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
<!-- <li><a href="#"><i class="icon-tasks"></i> My Tasks</a></li>-->
6969
<!-- <li><a href="#"><i class="icon-calendar"></i> Calendar</a></li>-->
7070
<!-- <li class="divider"></li>-->
71-
<li><a href="login.html"><i class="icon-key"></i>退出</a></li>
71+
<li><a href="/signout"><i class="icon-key"></i>退出</a></li>
7272
</ul>
7373
</li>
7474
<!-- END USER LOGIN DROPDOWN -->
@@ -409,6 +409,7 @@ <h4><i class="icon-reorder"></i>Bar Chat</h4>
409409
<script src="js/echarts.min.js"></script>
410410
<script src="js/scripts.js"></script>
411411
<script>
412+
412413
jQuery(document).ready(function() {
413414
// initiate layout and plugins
414415
// App.setMainPage(true);
@@ -457,11 +458,11 @@ <h4><i class="icon-reorder"></i>Bar Chat</h4>
457458
}
458459
},
459460
data:[
460-
{value:20, name:'待接单'},
461-
{value:20, name:'生产中'},
462-
{value:20, name:'已接单'},
463-
{value:10, name:'已排产'},
464-
{value:80, name:'已完成'}
461+
{value:2, name:'待接单'},
462+
{value:2, name:'生产中'},
463+
{value:2, name:'已接单'},
464+
{value:1, name:'已排产'},
465+
{value:8, name:'已完成'}
465466
]
466467
}
467468
]
@@ -513,6 +514,19 @@ <h4><i class="icon-reorder"></i>Bar Chat</h4>
513514
// 使用刚指定的配置项和数据显示图表。
514515
barChart.setOption(option);
515516

517+
//发起请求获取用户名
518+
$.ajax({
519+
type: 'GET',
520+
url: '/getName',
521+
dataType: "json",
522+
success : function(data){
523+
$(".username").text(data);
524+
},
525+
error : function(mes){
526+
console.log("error:"+mes);
527+
}
528+
});
529+
516530
</script>
517531
<!-- END JAVASCRIPTS -->
518532
</body>

‎src/main/resources/static/js/scripts.js‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2334,3 +2334,6 @@ $("small").text($("title").text().split("-")[1]);
23342334

23352335

23362336

2337+
2338+
2339+

‎src/main/resources/static/pages/orderMgr.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
<!-- <li><a href="#"><i class="icon-tasks"></i> My Tasks</a></li>-->
6666
<!-- <li><a href="#"><i class="icon-calendar"></i> Calendar</a></li>-->
6767
<!-- <li class="divider"></li>-->
68-
<li><a href="login.html"><i class="icon-key"></i>退出</a></li>
68+
<li><a href="/signout"><i class="icon-key"></i>退出</a></li>
6969
</ul>
7070
</li>
7171
<!-- END USER LOGIN DROPDOWN -->

‎src/main/resources/static/pages/pdcOrdTck.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
<!-- <li><a href="#"><i class="icon-tasks"></i> My Tasks</a></li>-->
6666
<!-- <li><a href="#"><i class="icon-calendar"></i> Calendar</a></li>-->
6767
<!-- <li class="divider"></li>-->
68-
<li><a href="login.html"><i class="icon-key"></i>退出</a></li>
68+
<li><a href="/signout"><i class="icon-key"></i>退出</a></li>
6969
</ul>
7070
</li>
7171
<!-- END USER LOGIN DROPDOWN -->

‎src/main/resources/static/pages/pdcplaMgr.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
<!-- <li><a href="#"><i class="icon-tasks"></i> My Tasks</a></li>-->
6666
<!-- <li><a href="#"><i class="icon-calendar"></i> Calendar</a></li>-->
6767
<!-- <li class="divider"></li>-->
68-
<li><a href="login.html"><i class="icon-key"></i>退出</a></li>
68+
<li><a href="/signout"><i class="icon-key"></i>退出</a></li>
6969
</ul>
7070
</li>
7171
<!-- END USER LOGIN DROPDOWN -->

‎src/main/resources/static/pages/pdcsdMgr.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
<!-- <li><a href="#"><i class="icon-tasks"></i> My Tasks</a></li>-->
6666
<!-- <li><a href="#"><i class="icon-calendar"></i> Calendar</a></li>-->
6767
<!-- <li class="divider"></li>-->
68-
<li><a href="login.html"><i class="icon-key"></i>退出</a></li>
68+
<li><a href="/signout"><i class="icon-key"></i>退出</a></li>
6969
</ul>
7070
</li>
7171
<!-- END USER LOGIN DROPDOWN -->

‎src/main/resources/static/pages/prodMgr.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
<!-- <li><a href="#"><i class="icon-tasks"></i> My Tasks</a></li>-->
6767
<!-- <li><a href="#"><i class="icon-calendar"></i> Calendar</a></li>-->
6868
<!-- <li class="divider"></li>-->
69-
<li><a href="login.html"><i class="icon-key"></i>退出</a></li>
69+
<li><a href="/signout"><i class="icon-key"></i>退出</a></li>
7070
</ul>
7171
</li>
7272
<!-- END USER LOGIN DROPDOWN -->

0 commit comments

Comments
 (0)