diff --git a/src/main/java/com/pyc/campus/config/WebMVCConfig.java b/src/main/java/com/pyc/campus/config/WebMVCConfig.java index 0656e882b04017212838703a2d87171f04e683b1..b3cf2d35cbb7215a909efd92dbe05578c0a0d7d6 100644 --- a/src/main/java/com/pyc/campus/config/WebMVCConfig.java +++ b/src/main/java/com/pyc/campus/config/WebMVCConfig.java @@ -10,10 +10,10 @@ package com.pyc.campus.config; import org.springframework.context.annotation.Configuration; import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; import org.springframework.web.servlet.config.annotation.ViewControllerRegistry; -import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; @Configuration -public class WebMVCConfig extends WebMvcConfigurerAdapter { +public class WebMVCConfig implements WebMvcConfigurer { @Override public void addResourceHandlers(ResourceHandlerRegistry registry) { registry.addResourceHandler("/static/**").addResourceLocations("classpath:/static/"); @@ -21,8 +21,6 @@ public class WebMVCConfig extends WebMvcConfigurerAdapter { @Override public void addViewControllers(ViewControllerRegistry registry) { -// registry.addViewController("/login").setViewName("page/Login"); -// registry.addViewController("/home").setViewName("page/Home"); registry.addViewController("/aboutLearn").setViewName("page/AboutLearn"); registry.addViewController("/aboutEnglish").setViewName("page/AboutEnglish"); registry.addViewController("/aboutMath").setViewName("page/AboutMath"); diff --git a/src/main/java/com/pyc/campus/config/WebSecurityConfig.java b/src/main/java/com/pyc/campus/config/WebSecurityConfig.java index 6090740bf45aacfb6b208c94ffe8b1bf3d332318..72ea44df8596c60631fd9f49934c8613ea3d89a5 100644 --- a/src/main/java/com/pyc/campus/config/WebSecurityConfig.java +++ b/src/main/java/com/pyc/campus/config/WebSecurityConfig.java @@ -32,7 +32,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter { @Override protected void configure(HttpSecurity http) throws Exception { http.sessionManagement() - .maximumSessions(1).maxSessionsPreventsLogin(true); + .maximumSessions(1).expiredUrl("/login"); http.authorizeRequests() .antMatchers("/campus").permitAll() .antMatchers("/aboutLearn").permitAll() diff --git a/src/main/java/com/pyc/campus/config/WebSocketConfig.java b/src/main/java/com/pyc/campus/config/WebSocketConfig.java index 407f6be626437ca9f97848a63352b46259c48f94..3c7029b080c03cda20e33b2f7dad3e4f76c3db14 100644 --- a/src/main/java/com/pyc/campus/config/WebSocketConfig.java +++ b/src/main/java/com/pyc/campus/config/WebSocketConfig.java @@ -10,13 +10,13 @@ package com.pyc.campus.config; import org.springframework.context.annotation.Configuration; import org.springframework.messaging.simp.config.MessageBrokerRegistry; -import org.springframework.web.socket.config.annotation.AbstractWebSocketMessageBrokerConfigurer; import org.springframework.web.socket.config.annotation.EnableWebSocketMessageBroker; import org.springframework.web.socket.config.annotation.StompEndpointRegistry; +import org.springframework.web.socket.config.annotation.WebSocketMessageBrokerConfigurer; @Configuration @EnableWebSocketMessageBroker -public class WebSocketConfig extends AbstractWebSocketMessageBrokerConfigurer { +public class WebSocketConfig implements WebSocketMessageBrokerConfigurer { @Override public void registerStompEndpoints(StompEndpointRegistry registry) { registry.addEndpoint("/endpointPublicChat").withSockJS(); diff --git a/src/main/java/com/pyc/campus/controller/ChatController.java b/src/main/java/com/pyc/campus/controller/ChatController.java index 129378cf64ec668a9942f0d2cb7b76c14ace86fd..132b840395d5307940901260fa485b874663d9a0 100644 --- a/src/main/java/com/pyc/campus/controller/ChatController.java +++ b/src/main/java/com/pyc/campus/controller/ChatController.java @@ -10,7 +10,6 @@ package com.pyc.campus.controller; import com.pyc.campus.domain.PublishMessage; import com.pyc.campus.domain.ResponseMessage; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.repository.query.Param; import org.springframework.messaging.handler.annotation.DestinationVariable; import org.springframework.messaging.handler.annotation.MessageMapping; import org.springframework.messaging.handler.annotation.SendTo; diff --git a/src/main/java/com/pyc/campus/controller/WebController.java b/src/main/java/com/pyc/campus/controller/WebController.java index 9715532eedd9ad53feccd2aea554a0cae97d8328..9f7cb459300bda3334d52676488f49acb9418102 100644 --- a/src/main/java/com/pyc/campus/controller/WebController.java +++ b/src/main/java/com/pyc/campus/controller/WebController.java @@ -361,7 +361,7 @@ public class WebController { } //@RequestMapping("/") @RequestMapping("/campus") - public String oppo() { + public String campus() { return "page/Index"; } diff --git a/src/main/java/com/pyc/campus/service/MailServiceImpl.java b/src/main/java/com/pyc/campus/service/MailServiceImpl.java index 3151969f9b7100926d147985c4936ed652021d20..6b7be682d76e327b607bdd2322407206afdbdb19 100644 --- a/src/main/java/com/pyc/campus/service/MailServiceImpl.java +++ b/src/main/java/com/pyc/campus/service/MailServiceImpl.java @@ -9,7 +9,6 @@ package com.pyc.campus.service; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.mail.SimpleMailMessage; import org.springframework.mail.javamail.JavaMailSender; import org.springframework.stereotype.Service; diff --git a/src/main/resources/templates/page/PrivateChat.html b/src/main/resources/templates/page/PrivateChat.html index 0ab6030ecb3d24f8418994cf5e64947addb0c3a8..35dc12f252e68758a551c7717165524e1b248b82 100644 --- a/src/main/resources/templates/page/PrivateChat.html +++ b/src/main/resources/templates/page/PrivateChat.html @@ -83,7 +83,6 @@ let str="
"+message.body+"
"; $('#output').append(str); console.log(str); - /*$('#output').append("
"+[[${toName}]]+":"+message.body+"
")*/ } function sendSpittle(text) { stomp.send("/chat/"+[[${toName}]],{},text);