CJYen преди 3 години
родител
ревизия
80909f97d5
променени са 1 файла, в които са добавени 7 реда и са изтрити 4 реда
  1. 7 4
      main.py

+ 7 - 4
main.py

@@ -11,8 +11,8 @@ import json
 app = fastapi.FastAPI()
 
 # bot config
-# line_bot_api = LineBotApi("SJT7VPT4RMQFLcS27jQBy3FcC24gtDrkcwJWZ5Xzqesr5T78LOKudHEJzt0k3b2S7n4KPwf27J7DVz2c8NQ4plSaaQylEeB1cYrfejaE/RPG/lCIQBYe4iBTzo26s4i2PcmT89837per/lTyvhVIKAdB04t89/1O/w1cDnyilFU=")
-# handler = WebhookHandler("411ae3ef7e766739ed2c2c27b249d010")
+line_bot_api = LineBotApi("SJT7VPT4RMQFLcS27jQBy3FcC24gtDrkcwJWZ5Xzqesr5T78LOKudHEJzt0k3b2S7n4KPwf27J7DVz2c8NQ4plSaaQylEeB1cYrfejaE/RPG/lCIQBYe4iBTzo26s4i2PcmT89837per/lTyvhVIKAdB04t89/1O/w1cDnyilFU=")
+handler = WebhookHandler("411ae3ef7e766739ed2c2c27b249d010")
 
 # db connect
 db = dataset.connect('mysql://choozmo:pAssw0rd@db.ptt.cx:3306/arkcard?charset=utf8mb4')
@@ -26,17 +26,20 @@ async def callback(request: fastapi.Request):
     handler.handle(body.decode('utf-8'), signature)
     return 'OK'
 
+# nft collection api
 @app.get("/collection/{userid}")
 def collection(userid):
     xname = userid
-    sql = 'SELECT * FROM nft WHERE userid="'+xname+'"'
+    sql = 'SELECT a.* FROM nft a INNER JOIN ( SELECT userid FROM users WHERE userid="'+xname+'" ) b ON b.userid = a.userid'
     result = db.query(sql)
     rows={}
     i = 0
     for row in result:
         rows[i]=row
         i+=1
-    return json.dumps(rows)
+    return rows
+
+
 
 # follow event
 @handler.add(FollowEvent)