修复盐的问题

app/Http/Services/UserService.php

@@ -19,6 +19,7 @@ class UserService
         }
         }
 
 
         if (!$ucId) {
         if (!$ucId) {
+            $data['password'] = PasswordService::passwordHash($data['password'],$data['salt']);
             //去新增注册
             //去新增注册
             $data['create_time'] = time();
             $data['create_time'] = time();
             $ucId = UserModel::insertGetId($data);
             $ucId = UserModel::insertGetId($data);
@@ -41,15 +42,18 @@ class UserService
     {
     {
         $loginQuery = UserModel::where('status', UserModel::STATUS_ENABLE);
         $loginQuery = UserModel::where('status', UserModel::STATUS_ENABLE);
         if (!empty($data['mobile'])) {
         if (!empty($data['mobile'])) {
-            $salt = UserModel::where('mobile', $data['mobile'])->value('salt');
+            $exists = UserModel::where('mobile', $data['mobile'])->first();
             $loginQuery->where('mobile', $data['mobile']);
             $loginQuery->where('mobile', $data['mobile']);
         } else {
         } else {
-            $salt = UserModel::where('email', $data['email'])->value('salt');
+            $exists = UserModel::where('email', $data['email'])->first();
             $loginQuery->where('email', $data['email']);
             $loginQuery->where('email', $data['email']);
         }
         }
-        if (empty($salt)) {
+        if (empty($exists)) {
             throw new InvalidRequestException('该账号不存在');
             throw new InvalidRequestException('该账号不存在');
         }
         }
+
+        $salt = $exists->salt;
+
         $passwordHash = PasswordService::passwordHash($data['password'], $salt);
         $passwordHash = PasswordService::passwordHash($data['password'], $salt);
         $user = $loginQuery->select([
         $user = $loginQuery->select([
             'uc_id',
             'uc_id',
@@ -57,10 +61,9 @@ class UserService
             'email',
             'email',
             'create_time',
             'create_time',
         ])->where('password', $passwordHash)->first();
         ])->where('password', $passwordHash)->first();
-
         UserModel::where('uc_id', $user['uc_id'])->update(['last_login_time' => time()]);
         UserModel::where('uc_id', $user['uc_id'])->update(['last_login_time' => time()]);
 
 
-        return $user ?: [];
+        return $user ? $user->toArray() : [];
     }
     }
 
 
     //绑定邮箱
     //绑定邮箱