From 7eff4e5339fd708a2ae7c1d800f4ace229d22f43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=AF=9B=E9=B9=8F?= <729164035@qq.com>
Date: Tue, 16 Jul 2024 10:18:39 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 MangoServer/PyAutoTest/auto_test/auto_user/views/user.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/MangoServer/PyAutoTest/auto_test/auto_user/views/user.py b/MangoServer/PyAutoTest/auto_test/auto_user/views/user.py
index 8a0f9415..9451d845 100644
--- a/MangoServer/PyAutoTest/auto_test/auto_user/views/user.py
+++ b/MangoServer/PyAutoTest/auto_test/auto_user/views/user.py
@@ -138,7 +138,7 @@ class LoginViews(ViewSet):
         password = request.data.get('password')
         source_type = request.data.get('type')
         password = EncryptionTool.md5_32_small(**{'data': password})
-        user_info = User.objects.filter(username=username, password=password).first()
+        user_info = User.objects.get(username=username, password=password)
         if not user_info:
             return ResponseData.fail(RESPONSE_MSG_0042)
         x_forwarded_for = request.META.get('HTTP_X_FORWARDED_FOR')
@@ -159,7 +159,7 @@ class LoginViews(ViewSet):
             "userName": user_info.username,
             "userId": user_info.id,
             "roleId": user_info.role.id if user_info.role else None,
-            "token": create_token({'id': user_info.id, 'username': user_info.username}),
+            "token": create_token({'id': user_info.id, 'username': user_info.username, 'nickname': user_info.nickname}),
             "selected_project": user_info.selected_project,
             "selected_environment": user_info.selected_environment,
             "roles": [
-- 
Gitee


From e19e9ecec77ae3667fcd3cfbcd8d72a7621fa949 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=AF=9B=E9=B9=8F?= <729164035@qq.com>
Date: Tue, 16 Jul 2024 10:39:28 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 MangoServer/manage.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/MangoServer/manage.py b/MangoServer/manage.py
index 50263c36..be5dbf4b 100644
--- a/MangoServer/manage.py
+++ b/MangoServer/manage.py
@@ -8,7 +8,6 @@ import sys
 def main():
     """Run administrative tasks."""
     django_env = None
-    # 从参数中获取 --env 参数
     for i, arg in enumerate(sys.argv):
         if '--env=' in arg:
             django_env = arg.split('=')[1]
-- 
Gitee