feat: admin log aspect

app/Service/Admin/User/LoginService.php

@@ -14,11 +14,9 @@ use App\Constants\Admin\UserCode;
 use App\Constants\AdminCode;
 use App\Exception\AdminException;
 use App\Extend\SystemUtil;
-use App\Lib\AdminReturn;
 use App\Lib\Crypto\CryptoFactory;
 use App\Model\AdminUser;
 use App\Service\Admin\BaseService;
-use App\Service\Common\AppMakeService;
 use Exception;
 use Hyperf\Di\Annotation\Inject;
 
@@ -51,7 +49,9 @@ class LoginService extends BaseService
 
         if ($userInfo->status == UserCode::DISABLE) throw new AdminException(UserCode::getMessage($userInfo->status),AdminCode::LOGIN_ERROR);
 
-        if ($this->cryptoFactory->cryptoClass('admin-password',$this->request->input('password'),$userInfo->salt) != $userInfo->password) throw new AdminException('密码错误！');
+        // pass加密跟数据库做判断
+        $password = $this->cryptoFactory->cryptoClass('admin-password',$this->request->input('password'),$userInfo->salt)->encrypt();
+        if ($password != $userInfo->password) throw new AdminException('密码错误！');
 
         $userInfo->last_login_time = date('Y-m-d H:i:s');
         $userInfo->last_login_ip = SystemUtil::getClientIp();
@@ -59,6 +59,7 @@ class LoginService extends BaseService
 
         if (!$userInfo->save()) throw new AdminException('登录失败');
 
+        //生成 token
         $token = $this->cryptoFactory->cryptoClass('jwt',json_encode([
             'id' => $userInfo->id,
             'role' => $userInfo->role_id,