From 9658d7a8996fef62caa321f8e315bdc0d0af0910 Mon Sep 17 00:00:00 2001
From: "453530270@qq.com" <xc@xyiege.com>
Date: Mon, 7 Oct 2024 20:17:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/model/User.php          |  2 +-
 app/api/service/UserService.php | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/api/model/User.php b/app/api/model/User.php
index cd20038..79fcc01 100644
--- a/app/api/model/User.php
+++ b/app/api/model/User.php
@@ -5,5 +5,5 @@ use app\common\model\TimeModel;
 
 class User extends TimeModel
 {
-    protected $deleteTime = 'delete_time';
+//    protected $deleteTime = 'delete_time';
 }
\ No newline at end of file
diff --git a/app/api/service/UserService.php b/app/api/service/UserService.php
index 21d5dd5..8258026 100644
--- a/app/api/service/UserService.php
+++ b/app/api/service/UserService.php
@@ -18,14 +18,15 @@ class UserService {
      */
     public function login(string $uname,string $pass){
         // query db
-        $drs = User::where(['nick_name'=>$uname])->find();
+        $drs = User::where(['nick_name'=>$uname,'delete_time'=>0])->find();
         // 异常处理
         if(!isset($drs)){
             throwError('用户不存在');
             return -1;
         }else{
+            $fpass = password($pass.$drs['salt']);
             // 对比密码
-            if($drs['password'] != $pass){
+            if($drs['password'] != $fpass){
                 throwError('密码错误');
                 return false;
             }
@@ -40,10 +41,11 @@ class UserService {
      * @return bool
      */
     public function register(array $arr){
+        $salt = makeSalt(6);
         // 密码加密
-        $arr['password'] = password($arr['password']);
+        $arr['password'] = password($arr['password'].$salt);
         // 生成salt
-        $arr['salt'] = makeSalt(6);
+        $arr['salt'] = $salt;
         $dtime =time();
         $arr['create_time'] = $dtime;
         $arr['update_time'] = $dtime;