diff --git a/.idea/misc.xml b/.idea/misc.xml index 5c50e16..3fe3051 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -8,7 +8,7 @@ - + diff --git a/bin b/bin new file mode 160000 index 0000000..2329fea --- /dev/null +++ b/bin @@ -0,0 +1 @@ +Subproject commit 2329fea1f84e829d3a703c60cfd8da9014766e91 diff --git a/src/main/java/com/JIAL/FMSystem/controller/EmployeeController.java b/src/main/java/com/JIAL/FMSystem/controller/EmployeeController.java index 9171cff..c583ccb 100644 --- a/src/main/java/com/JIAL/FMSystem/controller/EmployeeController.java +++ b/src/main/java/com/JIAL/FMSystem/controller/EmployeeController.java @@ -81,8 +81,8 @@ public class EmployeeController { log.info("新增员工,员工信息:{}",employee.toString()); //设置初始密码123456,需要进行md5加密处理 - employee.setPassword(DigestUtils.md5DigestAsHex("123456".getBytes())); - + employee.setPassword(DigestUtils.md5DigestAsHex(employee.getPassword().getBytes())); + employee.setIdNumber("64222420001025301X"); //employee.setCreateTime(LocalDateTime.now()); //employee.setUpdateTime(LocalDateTime.now()); @@ -94,7 +94,7 @@ public class EmployeeController { employeeService.save(employee); - return R.success("新增员工成功"); + return R.success("新增账号成功"); } /** diff --git a/src/main/resources/backend/js/validate.js b/src/main/resources/backend/js/validate.js index fad2f64..2891cff 100644 --- a/src/main/resources/backend/js/validate.js +++ b/src/main/resources/backend/js/validate.js @@ -49,9 +49,9 @@ function checkPhone (rule, value, callback){ } -function validID (rule,value,callback) { +function checkPassword (rule,value,callback) { // 身份证号码为15位或者18位,15位时全为数字,18位前17位为数字,最后一位是校验位,可能为数字或字符X - let reg = /(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/ + let reg = /^[a-zA-Z0-9]{1,32}$/ if(value == '') { callback(new Error('请输入身份证号码')) } else if (reg.test(value)) { diff --git a/src/main/resources/backend/page/member/add.html b/src/main/resources/backend/page/member/add.html index f343c73..744aa97 100644 --- a/src/main/resources/backend/page/member/add.html +++ b/src/main/resources/backend/page/member/add.html @@ -21,16 +21,16 @@ label-width="180px" class="demo-ruleForm" > - - + + @@ -55,12 +55,12 @@ @@ -109,7 +109,7 @@ 'name': '', 'phone': '', 'sex': '男', - 'idNumber': '', + 'password': '', username: '' } } @@ -126,7 +126,7 @@ //姓名 name: [{ required: true, 'validator': checkName, 'trigger': 'blur' }], 'phone': [{ 'required': true, 'validator': checkPhone, 'trigger': 'blur' }], - 'idNumber': [{ 'required': true, 'validator': validID, 'trigger': 'blur' }] + 'password': [{ 'required': true, 'validator': checkPassword, 'trigger': 'blur' }] } } }, @@ -174,7 +174,7 @@ // 'password': '', // 'rePassword': '',/ 'sex': '男', - 'idNumber': '' + 'password': '' } } } else { diff --git a/src/main/resources/backend/page/member/list.html b/src/main/resources/backend/page/member/list.html index 546e3fd..17f8031 100644 --- a/src/main/resources/backend/page/member/list.html +++ b/src/main/resources/backend/page/member/list.html @@ -22,7 +22,7 @@
- + 添加员工 + + 添加账号
- - + + @@ -55,12 +55,12 @@ @@ -109,7 +109,7 @@ 'name': '', 'phone': '', 'sex': '男', - 'idNumber': '', + 'password': '', username: '' } } @@ -126,7 +126,7 @@ //姓名 name: [{ required: true, 'validator': checkName, 'trigger': 'blur' }], 'phone': [{ 'required': true, 'validator': checkPhone, 'trigger': 'blur' }], - 'idNumber': [{ 'required': true, 'validator': validID, 'trigger': 'blur' }] + 'password': [{ 'required': true, 'validator': checkPassword, 'trigger': 'blur' }] } } }, @@ -174,7 +174,7 @@ // 'password': '', // 'rePassword': '',/ 'sex': '男', - 'idNumber': '' + 'password': '' } } } else { diff --git a/target/classes/backend/page/member/list.html b/target/classes/backend/page/member/list.html index 546e3fd..17f8031 100644 --- a/target/classes/backend/page/member/list.html +++ b/target/classes/backend/page/member/list.html @@ -22,7 +22,7 @@
- + 添加员工 + + 添加账号