From 35b8a1c7e7144c6dfe15555e57ffba45d73568ac Mon Sep 17 00:00:00 2001
From: Armor00 <2654988228@qq.com>
Date: Fri, 19 Jul 2024 11:41:56 +0800
Subject: [PATCH] update

---
 run_service_backend.py            | 18 ++++++++++++++++++
 src/ark_helper_backend/backend.py |  2 ++
 2 files changed, 20 insertions(+)

diff --git a/run_service_backend.py b/run_service_backend.py
index d3c443d..8009c36 100644
--- a/run_service_backend.py
+++ b/run_service_backend.py
@@ -37,7 +37,9 @@ def start_data_retrieve():
     else:
         ark_back.is_retrieving_data = True
         s1 = threading.Thread(target=data_retrieve_thread)
+        s2 = threading.Thread(target=skland_sign_in_thread())
         s1.start()
+        s2.start()
     return json.dumps({'status': 0, 'data': ark_back.is_retrieving_data})
 
 
@@ -72,6 +74,20 @@ def get_data():
     return json.dumps(data)
 
 
+@app.route("/RunGetDataNow", methods=["POST"])
+def run_get_data_now():
+    input_param_dict = json.loads(request.get_data()) if request.get_data() else {}
+    if not input_param_dict:
+        return 'No data supplied'
+    if input_param_dict.get('admin_key') != admin_key:
+        return '403 Forbidden'
+
+    ark_back.data_retrieve()
+    gacha_data, payment_data = ark_back.show_data()
+    data = {'status': 0, 'gacha_data': gacha_data, 'payment_data': payment_data}
+    return json.dumps(data)
+
+
 def data_retrieve_thread():
     try:
         while 1:
@@ -112,5 +128,7 @@ if __name__ == '__main__':
     print('start')
     logger = LoggerClass().get_log(logging.INFO)
     ark_back = ArkHelperBackend(logger=logger)
+    threading.Thread(target=skland_sign_in_thread).start()
+    threading.Thread(target=data_retrieve_thread).start()
     app.run(host="192.168.195.194", port=59001)
 
diff --git a/src/ark_helper_backend/backend.py b/src/ark_helper_backend/backend.py
index ae70c4b..fdf5f91 100644
--- a/src/ark_helper_backend/backend.py
+++ b/src/ark_helper_backend/backend.py
@@ -84,6 +84,8 @@ class ArkHelperBackend:
 
     def dump_json_data(self, json_path, json_data):
         try:
+            og_data = self.load_json_data(json_path)
+            og_data.update(json_data)
             with open(json_path, 'w', encoding='utf-8') as f:
                 f.write(json.dumps(json_data, ensure_ascii=False))
         except FileNotFoundError: