完善日志保存数据

Controller/SerialNumberController.py

@@ -50,9 +50,9 @@ class SerialNumberView(View):
         elif operation == 'allot':
             return self.do_allot(request_dict, response)
         elif operation == 'createSerial':  # 生成序列号
-            return self.create_serial(request_dict, response, request)
+            return self.create_serial(request_dict, response, request, token.userID)
         elif operation == 'serialCompany':  # 将序列号分匹配到指定企业
-            return self.do_serial_company(request_dict, response, request)
+            return self.do_serial_company(request_dict, response, request, token.userID)
         elif operation == 'revise/state':  # 修改序列号状态
             return self.revise_state(request_dict, response, request)
         else:
@@ -81,12 +81,13 @@ class SerialNumberView(View):
             print(e)
             return response.json(500)
 
-    def do_serial_company(self, request_dict, response, request):
+    def do_serial_company(self, request_dict, response, request, user_id):
         """
         将序列号分匹配到指定企业
         :param request_dict: 请求参数
         :param response: 响应对象
         :param request: 请求
+        :param user_id: 用户id
         :return:
         """
         id = request_dict.get('id', None)
@@ -132,12 +133,12 @@ class SerialNumberView(View):
             content = json.loads(json.dumps(request_dict))
             log = {
                 'ip': ip,
-                'user_id': 1,
+                'user_id': user_id,
                 'status': 200,
                 'time': now_time,
                 'url': 'serialNumber/serialCompany',
                 'content': json.dumps(content),
-                'operation': '{}生成{}个Company Serial{}: {}'.format(company.name, quantity, '成功', '同步更新成功'),
+                'operation': '{}生成{}个序列号{}: {}'.format(company.name, quantity, '成功', '同步更新成功'),
             }
 
             with transaction.atomic():
@@ -155,38 +156,38 @@ class SerialNumberView(View):
 
                 res1 = requests.post(url=url1, data=requests_data, timeout=2 * 60)
                 if res1.status_code != 200:
-                    fail_reason = '请求测试服务器生成Company Serial响应状态码异常'
+                    fail_reason = '请求测试服务器生成序列号响应状态码异常'
                     return self.failResponse(company.name, quantity, fail_reason, Log, response)
                 res1 = res1.json()
                 if res1['result_code'] != 0:
-                    fail_reason = '测试服务器生成Company Serial发生异常'
+                    fail_reason = '测试服务器生成序列号发生异常'
                     return self.failResponse(company.name, quantity, fail_reason, Log, response)
 
                 res2 = requests.post(url=url2, data=requests_data, timeout=2 * 60)
                 if res2.status_code != 200:
-                    fail_reason = '请求国内服务器生成Company Serial响应状态码异常'
+                    fail_reason = '请求国内服务器生成序列号响应状态码异常'
                     return self.failResponse(company.name, quantity, fail_reason, Log, response)
                 res2 = res2.json()
                 if res2['result_code'] != 0:
-                    fail_reason = '国内服务器生成Company Serial发生异常'
+                    fail_reason = '国内服务器生成序列号发生异常'
                     return self.failResponse(company.name, quantity, fail_reason, Log, response)
 
                 res3 = requests.post(url=url3, data=requests_data, timeout=2 * 60)
                 if res3.status_code != 200:
-                    fail_reason = '请求美国服务器生成Company Serial响应状态码异常'
+                    fail_reason = '请求美国服务器生成序列号响应状态码异常'
                     return self.failResponse(company.name, quantity, fail_reason, Log, response)
                 res3 = res3.json()
                 if res3['result_code'] != 0:
-                    fail_reason = '美国服务器生成Company Serial发生异常'
+                    fail_reason = '美国服务器生成序列号发生异常'
                     return self.failResponse(company.name, quantity, fail_reason, Log, response)
 
                 # res4 = requests.post(url=url4, data=requests_data, timeout=2 * 60)
                 # if res4.status_code != 200:
-                #     fail_reason = '请求欧洲服务器生成Company Serial响应状态码异常'
+                #     fail_reason = '请求欧洲服务器生成序列号响应状态码异常'
                 #     return self.failResponse(company.name, quantity, fail_reason, Log, response)
                 # res4 = res4.json()
                 # if res4['code'] != 0:
-                #     fail_reason = '欧洲服务器生成Company Serial发生异常'
+                #     fail_reason = '欧洲服务器生成序列号发生异常'
                 #     return self.failResponse(company.name, quantity, fail_reason, Log, response)
 
                 return response.json(0)
@@ -197,17 +198,18 @@ class SerialNumberView(View):
             return response.json(176)
 
     def failResponse(self, company_name, quantity, fail_reason, Log, response):
-        operation = '{}生成{}个Company Serial{}: {}'.format(company_name, quantity, '失败', fail_reason)
+        operation = '{}生成{}个序列号{}: {}'.format(company_name, quantity, '失败', fail_reason)
         Log.operation = operation
         Log.save()
         return response.json(177)
 
-    def create_serial(self, request_dict, response, request):
+    def create_serial(self, request_dict, response, request, user_id):
         """
         生成序列号
         :param request_dict: 请求参数
         :param response: 响应对象
         :param request: 请求
+        :param user_id: 用户id
         :return:
         """
         quantity = int(request_dict.get('quantity', 0))
