yml2213
cdee93c7c5
根因：access_token每2小时过期，前端收到401直接清token跳登录，没有用refresh_token续期 后端修复： - adminauth模块新增 POST /admin/auth/refresh 接口 - Service 注入 JWTManager，支持 admin refresh token 换新 token pair - Refresh 方法验证 subjectType=admin + tokenType=refresh 前端修复： - 401 拦截器核心改造：收到401先调 refresh 接口续期 - 加 isRefreshing 锁 + pendingRequests 队列防止并发刷新 - refresh 用原生 axios.post 避免拦截器递归 - 成功则更新 localStorage + 重试原请求，失败才清 token 跳登录 - 排除 /auth/refresh 自身避免死循环 - 支持 /admin/ 请求独立 token 管理 - auth.ts/adminAuth.ts 新增手动 refreshUserToken/refreshAdminSession - 路由守卫给所有需登录路由添加 meta.requiresAuth - 守卫同时支持 PC 端 /login 和移动端 /m/login
126 lines
4.8 KiB
Go
126 lines
4.8 KiB
Go
package order
|
|
|
|
import (
|
|
"time"
|
|
|
|
"gorm.io/datatypes"
|
|
)
|
|
|
|
type OrderDTO struct {
|
|
ID uint64 `json:"id"`
|
|
OrderNo string `json:"order_no"`
|
|
ListingID uint64 `json:"listing_id"`
|
|
AccountID uint64 `json:"account_id"`
|
|
OwnerID uint64 `json:"owner_id"`
|
|
RenterID uint64 `json:"renter_id"`
|
|
OwnerPhone string `json:"owner_phone,omitempty"`
|
|
RenterPhone string `json:"renter_phone,omitempty"`
|
|
Title string `json:"title"`
|
|
ServerRegion string `json:"server_region"`
|
|
LoginPlatform string `json:"login_platform"`
|
|
RentStartAt *time.Time `json:"rent_start_at"`
|
|
RentEndAt *time.Time `json:"rent_end_at"`
|
|
RentAmount float64 `json:"rent_amount"`
|
|
DepositAmount float64 `json:"deposit_amount"`
|
|
PlatformFee float64 `json:"platform_fee"`
|
|
AccountSnapshot datatypes.JSON `json:"account_snapshot"`
|
|
Status string `json:"status"`
|
|
HandoffStatus string `json:"handoff_status"`
|
|
SettlementStatus string `json:"settlement_status"`
|
|
Checkout *CheckoutDTO `json:"checkout,omitempty"`
|
|
CreatedAt time.Time `json:"created_at"`
|
|
UpdatedAt time.Time `json:"updated_at"`
|
|
}
|
|
|
|
type CreateRequest struct {
|
|
ListingID uint64 `json:"listing_id" binding:"required"`
|
|
}
|
|
|
|
type SubmitHandoffRequest struct {
|
|
Content string `json:"content" binding:"required"`
|
|
}
|
|
|
|
type SubmitCheckoutRequest struct {
|
|
Content string `json:"content" binding:"required"`
|
|
ConsumableAmount float64 `json:"consumable_amount"`
|
|
CoinConsumedM float64 `json:"coin_consumed_m"`
|
|
OtherAmount float64 `json:"other_amount"`
|
|
EvidenceURLS []string `json:"evidence_urls"`
|
|
}
|
|
|
|
type CounterCheckoutRequest struct {
|
|
ConsumableAmount float64 `json:"consumable_amount"`
|
|
CoinConsumedM float64 `json:"coin_consumed_m"`
|
|
OtherAmount float64 `json:"other_amount"`
|
|
DepositDeductAmount float64 `json:"deposit_deduct_amount"`
|
|
Reason string `json:"reason" binding:"required"`
|
|
EvidenceURLS []string `json:"evidence_urls"`
|
|
}
|
|
|
|
type AdminActionRequest struct {
|
|
Reason string `json:"reason" binding:"required"`
|
|
}
|
|
|
|
type AuditMeta struct {
|
|
IP string
|
|
UserAgent string
|
|
}
|
|
|
|
type HandoffRecordDTO struct {
|
|
ID uint64 `json:"id"`
|
|
OrderID uint64 `json:"order_id"`
|
|
FromUserID uint64 `json:"from_user_id"`
|
|
ToUserID uint64 `json:"to_user_id"`
|
|
Type string `json:"type"`
|
|
Content string `json:"content"`
|
|
ConfirmedByRenterAt *time.Time `json:"confirmed_by_renter_at"`
|
|
ConfirmedByOwnerAt *time.Time `json:"confirmed_by_owner_at"`
|
|
CreatedAt time.Time `json:"created_at"`
|
|
}
|
|
|
|
type OrderListItemDTO struct {
|
|
ID uint64 `json:"id"`
|
|
OrderNo string `json:"order_no"`
|
|
ListingTitle string `json:"listing_title"`
|
|
GameName string `json:"game_name"`
|
|
AccountTitle string `json:"account_title"`
|
|
RenterNickname string `json:"renter_nickname"`
|
|
OwnerNickname string `json:"owner_nickname"`
|
|
Status string `json:"status"`
|
|
HandoffStatus string `json:"handoff_status"`
|
|
SettlementStatus string `json:"settlement_status"`
|
|
RentAmount float64 `json:"rent_amount"`
|
|
DepositAmount float64 `json:"deposit_amount"`
|
|
CreatedAt time.Time `json:"created_at"`
|
|
}
|
|
|
|
type PaginatedOrders struct {
|
|
Items []OrderListItemDTO `json:"items"`
|
|
Total int64 `json:"total"`
|
|
Page int `json:"page"`
|
|
PageSize int `json:"page_size"`
|
|
}
|
|
|
|
type CheckoutDTO struct {
|
|
ID uint64 `json:"id"`
|
|
OrderID uint64 `json:"order_id"`
|
|
InitiatedBy uint64 `json:"initiated_by"`
|
|
Status string `json:"status"`
|
|
RentAmount float64 `json:"rent_amount"`
|
|
DepositAmount float64 `json:"deposit_amount"`
|
|
ConsumableAmount float64 `json:"consumable_amount"`
|
|
CoinConsumedM float64 `json:"coin_consumed_m"`
|
|
OtherAmount float64 `json:"other_amount"`
|
|
DepositDeductAmount float64 `json:"deposit_deduct_amount"`
|
|
RenterRefundAmount float64 `json:"renter_refund_amount"`
|
|
OwnerIncomeAmount float64 `json:"owner_income_amount"`
|
|
Content string `json:"content"`
|
|
EvidenceURLS []string `json:"evidence_urls"`
|
|
OwnerAdjustmentReason string `json:"owner_adjustment_reason"`
|
|
OwnerAdjustedAt *time.Time `json:"owner_adjusted_at"`
|
|
RenterConfirmedAt *time.Time `json:"renter_confirmed_at"`
|
|
RenterRejectedAt *time.Time `json:"renter_rejected_at"`
|
|
CreatedAt time.Time `json:"created_at"`
|
|
UpdatedAt time.Time `json:"updated_at"`
|
|
}
|