修复注册姓名校验失效问题，修复文件上传无法回调问题

pom.xml

@@ -5,7 +5,7 @@
 
 	<groupId>com.fjy</groupId>
 	<artifactId>spring</artifactId>
-	<version>V2.9.5</version>
+	<version>V2.9.6</version>
 	<packaging>jar</packaging>
 
 	<name>spring</name>

src/main/java/com/fjy/spring/controller/RegisterController.java

@@ -74,7 +74,7 @@ public class RegisterController {
     public boolean doCheckStudent(@RequestParam(value = "studentno") String studentno,
                                   @RequestParam(value = "realname") String realname){
         TbStudentlist studentlist = studentService.findByColstudentnoAndColrealname(studentno,realname);
-        if (studentlist!=null&&studentlist.getRegistered().equals(RegisteredEnum.REGISTERED.getCode()) ) {
+        if (studentlist==null||studentlist.getRegistered().equals(RegisteredEnum.REGISTERED.getCode()) ) {
             return false;
         }
         return true;

src/main/resources/static/js/homepage.js

@@ -297,10 +297,21 @@ var Main = {
         handleClick(row) {
             console.log(row.colfileid);
         },
+        uploadSuccess (response, file, fileList) {
+            let that = this;
+            if (file.status==="success"){
+                that.openNotiSuccess("成功", file.name+"上传成功！");
+            }else{
+                that.openNotiError("失败", file.name+"上传失败！");
+            }
+/*            console.log('response', response);
+            console.log('file',file,fileList);
+            console.log('fileList',fileList);
+            console.log("信息"+file.status+"|"+file.name)*/
+        },
         submitUpload() {
             let that = this;
             this.$refs.upload.submit();
-            this.openNotiSuccess("成功", "文件上传成功！");
             setTimeout(function () {
                 that.getFileList();
             }, 1000);

src/main/resources/static/js/managecourse.js

@@ -1,3 +1,12 @@
+let datax = [
+    {
+        courseNo: 1,
+        courseName: "信息安全T",
+        courseTime: "2018-02-07 20:42:28.0",
+        teacherusername: "FJY1",
+        teacherrealname: "root1"
+    }
+];
 var Main = {
     data() {
         return {
@@ -12,10 +21,10 @@ var Main = {
             tableData3: [
                 {
                     courseNo: 1,
-                    courseName: "信息安全",
+                    courseName: "信息安全T",
-                    courseTime: "2018-02-06 20:42:28.0",
+                    courseTime: "2018-02-07 20:42:28.0",
-                    teacherusername: "FJY",
+                    teacherusername: "FJY1",
-                    teacherrealname: "root"
+                    teacherrealname: "root1"
                 }
             ],
             multipleSelection: [],
@@ -33,6 +42,7 @@ var Main = {
                 .then(function (response) {
                     console.log(response.data);
                     that.tableData3 = response.data;
+                    datax=response.data;
                 })
                 .catch(function (error) {
                     console.log(error);

src/main/resources/templates/dist/thymeleaf/layout.html

@@ -55,9 +55,12 @@
         <span th:text="${#httpServletRequest.getSession().getAttribute('USER_SESSION').colstudentno}"></span>
     </div>
     <div class="item">
-            <el-button type="text" @click="ClickToJump('home')">首页</el-button><br>
+        <el-button type="text" @click="ClickToJump('home')">首页</el-button>
-            <el-button type="text" @click="ClickToJump('home/user')">个人中心</el-button><br>
+        <br>
-            <el-button type="text" @click="ClickToJump('home/about')">关于</el-button><br>
+        <el-button type="text" @click="ClickToJump('home/user')">个人中心</el-button>
+        <br>
+        <el-button type="text" @click="ClickToJump('home/about')">关于</el-button>
+        <br>
         <el-button type="text" @click="ClickToJump('home/feedback')">意见反馈</el-button>
     </div>
 </el-card>
@@ -87,7 +90,9 @@
     <div class="text item">
         <el-table :data="tableHomeworkData" style="width: 100%"
                   :default-sort="{prop: 'time', order: 'descending'}">
-                <el-table-column prop="coursename" label="科目" sortable width="180">
+            <el-table-column prop="coursename" label="科目" sortable>
+            </el-table-column>
+            <el-table-column prop="workname" label="作业" sortable>
             </el-table-column>
             <el-table-column prop="time" label="倒计时" sortable>
                 <template slot-scope="scope">

src/main/resources/templates/home/home.html

@@ -129,6 +129,8 @@
                                                         <el-upload class="upload-demo" ref="upload"
                                                                    :action="uploadURL(props.row)"
                                                                    :on-preview="handlePreview(props.row)"
+                                                                   :on-success="uploadSuccess"
+                                                                   :on-error="uploadSuccess"
                                                                    :on-remove="handleRemove" :file-list="fileList"
                                                                    :auto-upload="false"
                                                                    v-show="isShow(props.row)"

src/main/resources/templates/login.html

@@ -35,7 +35,8 @@
                                 <el-form-item
                                         label="密码" prop="colpassword">
                                     <el-input type="password"
-                                              v-model="ruleForm1.colpassword" auto-complete="off" name="colpassword"></el-input>
+                                              v-model="ruleForm1.colpassword" auto-complete="off"
+                                              name="colpassword"></el-input>
                                 </el-form-item>
                                 <el-form-item>
                                     <el-button type="primary"
@@ -60,8 +61,12 @@
                                 <el-form-item
                                         label="密码" prop="colpassword">
                                     <el-input type="password"
-                                              v-model="ruleForm2.colpassword" auto-complete="off" name="colpassword"></el-input>
+                                              v-model="ruleForm2.colpassword" auto-complete="off"
-                                    <el-tooltip class="item" effect="dark" content="全站密码采用SHA加密算法，任何人都无法获取用户密码" placement="right">
+                                              name="colpassword"></el-input>
+                                </el-form-item>
+                                <el-form-item>
+                                    <el-tooltip class="item" effect="dark" content="全站密码采用SHA加密算法，任何人都无法获取用户密码"
+                                                placement="right">
                                         <el-button type="text">密码安全性？</el-button>
                                     </el-tooltip>
                                 </el-form-item>
@@ -106,7 +111,8 @@
                                               prop="colname">
                                     <el-input
                                             v-model="ruleForm3.colname" name="colname"></el-input>
-                                    <el-tooltip class="item" effect="dark" content="全站对问题的答案进行SHA加密算法，任何人均无法获取用户知晓用户的问题答案" placement="right">
+                                    <el-tooltip class="item" effect="dark"
+                                                content="全站对问题的答案进行SHA加密算法，任何人均无法获取用户知晓用户的问题答案" placement="right">
                                         <el-button type="text">问题和答案安全性？</el-button>
                                     </el-tooltip>
                                 </el-form-item>
@@ -131,7 +137,8 @@
                                 <el-form-item
                                         label="输入新密码" prop="colpassword">
                                     <el-input type="password"
-                                              v-model="ruleForm3.colpassword" auto-complete="off" name="colpassword"></el-input>
+                                              v-model="ruleForm3.colpassword" auto-complete="off"
+                                              name="colpassword"></el-input>
                                 </el-form-item>
                                 <el-form-item label="确认密码" prop="checkPass">
                                     <el-input

src/test/java/com/fjy/spring/controller/LoginControllerTest.java

@@ -10,6 +10,8 @@ import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
 import org.springframework.test.web.servlet.result.MockMvcResultMatchers;
 
+import javax.transaction.Transactional;
+
 import static org.junit.Assert.*;
 
 
@@ -28,6 +30,7 @@ public class LoginControllerTest {
     }
 
     @Test
+    @Transactional
     public void doLogin() throws Exception {
         //测试正常登录
         mvc.perform(MockMvcRequestBuilders.post("/login/dologin").param("colname", "root").param("colpassword", "admin"))

src/test/java/com/fjy/spring/controller/RegisterControllerTest.java

@@ -26,7 +26,7 @@ public class RegisterControllerTest {
     @Test
     @Transactional
     public void doRegister()throws Exception {
-        //测试正常注册,abc每次调试必须改，因为唯一约束
+        // 测试正常注册
         mvc.perform(MockMvcRequestBuilders.post("/register/doregister")
                 .param("colname", "abc")
                 .param("colpassword", "123456")
@@ -52,14 +52,14 @@ public class RegisterControllerTest {
     public void doCheckStudent()throws Exception {
         // 测试学号与姓名不匹配
         mvc.perform(MockMvcRequestBuilders.get("/CheckStudent")
-                .param("studentno","15251101238")
+                .param("studentno","15251101243")
-                .param("realname","符嘉"))
+                .param("realname","杨诗"))
-                .andExpect(MockMvcResultMatchers.content().string("true"));
+                .andExpect(MockMvcResultMatchers.content().string("false"));
         // 测试学号与姓名匹配
         mvc.perform(MockMvcRequestBuilders.get("/CheckStudent")
-                .param("studentno","15251101238")
+                .param("studentno","15251101243")
-                .param("realname","符嘉阳"))
+                .param("realname","杨诗敏"))
-                .andExpect(MockMvcResultMatchers.content().string("false"));
+                .andExpect(MockMvcResultMatchers.content().string("true"));
     }
 
     @Test