Browse Source

修复登录异常

kobe6258 6 months ago
parent
commit
607b45a983

+ 5 - 2
controllers/user/auth_controller.go

@@ -2,6 +2,7 @@ package user
 
 import (
 	"bufio"
+	"errors"
 	"eta/eta_mini_ht_api/common/component/config"
 	logger "eta/eta_mini_ht_api/common/component/log"
 	"eta/eta_mini_ht_api/common/contants"
@@ -64,9 +65,11 @@ func (a *AuthController) Login() {
 			return
 		}
 		mobileUser, err := user.GetUserByMobile(loginReq.Mobile)
-		if err != nil {
+		var etaErr *exception.EtaError
+		errors.As(err, &etaErr)
+		if etaErr.ErrorCode != exception.TemplateUserNotFound {
 			a.FailedResult("登录失败:"+userInfo.Mobile, result)
-			err = exception.New(exception.BindMobileFailed)
+			err = exception.New(exception.UnknownError)
 			return
 		}
 		if mobileUser.Id > 0 && (mobileUser.Id != userInfo.Id && mobileUser.Mobile == loginReq.Mobile) {

+ 9 - 0
controllers/web_hook/htfutures_account_controller.go

@@ -5,3 +5,12 @@ import "eta/eta_mini_ht_api/controllers"
 type HTFuturesAccountController struct {
 	controllers.WebHookController
 }
+
+// SyncCustomerRiskLevel  风险测评同步接口
+// @Summary 风险测评同步接口
+// @Description 风险测评同步接口
+// @Success 200 {object} controllers.BaseResponse
+// @router /v1/syncRiskLevel/ [get]
+func (h *HTFuturesAccountController) SyncCustomerRiskLevel() {
+	
+}

+ 2 - 4
controllers/webhook_controller.go

@@ -1,11 +1,9 @@
 package controllers
 
-import "github.com/beego/beego/v2/server/web"
-
 type WebHookController struct {
-	web.Controller
+	BaseController
 }
 
 func (c *WebHookController) Prepare() {
-
+	c.BaseController.Prepare()
 }

+ 3 - 4
domian/user/user_serivce.go

@@ -44,17 +44,16 @@ func convertUserDTO(user userDao.TemplateUser) UserDTO {
 		FollowingGzh: user.FollowingGzh,
 	}
 }
-func GetUserByMobile(mobile string) (UserDTO, error) {
-	var dto UserDTO
+func GetUserByMobile(mobile string) (dto UserDTO, err error) {
 	templateUser, err := userDao.GetUserByMobile(mobile)
 	if err != nil {
 		if !errors.Is(err, gorm.ErrRecordNotFound) {
 			logger.Error("查询用户失败:%v", err)
 		}
-		return dto, err
+		return
 	}
 	dto = convertUserDTO(templateUser)
-	return dto, nil
+	return
 }
 
 func GetUserAndCountReadTimes(userId int) (err error) {

+ 18 - 0
routers/commentsRouter.go

@@ -171,6 +171,15 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["eta/eta_mini_ht_api/controllers/user:AuthController"] = append(beego.GlobalControllerRouter["eta/eta_mini_ht_api/controllers/user:AuthController"],
+        beego.ControllerComments{
+            Method: "Logout",
+            Router: `/Logout`,
+            AllowHTTPMethods: []string{"post"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["eta/eta_mini_ht_api/controllers/user:AuthController"] = append(beego.GlobalControllerRouter["eta/eta_mini_ht_api/controllers/user:AuthController"],
         beego.ControllerComments{
             Method: "AreaCodes",
@@ -357,4 +366,13 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["eta/eta_mini_ht_api/controllers/web_hook:HTFuturesAccountController"] = append(beego.GlobalControllerRouter["eta/eta_mini_ht_api/controllers/web_hook:HTFuturesAccountController"],
+        beego.ControllerComments{
+            Method: "SyncCustomerRiskLevel",
+            Router: `/v1/syncRiskLevel/`,
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
 }

+ 6 - 0
routers/router.go

@@ -4,6 +4,7 @@ import (
 	"eta/eta_mini_ht_api/controllers/media"
 	"eta/eta_mini_ht_api/controllers/report"
 	"eta/eta_mini_ht_api/controllers/user"
+	"eta/eta_mini_ht_api/controllers/web_hook"
 	"eta/eta_mini_ht_api/middleware"
 	"github.com/beego/beego/v2/server/web"
 	"github.com/beego/beego/v2/server/web/filter/cors"
@@ -49,6 +50,11 @@ func init() {
 				&user.AnalystController{},
 			),
 		),
+		web.NSNamespace("/webhook/d ",
+			web.NSInclude(
+				&web_hook.HTFuturesAccountController{},
+			),
+		),
 	)
 	web.AddNamespace(ns)
 }

+ 3 - 2
service/user/user_service.go

@@ -217,9 +217,10 @@ func FeedBack(userId int, mobile string, message string) (err error) {
 
 func GetUserByMobile(mobile string) (user User, err error) {
 	userDTO, err := userService.GetUserByMobile(mobile)
-	if err == nil {
-		user = convertToUser(userDTO)
+	if err != nil {
+		err = exception.New(exception.TemplateUserNotFound)
 	}
+	user = convertToUser(userDTO)
 	return
 }