Merge remote-tracking branch 'origin/main'

app/controllers/userController/auth.go

@@ -1,8 +1,6 @@
 package userController
 
 import (
-	"crypto/sha256"
-	"encoding/hex"
 	"wejh-go/app/apiException"
 	"wejh-go/app/services/sessionServices"
 	"wejh-go/app/services/userServices"
@@ -41,11 +39,9 @@ func AuthByPassword(c *gin.Context) {
 		return
 	}
 
-	h := sha256.New()
-	h.Write([]byte(postForm.Password))
-	pass := hex.EncodeToString(h.Sum(nil))
-	if user.JHPassword != pass {
-		_ = c.AbortWithError(200, apiException.NoThatPasswordOrWrong)
+	err = userServices.CheckLogin(postForm.Username,postForm.Password)
+	if err != nil {
+		_ = c.AbortWithError(200, err)
 		return
 	}
 

app/services/userCenterServices/auth.go

@@ -0,0 +1,33 @@
+package userCenterServices
+
+import (
+	"net/url"
+	"wejh-go/app/apiException"
+	"wejh-go/config/api/userCenterApi"
+)
+
+func Login(stu_id string, pass string) error {
+	params := url.Values{}
+	Url, err := url.Parse(string(userCenterApi.Auth))
+	if err != nil {
+		return err
+	}
+	Url.RawQuery = params.Encode()
+	urlPath := Url.String()
+	regMap := make(map[string]string)
+	regMap["stu_id"] = stu_id
+	regMap["password"] = pass
+	resp, err := FetchHandleOfPost(regMap, userCenterApi.UserCenterApi(urlPath))
+	if err != nil {
+		return apiException.RequestError
+	}
+	if resp.Code == 404 {
+		return apiException.UserNotFind
+	} else if resp.Code == 405 {
+		return apiException.NoThatPasswordOrWrong
+	} else if resp.Code == 200 {
+		return nil
+	}else{
+		return apiException.ServerError
+	}
+}

app/services/userServices/create.go

@@ -73,3 +73,7 @@ func CreateAdmin(userName, password string, adminType int) error {
 	res := database.DB.Create(&admin)
 	return res.Error
 }
+
+func CheckLogin(username, password string) error {
+	return userCenterServices.Login(username, password)
+}