|
@@ -127,6 +127,9 @@ class Users extends Base
|
|
|
$userspw = db('users')->where($where)->field("user_pwd")->find();
|
|
$userspw = db('users')->where($where)->field("user_pwd")->find();
|
|
|
$newpwd = md5($param['new_pwd'] . config('salt'));//新密码
|
|
$newpwd = md5($param['new_pwd'] . config('salt'));//新密码
|
|
|
$oldpwd = md5($param['user_pwd'] . config('salt'));//旧密码
|
|
$oldpwd = md5($param['user_pwd'] . config('salt'));//旧密码
|
|
|
|
|
+ $rules = '/^([a-zA-Z0-9_\.\-])+\@(([a-zA-Z0-9\-])+\.)+([a-zA-Z0-9]{2,4})+$/';
|
|
|
|
|
+ $useremail = $param['user_email'];
|
|
|
|
|
+ $phone = $param['phone'];
|
|
|
|
|
|
|
|
// 检测用户新密码与原密码是否重复
|
|
// 检测用户新密码与原密码是否重复
|
|
|
if(!empty($param['new_pwd'])){
|
|
if(!empty($param['new_pwd'])){
|
|
@@ -143,11 +146,21 @@ class Users extends Base
|
|
|
}
|
|
}
|
|
|
$addar['user_pwd'] = md5($param['new_pwd'] . config('salt'));
|
|
$addar['user_pwd'] = md5($param['new_pwd'] . config('salt'));
|
|
|
}
|
|
}
|
|
|
|
|
+
|
|
|
|
|
+ if(!preg_match($rules,$useremail)){
|
|
|
|
|
+ return json(['code' => -9, 'data' => '', 'msg' => '请输入正确的邮箱']);
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ if(!preg_match("/^1[34578]\d{9}$/", $phone)){
|
|
|
|
|
+ return json(['code' => -10, 'data' => '', 'msg' => '请输入正确的手机号码']);
|
|
|
|
|
+ }
|
|
|
|
|
|
|
|
if(!empty($param['user_avatar'])){
|
|
if(!empty($param['user_avatar'])){
|
|
|
$addar['user_avatar'] = $param['user_avatar'];
|
|
$addar['user_avatar'] = $param['user_avatar'];
|
|
|
}
|
|
}
|
|
|
$addar['fullname'] = $param['fullname'];
|
|
$addar['fullname'] = $param['fullname'];
|
|
|
|
|
+ $addar['user_email'] = $param['user_email'];
|
|
|
|
|
+ $addar['phone'] = $param['phone'];
|
|
|
$addar['signature'] = $param['signature'];
|
|
$addar['signature'] = $param['signature'];
|
|
|
$addar['group_id'] = $param['group_id'];
|
|
$addar['group_id'] = $param['group_id'];
|
|
|
$addar['status'] = $param['status'];
|
|
$addar['status'] = $param['status'];
|