diff --git a/api/service/payment/payjs_service.go b/api/service/payment/payjs_service.go index 62d88854..98748780 100644 --- a/api/service/payment/payjs_service.go +++ b/api/service/payment/payjs_service.go @@ -79,7 +79,7 @@ func (js *PayJS) Pay(param JPayReq) JPayReps { } func (js *PayJS) sign(params url.Values) string { - params.Del(`Sign`) + params.Del(`sign`) var keys = make([]string, 0, 0) for key := range params { if params.Get(key) != `` { @@ -109,7 +109,7 @@ func (js *PayJS) Check(tradeNo string) error { apiURL := fmt.Sprintf("%s/api/check", js.config.ApiURL) params := url.Values{} params.Add("payjs_order_id", tradeNo) - params.Add("Sign", js.sign(params)) + params.Add("sign", js.sign(params)) data := strings.NewReader(params.Encode()) resp, err := http.Post(apiURL, "application/x-www-form-urlencoded", data) defer resp.Body.Close() @@ -135,6 +135,7 @@ func (js *PayJS) Check(tradeNo string) error { if r.ReturnCode == 1 && r.Status == 1 { return nil } else { + logger.Errorf("PayJs 支付验证响应:%s", string(body)) return errors.New("order not paid") } } diff --git a/api/utils/net.go b/api/utils/net.go index 39c6ddec..578d42bf 100644 --- a/api/utils/net.go +++ b/api/utils/net.go @@ -110,7 +110,7 @@ func OpenAIRequest(db *gorm.DB, prompt string) (string, error) { r, err := client.R().SetHeader("Content-Type", "application/json"). SetHeader("Authorization", "Bearer "+apiKey.Value). SetBody(types.ApiRequest{ - Model: "gpt-3.5-turbo", + Model: "gpt-3.5-turbo-0125", Temperature: 0.9, MaxTokens: 1024, Stream: false, diff --git a/web/src/assets/css/member.css b/web/src/assets/css/member.css index ac0645a0..0627f47e 100644 --- a/web/src/assets/css/member.css +++ b/web/src/assets/css/member.css @@ -56,7 +56,6 @@ background-color: #393f4a; color: #fff; border-radius: 10px; - height: 100vh; } .member .inner .user-profile .el-form-item__label { color: #fff; @@ -130,7 +129,7 @@ .member .inner .product-box .list-box .product-item .product-info .info-line .expire { color: #409eff; } -.member .inner .product-box .list-box .product-item .product-info .info-line .calls { +.member .inner .product-box .list-box .product-item .product-info .info-line .power { color: #f2cb51; } .member .inner .product-box .list-box .product-item .product-info .pay-way { diff --git a/web/src/assets/css/member.styl b/web/src/assets/css/member.styl index d8878556..7eed89e3 100644 --- a/web/src/assets/css/member.styl +++ b/web/src/assets/css/member.styl @@ -71,7 +71,7 @@ background-color #393F4A color #ffffff border-radius 10px - height 100vh + //height 100vh .el-form-item__label { color #ffffff @@ -162,7 +162,7 @@ color #409eff } - .calls { + .power { color #F2CB51 } } diff --git a/web/src/components/CountDown.vue b/web/src/components/CountDown.vue index abe584a0..75a15b0c 100644 --- a/web/src/components/CountDown.vue +++ b/web/src/components/CountDown.vue @@ -1,7 +1,7 @@ - {{ timerStr }} + {{ timerStr }}