From 2f8d9d6713b1ef660d80b2cf7db6dc2d5b6dd08c Mon Sep 17 00:00:00 2001 From: 91c0e59d-6161-45ab-8aa4-2371574db28f <91c0e59d-6161-45ab-8aa4-2371574db28f@bankofchina.com> Date: Mon, 20 Jan 2025 14:28:14 +0800 Subject: [PATCH] format code --- sdga/login.py | 8 ++------ sdga/logout.py | 6 ++---- sdga/preview.py | 2 -- sdgb/login.py | 6 ++---- sdgb/logout.py | 6 ++---- sdgb/mapstock.py | 8 ++------ sdgb/music.py | 8 ++------ sdgb/ticket.py | 6 ++---- sdgb/unlock.py | 10 +++------- sdgb/unlock_all.py | 8 ++------ 10 files changed, 19 insertions(+), 49 deletions(-) diff --git a/sdga/login.py b/sdga/login.py index 4d3bd81..cc64e68 100644 --- a/sdga/login.py +++ b/sdga/login.py @@ -2,13 +2,10 @@ import json import pytz from sdgb import sdgb_api -from sdgb import aimedb_api from datetime import datetime from settings import userId, accessCode -from settings import regionId -from settings import clientId -from settings import placeId +from settings import regionId, clientId, placeId def login(timestamp): data = json.dumps({ @@ -22,9 +19,8 @@ def login(timestamp): "genericFlag": 0, }) - login_result = json.loads(sdgb_api(data, "UserLoginApi", userId)) + login_result = sdgb_api(data, "UserLoginApi", userId) return login_result if __name__ == "__main__": - print(aimedb_api(accessCode)) print(login(int(input()))) diff --git a/sdga/logout.py b/sdga/logout.py index e1b369c..289b402 100644 --- a/sdga/logout.py +++ b/sdga/logout.py @@ -5,9 +5,7 @@ from sdgb import sdgb_api from datetime import datetime from settings import userId, accessCode -from settings import regionId -from settings import clientId -from settings import placeId +from settings import regionId, clientId, placeId def logout(timestamp): data = json.dumps({ @@ -20,7 +18,7 @@ def logout(timestamp): "type": 1 }) - logout_result = json.loads(sdgb_api(data, "UserLogoutApi", userId)) + logout_result = sdgb_api(data, "UserLogoutApi", userId) return logout_result diff --git a/sdga/preview.py b/sdga/preview.py index 5a4fe24..8cce77d 100644 --- a/sdga/preview.py +++ b/sdga/preview.py @@ -1,7 +1,6 @@ import json from sdgb import sdgb_api -from sdgb import aimedb_api from settings import userId, accessCode def preview(userId): @@ -14,5 +13,4 @@ def preview(userId): return preview_result if __name__ == "__main__": - print(aimedb_api(accessCode)) print(preview(userId)) diff --git a/sdgb/login.py b/sdgb/login.py index 631d69b..5127de9 100644 --- a/sdgb/login.py +++ b/sdgb/login.py @@ -5,9 +5,7 @@ from sdgb import sdgb_api from datetime import datetime from settings import userId -from settings import regionId -from settings import clientId -from settings import placeId +from settings import regionId, clientId, placeId def login(timestamp): data = json.dumps({ @@ -21,7 +19,7 @@ def login(timestamp): "genericFlag": 0, }) - login_result = json.loads(sdgb_api(data, "UserLoginApi", userId)) + login_result = sdgb_api(data, "UserLoginApi", userId) return login_result if __name__ == "__main__": diff --git a/sdgb/logout.py b/sdgb/logout.py index e310da9..f4bf8fe 100644 --- a/sdgb/logout.py +++ b/sdgb/logout.py @@ -5,9 +5,7 @@ from sdgb import sdgb_api from datetime import datetime from settings import userId -from settings import regionId -from settings import clientId -from settings import placeId +from settings import regionId, clientId, placeId def logout(timestamp): data = json.dumps({ @@ -20,7 +18,7 @@ def logout(timestamp): "type": 1 }) - logout_result = json.loads(sdgb_api(data, "UserLogoutApi", userId)) + logout_result = sdgb_api(data, "UserLogoutApi", userId) return logout_result diff --git a/sdgb/mapstock.py b/sdgb/mapstock.py index afca934..dd028ed 100644 --- a/sdgb/mapstock.py +++ b/sdgb/mapstock.py @@ -8,11 +8,7 @@ from datetime import datetime, timedelta from settings import userId from settings import music_data -from settings import regionId -from settings import regionName -from settings import clientId -from settings import placeId -from settings import placeName +from settings import regionId, clientId, placeId, regionName, placeName from login import login from logout import logout @@ -50,7 +46,7 @@ def music(): # UserLogin - login_result = login(timestamp) + login_result = json.loads(login(timestamp)) print(login_result) login_id = login_result['loginId'] diff --git a/sdgb/music.py b/sdgb/music.py index c126533..f864d7c 100644 --- a/sdgb/music.py +++ b/sdgb/music.py @@ -8,11 +8,7 @@ from datetime import datetime, timedelta from settings import userId from settings import music_data -from settings import regionId -from settings import regionName -from settings import clientId -from settings import placeId -from settings import placeName +from settings import regionId, clientId, placeId, regionName, placeName from login import login from logout import logout @@ -50,7 +46,7 @@ def music(): # UserLogin - login_result = login(timestamp) + login_result = json.loads(login(timestamp)) print(login_result) login_id = login_result['loginId'] diff --git a/sdgb/ticket.py b/sdgb/ticket.py index 6c3be7e..375279f 100644 --- a/sdgb/ticket.py +++ b/sdgb/ticket.py @@ -6,9 +6,7 @@ from sdgb import sdgb_api from datetime import datetime, timedelta from settings import userId -from settings import regionId -from settings import clientId -from settings import placeId +from settings import regionId, clientId, placeId from logout import logout from login import login @@ -32,7 +30,7 @@ def get_ticket(): } }) - ticket_result = json.loads(sdgb_api(data, "UpsertUserChargelogApi", userId)) + ticket_result = sdgb_api(data, "UpsertUserChargelogApi", userId) return ticket_result diff --git a/sdgb/unlock.py b/sdgb/unlock.py index 8ef21bc..42e971a 100644 --- a/sdgb/unlock.py +++ b/sdgb/unlock.py @@ -8,11 +8,7 @@ from datetime import datetime, timedelta from settings import userId from settings import music_data -from settings import regionId -from settings import regionName -from settings import clientId -from settings import placeId -from settings import placeName +from settings import regionId, clientId, placeId, regionName, placeName from login import login from logout import logout @@ -50,7 +46,7 @@ def music(unlock_id): # UserLogin - login_result = login(timestamp) + login_result = json.loads(login(timestamp)) print(login_result) login_id = login_result['loginId'] @@ -388,7 +384,7 @@ def music(unlock_id): "isNewMapList": "", "isNewLoginBonusList": "", "isNewItemList": 11, - "isNewMusicDetailList": "0", + "isNewMusicDetailList": "1", "isNewCourseList": "0", "isNewFavoriteList": "", "isNewFriendSeasonRankingList": "" diff --git a/sdgb/unlock_all.py b/sdgb/unlock_all.py index 34c68e6..8dffa2e 100644 --- a/sdgb/unlock_all.py +++ b/sdgb/unlock_all.py @@ -8,11 +8,7 @@ from datetime import datetime, timedelta from settings import userId from settings import music_data -from settings import regionId -from settings import regionName -from settings import clientId -from settings import placeId -from settings import placeName +from settings import regionId, clientId, placeId, regionName, placeName from login import login from logout import logout @@ -50,7 +46,7 @@ def music(): # UserLogin - login_result = login(timestamp) + login_result = json.loads(login(timestamp)) print(login_result) login_id = login_result['loginId']