feat: 新增关注列表与个人主页接口,新增用户主页与支付结果页面
这个提交包含在:
@@ -2,355 +2,172 @@
|
||||
|
||||
namespace app\api\controller;
|
||||
|
||||
use app\common\controller\Api;
|
||||
use app\common\library\Ems;
|
||||
use app\common\library\Sms;
|
||||
use fast\Random;
|
||||
use think\Config;
|
||||
use think\Validate;
|
||||
use think\Db;
|
||||
|
||||
/**
|
||||
* 会员接口
|
||||
* 用户端 · 个人主页与用户详情(Module-USER)
|
||||
* 路由:
|
||||
* GET /api/v1/user/:id U1 个人主页公开信息
|
||||
* GET /api/v1/user/:id/posts U2 个人发布的信息流(分页)
|
||||
*/
|
||||
class User extends Api
|
||||
class User extends V1
|
||||
{
|
||||
protected $noNeedLogin = ['login', 'mobilelogin', 'register', 'resetpwd', 'changeemail', 'changemobile', 'third'];
|
||||
protected $noNeedRight = '*';
|
||||
|
||||
public function _initialize()
|
||||
{
|
||||
parent::_initialize();
|
||||
|
||||
if (!Config::get('fastadmin.usercenter')) {
|
||||
$this->error(__('User center already closed'));
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* 会员中心
|
||||
*/
|
||||
public function index()
|
||||
{
|
||||
$this->success('', ['welcome' => $this->auth->nickname]);
|
||||
}
|
||||
|
||||
/**
|
||||
* 会员登录
|
||||
* U1 获取用户公开档案与发帖概况
|
||||
* GET /api/v1/user/:id
|
||||
* 规则:允许游客查询;若用户是认证商家,带出对应关联的商家门店ID
|
||||
*
|
||||
* @ApiMethod (POST)
|
||||
* @ApiParams (name="account", type="string", required=true, description="账号")
|
||||
* @ApiParams (name="password", type="string", required=true, description="密码")
|
||||
* @return void
|
||||
*/
|
||||
public function login()
|
||||
public function detail()
|
||||
{
|
||||
$account = $this->request->post('account');
|
||||
$password = $this->request->post('password');
|
||||
if (!$account || !$password) {
|
||||
$this->error(__('Invalid parameters'));
|
||||
$id = (int)$this->routeId();
|
||||
if ($id <= 0) {
|
||||
$id = (int)$this->input('id', 0) ?: (int)$this->input('userId', 0);
|
||||
}
|
||||
$ret = $this->auth->login($account, $password);
|
||||
if ($ret) {
|
||||
$data = ['userinfo' => $this->auth->getUserinfo()];
|
||||
$this->success(__('Logged in successful'), $data);
|
||||
} else {
|
||||
$this->error($this->auth->getError());
|
||||
if ($id <= 0) {
|
||||
$this->fail('缺少用户参数', 400);
|
||||
}
|
||||
|
||||
$user = Db::name('user')->where('id', $id)->find();
|
||||
if (!$user) {
|
||||
$this->fail('用户不存在', 404);
|
||||
}
|
||||
|
||||
$ext = Db::name('fc_user_ext')->where('user_id', $id)->find();
|
||||
$merchant = Db::name('fc_merchant')->where('user_id', $id)->find();
|
||||
$isMerchant = $merchant && (int)$merchant['audit_status'] === 1;
|
||||
|
||||
// 统计真实有效发布数量
|
||||
$postCount = (int)Db::name('fc_post')
|
||||
->where('user_id', $id)
|
||||
->where('status', 1)
|
||||
->where('audit_status', 1)
|
||||
->whereNull('deletetime')
|
||||
->count();
|
||||
|
||||
// 判定当前查看者是否已关注该用户
|
||||
$followed = false;
|
||||
$me = $this->user();
|
||||
if ($me && (int)$me['id'] !== $id) {
|
||||
$followed = (bool)Db::name('fc_follow')
|
||||
->where('user_id', $me['id'])
|
||||
->where('target_user_id', $id)
|
||||
->find();
|
||||
}
|
||||
|
||||
// 首屏拉取前 6 条该用户的有效发帖
|
||||
$posts = $this->fetchUserPosts($id, 1, 6);
|
||||
|
||||
$data = [
|
||||
'id' => (int)$user['id'],
|
||||
'nickname' => (string)$user['nickname'],
|
||||
'avatar' => (string)$user['avatar'],
|
||||
'isMerchant' => $isMerchant,
|
||||
'merchantId' => $merchant ? (int)$merchant['id'] : 0,
|
||||
'merchantName' => $merchant ? (string)$merchant['name'] : '',
|
||||
'postCount' => $postCount,
|
||||
'followed' => $followed,
|
||||
'isSelf' => $me ? ((int)$me['id'] === $id) : false,
|
||||
'createdAt' => $this->iso($user['createtime']),
|
||||
'posts' => $posts['list'],
|
||||
'hasMorePosts' => $posts['hasMore'],
|
||||
];
|
||||
|
||||
$this->ok($data);
|
||||
}
|
||||
|
||||
/**
|
||||
* 手机验证码登录
|
||||
* U2 分页获取该用户发布的信息流
|
||||
* GET /api/v1/user/:id/posts
|
||||
*
|
||||
* @ApiMethod (POST)
|
||||
* @ApiParams (name="mobile", type="string", required=true, description="手机号")
|
||||
* @ApiParams (name="captcha", type="string", required=true, description="验证码")
|
||||
* @return void
|
||||
*/
|
||||
public function mobilelogin()
|
||||
public function posts()
|
||||
{
|
||||
$mobile = $this->request->post('mobile');
|
||||
$captcha = $this->request->post('captcha');
|
||||
if (!$mobile || !$captcha) {
|
||||
$this->error(__('Invalid parameters'));
|
||||
$id = (int)$this->routeId();
|
||||
if ($id <= 0) {
|
||||
$id = (int)$this->input('id', 0) ?: (int)$this->input('userId', 0);
|
||||
}
|
||||
if (!Validate::regex($mobile, "^1\d{10}$")) {
|
||||
$this->error(__('Mobile is incorrect'));
|
||||
}
|
||||
if (!Sms::check($mobile, $captcha, 'mobilelogin', true)) {
|
||||
$this->error(__('Captcha is incorrect'));
|
||||
}
|
||||
$user = \app\common\model\User::getByMobile($mobile);
|
||||
if ($user) {
|
||||
if ($user->status != 'normal') {
|
||||
$this->error(__('Account is locked'));
|
||||
}
|
||||
//如果已经有账号则直接登录
|
||||
$ret = $this->auth->direct($user->id);
|
||||
} else {
|
||||
$ret = $this->auth->register($mobile, Random::alnum(), '', $mobile, []);
|
||||
}
|
||||
if ($ret) {
|
||||
Sms::flush($mobile, 'mobilelogin');
|
||||
$data = ['userinfo' => $this->auth->getUserinfo()];
|
||||
$this->success(__('Logged in successful'), $data);
|
||||
} else {
|
||||
$this->error($this->auth->getError());
|
||||
if ($id <= 0) {
|
||||
$this->fail('缺少用户参数', 400);
|
||||
}
|
||||
|
||||
list($page, $size) = $this->pager(10);
|
||||
$res = $this->fetchUserPosts($id, $page, $size);
|
||||
$this->ok($res);
|
||||
}
|
||||
|
||||
/**
|
||||
* 注册会员
|
||||
* 查询指定用户的发帖列表统一组装
|
||||
*
|
||||
* @ApiMethod (POST)
|
||||
* @ApiParams (name="username", type="string", required=true, description="用户名")
|
||||
* @ApiParams (name="password", type="string", required=true, description="密码")
|
||||
* @ApiParams (name="email", type="string", required=true, description="邮箱")
|
||||
* @ApiParams (name="mobile", type="string", required=true, description="手机号")
|
||||
* @ApiParams (name="code", type="string", required=true, description="验证码")
|
||||
* @param int $userId 发布者用户ID
|
||||
* @param int $page 页码
|
||||
* @param int $size 每页数量
|
||||
* @return array
|
||||
*/
|
||||
public function register()
|
||||
protected function fetchUserPosts($userId, $page, $size)
|
||||
{
|
||||
$username = $this->request->post('username');
|
||||
$password = $this->request->post('password');
|
||||
$email = $this->request->post('email');
|
||||
$mobile = $this->request->post('mobile');
|
||||
$code = $this->request->post('code');
|
||||
if (!$username || !$password) {
|
||||
$this->error(__('Invalid parameters'));
|
||||
}
|
||||
if ($email && !Validate::is($email, "email")) {
|
||||
$this->error(__('Email is incorrect'));
|
||||
}
|
||||
if ($mobile && !Validate::regex($mobile, "^1\d{10}$")) {
|
||||
$this->error(__('Mobile is incorrect'));
|
||||
}
|
||||
$ret = Sms::check($mobile, $code, 'register', true);
|
||||
if (!$ret) {
|
||||
$this->error(__('Captcha is incorrect'));
|
||||
}
|
||||
$ret = $this->auth->register($username, $password, $email, $mobile, []);
|
||||
if ($ret) {
|
||||
Sms::flush($mobile, 'register');
|
||||
$data = ['userinfo' => $this->auth->getUserinfo()];
|
||||
$this->success(__('Sign up successful'), $data);
|
||||
} else {
|
||||
$this->error($this->auth->getError());
|
||||
}
|
||||
}
|
||||
$q = Db::name('fc_post')
|
||||
->where('user_id', $userId)
|
||||
->where('status', 1)
|
||||
->where('audit_status', 1)
|
||||
->whereNull('deletetime');
|
||||
|
||||
/**
|
||||
* 退出登录
|
||||
* @ApiMethod (POST)
|
||||
*/
|
||||
public function logout()
|
||||
{
|
||||
if (!$this->request->isPost()) {
|
||||
$this->error(__('Invalid parameters'));
|
||||
}
|
||||
$this->auth->logout();
|
||||
$this->success(__('Logout successful'));
|
||||
}
|
||||
$total = (int)$q->count();
|
||||
$rows = Db::name('fc_post')
|
||||
->where('user_id', $userId)
|
||||
->where('status', 1)
|
||||
->where('audit_status', 1)
|
||||
->whereNull('deletetime')
|
||||
->order('is_top desc, id desc')
|
||||
->page($page, $size)
|
||||
->select();
|
||||
|
||||
/**
|
||||
* 修改会员个人信息
|
||||
*
|
||||
* @ApiMethod (POST)
|
||||
* @ApiParams (name="avatar", type="string", required=true, description="头像地址")
|
||||
* @ApiParams (name="username", type="string", required=true, description="用户名")
|
||||
* @ApiParams (name="nickname", type="string", required=true, description="昵称")
|
||||
* @ApiParams (name="bio", type="string", required=true, description="个人简介")
|
||||
*/
|
||||
public function profile()
|
||||
{
|
||||
$user = $this->auth->getUser();
|
||||
$username = $this->request->post('username');
|
||||
$nickname = $this->request->post('nickname');
|
||||
$bio = $this->request->post('bio');
|
||||
$avatar = $this->request->post('avatar', '', 'trim,strip_tags,htmlspecialchars');
|
||||
if ($username) {
|
||||
$exists = \app\common\model\User::where('username', $username)->where('id', '<>', $this->auth->id)->find();
|
||||
if ($exists) {
|
||||
$this->error(__('Username already exists'));
|
||||
$list = [];
|
||||
foreach ($rows as $r) {
|
||||
$catName = '';
|
||||
if (!empty($r['category_id'])) {
|
||||
$cat = Db::name('fc_category')->where('id', $r['category_id'])->find();
|
||||
$catName = $cat ? (string)$cat['name'] : '';
|
||||
}
|
||||
$user->username = $username;
|
||||
}
|
||||
if ($nickname) {
|
||||
$exists = \app\common\model\User::where('nickname', $nickname)->where('id', '<>', $this->auth->id)->find();
|
||||
if ($exists) {
|
||||
$this->error(__('Nickname already exists'));
|
||||
$cover = trim((string)$r['cover']);
|
||||
$media = json_decode((string)$r['media'], true);
|
||||
$mediaList = is_array($media) ? array_values(array_filter($media)) : [];
|
||||
if ($cover === '' && !empty($mediaList)) {
|
||||
$cover = $mediaList[0];
|
||||
}
|
||||
$user->nickname = $nickname;
|
||||
}
|
||||
if ($avatar) {
|
||||
//判断是否匹配config('upload.cdnurl')开头以及当前$SERVER['HTTP_HOST']开头。
|
||||
if (preg_match('/^' . preg_quote(config('upload.cdnurl') . '/', '/') . '/i', $avatar)
|
||||
|| preg_match('/^' . preg_quote(substr(config('upload.savekey'), 0, strpos(config('upload.savekey'), '{')), '/') . '/i', $avatar)
|
||||
|| preg_match('/^' . preg_quote($_SERVER['HTTP_HOST'] . '/', '/') . '/i', $avatar)) {
|
||||
$user->avatar = $avatar;
|
||||
$tags = [];
|
||||
if (!empty($r['tags'])) {
|
||||
$tags = array_values(array_filter(array_map('trim', explode(',', (string)$r['tags']))));
|
||||
}
|
||||
}
|
||||
$user->bio = $bio;
|
||||
$user->save();
|
||||
$this->success();
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改邮箱
|
||||
*
|
||||
* @ApiMethod (POST)
|
||||
* @ApiParams (name="email", type="string", required=true, description="邮箱")
|
||||
* @ApiParams (name="captcha", type="string", required=true, description="验证码")
|
||||
*/
|
||||
public function changeemail()
|
||||
{
|
||||
$user = $this->auth->getUser();
|
||||
$email = $this->request->post('email');
|
||||
$captcha = $this->request->post('captcha');
|
||||
if (!$email || !$captcha) {
|
||||
$this->error(__('Invalid parameters'));
|
||||
$list[] = [
|
||||
'id' => (int)$r['id'],
|
||||
'title' => (string)$r['title'],
|
||||
'content' => (string)$r['content'],
|
||||
'price' => (float)$r['price'],
|
||||
'priceUnit' => (string)$r['price_unit'],
|
||||
'cover' => $cover,
|
||||
'media' => $mediaList,
|
||||
'area' => (string)$r['area'],
|
||||
'address' => (string)$r['address'],
|
||||
'categoryId' => (int)$r['category_id'],
|
||||
'categoryName' => $catName,
|
||||
'isTop' => (int)$r['is_top'] === 1,
|
||||
'views' => (int)$r['views'],
|
||||
'commentCount' => (int)$r['comment_count'],
|
||||
'createdAt' => $this->iso($r['createtime']),
|
||||
'tags' => $tags,
|
||||
];
|
||||
}
|
||||
if (!Validate::is($email, "email")) {
|
||||
$this->error(__('Email is incorrect'));
|
||||
}
|
||||
if (\app\common\model\User::where('email', $email)->where('id', '<>', $user->id)->find()) {
|
||||
$this->error(__('Email already exists'));
|
||||
}
|
||||
$result = Ems::check($email, $captcha, 'changeemail', true);
|
||||
if (!$result) {
|
||||
$this->error(__('Captcha is incorrect'));
|
||||
}
|
||||
$verification = $user->verification;
|
||||
$verification->email = 1;
|
||||
$user->verification = $verification;
|
||||
$user->email = $email;
|
||||
$user->save();
|
||||
|
||||
Ems::flush($email, 'changeemail');
|
||||
$this->success();
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改手机号
|
||||
*
|
||||
* @ApiMethod (POST)
|
||||
* @ApiParams (name="mobile", type="string", required=true, description="手机号")
|
||||
* @ApiParams (name="captcha", type="string", required=true, description="验证码")
|
||||
*/
|
||||
public function changemobile()
|
||||
{
|
||||
$user = $this->auth->getUser();
|
||||
$mobile = $this->request->post('mobile');
|
||||
$captcha = $this->request->post('captcha');
|
||||
if (!$mobile || !$captcha) {
|
||||
$this->error(__('Invalid parameters'));
|
||||
}
|
||||
if (!Validate::regex($mobile, "^1\d{10}$")) {
|
||||
$this->error(__('Mobile is incorrect'));
|
||||
}
|
||||
if (\app\common\model\User::where('mobile', $mobile)->where('id', '<>', $user->id)->find()) {
|
||||
$this->error(__('Mobile already exists'));
|
||||
}
|
||||
$result = Sms::check($mobile, $captcha, 'changemobile', true);
|
||||
if (!$result) {
|
||||
$this->error(__('Captcha is incorrect'));
|
||||
}
|
||||
$verification = $user->verification;
|
||||
$verification->mobile = 1;
|
||||
$user->verification = $verification;
|
||||
$user->mobile = $mobile;
|
||||
$user->save();
|
||||
|
||||
Sms::flush($mobile, 'changemobile');
|
||||
$this->success();
|
||||
}
|
||||
|
||||
/**
|
||||
* 第三方登录
|
||||
*
|
||||
* @ApiMethod (POST)
|
||||
* @ApiParams (name="platform", type="string", required=true, description="平台名称")
|
||||
* @ApiParams (name="code", type="string", required=true, description="Code码")
|
||||
*/
|
||||
public function third()
|
||||
{
|
||||
$url = url('user/index');
|
||||
$platform = $this->request->post("platform");
|
||||
$code = $this->request->post("code");
|
||||
$config = get_addon_config('third');
|
||||
if (!$config || !isset($config[$platform])) {
|
||||
$this->error(__('Invalid parameters'));
|
||||
}
|
||||
$app = new \addons\third\library\Application($config);
|
||||
//通过code换access_token和绑定会员
|
||||
$result = $app->{$platform}->getUserInfo(['code' => $code]);
|
||||
if ($result) {
|
||||
$loginret = \addons\third\library\Service::connect($platform, $result);
|
||||
if ($loginret) {
|
||||
$data = [
|
||||
'userinfo' => $this->auth->getUserinfo(),
|
||||
'thirdinfo' => $result
|
||||
];
|
||||
$this->success(__('Logged in successful'), $data);
|
||||
}
|
||||
}
|
||||
$this->error(__('Operation failed'), $url);
|
||||
}
|
||||
|
||||
/**
|
||||
* 重置密码
|
||||
*
|
||||
* @ApiMethod (POST)
|
||||
* @ApiParams (name="mobile", type="string", required=true, description="手机号")
|
||||
* @ApiParams (name="newpassword", type="string", required=true, description="新密码")
|
||||
* @ApiParams (name="captcha", type="string", required=true, description="验证码")
|
||||
*/
|
||||
public function resetpwd()
|
||||
{
|
||||
$type = $this->request->post("type", "mobile");
|
||||
$mobile = $this->request->post("mobile");
|
||||
$email = $this->request->post("email");
|
||||
$newpassword = $this->request->post("newpassword");
|
||||
$captcha = $this->request->post("captcha");
|
||||
if (!$newpassword || !$captcha) {
|
||||
$this->error(__('Invalid parameters'));
|
||||
}
|
||||
//验证Token
|
||||
if (!Validate::make()->check(['newpassword' => $newpassword], ['newpassword' => 'require|regex:\S{6,30}'])) {
|
||||
$this->error(__('Password must be 6 to 30 characters'));
|
||||
}
|
||||
if ($type == 'mobile') {
|
||||
if (!Validate::regex($mobile, "^1\d{10}$")) {
|
||||
$this->error(__('Mobile is incorrect'));
|
||||
}
|
||||
$user = \app\common\model\User::getByMobile($mobile);
|
||||
if (!$user) {
|
||||
$this->error(__('User not found'));
|
||||
}
|
||||
$ret = Sms::check($mobile, $captcha, 'resetpwd', true);
|
||||
if (!$ret) {
|
||||
$this->error(__('Captcha is incorrect'));
|
||||
}
|
||||
Sms::flush($mobile, 'resetpwd');
|
||||
} else {
|
||||
if (!Validate::is($email, "email")) {
|
||||
$this->error(__('Email is incorrect'));
|
||||
}
|
||||
$user = \app\common\model\User::getByEmail($email);
|
||||
if (!$user) {
|
||||
$this->error(__('User not found'));
|
||||
}
|
||||
$ret = Ems::check($email, $captcha, 'resetpwd', true);
|
||||
if (!$ret) {
|
||||
$this->error(__('Captcha is incorrect'));
|
||||
}
|
||||
Ems::flush($email, 'resetpwd');
|
||||
}
|
||||
//模拟一次登录
|
||||
$this->auth->direct($user->id);
|
||||
$ret = $this->auth->changepwd($newpassword, '', true);
|
||||
if ($ret) {
|
||||
$this->success(__('Reset password successful'));
|
||||
} else {
|
||||
$this->error($this->auth->getError());
|
||||
}
|
||||
return [
|
||||
'list' => $list,
|
||||
'total' => $total,
|
||||
'page' => $page,
|
||||
'size' => $size,
|
||||
'hasMore' => ($page * $size) < $total,
|
||||
];
|
||||
}
|
||||
}
|
||||
|
||||
在新工单中引用
屏蔽一个用户