diff --git a/backend/cmd/admin.go b/backend/cmd/admin.go index 4aac1fd..4a3bbd0 100644 --- a/backend/cmd/admin.go +++ b/backend/cmd/admin.go @@ -42,6 +42,11 @@ func updateAdmin(username string, password string) { } func showAdmin() { + err := database.InitDB(config.GetDBPath()) + if err != nil { + fmt.Println(err) + return + } userService := service.UserService{} userModel, err := userService.GetFirstUser() if err != nil { diff --git a/backend/cmd/setting.go b/backend/cmd/setting.go index 7765f16..4b7f0d5 100644 --- a/backend/cmd/setting.go +++ b/backend/cmd/setting.go @@ -67,6 +67,11 @@ func updateSetting(port int, path string, subPort int, subPath string) { } func showSetting() { + err := database.InitDB(config.GetDBPath()) + if err != nil { + fmt.Println(err) + return + } settingService := service.SettingService{} allSetting, err := settingService.GetAllSetting() if err != nil { diff --git a/backend/web/web.go b/backend/web/web.go index 7994a05..794f661 100644 --- a/backend/web/web.go +++ b/backend/web/web.go @@ -108,6 +108,10 @@ func (s *Server) initRouter() (*gin.Engine, error) { // Serve index.html as the entry point // Handle all other routes by serving index.html engine.NoRoute(func(c *gin.Context) { + if c.Request.URL.Path == strings.TrimSuffix(base_url, "/") { + c.Redirect(http.StatusTemporaryRedirect, base_url) + return + } if !strings.HasPrefix(c.Request.URL.Path, base_url) { c.String(404, "") return diff --git a/s-ui.sh b/s-ui.sh index 8a0b0a0..4fa3ad7 100644 --- a/s-ui.sh +++ b/s-ui.sh @@ -185,19 +185,23 @@ view_admin() { reset_setting() { confirm "Are you sure you want to reset settings to default ?" "n" - if [[ $? != 0 ]]; then + if [[ $? == 0 ]]; then /usr/local/s-ui/sui setting -reset fi before_show_menu } set_setting() { - read -p "Enter the ${yellow}panel port${plain} (leave blank for existing/default value):" config_port - read -p "Enter the ${yellow}panel path${plain} (leave blank for existing/default value):" config_path + echo -e "Enter the ${yellow}panel port${plain} (leave blank for existing/default value):" + read config_port + echo -e "Enter the ${yellow}panel path${plain} (leave blank for existing/default value):" + read config_path # Sub configuration - read -p "Enter the ${yellow}subscription port${plain} (leave blank for existing/default value):" config_subPort - read -p "Enter the ${yellow}subscription path${plain} (leave blank for existing/default value):" config_subPath + echo -e "Enter the ${yellow}subscription port${plain} (leave blank for existing/default value):" + read config_subPort + echo -e "Enter the ${yellow}subscription path${plain} (leave blank for existing/default value):" + read config_subPath # Set configs echo -e "${yellow}Initializing, please wait...${plain}"