Browse Source

4012登录状态码

hsun 1 year ago
parent
commit
7d8418afb3
5 changed files with 120 additions and 7 deletions
  1. 47 2
      controllers/user_login.go
  2. 1 0
      models/base.go
  3. 5 1
      models/company/company_config.go
  4. 63 0
      routers/commentsRouter.go
  5. 4 4
      utils/constants.go

+ 47 - 2
controllers/user_login.go

@@ -4,6 +4,7 @@ import (
 	"encoding/base64"
 	"encoding/json"
 	"eta/eta_api/models"
+	"eta/eta_api/models/company"
 	"eta/eta_api/models/system"
 	"eta/eta_api/services"
 	"eta/eta_api/utils"
@@ -152,10 +153,10 @@ func (this *UserLoginController) GetVerifyCode() {
 	// 限制最多60s获取一次
 	var lockKey string
 	if req.VerifyType == 1 {
-		lockKey = fmt.Sprint(utils.CaptchaCachePrefix, "lock:eta_", req.Mobile)
+		lockKey = fmt.Sprint(utils.CaptchaCachePrefix, req.Mobile)
 	}
 	if req.VerifyType == 2 {
-		lockKey = fmt.Sprint(utils.CaptchaCachePrefix, "lock:eta_", req.Email)
+		lockKey = fmt.Sprint(utils.CaptchaCachePrefix, req.Email)
 	}
 	locked := utils.Rc.SetNX(lockKey, 1, time.Minute)
 	if !locked {
@@ -322,6 +323,7 @@ func (this *UserLoginController) Login() {
 		errPassKey := fmt.Sprint(utils.CACHE_LOGIN_ERR_PASS, req.Username)
 		accountUser, e := system.CheckSysUser(req.Username, req.Password)
 		if e != nil {
+			br.Ret = models.BaseRespCodeLoginErr
 			if e.Error() == utils.ErrNoRow() {
 				br.Msg = "登录失败, 账号或密码错误"
 				if isAbnormal != "" {
@@ -846,3 +848,46 @@ func (this *UserLoginController) ForgetResetPass() {
 	br.Success = true
 	br.Msg = "操作成功"
 }
+
+// AreaCodeList
+// @Title 手机号区号列表
+// @Description 手机号区号列表
+// @Success 200 Ret=200 获取成功
+// @router /area_code/list [get]
+func (this *UserLoginController) AreaCodeList() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		if br.ErrMsg == "" {
+			br.IsSendEmail = false
+		}
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+
+	type AreaCodeListResp struct {
+		Name  string `description:"地区"`
+		Value string `description:"区号"`
+	}
+	resp := make([]AreaCodeListResp, 0)
+	confAuth, e := company.GetConfigDetailByCode(company.ConfAreaCodeListKey)
+	if e != nil {
+		br.Msg = "获取失败"
+		br.ErrMsg = "获取手机号区号配置失败, Err: " + e.Error()
+		return
+	}
+	if confAuth.ConfigValue == "" {
+		br.Msg = "获取失败"
+		br.ErrMsg = "手机号区号配置为空"
+		return
+	}
+	if e := json.Unmarshal([]byte(confAuth.ConfigValue), &resp); e != nil {
+		br.Msg = "获取失败"
+		br.ErrMsg = "手机号区号配置有误"
+		return
+	}
+
+	br.Data = resp
+	br.Ret = 200
+	br.Success = true
+	br.Msg = "获取成功"
+}

+ 1 - 0
models/base.go

@@ -2,6 +2,7 @@ package models
 
 const (
 	BaseRespCodeAbnormalLogin = 4011 // 异常登录状态码
+	BaseRespCodeLoginErr      = 4012 // 账号或密码输入错误
 )
 
 type BaseResponse struct {

+ 5 - 1
models/company/company_config.go

@@ -4,6 +4,10 @@ import (
 	"github.com/beego/beego/v2/client/orm"
 )
 
+const (
+	ConfAreaCodeListKey = "area_code_list" // 手机号区号列表
+)
+
 type CrmConfig struct {
 	ConfigValue string `description:"详情"`
 }
@@ -15,7 +19,7 @@ func GetConfigValueByCode(configCode string) (total int, err error) {
 	return
 }
 
-//修改
+// 修改
 func CrmConfigUpdate(newValue, configCode string) (err error) {
 	o := orm.NewOrm()
 	sql := `UPDATE crm_config SET  config_value=?   WHERE config_code=  ?`

+ 63 - 0
routers/commentsRouter.go

@@ -6559,6 +6559,69 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["eta/eta_api/controllers:UserLoginController"] = append(beego.GlobalControllerRouter["eta/eta_api/controllers:UserLoginController"],
+        beego.ControllerComments{
+            Method: "AreaCodeList",
+            Router: `/area_code/list`,
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
+    beego.GlobalControllerRouter["eta/eta_api/controllers:UserLoginController"] = append(beego.GlobalControllerRouter["eta/eta_api/controllers:UserLoginController"],
+        beego.ControllerComments{
+            Method: "ForgetAccountGet",
+            Router: `/forget/account_get`,
+            AllowHTTPMethods: []string{"post"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
+    beego.GlobalControllerRouter["eta/eta_api/controllers:UserLoginController"] = append(beego.GlobalControllerRouter["eta/eta_api/controllers:UserLoginController"],
+        beego.ControllerComments{
+            Method: "ForgetCodeVerify",
+            Router: `/forget/code_verify`,
+            AllowHTTPMethods: []string{"post"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
+    beego.GlobalControllerRouter["eta/eta_api/controllers:UserLoginController"] = append(beego.GlobalControllerRouter["eta/eta_api/controllers:UserLoginController"],
+        beego.ControllerComments{
+            Method: "ForgetResetPass",
+            Router: `/forget/reset_pass`,
+            AllowHTTPMethods: []string{"post"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
+    beego.GlobalControllerRouter["eta/eta_api/controllers:UserLoginController"] = append(beego.GlobalControllerRouter["eta/eta_api/controllers:UserLoginController"],
+        beego.ControllerComments{
+            Method: "GenerateCaptcha",
+            Router: `/get_captcha`,
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
+    beego.GlobalControllerRouter["eta/eta_api/controllers:UserLoginController"] = append(beego.GlobalControllerRouter["eta/eta_api/controllers:UserLoginController"],
+        beego.ControllerComments{
+            Method: "Login",
+            Router: `/login`,
+            AllowHTTPMethods: []string{"post"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
+    beego.GlobalControllerRouter["eta/eta_api/controllers:UserLoginController"] = append(beego.GlobalControllerRouter["eta/eta_api/controllers:UserLoginController"],
+        beego.ControllerComments{
+            Method: "GetVerifyCode",
+            Router: `/verify_code`,
+            AllowHTTPMethods: []string{"post"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["eta/eta_api/controllers:VarietyTagController"] = append(beego.GlobalControllerRouter["eta/eta_api/controllers:VarietyTagController"],
         beego.ControllerComments{
             Method: "TagTree",

+ 4 - 4
utils/constants.go

@@ -311,8 +311,8 @@ const (
 
 // 验证码
 const (
-	CaptchaCachePrefix     = "captcha:" // 验证码缓存Key
-	VerifyCodeExpireMinute = 15         // 短信/邮箱验证码过期时间-分钟
-	SmsLoginTplId          = "65692"    // 【弘则研究】您的验证码是XXX,如非本人操作,请忽略本短信
-	SmsNewLoginTplId       = "254663"   // 【弘则研究】您的验证码是XXX,有效期15分钟
+	CaptchaCachePrefix     = "captcha:lock:eta_" // 验证码缓存Key
+	VerifyCodeExpireMinute = 15                  // 短信/邮箱验证码过期时间-分钟
+	SmsLoginTplId          = "65692"             // 【弘则研究】您的验证码是XXX,如非本人操作,请忽略本短信
+	SmsNewLoginTplId       = "254663"            // 【弘则研究】您的验证码是XXX,有效期15分钟
 )