@@ -235,12 +237,12 @@ class SerialNumberView(View):
             content = json.loads(json.dumps(request_dict))
             log = {
                 'ip': ip,
-                'user_id': 1,
+                'user_id': user_id,
                 'status': 200,
                 'time': now_time,
                 'url': 'serialNumber/createSerial',
                 'content': json.dumps(content),
-                'operation': '生成{}个Serial Number{}: {}'.format(quantity, '成功', '同步更新成功'),
+                'operation': '生成{}个序列号{}: {}'.format(quantity, '成功', '同步更新成功'),
             }
 
             # 开启事务写入
@@ -257,37 +259,37 @@ class SerialNumberView(View):
 
                 res1 = requests.post(url=url1, data=requests_data, timeout=2 * 60)
                 if res1.status_code != 200:
-                    fail_reason = '请求测试服务器生成Serial Number响应状态码异常'
+                    fail_reason = '请求测试服务器生成序列号响应状态码异常'
                     return self.generateFail(quantity, fail_reason, Log, response)
                 res1 = res1.json()
                 if res1['result_code'] != 0:
-                    fail_reason = '测试服务器生成Serial Number发生异常'
+                    fail_reason = '测试服务器生成序列号发生异常'
                     return self.generateFail(quantity, fail_reason, Log, response)
 
                 res2 = requests.post(url=url2, data=requests_data, timeout=2 * 60)
                 if res2.status_code != 200:
-                    fail_reason = '请求国内服务器生成Serial Number响应状态码异常'
+                    fail_reason = '请求国内服务器生成序列号响应状态码异常'
                     return self.generateFail(quantity, fail_reason, Log, response)
                 res2 = res2.json()
                 if res2['result_code'] != 0:
-                    fail_reason = '国内服务器生成Serial Number发生异常'
+                    fail_reason = '国内服务器生成序列号发生异常'
                     return self.generateFail(quantity, fail_reason, Log, response)
 
                 res3 = requests.post(url=url3, data=requests_data, timeout=2 * 60)
                 if res3.status_code != 200:
-                    fail_reason = '请求美国服务器生成Serial Number响应状态码异常'
+                    fail_reason = '请求美国服务器生成序列号响应状态码异常'
                     return self.generateFail(quantity, fail_reason, Log, response)
                 res3 = res3.json()
                 if res3['result_code'] != 0:
-                    fail_reason = '美国服务器生成Serial Number发生异常'
+                    fail_reason = '美国服务器生成序列号发生异常'
                     return self.generateFail(quantity, fail_reason, Log, response)
                 # res4 = requests.post(url=url4, data=requests_data, timeout=2 * 60)
                 # if res4.status_code != 200:
-                #     fail_reason = '请求欧洲服务器生成Company Serial响应状态码异常'
+                #     fail_reason = '请求欧洲服务器生成序列号响应状态码异常'
                 #     return self.generateFail(quantity, fail_reason, Log, response)
                 # res4 = res4.json()
                 # if res4['code'] != 0:
-                #     fail_reason = '欧洲服务器生成Company Serial发生异常'
+                #     fail_reason = '欧洲服务器生成序列号发生异常'
                 #     return self.generateFail(quantity, fail_reason, Log, response)
                 return response.json(0)
 
@@ -297,7 +299,7 @@ class SerialNumberView(View):
             return response.json(176)
 
     def generateFail(self, quantity, fail_reason, Log, response):
-        operation = '生成{}个Serial Number{}: {}'.format(quantity, '失败', fail_reason)
+        operation = '生成{}个序列号{}: {}'.format(quantity, '失败', fail_reason)
         Log.operation = operation
         Log.save()
         return response.json(177)

Service/LogMiddleware.py

@@ -14,13 +14,6 @@ from Service.CommonService import CommonService
 
 class LogMiddleware(MiddlewareMixin):
 
-    # def process_request(self, request):
-        # if request.path == '/upload':
-        #     request.encoding = 'utf-8'
-        #     request_dict = request.POST
-        #     print(request.POST)
-        #     request.POST = request_dict
-
     def process_response(self, request, response):
 
         if request.path != '/favicon.ico':
@@ -42,7 +35,6 @@ def add_log(request, response):
     else:
         return
 
-    # print(response.content.decode().strip())
     request_path = request.path.strip().strip('/')
     print(request_path)
     jsonObject = {}
@@ -62,13 +54,11 @@ def add_log(request, response):
             return
 
     token = request_dict.get('token', None)
-    # print(token)
     token = TokenObject(token)
 
     status = response.status_code
     # 去除密码
     contentDict = dict(request_dict)
-    # print(contentDict)
     password = contentDict.get('password')
     if password:
         contentDict.pop('password')
@@ -80,7 +70,6 @@ def add_log(request, response):
     if token.code == 0:
         user_qs = UserModel.objects.filter(id=token.userID)
     else:
-        # print(token.code)
         username = request_dict.get('username', None)
         if username is None:
             print('username')
@@ -88,12 +77,10 @@ def add_log(request, response):
         user_qs = UserModel.objects.filter(username=username)
 
     if not user_qs.exists():
-        # print('exists')
         return
 
     user = user_qs[0]
     operation = ''
-    # print(request_path)
     if request_path == 'user/login':
         operation = '登录账号'
     elif request_path == 'user/logout':