Merge pull request #5 from mkitsdts/dev

Dev

Author: mkitsdts

Makefile

@@ -21,9 +21,9 @@ copy:
 	find "$$DIST" -type f \( -name '*.css' -o -name '*.js' \) -exec cp {} static/assets/ \;
 
 run:
-	@echo "Starting mkBlog with nohup..."
-	nohup ./mkBlog > nohup.out 2>&1 & echo $$! > mkblog.pid
+	@echo "Starting mkBlog..."
+	./mkBlog & 1 & echo $$! > mkblog.pid
 	@echo "mkBlog started, pid saved to mkblog.pid"
 
 stop:
-	@if [ -f mkblog.pid ]; then kill `cat mkblog.pid` && rm -f mkblog.pid && echo "Stopped mkBlog"; else echo "mkBlog not running (no mkblog.pid)"; fi
+	@if [ -f mkblog.pid ]; then kill `cat mkblog.pid` && rm -f mkblog.pid && echo "Stopped mkBlog"; else echo "mkBlog not running (no mkblog.pid)"; fi

config.yaml.tmpl

@@ -1,6 +1,6 @@
 # 所有路径都是与程序同一目录下的data文件夹下的相对路径
 database:
-  host: data/app.db   # 数据库地址，如果启用sqlite3，只需要在 host 填写路径，其他不用管
+  host: app.db   # 数据库地址，如果启用sqlite3，只需要在 host 填写路径，其他不用管
   port: 3306          # 数据库端口
   user: root          # 数据库用户
   password: root      # 数据库密码
@@ -9,8 +9,8 @@ database:
 
 tls:
   enabled: false              # 是否启用TLS
-  cert: ./static/server.crt   # TLS证书文件路径
-  key: ./static/server.key    # TLS密钥文件路径
+  cert: static/server.crt   # TLS证书文件路径
+  key: static/server.key    # TLS密钥文件路径
 
 cert_control:
   email: 114514@colima.com      # 注册 Let's Encrypt 账号的邮箱
@@ -21,11 +21,11 @@ cert_control:
 
 auth:
   enabled: false                        # 是否启用身份验证
-  secret: "123456789015234564892545456" # 自行设置验证密码
+  secret: 123456789015234564892545456 # 自行设置验证密码
 
 server:
-  port: 8080                     # 服务器端口
-  imageSavePath: ./static/images # 图片保存路径
+  port: 4801                     # 服务器端口
+  imageSavePath: static/images   # 图片保存路径
   limiter:
     requests: 100                # 每个IP在duration内最多允许的请求数
     duration: 5                  # 限制的时间窗口，单位为秒
@@ -34,10 +34,8 @@ server:
   cert_ctrl_enabled: false
 
 site:
-  signature: "鼠鼠是穿越者..."        # 个性签名
+  signature: "鼠鼠是穿越者..."         # 个性签名
   about: "鼠鼠是一个喜欢折腾的程序员..." # 关于我
   avatarPath: avatar.jpg          # 头像路径
-  server: http://localhost:8080   # 服务器地址(端口为80/443时后面不需要加端口号)
-  devmode: true                   # 开发模式，启用后前端使用未压缩的资源文件
   comment_enabled: false          # 是否启用评论功能
   icp: 粤ICP备123456789号          # 备案号（可选）

config/config.go

@@ -1,9 +1,11 @@
 package config
 
 import (
+	"fmt"
 	"log/slog"
 	"mkBlog/models"
 	"os"
+	"path"
 
 	"go.yaml.in/yaml/v3"
 )
