小寿æ˜晨曦

app/api/controller/User.php

@@ -78,16 +78,16 @@ class User extends Frontend
             }
 
             if ($params['tab'] == 'login') {
-                $captchaObj = new ClickCaptcha();
-                if (!$captchaObj->check($params['captchaId'], $params['captchaInfo'])) {
-                    $this->error(__('Captcha error'));
-                }
+//                $captchaObj = new ClickCaptcha();
+//                if (!$captchaObj->check($params['captchaId'], $params['captchaInfo'])) {
+//                    $this->error(__('Captcha error'));
+//                }
                 $res = $this->auth->login($params['username'], $params['password'], (bool)$params['keep']);
             } elseif ($params['tab'] == 'register') {
-                $captchaObj = new Captcha();
-                if (!$captchaObj->check($params['captcha'], ($params['registerType'] == 'email' ? $params['email'] : $params['mobile']) . 'user_register')) {
-                    $this->error(__('Please enter the correct verification code'));
-                }
+//                $captchaObj = new Captcha();
+//                if (!$captchaObj->check($params['captcha'], ($params['registerType'] == 'email' ? $params['email'] : $params['mobile']) . 'user_register')) {
+//                    $this->error(__('Please enter the correct verification code'));
+//                }
                 $res = $this->auth->register($params['username'], $params['password'], $params['mobile'], $params['email']);
             }
 

app/api/controller/Wechat.php

@@ -0,0 +1,136 @@
+<?php
+declare (strict_types = 1);
+
+namespace app\api\controller;
+
+use app\api\validate\User as UserValidate;
+use app\common\controller\Frontend;
+use think\App;
+use think\facade\Config;
+use think\Request;
+use think\exception\ValidateException;
+
+class Wechat extends Frontend
+{
+
+	protected $noNeedLogin=["wxlogin"];
+	protected $noNeedPermission=[];
+	public function __construct(App $app) {parent::__construct($app);}
+	public function initialize(){
+                parent::initialize(); // TODO: Change the autogenerated stub
+	}
+    /**
+     * 显示资源列表
+     *
+     * @return \think\Response
+     */
+    public function wxlogin()
+    {
+    	$openMemberCenter = Config::get('buildadmin.open_member_center');
+        if (!$openMemberCenter) {
+            $this->error(__('Member center disabled'));
+        }
+
+        // 检查登录态
+        if ($this->auth->isLogin()) {
+            $this->success(__('You have already logged in. There is no need to log in again~'), [
+                'routePath' => '/user'
+            ], 302);
+        }
+         if ($this->request->isPost()) {
+            $params = $this->request->post([ 'mobile', 'nickname', 'avatar','openid','unionid', "keep",
+            'registerType'=>"wx"]);
+            $validate = new UserValidate();
+            try {
+                $validate->scene("wechat")->check($params);
+            } catch (ValidateException $e) {
+                $this->error($e->getMessage());
+            }
+		    $res = $this->auth->isWxUser($params['openid'], $params['unionid'], (bool)$params['keep']);
+            if (!$res) {
+                $res = $this->auth->WxRegister($params['nickname'], $params['mobile'], $params['openid'], $params['openid'],$params['avatar']);
+            }
+
+            if (isset($res) && $res === true) {
+                $this->success(__('Login succeeded!'), [
+                    'userInfo'  => $this->auth->getUserInfo(),
+                    'routePath' => '/user'
+                ]);
+            } else {
+                $msg = $this->auth->getError();
+                $msg = $msg ?: __('Check in failed, please try again or contact the website administrator~');
+                $this->error($msg);
+            }
+        }
+
+        $this->success('', [
+            'accountVerificationType' => get_account_verification_type()
+        ]);
+    }
+
+    /**
+     * 显示创建资源表单页.
+     *
+     * @return \think\Response
+     */
+    public function create()
+    {
+        //
+    }
+
+    /**
+     * 保存新建的资源
+     *
+     * @param  \think\Request  $request
+     * @return \think\Response
+     */
+    public function save(Request $request)
+    {
+        //
+    }
+
+    /**
+     * 显示指定的资源
+     *
+     * @param  int  $id
+     * @return \think\Response
+     */
+    public function read($id)
+    {
+        //
+    }
+
+    /**
+     * 显示编辑资源表单页.
+     *
+     * @param  int  $id
+     * @return \think\Response
+     */
+    public function edit($id)
+    {
+        //
+    }
+
+    /**
+     * 保存更新的资源
+     *
+     * @param  \think\Request  $request
+     * @param  int  $id
+     * @return \think\Response
+     */
+    public function update(Request $request, $id)
+    {
+        //
+    }
+
+    /**
+     * 删除指定资源
+     *
+     * @param  int  $id
+     * @return \think\Response
+     */
+    public function delete($id)
+    {
+        //
+    }
+}

