diff --git a/pom.xml b/pom.xml
index c9994ab..e7844ae 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
com.fjy
spring
- V2.9.5
+ V2.9.6
jar
spring
diff --git a/src/main/java/com/fjy/spring/controller/RegisterController.java b/src/main/java/com/fjy/spring/controller/RegisterController.java
index e73da96..006ddf1 100644
--- a/src/main/java/com/fjy/spring/controller/RegisterController.java
+++ b/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;
diff --git a/src/main/resources/static/js/homepage.js b/src/main/resources/static/js/homepage.js
index d490a1f..b7e5b8d 100644
--- a/src/main/resources/static/js/homepage.js
+++ b/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);
diff --git a/src/main/resources/static/js/managecourse.js b/src/main/resources/static/js/managecourse.js
index e2d6eb3..20df3d9 100644
--- a/src/main/resources/static/js/managecourse.js
+++ b/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: "信息安全",
- courseTime: "2018-02-06 20:42:28.0",
- teacherusername: "FJY",
- teacherrealname: "root"
+ courseName: "信息安全T",
+ courseTime: "2018-02-07 20:42:28.0",
+ teacherusername: "FJY1",
+ 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);
diff --git a/src/main/resources/templates/dist/thymeleaf/layout.html b/src/main/resources/templates/dist/thymeleaf/layout.html
index b49d581..820fd7c 100644
--- a/src/main/resources/templates/dist/thymeleaf/layout.html
+++ b/src/main/resources/templates/dist/thymeleaf/layout.html
@@ -2,116 +2,121 @@
-
-
-
+
+
+
-
-
-
- 默认颜色
-
-
-
-
-
-
-
-
- 用户名
-
-
-
- 首页
- 个人中心
- 关于
- 意见反馈
-
-
-
-
-
- 管理员
- 管理员号
-
-
- 后台主页
-
- 课程管理
-
- 作业管理
-
- 用户管理
-
-
-
-
-
- 作业提交倒计时
-
-
-
-
-
-
-
-
-
- {{limitTime(scope.row)}}
+
+
+
+ 默认颜色
+
-
-
-
+
+ 分组一
+ 选项1
+ 选项2
+
+
+ 选项3
+
+
+ 选项4
+ 选项1
+
+
+
+
+ 导航二
+
+
+
+ 导航三
+
+
+
+
+
-
-
- 公告
-
-
- {{notice.noticeContent + notice.issueTime}}
-
-
+
+
+
+ 用户名
+
+
+
+ 首页
+
+ 个人中心
+
+ 关于
+
+ 意见反馈
+
+
-
-
-
+
+
+ 管理员
+ 管理员号
+
+
+ 后台主页
+
+ 课程管理
+
+ 作业管理
+
+ 用户管理
+
+
+
+
+
+ 作业提交倒计时
+
+
+
+
+
+
+
+
+
+
+
+ {{limitTime(scope.row)}}
+
+
+
+
+
+
+
+
+ 公告
+
+
+ {{notice.noticeContent + notice.issueTime}}
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/resources/templates/home/home.html b/src/main/resources/templates/home/home.html
index 6e6c17a..4de5b19 100644
--- a/src/main/resources/templates/home/home.html
+++ b/src/main/resources/templates/home/home.html
@@ -129,6 +129,8 @@
+ v-model="ruleForm1.colpassword" auto-complete="off"
+ name="colpassword">
-
+ v-model="ruleForm2.colpassword" auto-complete="off"
+ name="colpassword">
+
+
+
密码安全性？
@@ -106,7 +111,8 @@
prop="colname">
-
+
问题和答案安全性？
@@ -131,7 +137,8 @@
+ v-model="ruleForm3.colpassword" auto-complete="off"
+ name="colpassword">
-
+
diff --git a/src/test/java/com/fjy/spring/controller/LoginControllerTest.java b/src/test/java/com/fjy/spring/controller/LoginControllerTest.java
index 1179cba..3f283af 100644
--- a/src/test/java/com/fjy/spring/controller/LoginControllerTest.java
+++ b/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"))
diff --git a/src/test/java/com/fjy/spring/controller/RegisterControllerTest.java b/src/test/java/com/fjy/spring/controller/RegisterControllerTest.java
index 3af13e5..77cf921 100644
--- a/src/test/java/com/fjy/spring/controller/RegisterControllerTest.java
+++ b/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")
@@ -38,11 +38,11 @@ public class RegisterControllerTest {
@Test
public void doCheckStudentNo()throws Exception {
- //测试非法学号检查
+ // 测试非法学号检查
mvc.perform(MockMvcRequestBuilders.get("/CheckStudentNo")
.param("studentno","0003"))
.andExpect(MockMvcResultMatchers.content().string("false"));
- //测试合法学号检查
+ // 测试合法学号检查
mvc.perform(MockMvcRequestBuilders.get("/CheckStudentNo")
.param("studentno","15251101238"))
.andExpect(MockMvcResultMatchers.content().string("true"));
@@ -50,25 +50,25 @@ public class RegisterControllerTest {
@Test
public void doCheckStudent()throws Exception {
- //测试学号与姓名不匹配
+ // 测试学号与姓名不匹配
mvc.perform(MockMvcRequestBuilders.get("/CheckStudent")
- .param("studentno","15251101238")
- .param("realname","符嘉"))
- .andExpect(MockMvcResultMatchers.content().string("true"));
- //测试学号与姓名匹配
- mvc.perform(MockMvcRequestBuilders.get("/CheckStudent")
- .param("studentno","15251101238")
- .param("realname","符嘉阳"))
+ .param("studentno","15251101243")
+ .param("realname","杨诗"))
.andExpect(MockMvcResultMatchers.content().string("false"));
+ // 测试学号与姓名匹配
+ mvc.perform(MockMvcRequestBuilders.get("/CheckStudent")
+ .param("studentno","15251101243")
+ .param("realname","杨诗敏"))
+ .andExpect(MockMvcResultMatchers.content().string("true"));
}
@Test
public void doUserName()throws Exception {
- //测试用户名已存在
+ // 测试用户名已存在
mvc.perform(MockMvcRequestBuilders.get("/CheckUserName")
.param("name","root"))
.andExpect(MockMvcResultMatchers.content().string("false"));
- //测试用户名不存在
+ // 测试用户名不存在
mvc.perform(MockMvcRequestBuilders.get("/CheckUserName")
.param("name","root1"))
.andExpect(MockMvcResultMatchers.content().string("true"));