Merge branch 'embed' of https://github.com/0xJacky/nginx-ui into embed

server/api/install.go

@@ -1,22 +1,17 @@
 package api
 
 import (
-	model2 "github.com/0xJacky/Nginx-UI/server/model"
+	"github.com/0xJacky/Nginx-UI/server/model"
 	"github.com/0xJacky/Nginx-UI/server/settings"
+	"github.com/0xJacky/Nginx-UI/server/tool"
 	"github.com/gin-gonic/gin"
 	"github.com/google/uuid"
 	"golang.org/x/crypto/bcrypt"
 	"net/http"
-	"os"
-	"path"
 )
 
 func installLockStatus() bool {
-	lockPath := path.Join(settings.DataDir, "app.ini")
-	_, err := os.Stat(lockPath)
-
-	return !os.IsNotExist(err)
-
+	return "" != settings.ServerSettings.JwtSecret
 }
 
 func InstallLockCheck(c *gin.Context) {
@@ -29,6 +24,7 @@ type InstallJson struct {
 	Email    string `json:"email" binding:"required,email"`
 	Username string `json:"username" binding:"required,max=255"`
 	Password string `json:"password" binding:"required,max=255"`
+	Database string `json:"database"`
 }
 
 func InstallNginxUI(c *gin.Context) {
@@ -45,18 +41,26 @@ func InstallNginxUI(c *gin.Context) {
 		return
 	}
 
-	serverSettings := settings.Conf.Section("server")
-	serverSettings.Key("JwtSecret").SetValue(uuid.New().String())
-	serverSettings.Key("Email").SetValue(json.Email)
+	settings.ServerSettings.JwtSecret = uuid.New().String()
+	settings.ServerSettings.Email = json.Email
+	if "" != json.Database {
+		settings.ServerSettings.Database = json.Database
+	}
+	settings.ReflectFrom()
+
 	err := settings.Save()
 	if err != nil {
 		ErrHandler(c, err)
 		return
 	}
 
-	curd := model2.NewCurd(&model2.Auth{})
+	// Init model and auto cert
+	model.Init()
+	go tool.AutoCert()
+
+	curd := model.NewCurd(&model.Auth{})
 	pwd, _ := bcrypt.GenerateFromPassword([]byte(json.Password), bcrypt.DefaultCost)
-	err = curd.Add(&model2.Auth{
+	err = curd.Add(&model.Auth{
 		Name:     json.Username,
 		Password: string(pwd),
 	})

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

@@ -3,6 +3,7 @@ package router
 import (
 	"bufio"
 	api2 "github.com/0xJacky/Nginx-UI/server/api"
+	"github.com/gin-contrib/static"
 	"github.com/gin-gonic/gin"
 	"net/http"
 	"strings"
@@ -14,7 +15,7 @@ func InitRouter() *gin.Engine {
 
 	r.Use(gin.Recovery())
 
-	r.Use(tryStatic("/", mustFS("")))
+	r.Use(static.Serve("/", mustFS("")))
 
 	r.NoRoute(func(c *gin.Context) {
 		accept := c.Request.Header.Get("Accept")

server/settings/settings.go

@@ -1,10 +1,8 @@
 package settings
 
 import (
-    "gopkg.in/ini.v1"
-    "log"
-    "os"
-    "path"
+	"gopkg.in/ini.v1"
+	"log"
 )
 
 var Conf *ini.File
@@ -16,30 +14,47 @@ 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)
+var sections = map[string]interface{}{
+	"server": ServerSettings,
+}
+
+func Init(confPath string) {
+	ConfPath = confPath
+	Setup()
+}
+
+func Setup() {
+	var err error
+	Conf, err = ini.LooseLoad(ConfPath)
+	if err != nil {
+		log.Printf("setting.Setup: %v", err)
+	} else {
+		MapTo()
+	}
+}
+
+func MapTo() {
+	for k, v := range sections {
+		mapTo(k, v)
+	}
+}
+
+func ReflectFrom() {
+	for k, v := range sections {
+		reflectFrom(k, v)
+	}
 }
 
 func mapTo(section string, v interface{}) {
@@ -49,12 +64,18 @@ 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
+func reflectFrom(section string, v interface{}) {
+	err := Conf.Section(section).ReflectFrom(v)
+	if err != nil {
+		log.Fatalf("Cfg.ReflectFrom %s err: %v", section, err)
+	}
+}
+
+func Save() (err error) {
+	err = Conf.SaveTo(ConfPath)
+	if err != nil {
+		return
+	}
+	Setup()
+	return
 }