Merge pull request #59 from GMWalletApp/dev

feat(pay): switch checkout counter to SPA redirect + JSON API

Author: line-6000

src/controller/comm/pay_controller.go

@@ -1,47 +1,35 @@
 package comm
 
 import (
-	"html/template"
 	"net/http"
-	"path/filepath"
 
-	"github.com/GMWalletApp/epusdt/config"
 	"github.com/GMWalletApp/epusdt/model/response"
 	"github.com/GMWalletApp/epusdt/model/service"
 	"github.com/labstack/echo/v4"
 )
 
 // CheckoutCounter 收银台
 // @Summary      Checkout counter page
-// @Description  Render the payment checkout counter HTML page for a given trade
+// @Description  Render the payment checkout counter JSON response for a given trade
 // @Tags         Payment
-// @Produce      html
+// @Produce      json
 // @Param        trade_id path string true "Trade ID"
-// @Success      200 {string} string "HTML page"
-// @Router       /pay/checkout-counter/{trade_id} [get]
+// @Success      200 {object} response.CheckoutCounterResponse
+// @Router       /pay/checkout-counter-resp/{trade_id} [get]
 func (c *BaseCommController) CheckoutCounter(ctx echo.Context) (err error) {
 	tradeId := ctx.Param("trade_id")
 	resp, err := service.GetCheckoutCounterByTradeId(tradeId)
 	if err != nil {
 		if err == service.ErrOrder {
 			// Unknown trade id: render the page with empty payload
 			// (client side shows a friendly "order not found" screen).
-			tmpl, tmplErr := template.ParseFiles(filepath.Join(config.StaticFilePath, "index.html"))
-			if tmplErr != nil {
-				return ctx.String(http.StatusInternalServerError, tmplErr.Error())
-			}
-			ctx.Response().Status = http.StatusNotFound
 			emptyResp := response.CheckoutCounterResponse{}
-			return tmpl.Execute(ctx.Response(), emptyResp)
+			return c.SucJson(ctx, emptyResp)
 		}
 		return ctx.String(http.StatusInternalServerError, err.Error())
 	}
-	tmpl, err := template.ParseFiles(filepath.Join(config.StaticFilePath, "index.html"))
-	if err != nil {
-		return ctx.String(http.StatusInternalServerError, err.Error())
-	}
 
-	return tmpl.Execute(ctx.Response(), resp)
+	return c.SucJson(ctx, resp)
 }
 
 // CheckStatus 支付状态检测

src/main.go

@@ -12,9 +12,6 @@ import (
 	"github.com/gookit/color"
 )
 
-//go:embed all:static
-var staticDir embed.FS
-
 //go:embed all:www
 var wwwDir embed.FS
 
@@ -92,12 +89,6 @@ func releaseStatic(fs embed.FS, target string) (string, error) {
 }
 
 func main() {
-	staticPath, err := releaseStatic(staticDir, "static")
-	if err != nil {
-		panic(err)
-	}
-	fmt.Println("static released to:", staticPath)
-
 	wwwwPath, err := releaseStatic(wwwDir, "www")
 	if err != nil {
 		panic(err)

src/route/router.go

@@ -27,7 +27,15 @@ func RegisterRoute(e *echo.Echo) {
 	})
 
 	payRoute := e.Group("/pay")
-	payRoute.GET("/checkout-counter/:trade_id", comm.Ctrl.CheckoutCounter)
+	payRoute.GET("/checkout-counter/:trade_id", func(ctx echo.Context) error {
+		tradeId := ctx.Param("trade_id")
+
+		targetURL := fmt.Sprintf("/cashier/%s", tradeId)
+
+		return ctx.Redirect(http.StatusMovedPermanently, targetURL)
+	})
+
+	payRoute.GET("/checkout-counter-resp/:trade_id", comm.Ctrl.CheckoutCounter)
 	payRoute.GET("/check-status/:trade_id", comm.Ctrl.CheckStatus)
 	payRoute.POST("/switch-network", comm.Ctrl.SwitchNetwork)