feat: 优化设置项

tnb-labs · Jul 12, 2024 · f65cf9e · f65cf9e
1 parent 4a8ebfb
commit f65cf9e
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/app/console/commands/panel.go b/app/console/commands/panel.go
@@ -165,8 +165,8 @@ func (receiver *Panel) Handle(ctx console.Context) error {
 		color.Green().Printfln(translate.Get("commands.panel.getInfo.username") + ": " + user.Username)
 		color.Green().Printfln(translate.Get("commands.panel.getInfo.password") + ": " + password)
 		color.Green().Printfln(translate.Get("commands.panel.port") + ": " + port)
-		color.Green().Printfln(translate.Get("commands.panel.entrance") + ": " + facades.Config().GetString("http.entrance"))
-		color.Green().Printfln(translate.Get("commands.panel.getInfo.address") + ": " + protocol + "://" + ip + ":" + port + facades.Config().GetString("http.entrance"))
+		color.Green().Printfln(translate.Get("commands.panel.entrance") + ": " + facades.Config().GetString("panel.entrance"))
+		color.Green().Printfln(translate.Get("commands.panel.getInfo.address") + ": " + protocol + "://" + ip + ":" + port + facades.Config().GetString("panel.entrance"))
 
 	case "getPort":
 		port, err := shell.Execf(`cat /www/panel/panel.conf | grep APP_PORT | awk -F '=' '{print $2}' | tr -d '\n'`)
@@ -178,7 +178,7 @@ func (receiver *Panel) Handle(ctx console.Context) error {
 		color.Green().Printfln(translate.Get("commands.panel.port") + ": " + port)
 
 	case "getEntrance":
-		color.Green().Printfln(translate.Get("commands.panel.entrance") + ": " + facades.Config().GetString("http.entrance"))
+		color.Green().Printfln(translate.Get("commands.panel.entrance") + ": " + facades.Config().GetString("panel.entrance"))
 
 	case "deleteEntrance":
 		oldEntrance, err := shell.Execf(`cat /www/panel/panel.conf | grep APP_ENTRANCE | awk -F '=' '{print $2}' | tr -d '\n'`)

diff --git a/app/http/controllers/setting_controller.go b/app/http/controllers/setting_controller.go
@@ -62,7 +62,7 @@ func (r *SettingController) List(ctx http.Context) http.Response {
 	return Success(ctx, http.Json{
 		"name":         r.setting.Get(models.SettingKeyName),
 		"language":     facades.Config().GetString("app.locale"),
-		"entrance":     facades.Config().GetString("http.entrance"),
+		"entrance":     facades.Config().GetString("panel.entrance"),
 		"ssl":          facades.Config().GetBool("panel.ssl"),
 		"website_path": r.setting.Get(models.SettingKeyWebsitePath),
 		"backup_path":  r.setting.Get(models.SettingKeyBackupPath),

diff --git a/app/http/middleware/entrance.go b/app/http/middleware/entrance.go
@@ -17,7 +17,7 @@ func Entrance() http.Middleware {
 			return
 		}
 
-		entrance := facades.Config().GetString("http.entrance")
+		entrance := facades.Config().GetString("panel.entrance")
 		if ctx.Request().Path() == entrance {
 			ctx.Request().Session().Put("verify_entrance", true)
 			_ = ctx.Response().Redirect(http.StatusFound, "/login").Render()

diff --git a/config/http.go b/config/http.go
@@ -29,8 +29,6 @@ func init() {
 		"host": "",
 		// HTTP Port
 		"port": config.Env("APP_PORT", "8888"),
-		// HTTP Entrance
-		"entrance": config.Env("APP_ENTRANCE", "/"),
 		// HTTPS Configuration
 		"tls": map[string]any{
 			// HTTPS Host

diff --git a/config/panel.go b/config/panel.go
@@ -10,5 +10,7 @@ func init() {
 		"name":    "耗子面板",
 		"version": "v2.2.24",
 		"ssl":     config.Env("APP_SSL", false),
+		// 安全入口
+		"entrance": config.Env("APP_ENTRANCE", "/"),
 	})
 }