Merge remote-tracking branch 'remotes/origin/Bin' into dev

Controller/UserController.py

@@ -1780,7 +1780,7 @@ class v3LoginView(TemplateView):
             res['userEmail'] = users['userEmail'] if users['userEmail'] is not None else ''
             res['phone'] = users['phone'] if users['phone'] is not None else ''
             res['fingerprint_enable'] = users['fingerprint_enable']
-            res['fingerprint_key'] = users['fingerprint_key']
+            res['fingerprint_key'] = CommonService.encode_data(content=users['fingerprint_key'], start=2)
             return response.json(0, res)
         else:
             return response.json(tko.code)
@@ -3238,6 +3238,7 @@ class v3LoginByFingerprintView(View):
                             res['username'] = users['username'] if users['username'] is not None else ''
                             res['userEmail'] = users['userEmail'] if users['userEmail'] is not None else ''
                             res['phone'] = users['phone'] if users['phone'] is not None else ''
+                            res['fingerprint_enable'] = users['fingerprint_enable']
                             res['fingerprint_key'] = CommonService.encode_data(content=users['fingerprint_key'], start=2)
                             return response.json(0, res)
                         else: