update: Web UI

nitezs · Sep 16, 2023 · 8833e03 · 8833e03
1 parent e64bc9b
commit 8833e03
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 2 deletions.
diff --git a/api/route.go b/api/route.go
@@ -1,13 +1,25 @@
 package api
 
 import (
+	"embed"
 	"github.com/gin-gonic/gin"
+	"html/template"
 	"sub2clash/api/controller"
 	"sub2clash/middleware"
 )
 
+//go:embed templates/*
+var templates embed.FS
+
 func SetRoute(r *gin.Engine) {
 	r.Use(middleware.ZapLogger())
+	// 使用内嵌的模板文件
+	r.SetHTMLTemplate(template.Must(template.New("").ParseFS(templates, "templates/*")))
+	r.GET(
+		"/", func(c *gin.Context) {
+			c.HTML(200, "index.html", nil)
+		},
+	)
 	r.GET(
 		"/clash", func(c *gin.Context) {
 			controller.SubmodHandler(c)

diff --git a/template/index.html → api/templates/index.html b/template/index.html → api/templates/index.html
diff --git a/utils/template.go b/utils/template.go
@@ -8,7 +8,7 @@ import (
 )
 
 // LoadTemplate 加载模板
-// template 模板文件名
+// templates 模板文件名
 func LoadTemplate(template string) ([]byte, error) {
 	tPath := filepath.Join("templates", template)
 	if _, err := os.Stat(tPath); err == nil {

diff --git a/validator/sub.go b/validator/sub.go
@@ -17,7 +17,7 @@ type SubQuery struct {
 	Proxy         string               `form:"proxy" binding:""`
 	Proxies       []string             `form:"-" binding:""`
 	Refresh       bool                 `form:"refresh,default=false" binding:""`
-	Template      string               `form:"template" binding:""`
+	Template      string               `form:"templates" binding:""`
 	RuleProvider  string               `form:"ruleProvider" binding:""`
 	RuleProviders []RuleProviderStruct `form:"-" binding:""`
 	Rule          string               `form:"rule" binding:""`