commit

pom.xml

@@ -19,6 +19,15 @@
         <java.version>1.8</java.version>
     </properties>
     <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-devtools</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
         <!--文件上传依赖-->
         <dependency>
             <groupId>commons-fileupload</groupId>

src/main/java/com/pyc/campus/controller/ChatController.java → src/main/java/com/pyc/campus/chat/ChatController.java

@@ -5,12 +5,13 @@
 // Author:御承扬
 //E-mail:2923616405@qq.com
 
-package com.pyc.campus.controller;
+package com.pyc.campus.chat;
 
 import com.pyc.campus.dao.StudentRepository;
 import com.pyc.campus.domain.PublishMessage;
 import com.pyc.campus.domain.ResponseMessage;
 import com.pyc.campus.domain.Student;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.messaging.handler.annotation.DestinationVariable;
 import org.springframework.messaging.handler.annotation.MessageMapping;
@@ -25,6 +26,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import javax.servlet.http.HttpSession;
 import java.security.Principal;
 
+@Slf4j
 @Controller
 public class ChatController {
 
@@ -36,6 +38,7 @@ public class ChatController {
 
     @RequestMapping("/publicChatRoom")
     public String publicChatRoom(Model model, HttpSession session){
+        log.info("由用户进入公共聊天室....");
         SecurityContextImpl securityContext = (SecurityContextImpl)session.getAttribute("SPRING_SECURITY_CONTEXT");
         String currentStudentId = ((UserDetails) securityContext.getAuthentication().getPrincipal()).getUsername();
         Student s = studentRepository.findNameByStudentID(currentStudentId);

src/main/java/com/pyc/campus/config/WebSecurityConfig.java

@@ -12,12 +12,13 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.config.annotation.web.builders.WebSecurity;
+import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
 import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
 import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.crypto.password.NoOpPasswordEncoder;
 
 @Configuration
+@EnableWebSecurity
 public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
     @Bean
     UserDetailsService customUserService(){
@@ -48,6 +49,8 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
                 .antMatchers("/static/**").permitAll()
                 .antMatchers("/static/**/**").permitAll()
                 .antMatchers("/static/**/**/**").permitAll()
+                .antMatchers("/static/**/**.**").permitAll()
+                .antMatchers("/static/**/**.**.**").permitAll()
                 .antMatchers("/images/**/**").permitAll()
                 .anyRequest().authenticated()
                 .and().formLogin()

src/main/java/com/pyc/campus/controller/FriendListController.java

@@ -5,6 +5,7 @@ import com.pyc.campus.dao.StudentRepository;
 import com.pyc.campus.domain.FriendList;
 import com.pyc.campus.domain.Msg;
 import com.pyc.campus.domain.Student;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.repository.query.Param;
 import org.springframework.security.core.context.SecurityContextImpl;
 import org.springframework.security.core.userdetails.UserDetails;
@@ -25,7 +26,7 @@ import java.util.List;
  * @time 11:44
  * @E-mail 2923616405@qq.com
  **/
-
+@Slf4j
 @Controller
 public class FriendListController {
 
@@ -118,6 +119,7 @@ public class FriendListController {
 
         SecurityContextImpl securityContext = (SecurityContextImpl)session.getAttribute("SPRING_SECURITY_CONTEXT");
         String currentStudentId = ((UserDetails) securityContext.getAuthentication().getPrincipal()).getUsername();
+        log.info(currentStudentId + "发起与" + toName + "的私聊....");
         Student toUse = studentRepository.findNameByStudentID(toName);
         model.addAttribute("curUser", toUse);
         boolean s;

src/main/resources/templates/page/Login.html

@@ -27,7 +27,7 @@
     </div>-->
     <h1>登陆</h1>
     <form class="form-horizontal" name="form"  id="form" method="post" th:action="@{/login}"
-          action="/login" onsubmit="return checkPWD(form.password,form.checkPassword)">
+          action="/login" onsubmit="return checkPWD(form.password,form.checkPassword,form.username)">
         <div class="input-group input-group-lg">
             <span class="input-group-addon" id="sizing-addon1">@</span>
             <input type="text" name="username" class="form-control" placeholder="studentID" aria-describedby="sizing-addon1">
@@ -50,8 +50,17 @@
     </form>
 </div>
 <script>
-    function checkPWD(password,checkPassword) {
-        if(password.value !== checkPassword.value){
+    function checkPWD(password,checkPassword,stuID) {
+        if(stuID.value===""){
+            alert("学号不得为空");
+            return false;
+        }
+        else if(password === ""){
+            alert("密码不得为空");
+            return false;
+        }
+        else if(password.value !== checkPassword.value){
+
             alert("密码不一致");
             return false;
         }else {

src/main/resources/templates/page/Sign.html

@@ -25,7 +25,8 @@
             <h1 th:text="${msg.title}"></h1>
             <p class="bg-primary" th:text="${msg.content}"></p>
         </div>
-    <form class="form-horizontal" name="form"  action="/signUP" onsubmit="return checkPWD(form.password,form.checkPassword)">
+    <form class="form-horizontal" name="form"  action="/signUP"
+          onsubmit="return checkPWD(form.password,form.checkPassword,form.studentID)">
         <div class="input-group input-group-lg">
             <span class="input-group-addon" id="sizing-addon1">@</span>
             <input type="text" name="studentID" class="form-control" placeholder="studentID" aria-describedby="sizing-addon1">
@@ -58,8 +59,17 @@
     </form>
 </div>
 <script>
-    function checkPWD(password,checkPassword) {
-        if(password.value !== checkPassword.value){
+    function checkPWD(password,checkPassword,stuID) {
+        if(stuID.value===""){
+            alert("学号不得为空");
+            return false;
+        }
+        else if(password === ""){
+            alert("密码不得为空");
+            return false;
+        }
+        else if(password.value !== checkPassword.value){
+
             alert("密码不一致");
             return false;
         }else {