OMC/nbi_alarm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

固定值顺序数据key

Browse Source
This commit is contained in:
TsMask
2023-08-24 10:56:16 +08:00
parent 1902c78572
commit 189122061d
6 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
handle/api/req_cmca_login_alarm.go
View File

@@ -54,7 +54,7 @@ func (*ReqCMCALoginAlarm) Handle(request ziface.IRequest) {
zlog.Ins().ErrorF("LoginFail %s", err)
request.GetConnection().SendMsg(ReqLoginAlarmMsgType, core.Result(ReqLoginAlarmMsgName, map[string]string{
"result": "autherror",
"resDesc": err.Error()[:30],
"resDesc": err.Error(),
}))
// 已登录的，登录错误超过3次,断开连接
if uid != nil || uid != "" {
@@ -73,7 +73,7 @@ func (*ReqCMCALoginAlarm) Handle(request ziface.IRequest) {
zlog.Ins().ErrorF("manager:%s", err)
request.GetConnection().SendMsg(ReqLoginAlarmMsgType, core.Result(ReqLoginAlarmMsgName, map[string]string{
"result": "autherror",
"resDesc": err.Error()[:30],
"resDesc": err.Error(),
}))
return
}

4
handle/api/req_login_alarm.go
View File

@@ -54,7 +54,7 @@ func (s *ReqLoginAlarm) Handle(request ziface.IRequest) {
zlog.Ins().ErrorF("LoginFail %s", err)
request.GetConnection().SendMsg(ReqLoginAlarmMsgType, core.Result(ReqLoginAlarmMsgName, map[string]string{
"result": "autherror",
"resDesc": err.Error()[:30],
"resDesc": err.Error(),
}))
// 已登录的，登录错误超过3次,断开连接
if uid != nil || uid != "" {
@@ -73,7 +73,7 @@ func (s *ReqLoginAlarm) Handle(request ziface.IRequest) {
zlog.Ins().ErrorF("manager:%s", err)
request.GetConnection().SendMsg(ReqLoginAlarmMsgType, core.Result(ReqLoginAlarmMsgName, map[string]string{
"result": "autherror",
"resDesc": err.Error()[:30],
"resDesc": err.Error(),
}))
return
}

12
handle/service/login.go
View File

@@ -17,7 +17,8 @@ func UserLogin(name, passwd string) error {
var user model.User
err := db.Client.Model(&model.User{}).Where("account_id=?", name).First(&user).Error
if err != nil {
return err
zlog.Ins().ErrorF("Password Login[%s]:%s", name, err)
return errors.New("incorrect username and password")
}
if err := utils.Compare(user.Password, passwd); err != nil {
@@ -35,7 +36,8 @@ func CMCALogin(name, publicKeyStr, content, signatureBase64 string) error {
var user model.User
err := db.Client.Model(&model.User{}).Where("account_id=?", name).First(&user).Error
if err != nil {
return err
zlog.Ins().ErrorF("Password Login[%s]:%s", name, err)
return errors.New("无效用户名")
}
if user.AccountId != name {
@@ -48,13 +50,15 @@ func CMCALogin(name, publicKeyStr, content, signatureBase64 string) error {
// 解析公钥
publicKey, err := utils.ParsePKCS1PublicKey(publicKeyPEM)
if err != nil {
return fmt.Errorf("解析公钥失败 %s", err)
zlog.Ins().ErrorF("publicKeyPEM Login[%s]:%s", name, err)
return fmt.Errorf("解析公钥失败")
}
// 解码base64得到签名字节串
signature, err := base64.StdEncoding.DecodeString(signatureBase64)
if err != nil {
return fmt.Errorf("解码签名数据失败 %s", err)
zlog.Ins().ErrorF("signatureBase64 Login[%s]:%s", name, err)
return fmt.Errorf("解码签名数据失败")
}
// 验证签名