Commit 2e34a867 authored by xupeng's avatar xupeng

添加代码token权限

parent 4cdfb57a
...@@ -4,12 +4,13 @@ from app import get_db ...@@ -4,12 +4,13 @@ from app import get_db
from app.api.account import schemas, crud from app.api.account import schemas, crud
from app.api.statement import crud as statement_crud from app.api.statement import crud as statement_crud
from libs.result_format import HttpResultResponse, HttpMessage from libs.result_format import HttpResultResponse, HttpMessage
from libs.token_verify import login_required
router = APIRouter() router = APIRouter()
@router.post("/create") @router.post("/create")
def create_account(data: schemas.AccountCreate, db: Session = Depends(get_db)): def create_account(data: schemas.AccountCreate, token=Depends(login_required),db: Session = Depends(get_db)):
"""添加账户""" """添加账户"""
db_info = crud.get_account(db, name=data.name) db_info = crud.get_account(db, name=data.name)
if db_info: if db_info:
...@@ -21,7 +22,7 @@ def create_account(data: schemas.AccountCreate, db: Session = Depends(get_db)): ...@@ -21,7 +22,7 @@ def create_account(data: schemas.AccountCreate, db: Session = Depends(get_db)):
@router.post("/list") @router.post("/list")
def user_list(data: schemas.AccountList, db: Session = Depends(get_db)): def user_list(data: schemas.AccountList, token=Depends(login_required),db: Session = Depends(get_db)):
"""账户列表""" """账户列表"""
result = crud.get_account_list(db, data) result = crud.get_account_list(db, data)
return HttpResultResponse(total=len(result), data=result) return HttpResultResponse(total=len(result), data=result)
...@@ -35,35 +36,35 @@ def gift_type_list(db: Session = Depends(get_db)): ...@@ -35,35 +36,35 @@ def gift_type_list(db: Session = Depends(get_db)):
@router.post("/update") @router.post("/update")
def read_account(data: schemas.AccountUpdate, db: Session = Depends(get_db)): def read_account(data: schemas.AccountUpdate, token=Depends(login_required),db: Session = Depends(get_db)):
"""账户修改""" """账户修改"""
crud.update_account_info(db, data) crud.update_account_info(db, data)
return HttpResultResponse() return HttpResultResponse()
@router.post("/finance/info") @router.post("/finance/info")
def finance_information(data: schemas.FinanceInfo, db: Session = Depends(get_db)): def finance_information(data: schemas.FinanceInfo,token=Depends(login_required),db: Session = Depends(get_db)):
"""账户财务信息""" """账户财务信息"""
res, total = crud.get_finance_info(db, data, 1) res, total = crud.get_finance_info(db, data, 1)
return HttpResultResponse(total=total, data=res[int(data.page-1)*data.size:data.page*data.size]) return HttpResultResponse(total=total, data=res[int(data.page-1)*data.size:data.page*data.size])
@router.post("/finance/info/excel") @router.post("/finance/info/excel")
def finance_info_excel(data: schemas.FinanceInfo, db: Session = Depends(get_db)): def finance_info_excel(data: schemas.FinanceInfo,token=Depends(login_required), db: Session = Depends(get_db)):
"""账户财务信息导出""" """账户财务信息导出"""
statement_list = crud.get_finance_info(db, data) statement_list = crud.get_finance_info(db, data)
return statement_crud.data_to_file(statement_list, "财务信息") return statement_crud.data_to_file(statement_list, "财务信息")
@router.post("/finance/details") @router.post("/finance/details")
def finance_details(data: schemas.FinanceDetails, db: Session = Depends(get_db)): def finance_details(data: schemas.FinanceDetails,token=Depends(login_required), db: Session = Depends(get_db)):
"""账户财务明细""" """账户财务明细"""
res, total, count = crud.get_finance_details(db, data, 1) res, total, count = crud.get_finance_details(db, data, 1)
return HttpResultResponse(total=total, data=res, count=count) return HttpResultResponse(total=total, data=res, count=count)
@router.post("/finance/details/excel") @router.post("/finance/details/excel")
def finance_info_excel(data: schemas.FinanceDetails, db: Session = Depends(get_db)): def finance_info_excel(data: schemas.FinanceDetails,token=Depends(login_required), db: Session = Depends(get_db)):
"""账户财务明细导出""" """账户财务明细导出"""
statement_list = crud.get_finance_details(db, data) statement_list = crud.get_finance_details(db, data)
return statement_crud.data_to_file(statement_list, "财务明细") return statement_crud.data_to_file(statement_list, "财务明细")
...@@ -3,12 +3,13 @@ from sqlalchemy.orm import Session ...@@ -3,12 +3,13 @@ from sqlalchemy.orm import Session
from app import get_db from app import get_db
from app.api.margin import schemas, crud from app.api.margin import schemas, crud
from libs.result_format import HttpResultResponse from libs.result_format import HttpResultResponse
from libs.token_verify import login_required
router = APIRouter() router = APIRouter()
@router.post("/list") @router.post("/list")
def guild_margin_list(data: schemas.GuildMarginList, db: Session = Depends(get_db)): def guild_margin_list(data: schemas.GuildMarginList,token=Depends(login_required), db: Session = Depends(get_db)):
"""保证金列表""" """保证金列表"""
result = crud.get_margin(db, data) result = crud.get_margin(db, data)
return HttpResultResponse(total=len(result), data=result[int(data.page-1)*data.size:data.page*data.size]) return HttpResultResponse(total=len(result), data=result[int(data.page-1)*data.size:data.page*data.size])
......
...@@ -3,12 +3,13 @@ from sqlalchemy.orm import Session ...@@ -3,12 +3,13 @@ from sqlalchemy.orm import Session
from app import get_db from app import get_db
from app.api.role import schemas, crud from app.api.role import schemas, crud
from libs.result_format import HttpResultResponse, HttpMessage from libs.result_format import HttpResultResponse, HttpMessage
from libs.token_verify import login_required
router = APIRouter() router = APIRouter()
@router.post("/create") @router.post("/create")
def create_user(data: schemas.RoleCreate, db: Session = Depends(get_db)): def create_user(data: schemas.RoleCreate,token=Depends(login_required), db: Session = Depends(get_db)):
"""添加角色""" """添加角色"""
db_role = crud.get_role_by_name(db, role_name=data.role_name) db_role = crud.get_role_by_name(db, role_name=data.role_name)
if db_role: if db_role:
...@@ -20,14 +21,14 @@ def create_user(data: schemas.RoleCreate, db: Session = Depends(get_db)): ...@@ -20,14 +21,14 @@ def create_user(data: schemas.RoleCreate, db: Session = Depends(get_db)):
@router.post("/update") @router.post("/update")
def read_user(data: schemas.RoleUpdate, db: Session = Depends(get_db)): def read_user(data: schemas.RoleUpdate,token=Depends(login_required), db: Session = Depends(get_db)):
"""角色权限分配""" """角色权限分配"""
crud.update_role(db, data) crud.update_role(db, data)
return HttpResultResponse() return HttpResultResponse()
@router.delete("/delete/{role_id}") @router.delete("/delete/{role_id}")
def delete_user(role_id: int, db: Session = Depends(get_db)): def delete_user(role_id: int,token=Depends(login_required), db: Session = Depends(get_db)):
"""角色删除""" """角色删除"""
res_bool = crud.delete_role(db, role_id) res_bool = crud.delete_role(db, role_id)
if not res_bool: if not res_bool:
...@@ -36,7 +37,7 @@ def delete_user(role_id: int, db: Session = Depends(get_db)): ...@@ -36,7 +37,7 @@ def delete_user(role_id: int, db: Session = Depends(get_db)):
@router.post("/list") @router.post("/list")
def role_list(data: schemas.RoleList, db: Session = Depends(get_db)): def role_list(data: schemas.RoleList,token=Depends(login_required), db: Session = Depends(get_db)):
"""用户列表""" """用户列表"""
result = crud.get_roles(db, data) result = crud.get_roles(db, data)
return HttpResultResponse(total=len(result), data=result) return HttpResultResponse(total=len(result), data=result)
...@@ -11,55 +11,56 @@ from app.api.statement.guild import GuildSet, paymentset_guild_data, outon_accou ...@@ -11,55 +11,56 @@ from app.api.statement.guild import GuildSet, paymentset_guild_data, outon_accou
from app.api.statement.schemas import PaymentWithdrawalList, PaymentAdd, PaymentAccountlList, UserNumber, CreateBill from app.api.statement.schemas import PaymentWithdrawalList, PaymentAdd, PaymentAccountlList, UserNumber, CreateBill
from libs.img_code import new_upload_file, random_number from libs.img_code import new_upload_file, random_number
from libs.result_format import HttpResultResponse from libs.result_format import HttpResultResponse
from libs.token_verify import login_required
from models.recharge import Paymentlog, Fiaccount, Fitransferlog, Account_log from models.recharge import Paymentlog, Fiaccount, Fitransferlog, Account_log
router = APIRouter() router = APIRouter()
@router.post("/recharge/list") @router.post("/recharge/list")
def statement_recharge_list(data: schemas.StatementList, db: Session = Depends(get_db)): def statement_recharge_list(data: schemas.StatementList,token=Depends(login_required), db: Session = Depends(get_db)):
"""充值报表列表""" """充值报表列表"""
statement_list, total, money = RechargeStatement().get_statements(db, data, 1) statement_list, total, money = RechargeStatement().get_statements(db, data, 1)
return HttpResultResponse(total=total, count=float(money), data=statement_list) return HttpResultResponse(total=total, count=float(money), data=statement_list)
@router.post("/derive/excel") @router.post("/derive/excel")
def statement_derive_excel(data: schemas.StatementList, db: Session = Depends(get_db)): def statement_derive_excel(data: schemas.StatementList,token=Depends(login_required), db: Session = Depends(get_db)):
"""充值报表导出""" """充值报表导出"""
statement_list = RechargeStatement().get_statements(db, data) statement_list = RechargeStatement().get_statements(db, data)
return crud.data_to_file(statement_list, "充值报表") return crud.data_to_file(statement_list, "充值报表")
@router.post("/userWithdrawal/list") @router.post("/userWithdrawal/list")
def user_withdrawal_list(data: schemas.UserWithdrawalList, db: Session = Depends(get_db)): def user_withdrawal_list(data: schemas.UserWithdrawalList,token=Depends(login_required), db: Session = Depends(get_db)):
"""用户提现列表""" """用户提现列表"""
statement_list, total, money, final_money = WithdrawStatement().get_user_withdraw_cash(db, data) statement_list, total, money, final_money = WithdrawStatement().get_user_withdraw_cash(db, data)
return HttpResultResponse(total=total, count=float(money), actual_count=final_money, data=statement_list) return HttpResultResponse(total=total, count=float(money), actual_count=final_money, data=statement_list)
@router.post("/guildWithdrawal/list") @router.post("/guildWithdrawal/list")
def guild_withdrawal_list(data: schemas.GuildWithdrawalList, db: Session = Depends(get_db)): def guild_withdrawal_list(data: schemas.GuildWithdrawalList,token=Depends(login_required), db: Session = Depends(get_db)):
"""公会提现列表""" """公会提现列表"""
guild_list, total, money, final_money = WithdrawStatement().get_guild_withdraw_cash(db, data) guild_list, total, money, final_money = WithdrawStatement().get_guild_withdraw_cash(db, data)
return HttpResultResponse(total=total, count=float(money), actual_count=final_money, data=guild_list) return HttpResultResponse(total=total, count=float(money), actual_count=final_money, data=guild_list)
@router.post("/guild/settlement") @router.post("/guild/settlement")
def guild_settlement_list(data: schemas.GuildWithdrawalList, db: Session = Depends(get_db)): def guild_settlement_list(data: schemas.GuildWithdrawalList,token=Depends(login_required), db: Session = Depends(get_db)):
"""公会结算""" """公会结算"""
guild_list, total = GuildSet().get_guild_data(db, data) guild_list, total = GuildSet().get_guild_data(db, data)
return HttpResultResponse(total=total, data=guild_list) return HttpResultResponse(total=total, data=guild_list)
@router.post("/guild/payment") @router.post("/guild/payment")
def guild_payment_list(data:PaymentWithdrawalList,db: Session = Depends(get_db)): def guild_payment_list(data:PaymentWithdrawalList,token=Depends(login_required),db: Session = Depends(get_db)):
"""打款记录""" """打款记录"""
payment_list, total = paymentset_guild_data(db,Paymentlog,data.dict(exclude_none=True)) payment_list, total = paymentset_guild_data(db,Paymentlog,data.dict(exclude_none=True))
return HttpResultResponse(total=total, data=payment_list) return HttpResultResponse(total=total, data=payment_list)
@router.post('/upload') @router.post('/upload')
async def uploadFile(a_file: bytes = File(...)): async def uploadFile(a_file: bytes = File(...),token=Depends(login_required),):
a_content = a_file a_content = a_file
image_name = random_number() image_name = random_number()
cos_path = new_upload_file(a_content,image_name) cos_path = new_upload_file(a_content,image_name)
...@@ -67,7 +68,7 @@ async def uploadFile(a_file: bytes = File(...)): ...@@ -67,7 +68,7 @@ async def uploadFile(a_file: bytes = File(...)):
@router.post("/payment/add") @router.post("/payment/add")
def guild_payment_list(data:PaymentAdd,db: Session = Depends(get_db)): def guild_payment_list(data:PaymentAdd,token=Depends(login_required),db: Session = Depends(get_db)):
"""提交打款""" """提交打款"""
dataPayment = Paymentlog(uuid=data.uuid,money=data.money,cont=data.cont,url=data.url,create_time=datetime.now()) dataPayment = Paymentlog(uuid=data.uuid,money=data.money,cont=data.cont,url=data.url,create_time=datetime.now())
db.add(dataPayment) db.add(dataPayment)
...@@ -78,21 +79,21 @@ def guild_payment_list(data:PaymentAdd,db: Session = Depends(get_db)): ...@@ -78,21 +79,21 @@ def guild_payment_list(data:PaymentAdd,db: Session = Depends(get_db)):
@router.get("/onaccount") @router.get("/onaccount")
def outon_account(db: Session = Depends(get_db)): def outon_account(db: Session = Depends(get_db),token=Depends(login_required)):
"""转出和转入账户人员列表""" """转出和转入账户人员列表"""
account_list, total = outon_account_data(db, Fiaccount,{}) account_list, total = outon_account_data(db, Fiaccount,{})
return HttpResultResponse(total=total, data=account_list) return HttpResultResponse(total=total, data=account_list)
@router.post("/transferlist") @router.post("/transferlist")
def outon_account(data: PaymentAccountlList, db: Session = Depends(get_db)): def outon_account(data: PaymentAccountlList,token=Depends(login_required),db: Session = Depends(get_db)):
"""转账列表""" """转账列表"""
account_list, total = accout_list_data(db, Fitransferlog, data.dict(exclude_none=True)) account_list, total = accout_list_data(db, Fitransferlog, data.dict(exclude_none=True))
return HttpResultResponse(total=total, data=account_list) return HttpResultResponse(total=total, data=account_list)
@router.post("/query/consumable") @router.post("/query/consumable")
def query_account_money(data: UserNumber, db: Session = Depends(get_db)): def query_account_money(data: UserNumber,token=Depends(login_required),db: Session = Depends(get_db)):
"""查询账户余额""" """查询账户余额"""
consumable = account_money(db, data) consumable = account_money(db, data)
return HttpResultResponse(data=int(consumable)) return HttpResultResponse(data=int(consumable))
......
...@@ -73,21 +73,21 @@ def create_user(data: schemas.UserCreate,token=Depends(login_required), db: Sess ...@@ -73,21 +73,21 @@ def create_user(data: schemas.UserCreate,token=Depends(login_required), db: Sess
@router.post("/permission/allocation") @router.post("/permission/allocation")
def read_user(data: schemas.PermissionCreate, db: Session = Depends(get_db)): def read_user(data: schemas.PermissionCreate,token=Depends(login_required), db: Session = Depends(get_db)):
"""用户修改""" """用户修改"""
crud.update_user(db, data) crud.update_user(db, data)
return HttpResultResponse() return HttpResultResponse()
@router.post("/list") @router.post("/list")
def user_list(data: schemas.UserList, db: Session = Depends(get_db)): def user_list(data: schemas.UserList,token=Depends(login_required), db: Session = Depends(get_db)):
"""用户列表""" """用户列表"""
result = crud.get_users(db, data) result = crud.get_users(db, data)
return HttpResultResponse(total=len(result), data=result) return HttpResultResponse(total=len(result), data=result)
@router.delete("/delete/{user_id}") @router.delete("/delete/{user_id}")
def delete_user(user_id: int, db: Session = Depends(get_db)): def delete_user(user_id: int,token=Depends(login_required), db: Session = Depends(get_db)):
"""用户删除""" """用户删除"""
crud.delete_user(db, user_id) crud.delete_user(db, user_id)
return HttpResultResponse() return HttpResultResponse()
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment