From 8cb4f244d1fa17b60407ff0af5c194c852ec6c5c Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Thu, 27 Jan 2022 09:33:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E8=AF=81=E4=BB=B6=E7=85=A7bu?=
 =?UTF-8?q?g?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hb_server/apps/hrm/services.py | 10 +++++-----
 hb_server/apps/hrm/views.py    |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/hb_server/apps/hrm/services.py b/hb_server/apps/hrm/services.py
index 0786a29..bd2f6b4 100644
--- a/hb_server/apps/hrm/services.py
+++ b/hb_server/apps/hrm/services.py
@@ -21,7 +21,7 @@ class HRMService:
             os.remove(filepath)
         except:
             os.remove(filepath)
-            return None, '头像解码失败'
+            return None, '人脸识别失败'
 
         # 匹配人脸库
         face_datas = cache.get('face_datas')
@@ -32,13 +32,13 @@ class HRMService:
             results = face_recognition.compare_faces(face_datas, 
             unknown_face_encoding, tolerance=0.5)
         except:
-            return None, '识别失败'
+            return None, '人脸匹配失败'
         for index, value in enumerate(results):
             if value:
                 # 识别成功
                 user = User.objects.get(id=face_users[index])
                 return user, ''   
-        return None, '识别失败'
+        return None, '人脸匹配失败'
 
     @classmethod
     def get_facedata_from_img(cls, img_path):
@@ -47,6 +47,6 @@ class HRMService:
             picture_of_me = face_recognition.load_image_file(photo_path)
             my_face_encoding = face_recognition.face_encodings(picture_of_me)[0]
             face_data_list = my_face_encoding.tolist()
-            return face_data_list
+            return face_data_list, ''
         except:
-            return None
\ No newline at end of file
+            return None, '人脸识别失败'
\ No newline at end of file
diff --git a/hb_server/apps/hrm/views.py b/hb_server/apps/hrm/views.py
index 89dfa66..a1662bc 100644
--- a/hb_server/apps/hrm/views.py
+++ b/hb_server/apps/hrm/views.py
@@ -42,13 +42,13 @@ class EmployeeViewSet(CreateUpdateModelAMixin, OptimizationMixin, UpdateModelMix
         serializer.is_valid(raise_exception=True)
         photo = data.get('photo', None)
         if instance.photo != photo:
-            f_l = HRMService.get_facedata_from_img(img_path=photo)
+            f_l, msg = HRMService.get_facedata_from_img(img_path=photo)
             if f_l:
                 serializer.save(update_by=request.user, face_data = f_l)
                 # 更新人脸缓存
                 update_all_user_facedata_cache.delay()
                 return Response()
-            return Response('头像识别失败', status=status.HTTP_400_BAD_REQUEST)
+            return Response(msg, status=status.HTTP_400_BAD_REQUEST)
         serializer.save(update_by=request.user)
         return Response()