倒计时限制
All checks were successful
构建并部署前端到测试环境 / build-and-deploy (push) Successful in 4m12s

This commit is contained in:
2026-06-24 15:06:05 +08:00
parent 0c3065f970
commit cfb6b52cc2
8 changed files with 191 additions and 27 deletions

View File

@@ -4,6 +4,11 @@
*/
import { BaseService } from '../BaseService'
import {
assertAssetActionAllowed,
markAssetActionCalled,
type AssetRateLimitedAction
} from '@/utils/business/apiRateLimit'
import type {
BaseResponse,
AssetResolveResponse,
@@ -27,6 +32,17 @@ import type {
UpdateAssetPackageExpiresAtRequest
} from '@/types/api'
const runRateLimitedAssetAction = async <T>(
action: AssetRateLimitedAction,
identifier: string,
request: () => Promise<T>
): Promise<T> => {
assertAssetActionAllowed(action, identifier)
markAssetActionCalled(action, identifier)
const response = await request()
return response
}
export class AssetService extends BaseService {
/**
* 通过任意标识符查询设备或卡的完整详情
@@ -58,14 +74,16 @@ export class AssetService extends BaseService {
/**
* 主动调网关拉取最新数据后返回
* POST /api/admin/assets/:identifier/refresh
* 注意:设备有 30 秒冷却期,冷却中调用返回 429
* 前端按资产标识限制 5 分钟内只能调用一次
* @param identifier 资产标识符ICCID 或 VirtualNo
*/
static refreshAsset(identifier: string): Promise<BaseResponse<AssetRefreshResponse>> {
return this.post<BaseResponse<AssetRefreshResponse>>(
`/api/admin/assets/${identifier}/refresh`,
{},
{ timeout: 60000 }
return runRateLimitedAssetAction('refresh', identifier, () =>
this.post<BaseResponse<AssetRefreshResponse>>(
`/api/admin/assets/${identifier}/refresh`,
{},
{ timeout: 60000 }
)
)
}
@@ -156,11 +174,13 @@ export class AssetService extends BaseService {
/**
* 复机资产(卡或设备)
* POST /api/admin/assets/:identifier/start
* 复机成功后设置 1 小时复机保护期(保护期内禁止停机)
* 前端按资产标识限制 5 分钟内只能调用一次
* @param identifier 资产标识符ICCID 或 VirtualNo
*/
static startAsset(identifier: string): Promise<BaseResponse<void>> {
return this.post<BaseResponse<void>>(`/api/admin/assets/${identifier}/start`, {})
return runRateLimitedAssetAction('start', identifier, () =>
this.post<BaseResponse<void>>(`/api/admin/assets/${identifier}/start`, {})
)
}
// ========== 资产停用 ==========

View File

@@ -0,0 +1,74 @@
const FIVE_MINUTES_MS = 5 * 60 * 1000
const STORAGE_KEY_PREFIX = 'asset-action-rate-limit'
export type AssetRateLimitedAction = 'refresh' | 'start'
export class FrontendRateLimitError extends Error {
readonly remainingMs: number
readonly retryAt: number
constructor(remainingMs: number, retryAt: number) {
super(`操作过于频繁,请${formatRemainingTime(remainingMs)}后再试`)
this.name = 'FrontendRateLimitError'
this.remainingMs = remainingMs
this.retryAt = retryAt
}
}
const getStorageKey = (action: AssetRateLimitedAction, identifier: string) =>
`${STORAGE_KEY_PREFIX}:${action}:${identifier}`
const getTimestamp = (key: string): number => {
const value = Number(localStorage.getItem(key))
return Number.isFinite(value) ? value : 0
}
export const formatRemainingTime = (remainingMs: number): string => {
const totalSeconds = Math.max(1, Math.ceil(remainingMs / 1000))
const minutes = Math.floor(totalSeconds / 60)
const seconds = totalSeconds % 60
if (minutes <= 0) return `${seconds}`
if (seconds === 0) return `${minutes}分钟`
return `${minutes}${seconds}`
}
export const getAssetActionRateLimitState = (
action: AssetRateLimitedAction,
identifier: string,
now: number = Date.now()
) => {
const key = getStorageKey(action, identifier)
const lastCalledAt = getTimestamp(key)
const retryAt = lastCalledAt + FIVE_MINUTES_MS
const remainingMs = Math.max(0, retryAt - now)
if (remainingMs <= 0 && lastCalledAt > 0) {
localStorage.removeItem(key)
}
return {
limited: remainingMs > 0,
remainingMs,
retryAt
}
}
export const markAssetActionCalled = (
action: AssetRateLimitedAction,
identifier: string,
now: number = Date.now()
) => {
localStorage.setItem(getStorageKey(action, identifier), String(now))
}
export const assertAssetActionAllowed = (
action: AssetRateLimitedAction,
identifier: string,
now: number = Date.now()
) => {
const state = getAssetActionRateLimitState(action, identifier, now)
if (state.limited) {
throw new FrontendRateLimitError(state.remainingMs, state.retryAt)
}
}

View File

@@ -6,3 +6,4 @@ export * from './format'
export * from './validate'
export * from './calculate'
export * from './voucher'
export * from './apiRateLimit'

View File

@@ -33,8 +33,14 @@
<!-- 操作按钮组 -->
<div v-if="hasCardInfo" class="operation-button-group">
<ElButton v-permission="'asset_info:sync'" @click="handleRefresh" type="primary" :icon="Refresh" :disabled="refreshDisabled">
同步
<ElButton
v-permission="'asset_info:sync'"
@click="handleRefresh"
type="primary"
:icon="Refresh"
:disabled="refreshDisabled"
>
{{ refreshButtonText }}
</ElButton>
</div>
</div>
@@ -42,7 +48,7 @@
</template>
<script setup lang="ts">
import { ref } from 'vue'
import { computed, ref } from 'vue'
import { useRoute } from 'vue-router'
import { ElCard, ElInput, ElButton } from 'element-plus'
import { Search, Refresh } from '@element-plus/icons-vue'
@@ -57,13 +63,19 @@
interface Props {
hasCardInfo?: boolean
refreshDisabled?: boolean
refreshRemainingText?: string
}
withDefaults(defineProps<Props>(), {
const props = withDefaults(defineProps<Props>(), {
hasCardInfo: false,
refreshDisabled: false
refreshDisabled: false,
refreshRemainingText: ''
})
const refreshButtonText = computed(() =>
props.refreshRemainingText ? `同步(${props.refreshRemainingText})` : '同步'
)
// Emits
const emit = defineEmits<{
search: [payload: { identifier: string }]

View File

@@ -6,6 +6,7 @@
import { ref } from 'vue'
import { ElMessage } from 'element-plus'
import { AssetService } from '@/api/modules'
import { formatRemainingTime, FrontendRateLimitError } from '@/utils/business/apiRateLimit'
import type {
AssetBoundCard,
AssetWalletResponse,
@@ -183,7 +184,7 @@ export function useAssetInfo() {
ElMessage.error(response.msg || '查询失败')
cardInfo.value = null
}
} catch (error: any) {
} catch {
cardInfo.value = null
} finally {
loading.value = false
@@ -413,7 +414,7 @@ export function useAssetInfo() {
* 刷新资产数据(调用refresh接口后重新加载)
* @param identifier - 资产标识符
* @param assetType - 资产类型(card/device)
* @returns true if refresh was successful, false if rate limited (429)
* @returns true if refresh was successful, false if rate limited
*/
const refreshAsset = async (identifier: string, assetType: string): Promise<boolean> => {
try {
@@ -426,10 +427,12 @@ export function useAssetInfo() {
}
return true
} catch (error: any) {
console.log(error)
// Check if it's a 429 rate limit error
if (error instanceof FrontendRateLimitError) {
ElMessage.warning(`操作过于频繁,请${formatRemainingTime(error.remainingMs)}后再试`)
return false
}
if (error?.response?.status === 429) {
ElMessage.warning('操作过于频繁,请30秒后再试')
ElMessage.warning('操作过于频繁,请5分钟后再试')
return false
}
return false

View File

@@ -2,6 +2,7 @@ import { ref } from 'vue'
import type { Ref } from 'vue'
import { ElMessage, ElMessageBox } from 'element-plus'
import { AssetService, DeviceService } from '@/api/modules'
import { formatRemainingTime, FrontendRateLimitError } from '@/utils/business/apiRateLimit'
/**
* Asset operations composable
@@ -38,6 +39,10 @@ export function useAssetOperations(cardInfo: Ref<any>, refreshAssetFn?: () => Pr
}
} catch (error: any) {
if (error !== 'cancel') {
if (error instanceof FrontendRateLimitError) {
ElMessage.warning(`操作过于频繁,请${formatRemainingTime(error.remainingMs)}后再试`)
return
}
console.error('启用失败:', error)
}
} finally {

View File

@@ -5,6 +5,7 @@
ref="assetSearchCardRef"
:has-card-info="!!cardInfo"
:refresh-disabled="refreshDisabled"
:refresh-remaining-text="refreshRemainingText"
@search="handleSearch"
@refresh="handleRefresh"
/>
@@ -167,11 +168,16 @@
</template>
<script setup lang="ts">
import { computed, nextTick, onMounted, ref, watch } from 'vue'
import { computed, nextTick, onMounted, onUnmounted, ref, watch } from 'vue'
import { useRoute, useRouter } from 'vue-router'
import { ElMessage, ElCard, ElEmpty } from 'element-plus'
import { RoutesAlias } from '@/router/routesAlias'
import { DeviceService } from '@/api/modules'
import {
formatRemainingTime,
FrontendRateLimitError,
getAssetActionRateLimitState
} from '@/utils/business/apiRateLimit'
// 引入子组件
import AssetSearchCard from './components/AssetSearchCard.vue'
@@ -311,7 +317,34 @@
})
// ========== 刷新按钮状态 ==========
const refreshDisabled = ref(false)
const rateLimitNow = ref(Date.now())
const refreshSubmitting = ref(false)
let rateLimitTimer: ReturnType<typeof setInterval> | undefined
const refreshRateLimitState = computed(() => {
const identifier = cardInfo.value?.identifier
if (!identifier) {
return {
limited: false,
remainingMs: 0,
retryAt: 0
}
}
return getAssetActionRateLimitState('refresh', identifier, rateLimitNow.value)
})
const refreshDisabled = computed(
() => refreshSubmitting.value || refreshRateLimitState.value.limited
)
const refreshRemainingText = computed(() =>
refreshRateLimitState.value.limited
? formatRemainingTime(refreshRateLimitState.value.remainingMs)
: ''
)
const updateRateLimitNow = () => {
rateLimitNow.value = Date.now()
}
// ========== 事件处理 ==========
@@ -351,14 +384,14 @@
* 处理刷新
*/
const handleRefresh = async () => {
if (!cardInfo.value) return
const success = await refreshAsset(cardInfo.value.identifier, cardInfo.value.asset_type)
if (!success) {
// 如果刷新失败429错误禁用刷新按钮30秒
refreshDisabled.value = true
setTimeout(() => {
refreshDisabled.value = false
}, 30000)
if (!cardInfo.value || refreshDisabled.value) return
try {
refreshSubmitting.value = true
await refreshAsset(cardInfo.value.identifier, cardInfo.value.asset_type)
} finally {
refreshSubmitting.value = false
updateRateLimitNow()
}
}
@@ -524,6 +557,10 @@
if (cardInfo.value)
await loadRealtimeStatus(cardInfo.value.identifier, cardInfo.value.asset_type)
} catch (error: any) {
if (error instanceof FrontendRateLimitError) {
ElMessage.warning(`操作过于频繁,请${formatRemainingTime(error.remainingMs)}后再试`)
return
}
console.error('启用绑定卡失败:', error)
}
}
@@ -653,9 +690,16 @@
* URL参数自动加载
*/
onMounted(() => {
rateLimitTimer = setInterval(updateRateLimitNow, 1000)
autoLoadFromQuery()
})
onUnmounted(() => {
if (rateLimitTimer) {
clearInterval(rateLimitTimer)
}
})
/**
* 监听路由查询参数变化
*/

View File

@@ -1027,6 +1027,7 @@
import { useUserStore } from '@/store/modules/user'
import { storeToRefs } from 'pinia'
import { formatDateTime } from '@/utils/business/format'
import { formatRemainingTime, FrontendRateLimitError } from '@/utils/business/apiRateLimit'
import type {
StandaloneIotCard,
StandaloneCardStatus,
@@ -2891,6 +2892,10 @@
await getTableData()
}
} catch (error: any) {
if (error instanceof FrontendRateLimitError) {
ElMessage.warning(`操作过于频繁,请${formatRemainingTime(error.remainingMs)}后再试`)
return
}
console.error('启用此卡失败:', error)
}
})