diff --git a/.gitignore b/.gitignore index aedf6924..16a89aef 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,6 @@ # Dependency directories (remove the comment below to include it) # vendor/ + +# Project runtime log +logs/*.log \ No newline at end of file diff --git a/logs/go-gin-api-access.log b/INSTALL.lock old mode 100755 new mode 100644 similarity index 100% rename from logs/go-gin-api-access.log rename to INSTALL.lock diff --git a/assets/templates/admin/admin_modify_password.html b/assets/templates/admin/admin_modify_password.html index 7125c632..d9c47a58 100644 --- a/assets/templates/admin/admin_modify_password.html +++ b/assets/templates/admin/admin_modify_password.html @@ -132,8 +132,11 @@ okay: { text: '关闭', action: function () { - parent.window.close(); - window.open("/login"); + if (window.frames.length !== parent.frames.length) { + parent.window.open("/login",'_self'); + }else{ + window.open("/login",'_self'); + } } } } diff --git a/assets/templates/index/index.html b/assets/templates/index/index.html index 1b22b4e0..43b5347b 100644 --- a/assets/templates/index/index.html +++ b/assets/templates/index/index.html @@ -281,8 +281,11 @@ $.cookie('_nav_title_', ''); $.cookie('_login_token_', ''); - parent.window.close(); - window.open("/login"); + if (window.frames.length !== parent.frames.length) { + parent.window.open("/login",'_self'); + }else{ + window.open("/login",'_self'); + } }, function (response) { AjaxError(response); diff --git a/assets/templates/install/install_view.html b/assets/templates/install/install_view.html index 3158452c..abfe3416 100644 --- a/assets/templates/install/install_view.html +++ b/assets/templates/install/install_view.html @@ -14,6 +14,13 @@ + @@ -27,7 +34,8 @@
检测 · 环境
-

所需版本：go{{.MinGoVersion}}+ (当前版本 {{.GoVersion}})

+

所需版本：go{{.MinGoVersion}}+ (当前版本 {{.GoVersion}}) +

配置 · 语言
@@ -67,42 +75,57 @@
配置 · Redis
-
配置 · MySQL
+
配置 · 数据库
- 地址 + 数据库类型
- +
- -
-
- 用户 +
+
+
+ 地址 +
+
- -
-
-
- 密码 +
+
+ 用户 +
+
- -
-
-
- DB +
+
+ 密码 +
+
- -
- 请确保此数据库已存在！ + +
+
+ DB +
+ +
+ 请确保此数据库已存在！ +
-