合并代码

Module/FlaskService.py

@@ -18,6 +18,7 @@ from Utils.ControlUtils import ControlUtils
 from Utils.ThreadManager import ThreadManager
 from script.ScriptManager import ScriptManager
 from Entity.Variables import anchorList, addModelToAnchorList
+import Entity.Variables
 
 app = Flask(__name__)
 CORS(app)
@@ -310,19 +311,19 @@ def monitorMessages():
     return ResultData(data="").toJson()
 
 
-
-@app.route("/upLoadLogFile", methods=['POST'])
+@app.route("/setLoginInfo", methods=['POST'])
 def upLoadLogFile():
-    ok = LogManager.upload_all_logs(
-        server_url="http://47.79.98.113:8101/api/log/upload",
-        extra_data={"project": "TikTokAuto", "env": "dev"}
-    )
+    data = request.get_json()  # 解析 JSON
+    token = data.get("token")
+    userId = data.get("userId")
+    tenantId = data.get("tenantId")
+    ok = LogManager.upload_all_logs("http://47.79.98.113:8101/api/log/upload", token, userId, tenantId)
     if ok:
+        print(123)
         return ResultData(data="日志上传成功").toJson()
     else:
         return ResultData(data="", msg="日志上传失败").toJson()
 
 
-
 if __name__ == '__main__':
     app.run("0.0.0.0", port=5000, debug=True, use_reloader=False)