diff --git a/mapstock.py b/mapstock.py index 7428f16..ab8092a 100644 --- a/mapstock.py +++ b/mapstock.py @@ -45,12 +45,9 @@ def music(userId): scoreRank = music['scoreRank'] extNum1 = music['extNum1'] - print(timestamp) - # UserLogin login_result = login(userId,timestamp) - print(login_result) login_id = login_result['loginId'] login_date = login_result['lastLoginDate'] @@ -182,9 +179,6 @@ def music(userId): userlog_result = json.loads(sdgb_api(data, "UploadUserPlaylogApi", userId)) - print(userlog_result) - - # 获取 User Extend data = json.dumps({ "userId": int(userId) @@ -223,9 +217,6 @@ def music(userId): user_charge = json.loads(sdgb_api(data, "GetUserChargeApi", userId)) - - - # UserAll data = json.dumps({ @@ -382,7 +373,14 @@ def music(userId): }) userall_result = json.loads(sdgb_api(data, "UpsertUserAllApi", userId)) - return userall_result + + data = json.dumps( + login_result, + userlog_result, + userall_result + ) + + return data def music_with_retry(userId): for i in range(5): # 重试次数 @@ -391,8 +389,5 @@ def music_with_retry(userId): return logout(userId, timestamp) except ValueError as e: logout(userId, timestamp) - time.sleep(3) # 等待 5 秒后重试 - return "Error" - -if __name__ == "__main__": - print(music_with_retry()) + time.sleep(3) + return json.dumps({"status": "500 Internal Server Error"}), 500 diff --git a/music.py b/music.py index 27ec2d0..493d85d 100644 --- a/music.py +++ b/music.py @@ -46,7 +46,6 @@ def music(userId, music_data): # UserLogin login_result = login(userId, timestamp) - print(login_result) login_id = login_result['loginId'] login_date = login_result['lastLoginDate'] @@ -189,8 +188,6 @@ def music(userId, music_data): userlog_result = json.loads(sdgb_api(data, "UploadUserPlaylogApi", userId)) - print(userlog_result) - data = json.dumps({ "userId": int(userId), "userPlaylog": { @@ -307,8 +304,6 @@ def music(userId, music_data): userlog_result = json.loads(sdgb_api(data, "UploadUserPlaylogApi", userId)) - print(userlog_result) - data = json.dumps({ "userId": int(userId), "userPlaylog": { @@ -425,9 +420,6 @@ def music(userId, music_data): userlog_result = json.loads(sdgb_api(data, "UploadUserPlaylogApi", userId)) - print(userlog_result) - - # 获取 User Extend data = json.dumps({ "userId": int(userId) @@ -467,8 +459,6 @@ def music(userId, music_data): user_charge = json.loads(sdgb_api(data, "GetUserChargeApi", userId)) - - # UserAll data = json.dumps({ @@ -647,18 +637,21 @@ def music(userId, music_data): }) userall_result = json.loads(sdgb_api(data, "UpsertUserAllApi", userId)) - return userall_result -def music_with_retry(userId, music_data, max_retries=10): # 这里是重试次数 - for i in range(max_retries): + data = json.dumps( + login_result, + userlog_result + userall_result + ) + + return data + +def music_with_retry(userId, music_data): + for i in range(5): try: music(userId, music_data) return logout(userId, timestamp) except ValueError as e: - print(f"尝试 {i+1} 失败,错误:{e}") logout(userId, timestamp) - time.sleep(3) # 等待 5 秒后重试 - return "重试次数超过限制,乐曲上传失败" - -if __name__ == "__main__": - print(music_with_retry()) + time.sleep(3) + return json.dumps({"status": "500 Internal Server Error"}), 500