wishpal_ironfan
/
service
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'by Robin at 20240326; alter' (#203) from feat-IRONFANS-ALTER-Robin into main 

Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/203
This commit is contained in:
chenhao 2024-03-26 12:30:05 +08:00
parent faba1b1f96 594987f8ac
commit d5a151013b
3 changed files with 28 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/errcode/errcode.go
View File

@ -6,6 +6,7 @@ var ErrCodeMsgMap = map[ErrCode]string{
ErrCodeCheckSignatureFail: "签名检查失败",
ErrCodeEncryptionInterceptFail: "加密失败",
ErrCodeDecryptionInterceptFail: "解密失败",
ErrCodeSuspend: "软件维护中，暂时无法访问，给您带来的不便，敬请谅解!",
ErrCodeApolloReadFail: "Apollo配置读取失败，请立即联系管理员",
ErrCodeApolloVersionFormatError: "Apollo版本号配置格式错误",
ErrCodeUserVersionFormatError: "用户上送版本号格式错误",
@ -175,6 +176,7 @@ const (
ErrCodeOk ErrCode = 1
ErrCodeEncryptionInterceptFail ErrCode = -2 // 加密失败
ErrCodeDecryptionInterceptFail ErrCode = -3 // 解密失败
ErrCodeSuspend ErrCode = -4 // 软件关停中
ErrCodeCheckSignatureFail ErrCode = -10 // 签名检查失败
ErrCodeApolloReadFail ErrCode = -11 // Apollo配置读取失败
ErrCodeAssertionFail ErrCode = -12 // 类型断言异常

35
app/mix/controller/login_api.go
View File

@ -6,14 +6,14 @@ import (
"service/app/mix/service"
"service/bizcommon/util"
"service/library/logger"
"service/library/mediafiller"
"github.com/gin-gonic/gin"
)
func ApiLoginByPswd(ctx *gin.Context) {
req := ctx.MustGet("client_req").(*loginproto.ApiLoginByPswdReq)
isEnabled, token, accountVO, ec := service.DefaultService.ApiLoginByPswd(ctx, req)
//isEnabled, token, accountVO, ec := service.DefaultService.ApiLoginByPswd(ctx, req)
ec := errcode.ErrCodeSuspend
if ec != errcode.ErrCodeLoginSrvOk {
logger.Error("ApiLoginByPswd fail, req: %v, ec: %v", util.ToJson(req), ec)
ReplyErrCodeMsg(ctx, ec)
@ -21,13 +21,13 @@ func ApiLoginByPswd(ctx *gin.Context) {
}
//填充媒体切片
mediafiller.FillEntity(ctx, accountVO.Avatar)
// mediafiller.FillEntity(ctx, accountVO.Avatar)
ReplyOk(ctx, &loginproto.ApiLoginData{
IsEnabled: isEnabled,
Token: token,
AccountVO: accountVO,
})
// ReplyOk(ctx, &loginproto.ApiLoginData{
// IsEnabled: isEnabled,
// Token: token,
// AccountVO: accountVO,
// })
}
@ -75,7 +75,8 @@ func ApiUpdatePassword(ctx *gin.Context) {
func ApiLoginByVeriCode(ctx *gin.Context) {
req := ctx.MustGet("client_req").(*loginproto.ApiLoginByVeriCodeReq)
isEnabled, token, accountVO, ec := service.DefaultService.ApiLoginByVeriCode(ctx, req)
//isEnabled, token, accountVO, ec := service.DefaultService.ApiLoginByVeriCode(ctx, req)
ec := errcode.ErrCodeSuspend
if ec != errcode.ErrCodeLoginSrvOk {
logger.Error("ApiLoginByVeriCode fail, req: %v, ec: %v", util.ToJson(req), ec)
ReplyErrCodeMsg(ctx, ec)
@ -83,13 +84,13 @@ func ApiLoginByVeriCode(ctx *gin.Context) {
}
//填充媒体切片
mediafiller.FillEntity(ctx, accountVO.Avatar)
// mediafiller.FillEntity(ctx, accountVO.Avatar)
ReplyOk(ctx, &loginproto.ApiLoginData{
IsEnabled: isEnabled,
Token: token,
AccountVO: accountVO,
})
// ReplyOk(ctx, &loginproto.ApiLoginData{
// IsEnabled: isEnabled,
// Token: token,
// AccountVO: accountVO,
// })
}
@ -106,5 +107,7 @@ func ApiLogout(ctx *gin.Context) {
}
func ApiValidate(ctx *gin.Context) {
ReplyOk(ctx, nil)
ec := errcode.ErrCodeSuspend
ReplyErrCodeMsg(ctx, ec)
//ReplyOk(ctx, nil)
}

13
app/mix/controller/moment_api.go
View File

@ -14,12 +14,13 @@ import (
func ApiCreateMoment(ctx *gin.Context) {
req := ctx.MustGet("client_req").(*momentproto.ApiCreateReq)
ec, acctPunEndTime := service.DefaultService.ApiCreateMoment(ctx, req)
if ec == errcode.ErrCodMomentBlockedFromCreatingMoment {
logger.Error("ApiCreateMoment fail, req: %v, ec: %v", util.ToJson(req), ec)
ReplyErrCodeMsgAndDetail(ctx, ec, acctPunEndTime)
return
}
// ec, acctPunEndTime := service.DefaultService.ApiCreateMoment(ctx, req)
// if ec == errcode.ErrCodMomentBlockedFromCreatingMoment {
// logger.Error("ApiCreateMoment fail, req: %v, ec: %v", util.ToJson(req), ec)
// ReplyErrCodeMsgAndDetail(ctx, ec, acctPunEndTime)
// return
// }
ec := errcode.ErrCodeSuspend
if ec != errcode.ErrCodeMomentSrvOk {
logger.Error("ApiCreateMoment fail, req: %v, ec: %v", util.ToJson(req), ec)
ReplyErrCodeMsg(ctx, ec)