Browse Source

解决现场版本日志加载不出来的问题

casper 3 months ago
parent
commit
f8a2bf0631
3 changed files with 24 additions and 13 deletions
  1. 4 3
      sri-server-bg01/api/v6/code3000.py
  2. 9 0
      sri-server-bg01/hub.py
  3. 11 10
      sri-server-bg01/test/test-3000.py

+ 4 - 3
sri-server-bg01/api/v6/code3000.py

@@ -2,7 +2,7 @@ from hub import methods, Global
 
 import os
 
-save_dir = r'C:\logs'  # sri内网测试环境
+# save_dir = r'C:\logs'  # sri内网测试环境
 
 
 async def code3001(**sources):
@@ -16,9 +16,10 @@ async def code3001(**sources):
         return dict(code=2, details=f"something is wrong.")
 
     # --- get log_file_uuid_list ---
-    log_file_list = methods.get_file_path_list(save_dir)
+    log_file_list = methods.get_file_path_list(Global.save_dir)
     log_file_name_list = [i.split('\\')[-1] for i in log_file_list]
     log_file_uuid_list = [i.split('.')[0] for i in log_file_name_list]
+    methods.debug_log('code3000.22:', f"#log_file_uuid_list: {log_file_uuid_list}")
 
     # --- fill d2 ---
     d2 = dict()
@@ -103,7 +104,7 @@ async def code3002(**sources):
     # --- get file_path ---
     # log_uuid = '671754598302fc6fd344819f'
     log_uuid = sources.get('uuid')
-    file_path = os.path.join(save_dir, f"{log_uuid}.log")
+    file_path = os.path.join(Global.save_dir, f"{log_uuid}.log")
 
     # --- get file_name ---
     methods.debug_log('code3000.code3002|145:', f"#log_uuid: {log_uuid}")

+ 9 - 0
sri-server-bg01/hub.py

@@ -7,5 +7,14 @@ methods = importlib.import_module(f"xlib")
 
 
 class Global(object):
+
+    # --- 公司内网测试服务器 ---
+    # save_dir = r'C:\logs'  # sri内网测试环境
+
+
+    # --- 湛江现场 ----
+    save_dir = r'E:\logs'  # 容量为512G
+
+
     mdb = importlib.import_module(f"xclient.xmongo").Client(host='127.0.0.1', port=47017, database='bg',
                                                             username='admin', password='admin')

+ 11 - 10
sri-server-bg01/test/test-3000.py

@@ -2,8 +2,8 @@ import requests
 
 # --- test 获取token ---
 # url = 'http://58.34.94.177:29101/v1/token'
-# url = 'http://127.0.0.1:9000/v1/token'
-url = 'http://10.10.60.237:9000/v1/token'
+# url = 'http://10.10.60.237:9000/v1/token'
+url = 'http://127.0.0.1:9000/v1/token'
 data = {
     'username': 'admin',  # 用户名
     'password': '123456',  # 密码
@@ -15,7 +15,8 @@ token = response.headers.get('authorization')
 
 # --- test 3001 查询驾驶人员操作记录列表 ---
 # url = 'http://58.34.94.177:29101/v6/api'
-url = 'http://10.10.60.237:9000/v6/api'
+# url = 'http://10.10.60.237:9000/v6/api'
+url = 'http://127.0.0.1:9000/v6/api'
 data = {
     'code': 3001,  # 接口号
     'page': 1,  # 页码
@@ -45,10 +46,10 @@ print(response.json())
 """
 
 # --- test 3002 下载指定驾驶人员操作日志 ---
-url = 'http://58.34.94.177:29101/v6/api'
-params = {
-    'code': 3002,  # 接口号
-    'uuid': '65dbe96949fbe311a3a01d30',  # 日志id
-}
-response = requests.get(url=url, params=params, headers={'authorization': token})
-print(response.text)
+# url = 'http://58.34.94.177:29101/v6/api'
+# params = {
+#     'code': 3002,  # 接口号
+#     'uuid': '65dbe96949fbe311a3a01d30',  # 日志id
+# }
+# response = requests.get(url=url, params=params, headers={'authorization': token})
+# print(response.text)