瀏覽代碼

add get availible avatar (not tested)

ming 3 年之前
父節點
當前提交
9e03fd68e8
共有 3 個文件被更改,包括 11 次插入12 次删除
  1. 二進制
      api/__pycache__/main.cpython-39.pyc
  2. 2 4
      api/main.py
  3. 9 8
      api/util/user.py

二進制
api/__pycache__/main.cpython-39.pyc


+ 2 - 4
api/main.py

@@ -299,11 +299,9 @@ async def get_role(token: str = Depends(oauth2_scheme)):
 
 
 @app.post('/get_avatar_by_role')
 @app.post('/get_avatar_by_role')
 async def get_role(token: str = Depends(oauth2_scheme)):
 async def get_role(token: str = Depends(oauth2_scheme)):
-     
     user_id = util.user.get_user_id(token)
     user_id = util.user.get_user_id(token)
-    roles = util.user.get_user_role(user_id)
-    
-    return user_id
+    avatar_info = util.user.get_avatar_by_role(user_id)
+    return avatar_info
 
 
 @app.get('/verify_email')
 @app.get('/verify_email')
 async def verify_email(code):
 async def verify_email(code):

+ 9 - 8
api/util/user.py

@@ -91,16 +91,17 @@ def get_user_role(id):
 
 
 def get_avatar_by_role(id):
 def get_avatar_by_role(id):
     db = dataset.connect('mysql://choozmo:pAssw0rd@db.ptt.cx:3306/AI_anchor?charset=utf8mb4')
     db = dataset.connect('mysql://choozmo:pAssw0rd@db.ptt.cx:3306/AI_anchor?charset=utf8mb4')
-    state = 'SELECT * FROM ('\
-'SELECT role_id FROM AI_anchor.user_role '\
-'INNER JOIN users on user_role.user_id= users.id '\
-'INNER JOIN role on user_role.role_id = role.id '\
-'WHERE AI_anchor.users.id=36) a'\
-'INNER JOIN role on a.role_id = role.id'\
-'INNER JOIN avatar on role_avatar.id = avatar.id'
+    state = 'select role_avatar.role_id, avatar_id, avatar.name,num from role_avatar'\ 
+            'INNER JOIN'\
+            '(SELECT role_id FROM AI_anchor.user_role'\
+            'INNER JOIN users on user_role.user_id= users.id'\
+            'INNER JOIN role on user_role.role_id = role.id'\
+            'WHERE AI_anchor.users.id=36) a '\
+            'on role_avatar.role_id = a.role_id'\
+            'INNER JOIN avatar on role_avatar.avatar_id = avatar.id;'
     role_list = []
     role_list = []
     for row in db.query(state):
     for row in db.query(state):
-        role_list.append({'id':row['role_id'],'name':row['name']})
+        print(row)
     db.close()
     db.close()
     return role_list
     return role_list
 #def add_role( username,role_id):
 #def add_role( username,role_id):