Merge branch 'master' of http://git.choozmo.com:3000/choozmo/ArkCard-Linebot

main.py

@@ -260,7 +260,7 @@ def shop(userid):
     # db connect
     db = dataset.connect('mysql://choozmo:pAssw0rd@db.ptt.cx:3306/arkcard?charset=utf8mb4')
 
-    sql = 'SELECT * FROM arkcard.nft WHERE userid IS NULL OR userid="" LIMIT 5'
+    sql = 'SELECT DISTINCT title FROM arkcard.nft WHERE userid IS NULL OR userid="" LIMIT 5'
     result = db.query(sql)
     rows = {}
     i = 0
@@ -299,8 +299,8 @@ async def nftdrops(userModel : models.NftDrops):
 
     # input對應
     eventid = '1'
-    nftid = '101'
-    nftid2 = '102'
+    nftid = '1001'
+    nftid2 = '1002'
     userid = userModel.userid
     email = userModel.email