Refactor start-up parameters. Fixed embed bugs for Windows. Fixed wrong Content Type of .js file on some OS platforms.

server/api/install.go

@@ -8,11 +8,10 @@ import (
 	"golang.org/x/crypto/bcrypt"
 	"net/http"
 	"os"
-	"path"
 )
 
 func installLockStatus() bool {
-	lockPath := path.Join(settings.DataDir, "app.ini")
+	lockPath := settings.ConfPath
 	_, err := os.Stat(lockPath)
 
 	return !os.IsNotExist(err)

server/model/models.go

@@ -1,6 +1,7 @@
 package model
 
 import (
+	"fmt"
 	"github.com/0xJacky/Nginx-UI/server/settings"
 	"gorm.io/driver/sqlite"
 	"gorm.io/gorm"
@@ -20,7 +21,7 @@ type Model struct {
 }
 
 func Init() {
-	dbPath := path.Join(settings.DataDir, "database.db")
+	dbPath := path.Join(path.Dir(settings.ConfPath), fmt.Sprintf("%s.db", settings.ServerSettings.Database))
 	var err error
 	db, err = gorm.Open(sqlite.Open(dbPath), &gorm.Config{
 		Logger:      logger.Default.LogMode(logger.Info),

server/router/routers.go

@@ -11,7 +11,7 @@ import (
 	"io/fs"
 	"log"
 	"net/http"
-	"path/filepath"
+	"path"
 	"strings"
 )
 
@@ -47,14 +47,14 @@ type serverFileSystemType struct {
 	http.FileSystem
 }
 
-func (f serverFileSystemType) Exists(prefix string, path string) bool {
-	_, err := f.Open(filepath.Join(prefix, path))
+func (f serverFileSystemType) Exists(prefix string, filePath string) bool {
+	_, err := f.Open(path.Join(prefix, filePath))
 	return err == nil
 }
 
 func mustFS(dir string) (serverFileSystem static.ServeFileSystem) {
 
-	sub, err := fs.Sub(frontend.DistFS, filepath.Join("dist", dir))
+	sub, err := fs.Sub(frontend.DistFS, path.Join("dist", dir))
 
 	if err != nil {
 		log.Println(err)

server/settings/settings.go

@@ -1,10 +1,9 @@
 package settings
 
 import (
-    "gopkg.in/ini.v1"
-    "log"
-    "os"
-    "path"
+	"gopkg.in/ini.v1"
+	"log"
+	"os"
 )
 
 var Conf *ini.File
@@ -16,30 +15,33 @@ type Server struct {
 	JwtSecret         string
 	HTTPChallengePort string
 	Email             string
+	Database          string
 }
 
-var ServerSettings = &Server{}
-
-var DataDir string
-var confPath string
-
-func Init(dataDir string)  {
-    DataDir = dataDir
-    confPath = path.Join(dataDir, "app.ini")
-    if _, err := os.Stat(confPath); os.IsNotExist(err) {
-        confPath = path.Join(dataDir, "app.example.ini")
-    }
-    Setup()
+var ServerSettings = &Server{
+	HttpPort:          "9000",
+	RunMode:           "debug",
+	HTTPChallengePort: "9180",
+	Database:          "database",
 }
 
-func Setup()  {
-    var err error
-    Conf, err = ini.Load(confPath)
-    if err != nil {
-        log.Fatalf("setting.Setup, fail to parse '%s': %v", confPath, err)
-    }
+var ConfPath string
 
-    mapTo("server", ServerSettings)
+func Init(confPath string) {
+	ConfPath = confPath
+	if _, err := os.Stat(ConfPath); os.IsExist(err) {
+		Setup()
+	}
+}
+
+func Setup() {
+	var err error
+	Conf, err = ini.Load(ConfPath)
+	if err != nil {
+		log.Fatalf("setting.Setup, fail to parse '%s': %v", ConfPath, err)
+	}
+
+	mapTo("server", ServerSettings)
 }
 
 func mapTo(section string, v interface{}) {
@@ -50,11 +52,10 @@ func mapTo(section string, v interface{}) {
 }
 
 func Save() (err error) {
-    confPath = path.Join(DataDir, "app.ini")
-    err = Conf.SaveTo(confPath)
-    if err != nil {
-        return
-    }
-    Setup()
-    return
+	err = Conf.SaveTo(ConfPath)
+	if err != nil {
+		return
+	}
+	Setup()
+	return
 }