diff --git a/server/auth/internal/logic/useremailconfirmationlogic.go b/server/auth/internal/logic/useremailconfirmationlogic.go index f97378d0..a9cda652 100644 --- a/server/auth/internal/logic/useremailconfirmationlogic.go +++ b/server/auth/internal/logic/useremailconfirmationlogic.go @@ -185,6 +185,42 @@ func (l *UserEmailConfirmationLogic) AfterLogic(w http.ResponseWriter, r *http.R w.Write([]byte(successHtml)) httpx.Ok(w) } else { - httpx.OkJsonCtx(r.Context(), w, resp) + + errorHtml := ` + + + + 注册失败 + + + +

%s

+ + + ` + + errorHtml = fmt.Sprintf(errorHtml, resp.Message) + w.Write([]byte(errorHtml)) + httpx.Ok(w) } } diff --git a/server/auth/internal/logic/usergoogleloginlogic.go b/server/auth/internal/logic/usergoogleloginlogic.go index 4ccca7af..2a4372ec 100644 --- a/server/auth/internal/logic/usergoogleloginlogic.go +++ b/server/auth/internal/logic/usergoogleloginlogic.go @@ -96,7 +96,7 @@ func (l *UserGoogleLoginLogic) UserGoogleLogin(req *types.RequestGoogleLogin, us Platform: "google", OperateType: auth.OpTypeRegister, TraceId: uuid.NewString(), - CreateAt: time.Now(), + CreateAt: time.Now().UTC(), Extend: map[string]interface{}{ "google_id": googleId, }, diff --git a/server/home-user-auth/internal/logic/userorderlistlogic.go b/server/home-user-auth/internal/logic/userorderlistlogic.go index 2a68ad2a..6122e26e 100644 --- a/server/home-user-auth/internal/logic/userorderlistlogic.go +++ b/server/home-user-auth/internal/logic/userorderlistlogic.go @@ -67,13 +67,13 @@ func (l *UserOrderListLogic) UserOrderList(req *types.UserOrderListReq, userinfo // 根据时间来查询不同范围的订单 switch req.Time { case 1: - rowBuilder = rowBuilder.Where("ctime >?", time.Now().AddDate(0, -1, 0).Unix()) + rowBuilder = rowBuilder.Where("ctime >?", time.Now().UTC().AddDate(0, -1, 0).Unix()) case 2: - rowBuilder = rowBuilder.Where("ctime >?", time.Now().AddDate(0, -3, 0).Unix()) + rowBuilder = rowBuilder.Where("ctime >?", time.Now().UTC().AddDate(0, -3, 0).Unix()) case 3: - rowBuilder = rowBuilder.Where("ctime >?", time.Now().AddDate(0, -6, 0).Unix()) + rowBuilder = rowBuilder.Where("ctime >?", time.Now().UTC().AddDate(0, -6, 0).Unix()) case 4: - rowBuilder = rowBuilder.Where("ctime >?", time.Now().AddDate(-1, 0, 0).Unix()) + rowBuilder = rowBuilder.Where("ctime >?", time.Now().UTC().AddDate(-1, 0, 0).Unix()) default: } diff --git a/server/shopping-cart-confirmation/internal/logic/cartlistlogic.go b/server/shopping-cart-confirmation/internal/logic/cartlistlogic.go index 8195a842..68a0cfcd 100644 --- a/server/shopping-cart-confirmation/internal/logic/cartlistlogic.go +++ b/server/shopping-cart-confirmation/internal/logic/cartlistlogic.go @@ -97,7 +97,7 @@ func (l *CartListLogic) CartList(req *types.CartListReq, userinfo *auth.UserInfo Cover: *v.Cover, Name: name, Capacity: "", - ETA: time.Now().AddDate(0, 0, 60).Format("2006-01-02 15:04:05"), + ETA: time.Now().UTC().AddDate(0, 0, 60).Format("2006-01-02 15:04:05"), Pcs: *v.BuyNum, ProductSn: productSn, DesignSn: designSn,