fix: redirect subscription payment return to user-accessible page - #3052
Merged
Merged
Conversation
Contributor
WalkthroughThe pull request updates redirect URLs in the subscription Epay payment handler from Changes
Estimated code review effort🎯 1 (Trivial) | ⏱️ ~3 minutes Poem
🚥 Pre-merge checks | ✅ 5✅ Passed checks (5 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. ✨ Finishing Touches🧪 Generate unit tests (beta)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
Contributor
There was a problem hiding this comment.
🧹 Nitpick comments (1)
controller/subscription_payment_epay.go (1)
169-215: Consider extracting a small redirect helper to avoid repeated URL literals.This is optional, but it reduces copy/paste drift if the route changes again.
♻️ Optional refactor
func SubscriptionEpayReturn(c *gin.Context) { var params map[string]string + redirectPayStatus := func(status string) { + c.Redirect(http.StatusFound, fmt.Sprintf("%s/console/topup?pay=%s", system_setting.ServerAddress, status)) + } if c.Request.Method == "POST" { // POST 请求：从 POST body 解析参数 if err := c.Request.ParseForm(); err != nil { - c.Redirect(http.StatusFound, system_setting.ServerAddress+"/console/topup?pay=fail") + redirectPayStatus("fail") return } @@ if len(params) == 0 { - c.Redirect(http.StatusFound, system_setting.ServerAddress+"/console/topup?pay=fail") + redirectPayStatus("fail") return } @@ client := GetEpayClient() if client == nil { - c.Redirect(http.StatusFound, system_setting.ServerAddress+"/console/topup?pay=fail") + redirectPayStatus("fail") return } verifyInfo, err := client.Verify(params) if err != nil || !verifyInfo.VerifyStatus { - c.Redirect(http.StatusFound, system_setting.ServerAddress+"/console/topup?pay=fail") + redirectPayStatus("fail") return } @@ defer UnlockOrder(verifyInfo.ServiceTradeNo) if err := model.CompleteSubscriptionOrder(verifyInfo.ServiceTradeNo, common.GetJsonString(verifyInfo)); err != nil { - c.Redirect(http.StatusFound, system_setting.ServerAddress+"/console/topup?pay=fail") + redirectPayStatus("fail") return } - c.Redirect(http.StatusFound, system_setting.ServerAddress+"/console/topup?pay=success") + redirectPayStatus("success") return } - c.Redirect(http.StatusFound, system_setting.ServerAddress+"/console/topup?pay=pending") + redirectPayStatus("pending") }🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed. In `@controller/subscription_payment_epay.go` around lines 169 - 215, Extract a small helper inside SubscriptionEpayReturn (or as a local private function) to centralize redirects to the topup page so the repeated URL literal is not duplicated: add a function like redirectToTopup := func(status string) { c.Redirect(http.StatusFound, system_setting.ServerAddress+"/console/topup?pay="+status); return } and replace every c.Redirect(http.StatusFound, system_setting.ServerAddress+"/console/topup?pay=...") call with redirectToTopup("fail"|"success"|"pending"), keeping the existing control flow (including LockOrder/UnlockOrder and defer semantics) unchanged and using the same symbols SubscriptionEpayReturn, system_setting.ServerAddress, LockOrder, UnlockOrder, and model.CompleteSubscriptionOrder to locate the spots to update.
🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.
Nitpick comments:
In `@controller/subscription_payment_epay.go`:
- Around line 169-215: Extract a small helper inside SubscriptionEpayReturn (or
as a local private function) to centralize redirects to the topup page so the
repeated URL literal is not duplicated: add a function like redirectToTopup :=
func(status string) { c.Redirect(http.StatusFound,
system_setting.ServerAddress+"/console/topup?pay="+status); return } and replace
every c.Redirect(http.StatusFound,
system_setting.ServerAddress+"/console/topup?pay=...") call with
redirectToTopup("fail"|"success"|"pending"), keeping the existing control flow
(including LockOrder/UnlockOrder and defer semantics) unchanged and using the
same symbols SubscriptionEpayReturn, system_setting.ServerAddress, LockOrder,
UnlockOrder, and model.CompleteSubscriptionOrder to locate the spots to update.
ennnnny
pushed a commit
to ennnnny/new-api
that referenced
this pull request
Mar 17, 2026
…t-url fix: redirect subscription payment return to user-accessible page
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
fix #3048
Summary by CodeRabbit