Skip to content

T
tl_estate
Commit 03f03716 authored by hujun's avatar hujun
Browse files
Options

用户编辑条件判断修改

parent 1c98092a
Hide whitespace changes
Inline Side-by-side
Showing with 60 additions and 37 deletions
application/api/controller/Member.php
View file @ 03f03716
...@@ -36,22 +36,22 @@ class Member extends Basic ...@@ -36,22 +36,22 @@ class Member extends Basic
if (isset($user_data->id)) { if (isset($user_data->id)) {
if ($user_data->user_pswd == md5(md5($this->params['pwd']) . '+123')) { if ($user_data->user_pswd == md5(md5($this->params['pwd']) . '+123')) {
$user_data->last_login_ip = ip2long($this->request->ip());
$user_data->last_login_time = date('Y-m-d H:i:s');
$user_data->save();
if ($user_data->user_pic) {
$user_data->user_pic = HEADERIMGURL.$user_data->user_pic;
}
$jwt_data['id'] = $user_data->id; $jwt_data['id'] = $user_data->id;
$jwt_data['userNick'] = $user_data->user_nick; $jwt_data['userNick'] = $user_data->user_nick;
$jwt_data['phone'] = $user_data->user_phone; $jwt_data['phone'] = $user_data->user_phone;
$jwt = new JwtUntils(); $jwt = new JwtUntils();
$user_data->user_pic = HEADERIMGURL.$user_data->user_pic;
$data['data'] = $user_data->getData(); $data['data'] = $user_data->getData();
$data['data']['last_login_ip'] = long2ip($data['data']['last_login_ip']); $data['data']['last_login_ip'] = long2ip($data['data']['last_login_ip']);
$data['data']['AuthToken'] = $jwt->createToken($jwt_data); $data['data']['AuthToken'] = $jwt->createToken($jwt_data);
$data['msg'] = '登陆成功'; $data['msg'] = '登陆成功';
$data['status'] = 200; $data['status'] = 200;
$user_data->last_login_ip = ip2long($this->request->ip());
$user_data->last_login_time = date('Y-m-d H:i:s');
$user_data->save();
} else { } else {
$data['msg'] = '密码错误'; $data['msg'] = '密码错误';
} }
...@@ -165,23 +165,18 @@ class Member extends Basic ...@@ -165,23 +165,18 @@ class Member extends Basic
return $this->response(101, 'type is null'); return $this->response(101, 'type is null');
} }
if (!check_phone($phone)) { if (!check_phone($phone) && $phone != '') {
return $this->response(101, '手机号码错误'); return $this->response(101, '手机号码错误');
} }
if ($pwd == '') { if (mb_strlen($pwd) < 6 && $pwd != '') {
return $this->response(101, '密码为空');
}
if (mb_strlen($pwd) < 6) {
return $this->response(101, '密码少于6位'); return $this->response(101, '密码少于6位');
} }
if (empty($token) && $this->params['type'] != 'register') { if (empty($token) && $type != 'edit') {
return $this->response(101, 'token is null'); return $this->response(101, 'token is null');
} }
if ($token && $this->params['type'] != 'register') { if ($token && $this->params['type'] != 'register') {
$jwt = new JwtUntils(); $jwt = new JwtUntils();
$jwt_data = $jwt->getDecode($token); $jwt_data = $jwt->getDecode($token);
...@@ -203,12 +198,24 @@ class Member extends Basic ...@@ -203,12 +198,24 @@ class Member extends Basic
$data['status'] = 101; $data['status'] = 101;
$data['data'] = array(); $data['data'] = array();
$user_data = $this->user->get(['user_phone' => $this->params['phone']]); if ($phone) {
$user_data = $this->user->get(['user_phone' => $phone]);
} else {
$user_data = $this->user->get($this->userId);
}
$date = date('Y-m-d H:i:s'); $date = date('Y-m-d H:i:s');
$pwd = md5(md5($pwd) . '+123'); $pwd = md5(md5($pwd) . '+123');
switch ($type) { switch ($type) {
case 'add' : case 'add' :
if ($pwd == '') {
return $this->response(101, '密码为空');
}
if ($phone == '') {
return $this->response(101, '手机号码为空');
}
if (empty($user_data->id)) { if (empty($user_data->id)) {
if ($this->request->param('code') == $code && $code != '') { if ($this->request->param('code') == $code && $code != '') {
...@@ -252,6 +259,10 @@ class Member extends Basic ...@@ -252,6 +259,10 @@ class Member extends Basic
} }
break; break;
case 'forget' : case 'forget' :
if ($pwd == '') {
return $this->response(101, '密码为空');
}
if ($code == $this->request->param('code') && $jwt_phone == $phone) { if ($code == $this->request->param('code') && $jwt_phone == $phone) {
$user_data->update_time = $date; $user_data->update_time = $date;
$user_data->user_pswd = $pwd; $user_data->user_pswd = $pwd;
...@@ -267,34 +278,44 @@ class Member extends Basic ...@@ -267,34 +278,44 @@ class Member extends Basic
$data['msg'] = '验证码错误'; $data['msg'] = '验证码错误';
} }
break; break;
default :
$pwd2 = $this->request->param('pwd2');
$user_data->update_time = $date;
$user_data->user_nick = $user_nick? $user_nick : $user_data->user_nick;
$user_data->user_phone = $phone ? $phone : $user_data->user_phone;
$user_data->user_pic = $user_pic ? $user_pic : $user_data->user_pic;
//修改密码 default :
if (md5(md5($pwd2).'+123') == $user_data->user_pswd) { $result['AuthToken'] = $this->authToken;
$user_data->user_pswd = $pwd; if ($user_nick) {
$user_data->save(); $user_data->user_nick = $user_nick;
$result['user_nick'] = $user_nick;
}
if ($user_data->id) { if ($this->request->param('pwd2')) {
$data['data'] = $user_data; //编辑完返回用户信息 $pwd2 = $this->request->param('pwd2');
$data['status'] = 200; //修改密码
$data['msg'] = '修改成功'; if (md5(md5($pwd2).'+123') == $user_data->user_pswd) {
$user_data->user_pswd = $pwd;
$result['user_pswd'] = $pwd;
} else { } else {
$data['status'] = 101; $data['status'] = 101;
$data['msg'] = '编辑失败'; $data['msg'] = '密码错误';
} }
}
if ($user_pic) {
$user_data->user_pic = $user_pic;
$result['user_pic'] = $user_pic;
}
$user_data->update_time = $date;
$user_data->save();
if ($user_data->id) {
$data['data'] = $result; //编辑完返回用户信息
$data['status'] = 200;
$data['msg'] = '修改成功';
} else { } else {
$data['status'] = 101; $data['status'] = 101;
$data['msg'] = '密码错误'; $data['msg'] = '编辑失败';
} }
break; break;
} }
return $this->response($data['status'], $data['msg'], $data['data']); return $this->response($data['status'], $data['msg'], $data['data']);
} }
...@@ -395,13 +416,14 @@ class Member extends Basic ...@@ -395,13 +416,14 @@ class Member extends Basic
$user_data = $user->field('user_pic')->where('id',$this->userId)->find(); $user_data = $user->field('user_pic')->where('id',$this->userId)->find();
@unlink($path.DS.$user_data->user_pic); //删除原来的图片 @unlink($path.DS.$user_data->user_pic); //删除原来的图片
$img_path = $info->getSaveName(); //生成的图片路径 $img_path = $info->getSaveName(); //生成的图片路径
//更新用户信息
$user_data->user_pic = $img_path;
$user_data->save();
$static_path = $path.DS.$img_path; //生成图片的绝对路径 $static_path = $path.DS.$img_path; //生成图片的绝对路径
$image = \think\Image::open($static_path); $image = \think\Image::open($static_path);
$image->thumb(500, 500)->save($static_path); //生成缩略图 $image->thumb(500, 500)->save($static_path); //生成缩略图
//更新用户信息
$user_data->user_pic = $img_path;
$user_data->save();
$data['status'] = 200; $data['status'] = 200;
$data['msg'] = '上传成功'; $data['msg'] = '上传成功';
$data['data'] = ['file_name' => HEADERIMGURL . $img_path]; $data['data'] = ['file_name' => HEADERIMGURL . $img_path];
...@@ -417,4 +439,4 @@ class Member extends Basic ...@@ -417,4 +439,4 @@ class Member extends Basic
return $this->response($data['status'], $data['msg'], $data['data']); return $this->response($data['status'], $data['msg'], $data['data']);
} }
} }
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment