Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop

server/auth/auth_test.go

@@ -5,5 +5,6 @@ import (
 )
 
 func TestMain(t *testing.T) {
+
 	main()
 }

server/auth/internal/logic/email_manager.go

@@ -16,15 +16,15 @@ var EmailTaskResendTime = time.Second * 30
 var TimeLimit *check.TimeLimit[string]
 var EmailManager *EmailSender
 
-var emailTpl *template.Template
+var tpls *template.Template
 
 func init() {
+	var err error
 
-	tmpl, err := template.New("email").ParseFiles("../../html_template/email_register.tpl")
+	tpls, err = template.ParseGlob("../../../../html_template/*.tpl")
 	if err != nil {
 		log.Fatal(err)
 	}
-	emailTpl = tmpl
 
 	TimeLimit = check.NewTimelimit[string](EmailTaskResendTime)
 
@@ -165,7 +165,7 @@ func RenderEmailTemplate(companyName, confirmationLink, senderName, senderTitle
 	}
 
 	var result bytes.Buffer
-	err := emailTpl.Execute(&result, data)
+	err := tpls.ExecuteTemplate(&result, "email_register.tpl", data)
 	if err != nil {
 		log.Fatal(err)
 	}

server/auth/internal/logic/websocket_test.go

@@ -1,6 +1,7 @@
 package logic
 
 import (
+	"bytes"
 	"fmt"
 	"fusenapi/utils/wevent"
 	"log"
@@ -11,6 +12,24 @@ import (
 	"github.com/zeromicro/go-zero/core/logx"
 )
 
+func TestEmailTpl(t *testing.T) {
+	data := map[string]string{
+		"CompanyName":      "companyName",
+		"ConfirmationLink": "confirmationLink",
+		"SenderName":       "senderName",
+		"SenderTitle":      "senderTitle",
+	}
+
+	var result bytes.Buffer
+	err := tpls.ExecuteTemplate(&result, "email_register.tpl", data)
+	if err != nil {
+		log.Fatal(err)
+	}
+
+	log.Println(string(result.String()))
+
+}
+
 func TestSender(t *testing.T) {
 	traceId := uuid.NewString()
 	event := wevent.NewWebsocketEventSuccess(wevent.UserEmailRegister, traceId)

utils/fstpl/auto_parse.go

@@ -0,0 +1,7 @@
+package fstpl
+
+import "html/template"
+
+func ParseFile(t *template.Template) {
+
+}