🎨 updated error handling logic

app/core/api/internal/handler/oauth/get_gitee_oauth_url_handler.go

@@ -6,6 +6,7 @@ import (
 	"github.com/zeromicro/go-zero/core/logx"
 	"github.com/zeromicro/go-zero/rest/httpx"
 
+	"schisandra-album-cloud-microservices/app/core/api/common/response"
 	"schisandra-album-cloud-microservices/app/core/api/internal/logic/oauth"
 	"schisandra-album-cloud-microservices/app/core/api/internal/svc"
 )
@@ -16,7 +17,11 @@ func GetGiteeOauthUrlHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
 		resp, err := l.GetGiteeOauthUrl()
 		if err != nil {
 			logx.Error(err)
-			httpx.WriteJsonCtx(r.Context(), w, http.StatusInternalServerError, resp)
+			httpx.WriteJsonCtx(
+				r.Context(),
+				w,
+				http.StatusInternalServerError,
+				response.ErrorWithI18n(r.Context(), "system.error"))
 		} else {
 			httpx.OkJsonCtx(r.Context(), w, resp)
 		}

app/core/api/internal/handler/oauth/get_github_oauth_url_handler.go

@@ -6,6 +6,7 @@ import (
 	"github.com/zeromicro/go-zero/core/logx"
 	"github.com/zeromicro/go-zero/rest/httpx"
 
+	"schisandra-album-cloud-microservices/app/core/api/common/response"
 	"schisandra-album-cloud-microservices/app/core/api/internal/logic/oauth"
 	"schisandra-album-cloud-microservices/app/core/api/internal/svc"
 	"schisandra-album-cloud-microservices/app/core/api/internal/types"
@@ -23,7 +24,11 @@ func GetGithubOauthUrlHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
 		resp, err := l.GetGithubOauthUrl(&req)
 		if err != nil {
 			logx.Error(err)
-			httpx.WriteJsonCtx(r.Context(), w, http.StatusInternalServerError, resp)
+			httpx.WriteJsonCtx(
+				r.Context(),
+				w,
+				http.StatusInternalServerError,
+				response.ErrorWithI18n(r.Context(), "system.error"))
 		} else {
 			httpx.OkJsonCtx(r.Context(), w, resp)
 		}

app/core/api/internal/handler/oauth/get_qq_oauth_url_handler.go

@@ -6,6 +6,7 @@ import (
 	"github.com/zeromicro/go-zero/core/logx"
 	"github.com/zeromicro/go-zero/rest/httpx"
 
+	"schisandra-album-cloud-microservices/app/core/api/common/response"
 	"schisandra-album-cloud-microservices/app/core/api/internal/logic/oauth"
 	"schisandra-album-cloud-microservices/app/core/api/internal/svc"
 	"schisandra-album-cloud-microservices/app/core/api/internal/types"
@@ -23,7 +24,11 @@ func GetQqOauthUrlHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
 		resp, err := l.GetQqOauthUrl(&req)
 		if err != nil {
 			logx.Error(err)
-			httpx.WriteJsonCtx(r.Context(), w, http.StatusInternalServerError, resp)
+			httpx.WriteJsonCtx(
+				r.Context(),
+				w,
+				http.StatusInternalServerError,
+				response.ErrorWithI18n(r.Context(), "system.error"))
 		} else {
 			httpx.OkJsonCtx(r.Context(), w, resp)
 		}

app/core/api/internal/handler/oauth/get_wechat_qrcode_handler.go

@@ -6,6 +6,7 @@ import (
 	"github.com/zeromicro/go-zero/core/logx"
 	"github.com/zeromicro/go-zero/rest/httpx"
 
+	"schisandra-album-cloud-microservices/app/core/api/common/response"
 	"schisandra-album-cloud-microservices/app/core/api/internal/logic/oauth"
 	"schisandra-album-cloud-microservices/app/core/api/internal/svc"
 	"schisandra-album-cloud-microservices/app/core/api/internal/types"
@@ -23,7 +24,11 @@ func GetWechatQrcodeHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
 		resp, err := l.GetWechatQrcode(r, &req)
 		if err != nil {
 			logx.Error(err)
-			httpx.WriteJsonCtx(r.Context(), w, http.StatusInternalServerError, resp)
+			httpx.WriteJsonCtx(
+				r.Context(),
+				w,
+				http.StatusInternalServerError,
+				response.ErrorWithI18n(r.Context(), "system.error"))
 		} else {
 			httpx.OkJsonCtx(r.Context(), w, resp)
 		}

app/core/api/internal/handler/oauth/gitee_callback_handler.go

@@ -1,12 +1,12 @@
 package oauth
 
 import (
-	"errors"
 	"net/http"
 
 	"github.com/zeromicro/go-zero/core/logx"
 	"github.com/zeromicro/go-zero/rest/httpx"
 
+	"schisandra-album-cloud-microservices/app/core/api/common/response"
 	"schisandra-album-cloud-microservices/app/core/api/internal/logic/oauth"
 	"schisandra-album-cloud-microservices/app/core/api/internal/svc"
 	"schisandra-album-cloud-microservices/app/core/api/internal/types"
@@ -24,7 +24,11 @@ func GiteeCallbackHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
 		err := l.GiteeCallback(w, r, &req)
 		if err != nil {
 			logx.Error(err)
-			httpx.ErrorCtx(r.Context(), w, errors.New("server error"))
+			httpx.WriteJsonCtx(
+				r.Context(),
+				w,
+				http.StatusInternalServerError,
+				response.ErrorWithI18n(r.Context(), "system.error"))
 		} else {
 			httpx.Ok(w)
 		}

app/core/api/internal/handler/oauth/github_callback_handler.go

@@ -1,12 +1,12 @@
 package oauth
 
 import (
-	"errors"
 	"net/http"
 
 	"github.com/zeromicro/go-zero/core/logx"
 	"github.com/zeromicro/go-zero/rest/httpx"
 
+	"schisandra-album-cloud-microservices/app/core/api/common/response"
 	"schisandra-album-cloud-microservices/app/core/api/internal/logic/oauth"
 	"schisandra-album-cloud-microservices/app/core/api/internal/svc"
 	"schisandra-album-cloud-microservices/app/core/api/internal/types"
@@ -24,7 +24,11 @@ func GithubCallbackHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
 		err := l.GithubCallback(w, r, &req)
 		if err != nil {
 			logx.Error(err)
-			httpx.ErrorCtx(r.Context(), w, errors.New("server error"))
+			httpx.WriteJsonCtx(
+				r.Context(),
+				w,
+				http.StatusInternalServerError,
+				response.ErrorWithI18n(r.Context(), "system.error"))
 		} else {
 			httpx.Ok(w)
 		}

app/core/api/internal/handler/oauth/qq_callback_handler.go

@@ -1,12 +1,12 @@
 package oauth
 
 import (
-	"errors"
 	"net/http"
 
 	"github.com/zeromicro/go-zero/core/logx"
 	"github.com/zeromicro/go-zero/rest/httpx"
 
+	"schisandra-album-cloud-microservices/app/core/api/common/response"
 	"schisandra-album-cloud-microservices/app/core/api/internal/logic/oauth"
 	"schisandra-album-cloud-microservices/app/core/api/internal/svc"
 	"schisandra-album-cloud-microservices/app/core/api/internal/types"
@@ -24,7 +24,11 @@ func QqCallbackHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
 		err := l.QqCallback(w, r, &req)
 		if err != nil {
 			logx.Error(err)
-			httpx.ErrorCtx(r.Context(), w, errors.New("server error"))
+			httpx.WriteJsonCtx(
+				r.Context(),
+				w,
+				http.StatusInternalServerError,
+				response.ErrorWithI18n(r.Context(), "system.error"))
 		} else {
 			httpx.Ok(w)
 		}

app/core/api/internal/handler/oauth/wechat_callback_handler.go

@@ -1,12 +1,12 @@
 package oauth
 
 import (
-	"errors"
 	"net/http"
 
 	"github.com/zeromicro/go-zero/core/logx"
 	"github.com/zeromicro/go-zero/rest/httpx"
 
+	"schisandra-album-cloud-microservices/app/core/api/common/response"
 	"schisandra-album-cloud-microservices/app/core/api/internal/logic/oauth"
 	"schisandra-album-cloud-microservices/app/core/api/internal/svc"
 )
@@ -17,7 +17,11 @@ func WechatCallbackHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
 		err := l.WechatCallback(w, r)
 		if err != nil {
 			logx.Error(err)
-			httpx.ErrorCtx(r.Context(), w, errors.New("server error"))
+			httpx.WriteJsonCtx(
+				r.Context(),
+				w,
+				http.StatusInternalServerError,
+				response.ErrorWithI18n(r.Context(), "system.error"))
 		} else {
 			httpx.Ok(w)
 		}