1 parent
659d98b589
commit
a7ad2bc32e
8 files changed
+26
-21
No files matched your search
@@ -64,6 +64,8 @@ function isAuthenticationRefreshRequest(config) {
|
||||
}
|
||||
|
||||
function isAuthenticationFailureError(error) {
|
||||
const errorCode = error?.response?.data?.data?.code
|
||||
if (errorCode === 'RECENT_AUTH_REQUIRED') return false
|
||||
return error?.response?.data?.errorNo === 403
|
||||
|| (error?.response?.status === 403 && isAuthenticationRefreshRequest(error.config))
|
||||
}
|
||||
@@ -71,6 +73,7 @@ function isAuthenticationFailureError(error) {
|
||||
http.interceptors.response.use(async (response) => {
|
||||
//响应成功
|
||||
if (response.data?.errorNo === 403
|
||||
&& response.data?.data?.code !== 'RECENT_AUTH_REQUIRED'
|
||||
&& !isSetupRequest(response.config)
|
||||
&& !isAuthenticationRefreshRequest(response.config)) {
|
||||
await handleLoginRedirect();
|
||||
|
||||
@@ -18,12 +18,12 @@ export async function requestWithRecentAuthentication(request) {
|
||||
let password = ''
|
||||
try {
|
||||
const result = await ElMessageBox.prompt(
|
||||
'为保护敏感配置,请确认当前登录密码。确认后将自动继续应用。',
|
||||
'为保护敏感配置,请确认当前登录密码。确认后将自动完成保存。',
|
||||
'确认当前密码',
|
||||
{
|
||||
inputType: 'password',
|
||||
inputPlaceholder: '请输入当前密码',
|
||||
confirmButtonText: '确认并继续',
|
||||
confirmButtonText: '确认并保存',
|
||||
cancelButtonText: '取消',
|
||||
closeOnClickModal: false,
|
||||
inputValidator: value => String(value || '').length > 0 || '请输入当前密码'
|
||||
|
||||
@@ -78,7 +78,7 @@
|
||||
<div v-if="canWrite" class="editor-footer">
|
||||
<el-alert
|
||||
v-if="pendingCandidate"
|
||||
title="有一项配置尚未生效,可以继续应用或放弃更改。"
|
||||
title="上次保存尚未完成,可以继续保存或放弃本次更改。"
|
||||
type="warning"
|
||||
:closable="false"
|
||||
show-icon
|
||||
@@ -98,7 +98,7 @@
|
||||
:disabled="sectionLoading || !!working || !!sectionError || !hasChanges"
|
||||
@click="saveAndApply"
|
||||
>
|
||||
保存并应用
|
||||
保存配置
|
||||
</el-button>
|
||||
<el-button
|
||||
v-else
|
||||
@@ -107,7 +107,7 @@
|
||||
:disabled="sectionLoading || !!working || !!sectionError"
|
||||
@click="continuePending"
|
||||
>
|
||||
继续应用
|
||||
继续保存
|
||||
</el-button>
|
||||
<el-button
|
||||
v-if="pendingCandidate"
|
||||
|
||||
@@ -82,7 +82,7 @@ export function usePage(pageKey = 'base') {
|
||||
const scope = pending.payload && loadedText.value
|
||||
? (changed.length ? `本次候选涉及:${changed.join('、')}。` : '本次候选的插件运行配置未变化。')
|
||||
: '候选内容尚未完整读取,请刷新后核对。'
|
||||
return `${scope}三个插件共用一个配置分区,请在对应三级菜单核对;应用时整个候选一起生效,其他插件的原有配置会保留。`
|
||||
return `${scope}三个插件共用一组运行配置,请在对应三级菜单核对;完成保存时会统一生效,其他插件的原有配置会保留。`
|
||||
}
|
||||
if (pending?.section !== 'mail' || apiSection() !== 'mail') return ''
|
||||
const active = readFormConfig(loadedText.value)
|
||||
@@ -101,7 +101,7 @@ export function usePage(pageKey = 'base') {
|
||||
const scope = pending.payload && loadedText.value
|
||||
? (changed.length ? `本次候选涉及:${changed.join('、')}。` : '本次候选的邮件服务与安全策略未变化。')
|
||||
: '候选内容尚未完整读取,请刷新后核对。'
|
||||
return `${scope}邮件服务页和安全策略页共用一个候选配置;应用时全部变更一起生效,监听端口变更仍需重启后端。`
|
||||
return `${scope}邮件服务页和安全策略页共用一组运行配置;完成保存时全部变更一起生效,监听端口变更仍需重启后端。`
|
||||
})
|
||||
let savedInput = null
|
||||
const validationResult = ref(null)
|
||||
@@ -577,7 +577,7 @@ export function usePage(pageKey = 'base') {
|
||||
validationResult.value = { valid: true, generation: savedGeneration.value, issues: [] }
|
||||
await loadStatus()
|
||||
await loadPending()
|
||||
if (!quiet) ElMessage.success('配置已保存,等待应用')
|
||||
if (!quiet) ElMessage.success('配置已暂存,正在完成保存')
|
||||
return true
|
||||
} catch (error) {
|
||||
if (isRecentAuthenticationCancelled(error)) return false
|
||||
@@ -625,7 +625,7 @@ export function usePage(pageKey = 'base') {
|
||||
return
|
||||
}
|
||||
const saved = await saveConfig({ quiet: true })
|
||||
if (saved) await applyConfig({ successMessage: '配置已保存并应用' })
|
||||
if (saved) await applyConfig({ successMessage: '配置已保存' })
|
||||
}
|
||||
|
||||
const continuePending = async () => {
|
||||
@@ -716,7 +716,7 @@ export function usePage(pageKey = 'base') {
|
||||
if (!hasChanges.value && !migrationToken.value && !rollbackPreview.value) return true
|
||||
try {
|
||||
await ElMessageBox.confirm(
|
||||
'当前页有编辑内容、待应用候选配置或操作预览。离开会清除本页状态,但不会撤销已保存到服务器的候选配置。确认离开吗?',
|
||||
'当前页有编辑内容、未完成的保存或操作预览。离开会清除本页状态,但不会撤销已暂存到服务器的更改。确认离开吗?',
|
||||
'确认离开当前页',
|
||||
{ type: 'warning', confirmButtonText: '离开页面', cancelButtonText: '继续编辑' }
|
||||
)
|
||||
|
||||
@@ -131,7 +131,7 @@ export function useSpamBlockSettings() {
|
||||
savedInput = JSON.stringify(settings)
|
||||
validationResult.value = { valid: true, generation: savedGeneration.value, issues: [] }
|
||||
await load()
|
||||
if (!quiet) ElMessage.success('垃圾邮件插件配置已保存,等待应用')
|
||||
if (!quiet) ElMessage.success('垃圾邮件插件配置已暂存,正在完成保存')
|
||||
return true
|
||||
} catch (error) {
|
||||
if (isRecentAuthenticationCancelled(error)) return false
|
||||
@@ -201,7 +201,7 @@ export function useSpamBlockSettings() {
|
||||
return
|
||||
}
|
||||
const saved = await save({ quiet: true })
|
||||
if (saved) await apply({ successMessage: '垃圾邮件插件配置已保存并应用' })
|
||||
if (saved) await apply({ successMessage: '垃圾邮件插件配置已保存' })
|
||||
}
|
||||
|
||||
const continuePending = async () => {
|
||||
|
||||
+3
-3
@@ -25,7 +25,7 @@
|
||||
show-icon
|
||||
/>
|
||||
|
||||
<el-alert v-if="pendingCandidate" title="有一项配置尚未生效,可以继续应用或放弃更改。" type="warning" :closable="false" show-icon />
|
||||
<el-alert v-if="pendingCandidate" title="上次保存尚未完成,可以继续保存或放弃本次更改。" type="warning" :closable="false" show-icon />
|
||||
<el-form label-position="top" class="spam-form">
|
||||
<el-form-item label="模型 API 接口地址">
|
||||
<el-input
|
||||
@@ -68,7 +68,7 @@
|
||||
:disabled="!canWrite() || !!working || loading || !hasChanges"
|
||||
@click="saveAndApply"
|
||||
>
|
||||
保存并应用
|
||||
保存配置
|
||||
</el-button>
|
||||
<el-button
|
||||
v-else
|
||||
@@ -77,7 +77,7 @@
|
||||
:disabled="!canWrite() || !!working || loading"
|
||||
@click="continuePending"
|
||||
>
|
||||
继续应用
|
||||
继续保存
|
||||
</el-button>
|
||||
<el-button v-if="canWrite() && pendingCandidate" type="danger" plain :disabled="!!working || pendingCandidate.committed" @click="managePending('cancel')">放弃更改</el-button>
|
||||
</div>
|
||||
|
||||
Reference in new issue
Block a user