From 689ddb033b23f9453bfdf7c9e110144ae273c728 Mon Sep 17 00:00:00 2001
From: Penryn <15158052130@163.com>
Date: Sun, 15 Dec 2024 21:47:56 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=BB=9F=E4=B8=80?=
 =?UTF-8?q?=E5=AF=86=E7=A0=81=E6=9C=AA=E6=9B=B4=E6=96=B0=E6=97=B6=E6=9C=AA?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E6=8A=A5=E9=94=99=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controller/controllerHandle.go | 11 ++++++++---
 app/errors/funnelErrors.go         |  1 +
 app/errors/httpResponseErrors.go   |  1 +
 app/service/zfService/login.go     |  2 +-
 app/utils/fetch/fetch.go           |  5 +----
 5 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/app/controller/controllerHandle.go b/app/controller/controllerHandle.go
index e571bcd..b16e055 100644
--- a/app/controller/controllerHandle.go
+++ b/app/controller/controllerHandle.go
@@ -17,17 +17,22 @@ func ErrorHandle(context *gin.Context, err error) {
 	case errors.ERR_WRONG_PASSWORD:
 		{
 			exp = errors.WrongPassword
-			break
 		}
 	case errors.ERR_WRONG_Captcha:
 		{
 			exp = errors.CaptchaFailed
-			break
 		}
 	case errors.ERR_Session_Expired:
 		{
 			exp = errors.SessionExpired
-			break
+		}
+	case errors.ERR_OAUTH_ERROR:
+		{
+			exp = errors.OAuthNotUpdate
+		}
+	default:
+		{
+			exp = errors.UnKnown
 		}
 	}
 
diff --git a/app/errors/funnelErrors.go b/app/errors/funnelErrors.go
index 279a002..9380726 100644
--- a/app/errors/funnelErrors.go
+++ b/app/errors/funnelErrors.go
@@ -12,3 +12,4 @@ var ERR_INVALID_ARGS = errors.New("invalid args")
 var ERR_SESSION_NOT_EXIST = errors.New("ERR_SESSION_NOT_EXIST")
 var ERR_SESSION_EXPIRES = errors.New("ERR_SESSION_EXPIRES")
 var ERR_OAUTH_ERROR = errors.New("ERR_OAUTH_ERROR")
+var ERR_UNKNOWN = errors.New("ERR_UNKNOWN")
diff --git a/app/errors/httpResponseErrors.go b/app/errors/httpResponseErrors.go
index 3a077ce..947b47f 100644
--- a/app/errors/httpResponseErrors.go
+++ b/app/errors/httpResponseErrors.go
@@ -14,3 +14,4 @@ var WrongPassword = HttpResponseError{412, "密码错误"}
 var CaptchaFailed = HttpResponseError{413, "验证码错误"}
 var SessionExpired = HttpResponseError{414, "缓存过期"}
 var OauthError = HttpResponseError{415, "缓存过期"}
+var OAuthNotUpdate = HttpResponseError{416, "统一密码未更新"}
diff --git a/app/service/zfService/login.go b/app/service/zfService/login.go
index 77bc1a4..5cef3fe 100644
--- a/app/service/zfService/login.go
+++ b/app/service/zfService/login.go
@@ -108,7 +108,7 @@ func loginByOauth(username string, password string) (*model.User, error) {
 	}
 	getRedirectUrl2, err := f.GetRedirect(getRedirectUrl1.String())
 	if err != nil {
-		return nil, err
+		return nil, errors.ERR_OAUTH_ERROR
 	}
 	getRedirectUrl3, err := f.GetRedirect(getRedirectUrl2.String())
 	if err != nil {
diff --git a/app/utils/fetch/fetch.go b/app/utils/fetch/fetch.go
index a732c61..32b4a2a 100644
--- a/app/utils/fetch/fetch.go
+++ b/app/utils/fetch/fetch.go
@@ -2,7 +2,6 @@ package fetch
 
 import (
 	"crypto/tls"
-	"fmt"
 	errors2 "funnel/app/errors"
 	"io"
 	"net/http"
@@ -56,7 +55,7 @@ func (f *Fetch) GetRedirect(url string) (*url.URL, error) {
 		return nil, err
 	}
 	if response.StatusCode != 302 {
-		return nil, errors2.ERR_OAUTH_ERROR
+		return nil, errors2.ERR_UNKNOWN
 	}
 	location, err := response.Location()
 	if err != nil {
@@ -107,8 +106,6 @@ func (f *Fetch) PostFormRedirect(url string, requestData url.Values) (*url.URL,
 		return nil, err
 	}
 	if response.StatusCode != 302 {
-		fmt.Println(url)
-		fmt.Println(response.StatusCode)
 		return nil, errors2.ERR_WRONG_PASSWORD
 	}
 	f.Cookie = cookieMerge(f.Cookie, response.Cookies())