Move to Fix Plugin Load Issue

Plugin/nonebot_plugin_maimai_helper/leak/music.py

@@ -3,7 +3,7 @@ import pytz
 import time
 import random
 
-from sdgb import sdgb_api
+from nonebot_plugin_maimai_helper.leak.sdgb import sdgb_api
 from datetime import datetime, timedelta
 
 #from settings import userId
@@ -16,8 +16,8 @@ placeName = "插电师电玩北京西单大悦城店"
 clientId = "A63E01C2805"
 
 
-from login import login
-from logout import logout
+from nonebot_plugin_maimai_helper.leak.login import login
+from nonebot_plugin_maimai_helper.leak.logout import logout
 
 def CalcRandom():
     max = 1037933
@@ -34,26 +34,26 @@ def CalcRandom():
 
 timestamp = int(time.time()) - 60
 
-def music(music_data,userId):
+def music(music_id,music_level,music_count,music_acc,music_combo,music_sync,music_dx,music_rank,userId):
     result_success = {"is_success": False}
 
-    music = music_data
+#    music = music_data
 
-    musicId = music['musicId']
-    level = music['level']
-    playCount = music['playCount']
-    achievement = music['achievement']
-    comboStatus = music['comboStatus']
-    syncStatus = music['syncStatus']
-    deluxscoreMax = music['deluxscoreMax']
-    scoreRank = music['scoreRank']
-    extNum1 = music['extNum1']
+    musicId = music_id
+    level = music_level
+    playCount = music_count
+    achievement = music_acc
+    comboStatus = music_combo
+    syncStatus = music_sync
+    deluxscoreMax = music_dx
+    scoreRank = music_rank
+    extNum1 = 0
 
     print(timestamp)
 
     # UserLogin
 
-    login_result = json.loads(login(timestamp))
+    login_result = json.loads(login(timestamp,userId))
     print(login_result)
 
     login_id = login_result['loginId']
@@ -653,7 +653,8 @@ def music(music_data,userId):
         "isNewFriendSeasonRankingList": ""
         }
     })
-
+    logout1 = logout(timestamp,userId)
+    print(logout1)
 #    userall_result = json.loads(sdgb_api(data, "UpsertUserAllApi", userId))
     result_success["is_success"] = True
     return result_success