fix(admin): 修复QQBot线上二维码缓存过期

This commit is contained in:
sunlei 2026-06-04 03:32:04 +08:00
parent 3c8455e8ac
commit dea3306b41

View File

@ -43,6 +43,7 @@ export default defineComponent({
const router = useRouter(); const router = useRouter();
const scanLoading = ref(false); const scanLoading = ref(false);
const scanQrcodeImageFailed = ref(false); const scanQrcodeImageFailed = ref(false);
const scanQrcodeRevision = ref(0);
const scanQrcodeText = ref(''); const scanQrcodeText = ref('');
const scanState = reactive<{ const scanState = reactive<{
containerId?: string; containerId?: string;
@ -67,10 +68,18 @@ export default defineComponent({
const qrcode = scanQrcodeText.value.trim(); const qrcode = scanQrcodeText.value.trim();
if (!qrcode) return ''; if (!qrcode) return '';
if (!scanQrcodeImageFailed.value && isQrcodeImageCandidate(qrcode)) { if (!scanQrcodeImageFailed.value && isQrcodeImageCandidate(qrcode)) {
return normalizeQrcodeImageSrc(qrcode); return normalizeQrcodeImageSrc(qrcode, scanQrcodeRevision.value);
} }
return scanQrcode.value; return scanQrcode.value;
}); });
const scanQrcodeOpenHref = computed(() => {
const qrcode = scanQrcodeText.value.trim();
if (!qrcode) return '';
if (isQrcodeImageCandidate(qrcode)) {
return normalizeQrcodeImageSrc(qrcode, scanQrcodeRevision.value);
}
return qrcode;
});
let scanTimer: number | undefined; let scanTimer: number | undefined;
const [AccountForm, accountFormApi] = useVbenForm({ const [AccountForm, accountFormApi] = useVbenForm({
@ -306,14 +315,18 @@ export default defineComponent({
scanLoading.value = true; scanLoading.value = true;
try { try {
if (mode === 'create') { if (mode === 'create') {
await applyScanResult(await startQqbotAccountScanCreate()); await applyScanResult(await startQqbotAccountScanCreate(), {
reloadQrcode: true,
});
return; return;
} }
if (!row) { if (!row) {
message.warning('请选择需要更新登录的账号'); message.warning('请选择需要更新登录的账号');
return; return;
} }
await applyScanResult(await startQqbotAccountScanRefresh(row.id)); await applyScanResult(await startQqbotAccountScanRefresh(row.id), {
reloadQrcode: true,
});
} catch (error) { } catch (error) {
stopScanPolling(); stopScanPolling();
scanState.status = 'error'; scanState.status = 'error';
@ -323,7 +336,10 @@ export default defineComponent({
} }
} }
async function applyScanResult(result: QqbotApi.AccountScanResult) { async function applyScanResult(
result: QqbotApi.AccountScanResult,
options: { reloadQrcode?: boolean } = {},
) {
scanState.containerId = result.containerId; scanState.containerId = result.containerId;
scanState.containerName = result.containerName; scanState.containerName = result.containerName;
scanState.errorMessage = result.errorMessage; scanState.errorMessage = result.errorMessage;
@ -334,10 +350,15 @@ export default defineComponent({
scanState.status = result.status; scanState.status = result.status;
scanState.webuiPort = result.webuiPort; scanState.webuiPort = result.webuiPort;
const nextQrcode = result.qrcode || ''; const nextQrcode = result.qrcode || '';
if (nextQrcode !== scanQrcodeText.value) { const qrcodeChanged = nextQrcode !== scanQrcodeText.value;
if (qrcodeChanged) {
scanQrcodeImageFailed.value = false; scanQrcodeImageFailed.value = false;
} }
scanQrcodeText.value = nextQrcode; scanQrcodeText.value = nextQrcode;
if (nextQrcode && (qrcodeChanged || options.reloadQrcode)) {
scanQrcodeRevision.value += 1;
scanQrcodeImageFailed.value = false;
}
if (result.status === 'pending') { if (result.status === 'pending') {
startScanPolling(); startScanPolling();
@ -371,6 +392,7 @@ export default defineComponent({
try { try {
await applyScanResult( await applyScanResult(
await refreshQqbotAccountScanQrcode(scanState.sessionId), await refreshQqbotAccountScanQrcode(scanState.sessionId),
{ reloadQrcode: true },
); );
} finally { } finally {
scanLoading.value = false; scanLoading.value = false;
@ -404,6 +426,7 @@ export default defineComponent({
webuiPort: undefined, webuiPort: undefined,
}); });
scanQrcodeImageFailed.value = false; scanQrcodeImageFailed.value = false;
scanQrcodeRevision.value = 0;
scanQrcodeText.value = ''; scanQrcodeText.value = '';
} }
@ -454,13 +477,27 @@ export default defineComponent({
); );
} }
function normalizeQrcodeImageSrc(value: string) { function normalizeQrcodeImageSrc(value: string, revision = 0) {
if (isRawBase64Image(value)) { if (isRawBase64Image(value)) {
return `data:image/png;base64,${value}`; return `data:image/png;base64,${value}`;
} }
if (/^https?:\/\//i.test(value) && revision > 0) {
return appendQrcodeCacheBuster(value, revision);
}
return value; return value;
} }
function appendQrcodeCacheBuster(value: string, revision: number) {
try {
const url = new URL(value);
url.searchParams.set('_kt_qrcode_v', `${revision}`);
return url.toString();
} catch {
const joiner = value.includes('?') ? '&' : '?';
return `${value}${joiner}_kt_qrcode_v=${revision}`;
}
}
function isRawBase64Image(value: string) { function isRawBase64Image(value: string) {
const normalized = value.trim(); const normalized = value.trim();
return ( return (
@ -777,7 +814,7 @@ export default defineComponent({
)} )}
</div> </div>
{scanQrcodeText.value ? ( {scanQrcodeText.value ? (
<ATypographyLink href={scanQrcodeText.value} target="_blank"> <ATypographyLink href={scanQrcodeOpenHref.value} target="_blank">
</ATypographyLink> </ATypographyLink>
) : null} ) : null}