浏览代码

修改登录提示

kobe6258 4 月之前
父节点
当前提交
d2b8dc99e8
共有 3 个文件被更改,包括 12 次插入10 次删除
  1. 8 8
      api/ht_account_api.go
  2. 2 0
      common/exception/exc_enums.go
  3. 2 2
      controllers/user/auth_controller.go

+ 8 - 8
api/ht_account_api.go

@@ -25,19 +25,19 @@ const (
 var (
 	htFacadeOnce sync.Once
 
-	htFacade   *HTAccountApi
+	htFacade   *HTApi
 	redisUtils = cache.GetInstance()
 )
 
-type HTAccountApi struct {
+type HTApi struct {
 	htConfig *config.HTBizConfig
 	// HTTP请求客户端
 	client *client.HttpClient
 }
 
-func GetInstance() *HTAccountApi {
+func GetInstance() *HTApi {
 	htFacadeOnce.Do(func() {
-		htFacade = &HTAccountApi{
+		htFacade = &HTApi{
 			htConfig: config.GetConfig(contants.HT).(*config.HTBizConfig),
 			client:   client.DefaultClient()}
 	})
@@ -59,7 +59,7 @@ type CustomerRiskReq struct {
 	LoginType  string `json:"login_type"`
 }
 
-func (f *HTAccountApi) EnCodeData(req CustomerRiskReq) (token string, err error) {
+func (f *HTApi) EnCodeData(req CustomerRiskReq) (token string, err error) {
 	publicKey, err := auth.ParsePublicKey(f.htConfig.GetWebhookPublicKey())
 	if err != nil {
 		logger.Error("解析公钥失败:%v", err)
@@ -86,7 +86,7 @@ type EncodeReq struct {
 	Param string `json:"param"`
 }
 
-func (f *HTAccountApi) getToken() (token string, err error) {
+func (f *HTApi) getToken() (token string, err error) {
 	accessToken := redis.GenerateCAPAccessTokenKey()
 	token = redisUtils.GetString(accessToken)
 	var tokenInfo TokenInfo
@@ -109,7 +109,7 @@ func (f *HTAccountApi) getToken() (token string, err error) {
 	}
 	return
 }
-func (f *HTAccountApi) GetCustomerRiskLevelInfo(req ClientSuitInfoReq) (info CustomerAccountInfo, err error) {
+func (f *HTApi) GetCustomerRiskLevelInfo(req ClientSuitInfoReq) (info CustomerAccountInfo, err error) {
 	url := f.htConfig.GetAccountApiUrl() + clientSuitInfoUrl
 	token, err := f.getToken()
 	if err != nil {
@@ -144,7 +144,7 @@ type AccessTokenReq struct {
 	SecretKey string `json:"secret_key"`
 }
 
-func (f *HTAccountApi) GetAccessToken() (token TokenInfo, err error) {
+func (f *HTApi) GetAccessToken() (token TokenInfo, err error) {
 	url := f.htConfig.GetAccountApiUrl() + accessTokenUrl
 	req := AccessTokenReq{
 		AppId:     f.htConfig.GetAppId(),

+ 2 - 0
common/exception/exc_enums.go

@@ -52,6 +52,7 @@ const (
 	TemplateUserBindFailed
 	GenerateTokenFailed
 	JWTTokenDecodeFailed
+	LoginFailed
 	LogoutFailed
 	JWTTokenExpired
 	JWTTokenInvalid
@@ -161,6 +162,7 @@ var ErrorMap = map[int]string{
 	GetConfigValueFailed:  "配置获取失败",
 	//用户
 	TemplateUserNotFound:               "临时用户记录不存在",
+	LoginFailed:                        "登录失败",
 	LogoutFailed:                       "退出登录失败",
 	TemplateUserFoundFailed:            "查询临时用户表失败",
 	IllegalTemplateUserId:              "不合法的临时用户ID",

+ 2 - 2
controllers/user/auth_controller.go

@@ -62,7 +62,7 @@ func (a *AuthController) Login() {
 		userInfo := a.Data["user"].(user.User)
 		if userInfo.Mobile != "" && userInfo.Mobile != loginReq.Mobile {
 			a.FailedResult("登录失败,已绑定手机号:"+userInfo.Mobile, result)
-			err = exception.New(exception.IllegalAreaCode)
+			err = exception.New(exception.LoginFailed)
 			return
 		}
 		mobileUser, err := user.GetUserByMobile(loginReq.Mobile)
@@ -77,7 +77,7 @@ func (a *AuthController) Login() {
 		}
 		if mobileUser.Id > 0 && (mobileUser.Id != userInfo.Id && mobileUser.Mobile == loginReq.Mobile) {
 			a.FailedResult("登录失败,该手机号已绑定过微信", result)
-			err = exception.New(exception.IllegalAreaCode)
+			err = exception.New(exception.LoginFailed)
 			return
 		}
 		if loginReq.AreaCode == "" || !checkValidAreaCode(loginReq.AreaCode) {