Commit 2b2b18fd authored by 刘小敏's avatar 刘小敏

更新用户信息接口优化 校验生日

parent 550e34f8
...@@ -11,6 +11,7 @@ use app\admin\model\shopro\order\Order as OrderModel; ...@@ -11,6 +11,7 @@ use app\admin\model\shopro\order\Order as OrderModel;
use app\admin\model\shopro\order\Aftersale as AftersaleModel; use app\admin\model\shopro\order\Aftersale as AftersaleModel;
use app\admin\model\shopro\ThirdOauth; use app\admin\model\shopro\ThirdOauth;
use think\Db; use think\Db;
use think\exception\HttpResponseException;
class User extends Common class User extends Common
{ {
...@@ -94,20 +95,15 @@ class User extends Common ...@@ -94,20 +95,15 @@ class User extends Common
if (!$this->request->isPost()) { if (!$this->request->isPost()) {
$this->error(''); $this->error('');
} }
try { $user = auth_user();
$user = auth_user();
$params = $this->request->only(['avatar', 'nickname', 'birthday']);
$this->svalidate($params);
$user->save($params); $params = $this->request->only(['avatar', 'nickname', 'birthday']);
$user->hidden(['password', 'salt', 'createtime', 'updatetime', 'deletetime', 'remember_token', 'login_fail', 'login_ip', 'login_time']); $this->svalidate($params, '.update');
$this->success('更新成功', $user); $user->save($params);
$user->hidden(['password', 'salt', 'createtime', 'updatetime', 'deletetime', 'remember_token', 'login_fail', 'login_ip', 'login_time']);
} catch (\Exception $e) { $this->success('更新成功', $user);
$this->error($e->getMessage());
}
} }
/** /**
......
...@@ -10,6 +10,7 @@ class User extends Validate ...@@ -10,6 +10,7 @@ class User extends Validate
'password' => '/^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]+\S{5,12}$/', 'password' => '/^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]+\S{5,12}$/',
'notPureNumber' => '^[a-zA-Z][a-zA-Z0-9_]{4,15}$', 'notPureNumber' => '^[a-zA-Z][a-zA-Z0-9_]{4,15}$',
'mobile' => '/^1[3456789]\d{9}$/', 'mobile' => '/^1[3456789]\d{9}$/',
'date' => '/^\d{4}\.\d{2}\.\d{2}$/',
]; ];
protected $rule = [ protected $rule = [
...@@ -23,6 +24,7 @@ class User extends Validate ...@@ -23,6 +24,7 @@ class User extends Validate
'avatar' => 'require', 'avatar' => 'require',
'email' => 'email|unique:user', 'email' => 'email|unique:user',
'code' => 'require', 'code' => 'require',
'birthday' => 'regex:date',
]; ];
protected $message = [ protected $message = [
...@@ -57,6 +59,9 @@ class User extends Validate ...@@ -57,6 +59,9 @@ class User extends Validate
'email.unique' => '邮箱已被占用', 'email.unique' => '邮箱已被占用',
'code.require' => '请填写验证码', 'code.require' => '请填写验证码',
'birthday.regex' => '生日格式不正确',
]; ];
...@@ -70,5 +75,6 @@ class User extends Validate ...@@ -70,5 +75,6 @@ class User extends Validate
'changeMobile' => ['mobile' => 'require|regex:mobile|unique:user', 'code'], 'changeMobile' => ['mobile' => 'require|regex:mobile|unique:user', 'code'],
'changeUsername' => ['username'], 'changeUsername' => ['username'],
'updateMpUserInfo' => ['avatar', 'nickname'], 'updateMpUserInfo' => ['avatar', 'nickname'],
'update' => ['birthday']
]; ];
} }
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