From 6b123ffab366e12f2dd1af49f1ad6c2b44c50d9b Mon Sep 17 00:00:00 2001 From: HuangZhe <87906539+Zhe28@users.noreply.github.com> Date: Tue, 10 Sep 2024 11:39:31 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20db=5Fdsn=20?= =?UTF-8?q?=E4=B8=BA=E7=A9=BA=E7=9A=84=E9=94=99=E8=AF=AF=20(#200)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. 在切换数据库类型时, sqlite 的存储位置会被清空. 现于 placeholder 保持一致. --- fe/src/i18n/i18n.js | 8 ++++---- fe/src/views/SetupView.vue | 7 +++++++ 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/fe/src/i18n/i18n.js b/fe/src/i18n/i18n.js index a6c7b30..d2e23c1 100644 --- a/fe/src/i18n/i18n.js +++ b/fe/src/i18n/i18n.js @@ -105,7 +105,8 @@ var lang = { "move":"Move to group", "del_rule_confirm":"Are you sure to delete this?", "rule_params":"Executed params", - "autoSSLWarn":"PMail is not currently running on port 80. If you want PMail to manage SSL certificates automatically, please forward the /.well-known/* route to PMail. See https://github.com/Jinnrry/PMail/issues/94 for details." + "autoSSLWarn": "PMail is not currently running on port 80. If you want PMail to manage SSL certificates automatically, please forward the /.well-known/* route to PMail. See https://github.com/Jinnrry/PMail/issues/94 for details.", + "err_db_dsn_empty": "Database path cannot be empty!", }; @@ -217,7 +218,8 @@ var zhCN = { "move":"移动分组", "del_rule_confirm":"确定要删除吗?", "rule_params":"执行参数", - "autoSSLWarn":"PMail当前未使用80端口启动,如果想要PMail自动管理SSL证书,请将/.well-known/*路由转发到PMail。 详见https://github.com/Jinnrry/PMail/issues/94" + "autoSSLWarn": "PMail当前未使用80端口启动,如果想要PMail自动管理SSL证书,请将/.well-known/*路由转发到PMail。 详见https://github.com/Jinnrry/PMail/issues/94", + "err_db_dsn_empty": "数据库路径不能为空!", } switch (navigator.language) { @@ -231,6 +233,4 @@ switch (navigator.language) { break } - - export default lang; \ No newline at end of file diff --git a/fe/src/views/SetupView.vue b/fe/src/views/SetupView.vue index fa87f64..1e39c0d 100644 --- a/fe/src/views/SetupView.vue +++ b/fe/src/views/SetupView.vue @@ -342,6 +342,13 @@ const getDomainConfig = () => { } const setDbConfig = () => { + // 切换数据库类型为sqlite时,数据库路径为空,则使用默认路径 + if (dbSettings.type === "sqlite" && !dbSettings.dsn) dbSettings.dsn = "./config/pmail.db"; + else if (!dbSettings.dsn) ElMessage({ + title: "Error", + message: lang.err_db_dsn_empty, + type: "error", + }); $http.post("/api/setup", { "action": "set", "step": "database", "db_type": dbSettings.type, "db_dsn": dbSettings.dsn }).then((res) => { if (res.errorNo != 0) { ElMessage.error(res.errorMsg)