diff --git a/pom.xml b/pom.xml index df365ce..c9994ab 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.fjy spring - V2.9.2 + V2.9.5 jar spring diff --git a/src/main/java/com/fjy/spring/controller/DataController.java b/src/main/java/com/fjy/spring/controller/DataController.java index d5615e5..20cf3c1 100644 --- a/src/main/java/com/fjy/spring/controller/DataController.java +++ b/src/main/java/com/fjy/spring/controller/DataController.java @@ -130,6 +130,7 @@ public class DataController { */ @PostMapping("/home/adduserque") public boolean adduserque(TbUserque userque) throws Exception { + System.out.println("【问题】"+userque.toString()); //对密保问题加密存储 userque.setAnswer(new BigInteger(CodingUtil.encryptSHA(userque.getAnswer().getBytes())).toString(32)); return userService.addUserQue(userque); diff --git a/src/main/java/com/fjy/spring/controller/RegisterController.java b/src/main/java/com/fjy/spring/controller/RegisterController.java index 0115358..e73da96 100644 --- a/src/main/java/com/fjy/spring/controller/RegisterController.java +++ b/src/main/java/com/fjy/spring/controller/RegisterController.java @@ -50,7 +50,7 @@ public class RegisterController { tbUser.setColpassword(new BigInteger(CodingUtil.encryptSHA(tbUser.getColpassword().getBytes())).toString(32)); if (userService.doRegisterService(tbUser)){ //更新用户列表是否注册的标记 - studentService.UpdateStudentListRegistered(tbUser.getColrealname(),tbUser.getColstudentno(),RegisteredEnum.REGISTERED.getCode()); + studentService.updateStudentListRegistered(tbUser.getColrealname(),tbUser.getColstudentno(),RegisteredEnum.REGISTERED.getCode()); return true; /*return "redirect:" + request.getScheme() + "://" + request.getServerName() + ":" + serverProperties.getPortNum() + request.getContextPath() + "/index";*/ @@ -75,9 +75,9 @@ public class RegisterController { @RequestParam(value = "realname") String realname){ TbStudentlist studentlist = studentService.findByColstudentnoAndColrealname(studentno,realname); if (studentlist!=null&&studentlist.getRegistered().equals(RegisteredEnum.REGISTERED.getCode()) ) { - return true; + return false; } - return false; + return true; } /** diff --git a/src/main/java/com/fjy/spring/controller/UpdateController.java b/src/main/java/com/fjy/spring/controller/UpdateController.java index 1126ac1..912176c 100644 --- a/src/main/java/com/fjy/spring/controller/UpdateController.java +++ b/src/main/java/com/fjy/spring/controller/UpdateController.java @@ -43,18 +43,25 @@ public class UpdateController { @PostMapping(value = "/home/userUpdate") @ResponseBody public boolean doUserUpdate(TbUser tbUser)throws Exception{ + System.out.println("【tbUser】"+tbUser.toString()); if (tbUser.getColuserid()==null){ throw new UserException(ResultEnum.ID_NULLPOINT); } if (tbUser.getColpassword()!=null){ userService.updateColpasswordByColname(tbUser.getColpassword(),tbUser.getColname()); } + //注销原本的注册标记 VUserinfo tempUser = userService.findUserInfo(tbUser.getColuserid()); - studentService.UpdateStudentListRegistered(tempUser.getColrealname(),tempUser.getColstudentno(), + + System.out.println("【VUserinfo】"+tempUser.toString()); + + studentService.updateStudentListRegistered(tempUser.getColrealname(),tempUser.getColstudentno(), RegisteredEnum.UNREGISTERED.getCode()); + + if (userService.doRegisterService(tbUser)){ - studentService.UpdateStudentListRegistered(tbUser.getColrealname(),tbUser.getColstudentno(), + studentService.updateStudentListRegistered(tbUser.getColrealname(),tbUser.getColstudentno(), RegisteredEnum.REGISTERED.getCode()); log.info(tbUser.getColname()+" 信息更新成功"); //写入数据库日志 diff --git a/src/main/java/com/fjy/spring/domain/TbUserque.java b/src/main/java/com/fjy/spring/domain/TbUserque.java index 9470f4c..7d3f058 100644 --- a/src/main/java/com/fjy/spring/domain/TbUserque.java +++ b/src/main/java/com/fjy/spring/domain/TbUserque.java @@ -4,6 +4,7 @@ import lombok.Data; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.GeneratedValue; import javax.persistence.Id; @Entity @@ -12,7 +13,7 @@ public class TbUserque { @Id @Column(name = "coluserid") - private Integer userid; + private Integer coluserid; @Column(name = "colquestion") private String question; diff --git a/src/main/java/com/fjy/spring/service/StudentService.java b/src/main/java/com/fjy/spring/service/StudentService.java index c4ef454..0af9550 100644 --- a/src/main/java/com/fjy/spring/service/StudentService.java +++ b/src/main/java/com/fjy/spring/service/StudentService.java @@ -27,9 +27,8 @@ public class StudentService { return tbStudentListRepository.findByColstudentnoAndColrealname(studentno,realname); } - public TbStudentlist UpdateStudentListRegistered(String realname,String studentno,Integer code){ - TbStudentlist studentlist = new TbStudentlist(); - studentlist = findByColstudentnoAndColrealname(studentno,realname); + public TbStudentlist updateStudentListRegistered(String realname,String studentno,Integer code){ + TbStudentlist studentlist = findByColstudentnoAndColrealname(studentno,realname); studentlist.setRegistered(code); return tbStudentListRepository.save(studentlist); } diff --git a/src/main/java/com/fjy/spring/service/UserService.java b/src/main/java/com/fjy/spring/service/UserService.java index b4960b2..71d0e46 100644 --- a/src/main/java/com/fjy/spring/service/UserService.java +++ b/src/main/java/com/fjy/spring/service/UserService.java @@ -81,7 +81,7 @@ public class UserService { public boolean addUserQue(TbUserque userque) { TbUserque tbUserque = userqueRepository.save(userque); - if (tbUserque != null) { + if (!tbUserque.equals("")) { return true; } return false; diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 98102ce..e702b4a 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -17,8 +17,8 @@ spring: datasource: driver-class-name: com.mysql.jdbc.Driver url: jdbc:mysql://localhost:3306/db_imis2?useUnicode=true&characterEncoding=utf-8&useSSL=true - username: - password: + username: imis2 + password: 2015imis2 jpa: hibernate: diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml index 5c8b933..6fc34e7 100644 --- a/src/main/resources/application-prod.yml +++ b/src/main/resources/application-prod.yml @@ -22,8 +22,8 @@ spring: datasource: driver-class-name: com.mysql.jdbc.Driver url: jdbc:mysql://127.0.0.1:3306/db_imis2?useUnicode=true&characterEncoding=utf-8&useSSL=true - username: xxx - password: xxx + username: imis2 + password: 2015imis2 servlet: multipart: diff --git a/src/main/resources/static/js/user.js b/src/main/resources/static/js/user.js index 385d20f..462c30b 100644 --- a/src/main/resources/static/js/user.js +++ b/src/main/resources/static/js/user.js @@ -1,5 +1,6 @@ var dt = new Date(); let th = this; +let username = ""; /*let username = this.ruleForm2.colname.value;*/ var month = dt.getMonth() + 1; var day = dt.getDate(); @@ -47,7 +48,7 @@ var Main = { console.log(response.data); if (response.data === true) { callback(); - } else if (value !== that.ruleForm2.colname) { + } else if (value !== username) { return callback(new Error('用户名已存在')); } else { callback(); @@ -138,9 +139,12 @@ var Main = { colemail: '', colpassword: '', checkPass: '', + question: '', + answer: '' }, ruleForm3: { coluserid: '', + colname: '', question: '', answer: '' }, @@ -243,7 +247,7 @@ var Main = { var that = this; if (valid) { axios({ - url: getRootPath_web() + '/home/userUpdate', + url: getRootPath_web() + url, method: 'post', data: that.ruleForm2 , @@ -352,7 +356,9 @@ var Main = { axios.get(getRootPath_web() + '/home/userinfo') .then(function (response) { //console.log(response.data); - that.ruleForm2 = response.data; + // 注意此处赋值为引用赋值 + that.ruleForm3 = that.ruleForm2 = response.data; + username=response.data.colname; }) .catch(function (error) { //console.log(error); diff --git a/src/main/resources/templates/dist/thymeleaf/common_head.html b/src/main/resources/templates/dist/thymeleaf/common_head.html index 9bfa9a2..39adf2a 100644 --- a/src/main/resources/templates/dist/thymeleaf/common_head.html +++ b/src/main/resources/templates/dist/thymeleaf/common_head.html @@ -5,7 +5,7 @@ - + @@ -14,7 +14,7 @@ - + diff --git a/src/main/resources/templates/home/user.html b/src/main/resources/templates/home/user.html index 9071583..c1703e1 100644 --- a/src/main/resources/templates/home/user.html +++ b/src/main/resources/templates/home/user.html @@ -60,7 +60,7 @@ 提交 + @click="submitForm('ruleForm2','/home/userUpdate')">提交 重置 @@ -71,11 +71,10 @@ - 提交 + @click="submitForm('ruleForm3','/home/adduserque')">提交 重置 diff --git a/src/test/java/com/fjy/spring/controller/LoginControllerTest.java b/src/test/java/com/fjy/spring/controller/LoginControllerTest.java index 89e62e3..1179cba 100644 --- a/src/test/java/com/fjy/spring/controller/LoginControllerTest.java +++ b/src/test/java/com/fjy/spring/controller/LoginControllerTest.java @@ -30,12 +30,12 @@ public class LoginControllerTest { @Test public void doLogin() throws Exception { //测试正常登录 - mvc.perform(MockMvcRequestBuilders.post("/login/dologin").param("colname", "root").param("colpassword", "root")) - .andExpect(MockMvcResultMatchers.status().isOk()); + mvc.perform(MockMvcRequestBuilders.post("/login/dologin").param("colname", "root").param("colpassword", "admin")) + .andExpect(MockMvcResultMatchers.status().is3xxRedirection()); //测试密码错误 mvc.perform(MockMvcRequestBuilders.post("/login/dologin").param("colname", "root").param("colpassword", "123")) .andExpect(MockMvcResultMatchers.content().json("{\n" + - " \"code\": 105,\n" + + " \"code\": 605,\n" + " \"message\": \"用户名或密码错误\",\n" + " \"data\": null\n" + "}")); diff --git a/src/test/java/com/fjy/spring/controller/RegisterControllerTest.java b/src/test/java/com/fjy/spring/controller/RegisterControllerTest.java index 88f0e8b..3af13e5 100644 --- a/src/test/java/com/fjy/spring/controller/RegisterControllerTest.java +++ b/src/test/java/com/fjy/spring/controller/RegisterControllerTest.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.*; @@ -22,29 +24,26 @@ public class RegisterControllerTest { private MockMvc mvc; @Test + @Transactional public void doRegister()throws Exception { //测试正常注册,abc每次调试必须改，因为唯一约束 mvc.perform(MockMvcRequestBuilders.post("/register/doregister") .param("colname", "abc") .param("colpassword", "123456") .param("colemail","test@gmail.com") - .param("colstudentno","0003") - .param("colrealname","TestRegister")) - .andExpect(MockMvcResultMatchers.content().json("{\n" + - " \"code\": 0,\n" + - " \"message\": \"请求成功\",\n" + - " \"data\": null\n" + - "}")); + .param("colstudentno","15251101209") + .param("colrealname","徐杜鑫")) + .andExpect(MockMvcResultMatchers.content().string("true")); } @Test public void doCheckStudentNo()throws Exception { //测试非法学号检查 - mvc.perform(MockMvcRequestBuilders.post("/CheckStudentNo") + mvc.perform(MockMvcRequestBuilders.get("/CheckStudentNo") .param("studentno","0003")) .andExpect(MockMvcResultMatchers.content().string("false")); //测试合法学号检查 - mvc.perform(MockMvcRequestBuilders.post("/CheckStudentNo") + mvc.perform(MockMvcRequestBuilders.get("/CheckStudentNo") .param("studentno","15251101238")) .andExpect(MockMvcResultMatchers.content().string("true")); } @@ -55,12 +54,12 @@ public class RegisterControllerTest { mvc.perform(MockMvcRequestBuilders.get("/CheckStudent") .param("studentno","15251101238") .param("realname","符嘉")) - .andExpect(MockMvcResultMatchers.content().string("false")); + .andExpect(MockMvcResultMatchers.content().string("true")); //测试学号与姓名匹配 mvc.perform(MockMvcRequestBuilders.get("/CheckStudent") .param("studentno","15251101238") .param("realname","符嘉阳")) - .andExpect(MockMvcResultMatchers.content().string("true")); + .andExpect(MockMvcResultMatchers.content().string("false")); } @Test