diff --git a/app/install/controller/Index.php b/app/install/controller/Index.php index 7073d28..67b3158 100644 --- a/app/install/controller/Index.php +++ b/app/install/controller/Index.php @@ -124,9 +124,9 @@ class Index $now_time = time(); $create_admin_sql = "INSERT INTO " . $data['DB_PREFIX'] . "admin " . - "(username,salt,pwd,name,nickname,position_id,did,sex,mobile,type,thumb,entry_time,create_time,update_time)" + "(username,salt,pwd,name,nickname,position_id,did,sex,mobile,email,type,thumb,entry_time,create_time,update_time)" . "VALUES " - . "('$username','$salt','$password','$name','$nickname',1,1,1,'13800138000',1,'$thumb','$now_time','$now_time','$now_time')"; + . "('$username','$salt','$password','$name','$nickname',1,1,1,'13800138000','gouguoa@gougucms.com',1,'$thumb','$now_time','$now_time','$now_time')"; if (!$link->query($create_admin_sql)) { return to_assign(1, '创建管理员信息失败'); } diff --git a/app/install/view/index/step3.html b/app/install/view/index/step3.html index 91b5e03..39115bd 100644 --- a/app/install/view/index/step3.html +++ b/app/install/view/index/step3.html @@ -167,7 +167,7 @@ clearInterval(timer); } element.progress('demo', n + '%'); - }, 30 + Math.random() * 100); + }, 50 + Math.random() * 100); $.ajax({ url: "/index.php?s=install/index/install", diff --git a/app/user/validate/AdminCheck.php b/app/user/validate/AdminCheck.php index 6669bd6..a45eaac 100644 --- a/app/user/validate/AdminCheck.php +++ b/app/user/validate/AdminCheck.php @@ -23,6 +23,7 @@ class AdminCheck extends Validate 'name' => 'require|chs', 'username' => 'require|regex:checkUser', 'mobile' => 'require|mobile|unique:admin', + 'email' => 'require|email|unique:admin', 'reg_pwd' => 'require|min:6', 'did' => 'require', 'position_id' => 'require', @@ -43,6 +44,9 @@ class AdminCheck extends Validate 'mobile.require' => '手机不能为空', 'mobile.mobile' => '手机格式错误', 'mobile.unique' => '同样的手机号码已经存在,请检查一下是否被离职或者禁用员工占用', + 'email.require' => '邮箱不能为空', + 'email.email' => '邮箱格式错误', + 'email.unique' => '同样的邮箱已经存在,请检查一下是否被离职或者禁用员工占用', 'reg_pwd.require' => '密码不能为空', 'reg_pwd.min' => '密码至少要6个字符', 'did.require' => '请选择所在部门', @@ -58,8 +62,8 @@ class AdminCheck extends Validate ]; protected $scene = [ - 'add' => ['name', 'username', 'mobile','reg_pwd', 'did', 'position_id', 'type', 'entry_time'], - 'edit' => ['name', 'username', 'mobile', 'did', 'position_id', 'entry_time', 'id'], + 'add' => ['name', 'username', 'mobile','email','reg_pwd', 'did', 'position_id', 'type', 'entry_time'], + 'edit' => ['name', 'username', 'mobile','email', 'did', 'position_id', 'entry_time', 'id'], 'editPwd' => ['old_pwd', 'pwd'], ];