From b63afd5f66b278ca2040ae0ec7b09d89ade9bc68 Mon Sep 17 00:00:00 2001 From: GoEdgeLab Date: Sun, 25 Sep 2022 20:34:43 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/nodes/admin_node.go | 4 ++-- web/public/js/components.js | 2 +- web/public/js/components.src.js | 2 +- .../js/components/server/http-referers-config-box.js | 2 +- web/views/@default/clusters/cluster/node/detail.html | 2 +- web/views/@default/clusters/cluster/node/install.html | 2 +- web/views/@default/setup/index.html | 9 +++++---- web/views/@default/setup/index.js | 6 ++++++ web/views/@default/users/@user_menu.html | 2 +- 9 files changed, 19 insertions(+), 12 deletions(-) diff --git a/internal/nodes/admin_node.go b/internal/nodes/admin_node.go index 5bc76869..0ab3d25b 100644 --- a/internal/nodes/admin_node.go +++ b/internal/nodes/admin_node.go @@ -1,9 +1,9 @@ package nodes import ( + "errors" "github.com/TeaOSLab/EdgeAdmin/internal/configs" teaconst "github.com/TeaOSLab/EdgeAdmin/internal/const" - "github.com/TeaOSLab/EdgeAdmin/internal/errors" "github.com/TeaOSLab/EdgeAdmin/internal/events" "github.com/TeaOSLab/EdgeAdmin/internal/utils" "github.com/iwind/TeaGo" @@ -90,7 +90,7 @@ func (this *AdminNode) Run() { EndAll(). Session(sessions.NewFileSessionManager(86400, secret), teaconst.CookieSID). ReadHeaderTimeout(3 * time.Second). - ReadTimeout(600 * time.Second). + ReadTimeout(1200 * time.Second). Start() } diff --git a/web/public/js/components.js b/web/public/js/components.js index 3a577250..12c5e764 100644 --- a/web/public/js/components.js +++ b/web/public/js/components.js @@ -2204,7 +2204,7 @@ Vue.component("traffic-map-box",{props:["v-stats","v-is-attack"],mounted:functio - 启用 + 启用防盗链
diff --git a/web/public/js/components.src.js b/web/public/js/components.src.js index 3ac04efc..e9d1ba7e 100755 --- a/web/public/js/components.src.js +++ b/web/public/js/components.src.js @@ -6652,7 +6652,7 @@ Vue.component("http-referers-config-box", { - 启用 + 启用防盗链
diff --git a/web/public/js/components/server/http-referers-config-box.js b/web/public/js/components/server/http-referers-config-box.js index 65f6c488..ffb273bf 100644 --- a/web/public/js/components/server/http-referers-config-box.js +++ b/web/public/js/components/server/http-referers-config-box.js @@ -31,7 +31,7 @@ Vue.component("http-referers-config-box", { - 启用 + 启用防盗链
diff --git a/web/views/@default/clusters/cluster/node/detail.html b/web/views/@default/clusters/cluster/node/detail.html index 82d6baa8..861a37c6 100644 --- a/web/views/@default/clusters/cluster/node/detail.html +++ b/web/views/@default/clusters/cluster/node/detail.html @@ -209,7 +209,7 @@ - + 版本 v{{node.status.buildVersion}}   发现新版本v{{newVersion}} » diff --git a/web/views/@default/clusters/cluster/node/install.html b/web/views/@default/clusters/cluster/node/install.html index 28acd1de..77681db3 100644 --- a/web/views/@default/clusters/cluster/node/install.html +++ b/web/views/@default/clusters/cluster/node/install.html @@ -24,7 +24,7 @@

方法2：手动安装

- +
安装文件下载安装文件 diff --git a/web/views/@default/setup/index.html b/web/views/@default/setup/index.html index fbac9ad1..89986cdf 100644 --- a/web/views/@default/setup/index.html +++ b/web/views/@default/setup/index.html @@ -158,13 +158,14 @@ @@ -185,7 +186,7 @@ @@ -242,7 +243,7 @@
-
+ diff --git a/web/views/@default/setup/index.js b/web/views/@default/setup/index.js index 19690fba..84d9b7f3 100644 --- a/web/views/@default/setup/index.js +++ b/web/views/@default/setup/index.js @@ -92,6 +92,12 @@ Tea.context(function () { this.dbSuccess = function (resp) { this.step = this.STEP_ADMIN this.dbInfo = resp.data.db + + this.$delay(function () { + if (this.$refs.adminPasswordInput != null) { + this.$refs.adminPasswordInput.focus() + } + }) } this.dbDone = function () { diff --git a/web/views/@default/users/@user_menu.html b/web/views/@default/users/@user_menu.html index 000937ca..33c4567c 100644 --- a/web/views/@default/users/@user_menu.html +++ b/web/views/@default/users/@user_menu.html @@ -4,7 +4,7 @@ {{user.fullname}}  ({{user.username}}) 网站服务 修改 - 功能 + 功能 实名认证(待审核)({{user.identityTag}}) API AccessKey({{user.countAccessKeys}}) \ No newline at end of file
数据库连接端口 * +

MySQL默认端口为3306。
数据库名称 * -

请事先创建好此数据库，如果不存在，则会尝试自动创建。

+

请事先创建好此数据库，如果不存在，则会尝试自动创建。手动创建数据库语句CREATE DATABASE `数据库名称` CHARSET utf8mb4;。
访问日志保留天数
- + 天

网站等服务记录的访问日志保留天数，防止无限制地占用数据库空间，如果你的数据库空间比较小，请适当调小此值。

@@ -220,7 +221,7 @@
登录密码 * - +

只能是英文、数字和下划线的组合 。