feat: refactor Linuxdo configuration and update related handlers

Author: lovebai

auth.go

@@ -9,7 +9,7 @@ import (
 
 // 认证中间件
 func AuthMiddleware(next http.Handler) http.Handler {
-	if config.Secure != "false" || config.Linuxdo != "false" {
+	if config.Secure != "false" || config.LinuxdoEnable != "false" {
 		return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 			cookie, err := r.Cookie("auth")
 			// log.Printf("请求路径: %s, Cookie状态: %+v, 错误信息: %v", r.URL.Path, cookie, err)

config.go

@@ -1,21 +1,17 @@
 package main
 
-import (
-	"os"
-)
-
 type Config struct {
-	ImageDir     string
-	Secure       string
-	Password     string
-	Port         string
-	Title        string
-	Icon         string
-	Adderss      string
-	Dynamic      string
-	Linuxdo      string
-	ClientId     string
-	ClientSecret string
+	ImageDir            string `yaml:"image_dir"`
+	Secure              string `yaml:"secure"`
+	Password            string `yaml:"password"`
+	Port                string `yaml:"port"`
+	Title               string `yaml:"title"`
+	Icon                string `yaml:"icon"`
+	Dynamic             string `yaml:"dynamic"`
+	WebAdderss          string `yaml:"web_adderss"`
+	LinuxdoEnable       string `yaml:"linuxdo_enable"`
+	LinuxdoClientId     string `yaml:"linuxdo_client_id"`
+	LinuxdoClientSecret string `yaml:"linuxdo_client_secret"`
 }
 
 var config = Config{}
@@ -35,32 +31,3 @@ var imageExtensions = map[string]bool{
 	".gif":  true,
 	".webp": true,
 }
-
-func initEnv() {
-	envDefaults := map[string]struct {
-		target     *string
-		envKey     string
-		defaultVal string
-	}{
-		"ImageDir":     {&config.ImageDir, "SITE_DIR", "./images"},
-		"Port":         {&config.Port, "SITE_PORT", "8008"},
-		"Title":        {&config.Title, "SITE_TITLE", "在线图集"},
-		"Icon":         {&config.Icon, "SITE_ICON", "https://i.obai.cc/favicon.ico"},
-		"Dynamic":      {&config.Dynamic, "SITE_DYNAMIC", "false"},
-		"Linuxdo":      {&config.Linuxdo, "SITE_LINUXDO", "false"},
-		"Address":      {&config.Adderss, "SITE_Address", "http://localhost:8008"},
-		"ClientId":     {&config.ClientId, "SITE_CLIENT_ID", ""},
-		"ClientSecret": {&config.ClientSecret, "SITE_CLIENT_SECRET", ""},
-		"Secure":       {&config.Secure, "SITE_SECURE", "false"},
-		"Password":     {&config.Password, "SITE_PASSWORD", ""},
-	}
-
-	for _, cfg := range envDefaults {
-		if val := os.Getenv(cfg.envKey); val != "" {
-			*cfg.target = val
-		} else {
-			*cfg.target = cfg.defaultVal
-		}
-	}
-
-}

go.mod

@@ -3,8 +3,12 @@ module lovebai/plist
 go 1.24.0
 
 require (
-	github.com/go-resty/resty/v2 v2.16.5 // indirect
+	github.com/go-resty/resty/v2 v2.16.5
+	github.com/gorilla/sessions v1.4.0
+	gopkg.in/yaml.v2 v2.4.0
+)
+
+require (
 	github.com/gorilla/securecookie v1.1.2 // indirect
-	github.com/gorilla/sessions v1.4.0 // indirect
 	golang.org/x/net v0.33.0 // indirect
 )

go.sum

@@ -1,8 +1,16 @@
 github.com/go-resty/resty/v2 v2.16.5 h1:hBKqmWrr7uRc3euHVqmh1HTHcKn99Smr7o5spptdhTM=
 github.com/go-resty/resty/v2 v2.16.5/go.mod h1:hkJtXbA2iKHzJheXYvQ8snQES5ZLGKMwQ07xAwp/fiA=
+github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0=
+github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/gorilla/securecookie v1.1.2 h1:YCIWL56dvtr73r6715mJs5ZvhtnY73hBvEF8kXD8ePA=
 github.com/gorilla/securecookie v1.1.2/go.mod h1:NfCASbcHqRSY+3a8tlWJwsQap2VX5pwzwo4h3eOamfo=
 github.com/gorilla/sessions v1.4.0 h1:kpIYOp/oi6MG/p5PgxApU8srsSw9tuFbt46Lt7auzqQ=
 github.com/gorilla/sessions v1.4.0/go.mod h1:FLWm50oby91+hl7p/wRxDth9bWSuk0qVL2emc7lT5ik=
 golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=
 golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
+golang.org/x/time v0.6.0 h1:eTDhh4ZXt5Qf0augr54TN6suAUudPcawVZeIAPU7D4U=
+golang.org/x/time v0.6.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
+gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=

handler.go

@@ -30,7 +30,7 @@ func loggingMiddleware(next http.Handler) http.Handler {
 func indexHandler(w http.ResponseWriter, r *http.Request) {
 	session, _ := store.Get(r, "session-name")
 	var username, avatar string
-	if config.Linuxdo != "false" {
+	if config.LinuxdoEnable != "false" {
 		var ok bool
 		username, ok = session.Values["username"].(string)
 		if !ok {

init.go

@@ -0,0 +1,50 @@
+package main
+
+import (
+	"log"
+	"os"
+
+	"gopkg.in/yaml.v2"
+)
+
+func init() {
+	configFileName := "config.yaml"
+	if _, err := os.Stat(configFileName); os.IsNotExist(err) {
+		defauleConfig := Config{
+			ImageDir:            "./images",
+			Port:                "8008",
+			Title:               "在线图集",
+			Icon:                "https://i.051214.xyz/favicon.ico",
+			Dynamic:             "true",
+			LinuxdoEnable:       "false",
+			WebAdderss:          "http://localhost:8008",
+			LinuxdoClientId:     "",
+			LinuxdoClientSecret: "",
+			Secure:              "false",
+			Password:            "",
+		}
+		config = defauleConfig
+
+		content, err := yaml.Marshal(defauleConfig)
+		if err != nil {
+			log.Fatalf("无法序列化默认配置: %v", err)
+		}
+		if err := os.WriteFile(configFileName, content, 0644); err != nil {
+			log.Fatalf("无法创建默认配置文件 %s: %v", configFileName, err)
+		}
+
+		log.Println("配置文件不存在，已为您创建config.yaml，请根据需要修改配置。并重启服务。")
+	} else {
+		// 这里可以添加读取配置文件的逻辑
+		log.Println("加载配置文件:", configFileName)
+		file, err := os.Open(configFileName)
+		if err != nil {
+			log.Fatalf("无法读取配置文件 %s: %v", configFileName, err)
+		}
+		defer file.Close()
+		deyaml := yaml.NewDecoder(file)
+		if err := deyaml.Decode(&config); err != nil {
+			log.Fatalf("无法解析配置文件 %s: %v", configFileName, err)
+		}
+	}
+}

linuxdo.go

@@ -48,8 +48,8 @@ func initiateAuthHandler(w http.ResponseWriter, r *http.Request) {
 	// 构造授权 URL
 	authURL := fmt.Sprintf("%s?client_id=%s&response_type=code&redirect_uri=%s&state=%s",
 		AuthorizationEndpoint,
-		config.ClientId,
-		config.Adderss+"/oauth2/callback",
+		config.LinuxdoClientId,
+		config.WebAdderss+"/oauth2/callback",
 		state,
 	)
 	http.Redirect(w, r, authURL, http.StatusFound)
@@ -75,12 +75,12 @@ func callbackHandler(w http.ResponseWriter, r *http.Request) {
 
 	// 请求 access token
 	resp, err := client.R().
-		SetBasicAuth(config.ClientId, config.ClientSecret).
+		SetBasicAuth(config.LinuxdoClientId, config.LinuxdoClientSecret).
 		SetHeader("Accept", "application/json").
 		SetFormData(map[string]string{
 			"grant_type":   "authorization_code",
 			"code":         code,
-			"redirect_uri": config.Adderss + "/oauth2/callback",
+			"redirect_uri": config.WebAdderss + "/oauth2/callback",
 		}).
 		Post(TokenEndpoint)
 

main.go

@@ -49,13 +49,13 @@ func scanCategories(imageDir string) []Category {
 }
 
 func main() {
-	initEnv()
+
 	categoryCache = scanCategories(config.ImageDir)
 
 	// 路由设置
 	http.HandleFunc("/login", loginHandler)
 
-	if config.Linuxdo != "false" {
+	if config.LinuxdoEnable != "false" {
 		http.HandleFunc("/oauth2/linxdo", initiateAuthHandler)
 		http.HandleFunc("/oauth2/callback", callbackHandler)
 	}