@@ -73,13 +75,17 @@ var Cfg *Config = &Config{}
 
 func Init() {
 	// Fallback to config.yaml file if exists
-	file, err := os.Open(models.Default_Config_File_Path)
+	configPath := path.Join(models.Default_Data_Path, models.Default_Config_File_Path)
+	fmt.Println("Config Path ", configPath)
+	file, err := os.Open(configPath)
 	if err != nil {
 		slog.Warn("config file not found, writing default config.yaml")
 		if err = writeImpl(); err != nil {
 			slog.Error("Failed to write impl config file.", " Please check program's permission ", err)
+			useDefaultConfig()
+			return
 		}
-		if file, err = os.Open(models.Default_Config_File_Path); err != nil {
+		if file, err = os.Open(configPath); err != nil {
 			slog.Error("Failed to open file.", " Unknown error: ", err)
 			useDefaultConfig()
 			return
@@ -89,5 +95,9 @@ func Init() {
 		slog.Warn("Failed to decode config.yaml")
 		return
 	}
+
+	Cfg.Site.Server = fmt.Sprintf("http://localhost:%d", Cfg.Server.Port)
+	Cfg.Site.DevMode = Cfg.Server.Devmode
+
 	slog.Info("Configuration loaded", "database", Cfg.Database, "tls", Cfg.TLS, "auth_enabled", Cfg.Auth.Enabled, "server", Cfg.Server)
 }

config/default.go

@@ -1,12 +1,17 @@
 package config
 
-import "mkBlog/models"
+import (
+	"mkBlog/models"
+	"path"
+)
 
 func useDefaultConfig() {
+	pwd := PWD()
+	dataPath := path.Join(pwd, models.Default_Data_Path)
 	Cfg.Database.Kind = models.SQLite3
 
 	Cfg.Server.Port = models.Default_Server_Port
-	Cfg.Server.ImageSavePath = models.Default_Image_Save_Path
+	Cfg.Server.ImageSavePath = path.Join(dataPath, models.Default_Image_Save_Path)
 	Cfg.Server.Limiter.Duration = models.Default_Limiter_Duartion
 	Cfg.Server.Limiter.Requests = models.Default_Limiter_Requests
 	Cfg.Server.HTTP3Enabled = false

config/impl.go

@@ -1,26 +1,27 @@
 package config
 
 import (
+	"log/slog"
 	"mkBlog/models"
 	"os"
+	"path"
 )
 
 const impl string = `# 所有路径都是与程序同一目录下的data文件夹下的相对路径
 database:
-  host: data/app.db   # 数据库地址，如果启用sqlite3，只需要在 host 填写路径，其他不用管
-  port:           	  # 数据库端口
-  user:           	  # 数据库用户
-  password:           # 数据库密码
+  host: app.db   # 数据库地址，如果启用sqlite3，只需要在 host 填写路径，其他不用管
+  port: 3306          # 数据库端口
+  user: root          # 数据库用户
+  password: root      # 数据库密码
   name: mkblog        # 数据库名称
   kind: sqlite3       # 数据库类型，支持mysql和postgres以及sqlite3
 
 tls:
   enabled: false              # 是否启用TLS
-  cert: ./static/server.crt   # TLS证书文件路径
-  key: ./static/server.key    # TLS密钥文件路径
+  cert: static/server.crt   # TLS证书文件路径
+  key: static/server.key    # TLS密钥文件路径
 
 cert_control:
-  enabled: false				# 是否启用自动 TLS 证书管理
   email: 114514@colima.com      # 注册 Let's Encrypt 账号的邮箱
   domain: 114514.com            # 需要申请 TLS 证书的域名
   Key:                          # 域名提供商的 API Key
@@ -29,27 +30,36 @@ cert_control:
 
 auth:
   enabled: false                        # 是否启用身份验证
-  secret: "123456789015234564892545456" # 自行设置验证密码
+  secret: 123456789015234564892545456 # 自行设置验证密码
 
 server:
   port: 4801                     # 服务器端口
-  imageSavePath: ./static/images # 图片保存路径
+  imageSavePath: static/images   # 图片保存路径
   limiter:
     requests: 100                # 每个IP在duration内最多允许的请求数
     duration: 5                  # 限制的时间窗口，单位为秒
-  devmode: false
+  devmode: true
   http3_enabled: false
+  cert_ctrl_enabled: false
 
 site:
-  signature: "emm......."        # 个性签名
-  about: "鼠鼠我................" # 关于我
-  avatarPath: avatar.jpg         # 头像路径
-  server: http://localhost:4801  # 服务器地址(端口为80/443时后面可以不加端口号)
-  devmode: false                 # 开发模式，启用后前端使用未压缩的资源文件
-  comment_enabled: false         # 是否启用评论功能
-  icp: 粤ICP备123456789号         # 备案号（可选）
+  signature: "鼠鼠是穿越者..."         # 个性签名
+  about: "鼠鼠是一个喜欢折腾的程序员..." # 关于我
+  avatarPath: avatar.jpg          # 头像路径
+  comment_enabled: false          # 是否启用评论功能
+  icp: 粤ICP备123456789号          # 备案号（可选）
 `
 
+func PWD() string {
+	d, err := os.Getwd()
+	if err != nil {
+		d = "."
+	}
+	return d
+}
+
 func writeImpl() error {
-	return os.WriteFile(models.Default_Config_File_Path, []byte(impl), 0644)
+	slog.Debug("write impl begin")
+	p := path.Join(models.Default_Data_Path, models.Default_Config_File_Path)
+	return os.WriteFile(p, []byte(impl), 0644)
 }

main.go

@@ -1,6 +1,7 @@
 package main
 
 import (
+	"flag"
 	"mkBlog/config"
 	"mkBlog/models"
 	"mkBlog/pkg/bloom"
@@ -10,24 +11,31 @@ import (
 	"mkBlog/pkg/router"
 	"mkBlog/service"
 	"os"
-	"path/filepath"
 )
 
-func Init() {
-	dir := filepath.Dir(models.Default_Config_File_Path)
-	if err := os.MkdirAll(dir, 0755); err != nil {
+func Init(debugflag *bool) {
+	if err := os.MkdirAll(models.Default_Data_Path, 0755); err != nil {
 		return
 	}
-	log.Init()
+	if debugflag != nil {
+		log.Init(*debugflag)
+	} else {
+		log.Init(false)
+	}
+
 	config.Init()
 
 	bloom.Init()
-	cache.Init("./static")
+	cache.Init(models.Default_Static_File_Path)
 	middleware.Init()
 }
 
 func main() {
-	Init()
+	debug := flag.Bool("debug", false, "启用调试模式")
+
+	// 解析命令行参数
+	flag.Parse()
+	Init(debug)
 
 	if err := router.InitRouter(); err != nil {
 		panic("failed to create router: " + err.Error())

models/comment.go

@@ -7,6 +7,7 @@ type Comment struct {
 	Content     string     `json:"content" gorm:"type:text"`
 	CommentUser string     `json:"comment_user" gorm:"type:varchar(100)"`
 	CommentTo   int        `json:"comment_to_order" gorm:"type:int"`
+	CommentRoot int        `json:"comment_root" gorm:"type:int"`
 	Title       string     `json:"title" gorm:"index"` // 关联文章标题
 	Order       int        `json:"order" gorm:"default:0"`
 	CreatedAt   *time.Time `json:"created_at" gorm:"autoCreateTime;"`

models/const.go

@@ -12,11 +12,12 @@ const (
 )
 
 const (
-	Default_Log_File_Path    = "data/app.log"
-	Default_Image_Save_Path  = "data/images"
-	Default_Config_File_Path = "data/config.yaml"
-	Default_Data_File_Path   = "data/app.db"
-	Default_Static_File_Path = "data/static/"
+	Default_Data_Path        = "./data"
+	Default_Log_File_Path    = "app.log"
+	Default_Image_Save_Path  = "images"
+	Default_Config_File_Path = "config.yaml"
+	Default_Data_File_Path   = "app.db"
+	Default_Static_File_Path = "./static"
 )
 
 const (

pkg/database/utils.go

@@ -5,6 +5,7 @@ import (
 	"log/slog"
 	"mkBlog/config"
 	"mkBlog/models"
+	"path"
 	"strings"
 	"time"
 
@@ -16,34 +17,34 @@ import (
 
 func getDSN() string {
 	switch strings.ToLower(config.Cfg.Database.Kind) {
-	case "mysql":
+	case models.MySQL:
 		return config.Cfg.Database.User + ":" + config.Cfg.Database.Password +
 			"@tcp(" + config.Cfg.Database.Host + ":" + config.Cfg.Database.Port + ")/" +
 			config.Cfg.Database.Name + "?charset=utf8mb4&parseTime=True&loc=UTC"
-	case "postgres":
+	case models.Postgres:
 		return "host=" + config.Cfg.Database.Host +
 			" port=" + config.Cfg.Database.Port +
 			" user=" + config.Cfg.Database.User +
 			" password=" + config.Cfg.Database.Password +
 			" dbname=" + config.Cfg.Database.Name +
 			" sslmode=disable TimeZone=UTC"
-	case "sqlite3":
-		return config.Cfg.Database.Host
+	case models.SQLite3:
+		return path.Join(models.Default_Data_Path, config.Cfg.Database.Host)
 	}
-	return models.Default_Data_File_Path
+	return path.Join(models.Default_Data_Path, models.Default_Data_File_Path)
 }
 
 func openDatabase(dsn string) (*gorm.DB, error) {
 	switch strings.ToLower(config.Cfg.Database.Kind) {
-	case "mysql":
+	case models.MySQL:
 		return gorm.Open(mysql.Open(dsn), &gorm.Config{
 			NowFunc: func() time.Time { return time.Now().UTC() },
 		})
-	case "postgres":
+	case models.Postgres:
 		return gorm.Open(postgres.Open(dsn), &gorm.Config{
 			NowFunc: func() time.Time { return time.Now().UTC() },
 		})
-	case "sqlite3":
+	case models.SQLite3:
 		return gorm.Open(sqlite.Open(dsn), &gorm.Config{
 			NowFunc: func() time.Time { return time.Now().UTC() },
 		})
@@ -53,17 +54,17 @@ func openDatabase(dsn string) (*gorm.DB, error) {
 
 func createFullTextIndex() {
 	switch strings.ToLower(config.Cfg.Database.Kind) {
-	case "mysql":
+	case models.MySQL:
 		db.Exec(createMySQLFullTextIndexSQL)
-	case "postgres":
+	case models.Postgres:
 		if res := db.Exec(usePostgresExtensionSQL); res.Error != nil {
 			slog.Error("failed to start zhparser extension. please ensure it is installed", "error", res.Error)
 		}
 		slog.Info("start zhparser extension successfully")
 		db.Exec(createPostgresChineseDictionarySQL)
 		db.Exec(createPostgresDictionaryMappingSQL)
 		db.Exec(createPostgresFullTextIndexSQL)
-	case "sqlite3":
+	case models.SQLite3:
 		return
 	}
 }

pkg/log/log.go

@@ -2,29 +2,30 @@ package log
 
 import (
 	"log/slog"
-	"mkBlog/config"
 	"mkBlog/models"
 	"os"
+	"path"
 
 	"gopkg.in/natefinch/lumberjack.v2"
 )
 
-func Init() {
-	_, err := os.OpenFile("data/app.log", os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0666)
+func Init(flag bool) {
+	logPath := path.Join(models.Default_Data_Path, models.Default_Log_File_Path)
+	_, err := os.OpenFile(logPath, os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0666)
 	if err != nil {
 		panic("failed to open log file: " + err.Error())
 	}
 
 	logger := &lumberjack.Logger{
-		Filename:   models.Default_Log_File_Path, // 日志文件路径
-		MaxSize:    100,                          // 单个文件最大 100 MB
-		MaxBackups: 5,                            // 保留最多 5 个旧文件
-		MaxAge:     30,                           // 保留最多 30 天
-		Compress:   true,                         // 是否压缩旧日志（.gz）
+		Filename:   logPath, // 日志文件路径
+		MaxSize:    100,     // 单个文件最大 100 MB
+		MaxBackups: 5,       // 保留最多 5 个旧文件
+		MaxAge:     30,      // 保留最多 30 天
+		Compress:   true,    // 是否压缩旧日志（.gz）
 	}
 
 	var level slog.Level
-	if config.Cfg.Server.Devmode {
+	if flag {
 		level = slog.LevelDebug
 	} else {
 		level = slog.LevelInfo