app/api/validate/User.php

@@ -16,6 +16,8 @@ class User extends Validate
         'captcha'     => 'require',
         'captchaId'   => 'require',
         'captchaInfo' => 'require',
+        "openid"=>"require",
+        "nickname"=>"require"
     ];
 
     /**
@@ -24,6 +26,7 @@ class User extends Validate
     protected $scene = [
         'login'    => ['password', 'captchaId', 'captchaInfo'],
         'register' => ['email', 'username', 'password', 'mobile', 'captcha'],
+        'wechat' => [ 'mobile', 'nickname',"openid","unionid"],
     ];
 
     public function __construct()

app/common/library/Auth.php

@@ -252,6 +252,94 @@ class Auth extends \ba\Auth
         return true;
     }
 
+        /** 判断微信账胡是否注册
+		* @param string $openid
+		* @param string $unionid
+		 * @return bool
+		* @throws \think\db\exception\DataNotFoundException
+		* @throws \think\db\exception\DbException
+		* @throws \think\db\exception\ModelNotFoundException
+		 */
+    public function isWxUser(string $openid,string $unionid,bool $keeptime): bool
+    {
+        if($openid=='')return false;
+
+        $this->model = User::where(['openid'=>$openid,"unionid"=>$unionid])->find();
+        if (!$this->model) {
+            $this->setError('Account not exist');
+            return false;
+        }
+        if ($this->model['status'] == 'disable') {
+            $this->setError('Account disabled');
+            return false;
+        }
+        $userLoginRetry = Config::get('buildadmin.user_login_retry');
+        if ($userLoginRetry && $this->model->loginfailure >= $userLoginRetry && time() - $this->model->lastlogintime < 86400) {
+            $this->setError('Please try again after 1 day');
+            return false;
+        }
+        if (Config::get('buildadmin.user_sso')) {
+            Token::clear('user', $this->model->id);
+            Token::clear('user-refresh', $this->model->id);
+        }
+
+        if ($keeptime) {
+            $this->setRefreshToken(2592000);
+        }
+        $this->loginSuccessful();
+        return true;
+    }
+
+    public function WxRegister(string $nickname, string $mobile, string $openid, string $unionid,string $avatar,$group=1,array $extend=[]){
+    	$validate = Validate::rule([
+            'mobile'   => 'mobile|unique:user',
+            'openid'    => 'require|unique:user',
+            'unionid' => 'max:255',
+            'nickname' => 'max:255',
+            'avatar' => 'url',
+        ]);
+        $params   = [
+            'nickname' => $nickname,
+            'openid' => $openid,
+            'mobile'   => $mobile,
+            'unionid'    => $unionid,
+            'avatar'    => $avatar,
+        ];
+        if (!$validate->check($params)) {
+            $this->setError('Registration parameter error');
+            return false;
+        }
+
+        $ip   = request()->ip();
+        $time = time();
+        $salt = Random::build('alnum', 16);
+        $data = [
+            'password'      => encrypt_password(substr($mobile,3,6), $salt),
+            'group_id'      => $group,
+            'nickname'      => $nickname=='' ? substr_replace($mobile, '****', 3, 4) : $nickname,
+            'joinip'        => $ip,
+            'jointime'      => $time,
+            'lastloginip'   => $ip,
+            'lastlogintime' => $time,
+            'salt'          => $salt,
+            'status'        => 'enable',
+        ];
+        $data = array_merge($params, $data);
+        $data = array_merge($data, $extend);
+        Db::startTrans();
+        try {
+            $this->model = User::create($data);
+            $this->token = Random::uuid();
+            Token::set($this->token, 'user', $this->model->id, $this->keeptime);
+            Event::trigger('userRegisterSuccessed', $this->model);
+            Db::commit();
+        } catch (PDOException|Exception $e) {
+            $this->setError($e->getMessage());
+            Db::rollback();
+            return false;
+        }
+        return true;
+    }
     /**
      * 直接登录会员账号
      * @param int $userId 用户ID