[会员管理]-移除

app/api/controller/Install.php

@@ -11,7 +11,6 @@ use ba\Terminal;
 use ba\Filesystem;
 use app\common\controller\Api;
 use app\admin\model\Admin as AdminModel;
-use app\admin\model\User as UserModel;
 use app\process\Monitor;
 use support\Response;
 use Webman\Http\Request;
@@ -627,10 +626,6 @@ class Install extends Api
                 $adminModel->resetPassword($defaultAdmin->id, $param['adminpassword']);
             }
 
-            // 默认用户密码修改
-            $user = new UserModel();
-            $user->resetPassword(1, Random::build());
-
             // 修改站点名称
             if (class_exists(\app\admin\model\Config::class)) {
                 \app\admin\model\Config::where('name', 'site_name')->update([

app/api/controller/User.php

@@ -6,6 +6,7 @@ use ba\Captcha;
 use ba\ClickCaptcha;
 use app\common\controller\Frontend;
 use app\common\facade\Token;
+use support\think\Db;
 use support\validation\Validator;
 use support\validation\ValidationException;
 use Webman\Http\Request;
@@ -46,6 +47,7 @@ class User extends Frontend
                 'captchaId' => $params['captchaId'] ?? '',
                 'captchaInfo' => $params['captchaInfo'] ?? '',
                 'registerType' => $params['registerType'] ?? '',
+                'invite_code' => $params['invite_code'] ?? '',
             ]);
 
             if (!in_array($params['tab'], ['login', 'register'])) {
@@ -72,7 +74,20 @@ class User extends Frontend
                 if (!$captchaObj->check($params['captcha'], $params[$params['registerType']] . 'user_register')) {
                     return $this->error(__('Please enter the correct verification code'));
                 }
-                $res = $this->auth->register($params['username'], $params['password'], $params['mobile'], $params['email']);
+                $extend = [];
+                if (!empty($params['invite_code'])) {
+                    $inviterAdmin = Db::name('admin')
+                        ->field(['id', 'channel_id'])
+                        ->where('invite_code', $params['invite_code'])
+                        ->find();
+                    if (!$inviterAdmin) {
+                        return $this->error(__('Parameter error'));
+                    }
+                    $extend['register_invite_code'] = $params['invite_code'];
+                    $extend['inviter_admin_id'] = $inviterAdmin['id'];
+                    $extend['channel_id'] = $inviterAdmin['channel_id'] ?? null;
+                }
+                $res = $this->auth->register($params['username'], $params['password'], $params['mobile'], $params['email'], 1, $extend);
             }
 
             if ($res === true) {
@@ -117,6 +132,7 @@ class User extends Frontend
                 'email' => 'required_if:registerType,email|email|unique:user,email',
                 'mobile' => 'required_if:registerType,mobile|regex:/^1[3-9]\d{9}$/|unique:user,mobile',
                 'captcha' => 'required|string',
+                'invite_code' => 'nullable|string|max:64',
             ],
             [
                 'username.regex' => __('Please input correct username'),
@@ -129,6 +145,7 @@ class User extends Frontend
                 'password' => __('Password'),
                 'captcha' => __('captcha'),
                 'registerType' => __('Register type'),
+                'invite_code' => __('Invite code'),
             ]
         ];
     }