更明确的错误提示

IJNKAWAKAZE · Aug 22, 2024 · 5a9cff9 · 5a9cff9
1 parent d7c8e7c
commit 5a9cff9
Show file tree

Hide file tree

Showing 9 changed files with 4 additions and 19 deletions.
diff --git a/src/core/web/base.go b/src/core/web/base.go
@@ -144,8 +144,6 @@ func init() {
 
 func Base(r *gin.Engine) {
 	r.GET("/base", func(c *gin.Context) {
-		utils.WebC = make(chan error, 10)
-		defer close(utils.WebC)
 		r.LoadHTMLFiles("./template/Base.tmpl")
 		var playerBase PlayerBase
 		var userAccount account.UserAccount

diff --git a/src/core/web/box.go b/src/core/web/box.go
@@ -32,8 +32,6 @@ type Char struct {
 
 func Box(r *gin.Engine) {
 	r.GET("/box", func(c *gin.Context) {
-		utils.WebC = make(chan error, 10)
-		defer close(utils.WebC)
 		r.LoadHTMLFiles("./template/Box.tmpl")
 		var box BoxInfo
 		var userAccount account.UserAccount

diff --git a/src/core/web/box_detail.go b/src/core/web/box_detail.go
@@ -34,8 +34,6 @@ type Equip struct {
 
 func BoxDetail(r *gin.Engine) {
 	r.GET("/boxDetail", func(c *gin.Context) {
-		utils.WebC = make(chan error, 10)
-		defer close(utils.WebC)
 		r.LoadHTMLFiles("./template/BoxDetail.tmpl")
 		var detailList []Detail
 		var userAccount account.UserAccount

diff --git a/src/core/web/calendar.go b/src/core/web/calendar.go
@@ -24,8 +24,6 @@ type CalendarInfo struct {
 
 func Calendar(r *gin.Engine) {
 	r.GET("/calendar", func(c *gin.Context) {
-		utils.WebC = make(chan error, 10)
-		defer close(utils.WebC)
 		r.LoadHTMLFiles("./template/Calendar.tmpl")
 		var calendarMap = make(map[string]template.HTML)
 		resp, err := http.Get(viper.GetString("api.calendar"))

diff --git a/src/core/web/card.go b/src/core/web/card.go
@@ -74,8 +74,6 @@ func init() {
 
 func Card(r *gin.Engine) {
 	r.GET("/card", func(c *gin.Context) {
-		utils.WebC = make(chan error, 10)
-		defer close(utils.WebC)
 		r.LoadHTMLFiles("./template/Card.tmpl")
 		userId, _ := strconv.ParseInt(c.Query("userId"), 10, 64)
 		uid := c.Query("uid")

diff --git a/src/core/web/depot.go b/src/core/web/depot.go
@@ -43,8 +43,6 @@ func init() {
 
 func Depot(r *gin.Engine) {
 	r.GET("/depot", func(c *gin.Context) {
-		utils.WebC = make(chan error, 10)
-		defer close(utils.WebC)
 		r.LoadHTMLFiles("./template/Depot.tmpl")
 		var depotItems []DepotItem
 		var userAccount account.UserAccount

diff --git a/src/core/web/missing.go b/src/core/web/missing.go
@@ -25,8 +25,6 @@ type MissingChar struct {
 
 func Missing(r *gin.Engine) {
 	r.GET("/missing", func(c *gin.Context) {
-		utils.WebC = make(chan error, 10)
-		defer close(utils.WebC)
 		r.LoadHTMLFiles("./template/Missing.tmpl")
 		var missingInfo MissingInfo
 		param := c.Query("param")

diff --git a/src/core/web/state.go b/src/core/web/state.go
@@ -12,8 +12,6 @@ import (
 
 func State(r *gin.Engine) {
 	r.GET("/state", func(c *gin.Context) {
-		utils.WebC = make(chan error, 10)
-		defer close(utils.WebC)
 		r.LoadHTMLFiles("./template/State.tmpl")
 		var userAccount account.UserAccount
 		var skAccount skland.Account

diff --git a/src/utils/base_utils.go b/src/utils/base_utils.go
@@ -28,7 +28,7 @@ import (
 
 var ctx = context.Background()
 
-var WebC chan error
+var WebC = make(chan error, 10)
 
 var browser playwright.Browser
 
@@ -276,8 +276,9 @@ func Screenshot(url string, waitTime float64, scale float64) ([]byte, error) {
 	page.Goto(url, playwright.PageGotoOptions{
 		WaitUntil: playwright.WaitUntilStateNetworkidle,
 	})
-	e := <-WebC
-	if e != nil {
+	if len(WebC) > 0 {
+		e := <-WebC
+		close(WebC)
 		return nil, e
 	}
 	page.WaitForTimeout(waitTime)