优化数据库初始化失败处理
Security Checks / security (push) Waiting to run

This commit is contained in:
xuans committed 2026-08-30 19:40:57 +08:00
1 parent 29cfebd620
commit 0b10489728
7 files changed
+175 -32

No files matched your search

+2
View File
@@ -89,6 +89,8 @@ const lang = {
"db_name_required": "请输入数据库名",
"db_init_success": "数据库连接成功,数据库和数据表已初始化",
"db_init_failed": "数据库初始化失败,请检查连接信息和数据库权限",
"db_init_retry_tip": "连接失败不会跳转登录页,请修正信息后重新点击下一步。",
"db_request_failed": "数据库初始化请求失败,请检查 Smail 服务状态后重试",
"pg_user_ph": "请输入 PostgreSQL 用户名",
"pg_password_ph": "请输入 PostgreSQL 密码",
"pg_dsn": "PostgreSQL DSN",
+11
View File
@@ -116,6 +116,17 @@
line-height: 1.7;
}
.database-error {
margin: 0 0 18px;
}
.database-retry-tip {
margin: -4px 0 8px 120px;
color: var(--pm-text-secondary);
font-size: 12px;
line-height: 1.5;
}
.database-inline-fields {
display: grid;
grid-template-columns: minmax(0, 1fr) 180px;
+51 -22
View File
@@ -52,6 +52,16 @@ export function usePage() {
const fullscreenLoading = ref(false)
const databaseLoading = ref(false)
const databaseError = ref("")
const getDatabaseErrorMessage = (error) => {
const message = typeof error?.message === "string" ? error.message.trim() : ""
if (message && !/^network error$/i.test(message) && !/^timeout of \d+ms exceeded$/i.test(message) && !/^request failed with status code \d+$/i.test(message)) {
return message
}
return lang.db_request_failed
}
const dnsChecking = ref(false)
@@ -109,22 +119,19 @@ export function usePage() {
})
}
const getPassword = () => {
http.post("/api/v1/setup", {"action": "get", "step": "password"}).then((res) => {
if (res.errorNo !== 0) {
ElMessage.error(res.errorMsg)
} else {
adminSettings.hadSeted = res.data !== ""
if (adminSettings.hadSeted) {
adminSettings.account = res.data
adminSettings.password = "*******"
adminSettings.password2 = "*******"
}
}
})
}
const getPassword = () => http.post("/api/v1/setup", {"action": "get", "step": "password"}).then((res) => {
if (res.errorNo !== 0) {
throw new Error(res.errorMsg || lang.db_init_failed)
}
adminSettings.hadSeted = res.data != ""
if (adminSettings.hadSeted) {
adminSettings.account = res.data
adminSettings.password = "*******"
adminSettings.password2 = "*******"
}
})
const getDbConfig = () => {
http.post("/api/v1/setup", {"action": "get", "step": "database"}).then((res) => {
if (res.errorNo !== 0) {
@@ -155,6 +162,11 @@ export function usePage() {
}
const setDbConfig = () => {
if (databaseLoading.value) {
return
}
databaseError.value = ""
if (dbSettings.type === "sqlite" && !dbSettings.dsn) {
dbSettings.dsn = "./config/smail.db";
}
@@ -173,6 +185,10 @@ export function usePage() {
ElMessage.error(lang.db_port_required)
return
}
if (!/^\d+$/.test(dbSettings.port.trim()) || Number(dbSettings.port) < 1 || Number(dbSettings.port) > 65535) {
ElMessage.error("数据库端口必须是 1 到 65535 之间的数字")
return
}
if (!dbSettings.name.trim()) {
ElMessage.error(lang.db_name_required)
return
@@ -198,20 +214,27 @@ export function usePage() {
http.post("/api/v1/setup", payload).then((res) => {
if (res.errorNo !== 0) {
ElMessage.error(res.errorMsg || lang.db_init_failed)
databaseError.value = res.errorMsg || lang.db_init_failed
ElMessage.error(databaseError.value)
return
}
ElMessage.success(lang.db_init_success)
active.value++;
getPassword();
}).catch(() => {
ElMessage.error(lang.db_init_failed)
getPassword().then(() => {
ElMessage.success(lang.db_init_success)
active.value++
}).catch((error) => {
databaseError.value = getDatabaseErrorMessage(error)
ElMessage.error(databaseError.value)
})
}).catch((error) => {
databaseError.value = getDatabaseErrorMessage(error)
ElMessage.error(databaseError.value)
}).finally(() => {
databaseLoading.value = false
})
}
const handleDbTypeChange = (type) => {
databaseError.value = ""
dbSettings.dsn = ""
dbSettings.password = ""
if (type === "mysql" || type === "postgres") {
@@ -259,6 +282,10 @@ export function usePage() {
}
}
const clearDatabaseError = () => {
databaseError.value = ""
}
const formatDNSRecordTTL = (ttl) => {
if (ttl >= 3600 && ttl % 3600 === 0) {
return `${ttl / 3600}${lang.dns_ttl_hour}`
@@ -413,6 +440,7 @@ export function usePage() {
adminSettings,
dbSettings,
databaseLoading,
databaseError,
domainSettings,
sslSettings,
active,
@@ -428,6 +456,7 @@ export function usePage() {
getDomainConfig,
setDbConfig,
handleDbTypeChange,
clearDatabaseError,
getDNSConfig,
formatDNSRecordTTL,
copyDNSValue,
+37 -8
View File
@@ -33,40 +33,66 @@
</el-select>
</el-form-item>
<el-alert
v-if="databaseError"
:title="databaseError"
type="error"
show-icon
:closable="false"
class="database-error"
/>
<div v-if="dbSettings.type === 'mysql' || dbSettings.type === 'postgres'" class="mysql-fields">
<div class="database-hint">{{ dbSettings.type === 'mysql' ? lang.mysql_create_desc : lang.postgres_create_desc }}</div>
<div class="database-hint">
{{ dbSettings.type === 'mysql' ? lang.mysql_create_desc : lang.postgres_create_desc }}
</div>
<el-form-item :label="lang.db_user">
<el-input v-model="dbSettings.user" :placeholder="dbSettings.type === 'mysql' ? lang.db_user_ph : lang.pg_user_ph"
<el-input v-model="dbSettings.user" @input="clearDatabaseError"
:disabled="databaseLoading"
:placeholder="dbSettings.type === 'mysql' ? lang.db_user_ph : lang.pg_user_ph"
autocomplete="username"></el-input>
</el-form-item>
<div class="database-inline-fields">
<el-form-item :label="lang.db_host" class="database-host-field">
<el-input v-model="dbSettings.host" :placeholder="lang.db_host_ph"></el-input>
<el-input v-model="dbSettings.host" @input="clearDatabaseError"
:disabled="databaseLoading"
:placeholder="lang.db_host_ph"></el-input>
</el-form-item>
<el-form-item :label="lang.db_port" class="database-port-field">
<el-input v-model="dbSettings.port" :placeholder="lang.db_port_ph"
<el-input v-model="dbSettings.port" @input="clearDatabaseError"
:disabled="databaseLoading"
:placeholder="lang.db_port_ph"
inputmode="numeric"></el-input>
</el-form-item>
</div>
<el-form-item :label="lang.db_name">
<el-input v-model="dbSettings.name" :placeholder="lang.db_name_ph"></el-input>
<el-input v-model="dbSettings.name" @input="clearDatabaseError"
:disabled="databaseLoading"
:placeholder="lang.db_name_ph"></el-input>
</el-form-item>
<el-form-item :label="lang.db_password">
<el-input v-model="dbSettings.password" type="password"
<el-input v-model="dbSettings.password" @input="clearDatabaseError"
:disabled="databaseLoading"
type="password"
:placeholder="dbSettings.type === 'mysql' ? lang.db_password_ph : lang.pg_password_ph" autocomplete="new-password"
show-password></el-input>
<div class="database-field-tip">{{ lang.db_password_desc }}</div>
</el-form-item>
</div>
<div class="database-retry-tip">{{ lang.db_init_retry_tip }}</div>
<el-form-item :label="lang.sqlite_db_path" v-if="dbSettings.type === 'sqlite'">
<el-input v-model="dbSettings.dsn" placeholder="请输入 SQLite 数据文件路径"></el-input>
<el-input v-model="dbSettings.dsn" @input="clearDatabaseError"
:disabled="databaseLoading"
placeholder="请输入 SQLite 数据文件路径"></el-input>
</el-form-item>
</el-form>
</div>
@@ -308,7 +334,8 @@
<el-button v-if="active > 0" id="previous" @click="previous">
{{ lang.previous }}
</el-button>
<el-button :loading="databaseLoading" :element-loading-text="waitDesc"
<el-button :loading="databaseLoading" :disabled="databaseLoading"
:element-loading-text="waitDesc"
v-loading.fullscreen.lock="fullscreenLoading" id="next"
@click="next">
{{ dnsChecking ? lang.ssl_verify : lang.next }}
@@ -326,6 +353,7 @@ const {
lang,
dbSettings,
databaseLoading,
databaseError,
adminSettings,
domainSettings,
addDomain,
@@ -338,6 +366,7 @@ const {
next,
previous,
handleDbTypeChange,
clearDatabaseError,
formatDNSRecordTTL,
copyDNSValue,
fullscreenLoading