Merge branch 'dev' of http://192.168.136.45:3000/SERVER/AnsjerServer into dev

Controller/ApplicationController.py

@@ -162,6 +162,7 @@ class AuthView(View):
                 # print(CommonService.qs_to_dict(user_qs)['datas'][0]['fields'])
                 res_json = CommonService.qs_to_dict(user_qs)['datas'][0]['fields']
                 res_json.pop('password')
+                res_json.update(user_id=CommonService.qs_to_dict(user_qs)['datas'][0]['pk'])
                 print(res_json)
                 return JsonResponse(res_json)
             else:

Controller/EquipmentManagerV3.py

@@ -296,7 +296,7 @@ class EquipmentManagerV3(View):
                 userPwd = base64.b64encode(str(userPwd).encode("utf-8")).decode('utf8')
             if i == 2:
                 userPwd = RandomStr(2, False)+str(userPwd)+RandomStr(2, False)
-                userPwd =base64.b64encode(str(userPwd).encode("utf-8")).decode('utf8')
+                userPwd = base64.b64encode(str(userPwd).encode("utf-8")).decode('utf8')
             if i == 3:
                 userPwd = RandomStr(1, False)+str(userPwd)+RandomStr(1, False)
                 userPwd = base64.b64encode(str(userPwd).encode("utf-8")).decode('utf8')

Service/TemplateService.py

@@ -73,6 +73,7 @@ class TemplateService:
             'v3/equipment/add',
             'v3/equipment/modify',
             'v2/account/login',
+            'v3/account/login',
         ]
         return apiList