- TrimBlanChar to TrimBlankChar
- error_code.go
This commit is contained in:
@@ -6,8 +6,7 @@ import (
|
||||
|
||||
"git.rosy.net.cn/jx-callback/business/jxcallback/auth"
|
||||
"git.rosy.net.cn/jx-callback/business/jxutils/tasksch"
|
||||
"git.rosy.net.cn/jx-callback/globals"
|
||||
"github.com/astaxie/beego"
|
||||
"git.rosy.net.cn/jx-callback/business/model"
|
||||
)
|
||||
|
||||
type Context struct {
|
||||
@@ -52,9 +51,9 @@ func New(rootTask tasksch.ITask, token string, w http.ResponseWriter, r *http.Re
|
||||
mapData: make(map[interface{}]interface{}),
|
||||
}
|
||||
ctx.userInfo, err = auth.GetUserInfo(token)
|
||||
if err != nil && beego.BConfig.RunMode == "prod" {
|
||||
globals.SugarLogger.Warnf("token is invalid, token:%s", token)
|
||||
// return nil, "", err
|
||||
if err != nil {
|
||||
// globals.SugarLogger.Warnf("token is invalid, token:%s", token)
|
||||
return nil, model.ErrCodeTokenIsInvalid, err
|
||||
}
|
||||
return ctx, "", nil
|
||||
}
|
||||
|
||||
@@ -62,11 +62,11 @@ func SplitStoreName(fullName, separator, defaultPrefix string) (prefix, bareName
|
||||
bareName = strings.Trim(strings.Trim(fullName, defaultPrefix), separator)
|
||||
|
||||
}
|
||||
return utils.TrimBlanChar(defaultPrefix), utils.TrimBlanChar(bareName)
|
||||
return utils.TrimBlankChar(defaultPrefix), utils.TrimBlankChar(bareName)
|
||||
}
|
||||
|
||||
func ComposeStoreName(bareName, separator, prefix string) (fullName string) {
|
||||
return prefix + separator + utils.TrimBlanChar(strings.Trim(bareName, separator))
|
||||
return prefix + separator + utils.TrimBlankChar(strings.Trim(bareName, separator))
|
||||
}
|
||||
|
||||
func StrTime2JxOperationTime(strTime string, defValue int16) int16 {
|
||||
|
||||
Reference in New Issue
Block a user