update
This commit is contained in:
@@ -37,7 +37,9 @@ def start_data_retrieve():
|
|||||||
else:
|
else:
|
||||||
ark_back.is_retrieving_data = True
|
ark_back.is_retrieving_data = True
|
||||||
s1 = threading.Thread(target=data_retrieve_thread)
|
s1 = threading.Thread(target=data_retrieve_thread)
|
||||||
|
s2 = threading.Thread(target=skland_sign_in_thread())
|
||||||
s1.start()
|
s1.start()
|
||||||
|
s2.start()
|
||||||
return json.dumps({'status': 0, 'data': ark_back.is_retrieving_data})
|
return json.dumps({'status': 0, 'data': ark_back.is_retrieving_data})
|
||||||
|
|
||||||
|
|
||||||
@@ -72,6 +74,20 @@ def get_data():
|
|||||||
return json.dumps(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():
|
def data_retrieve_thread():
|
||||||
try:
|
try:
|
||||||
while 1:
|
while 1:
|
||||||
@@ -112,5 +128,7 @@ if __name__ == '__main__':
|
|||||||
print('start')
|
print('start')
|
||||||
logger = LoggerClass().get_log(logging.INFO)
|
logger = LoggerClass().get_log(logging.INFO)
|
||||||
ark_back = ArkHelperBackend(logger=logger)
|
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)
|
app.run(host="192.168.195.194", port=59001)
|
||||||
|
|
||||||
|
|||||||
@@ -84,6 +84,8 @@ class ArkHelperBackend:
|
|||||||
|
|
||||||
def dump_json_data(self, json_path, json_data):
|
def dump_json_data(self, json_path, json_data):
|
||||||
try:
|
try:
|
||||||
|
og_data = self.load_json_data(json_path)
|
||||||
|
og_data.update(json_data)
|
||||||
with open(json_path, 'w', encoding='utf-8') as f:
|
with open(json_path, 'w', encoding='utf-8') as f:
|
||||||
f.write(json.dumps(json_data, ensure_ascii=False))
|
f.write(json.dumps(json_data, ensure_ascii=False))
|
||||||
except FileNotFoundError:
|
except FileNotFoundError:
|
||||||
|
|||||||
Reference in New Issue
Block a user