zeromicro
/
go-zero
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix golint issues, redis methods (#455)

Browse Source
master
Kevin Wan 4 years ago committed by GitHub
parent 06f6dc9937
commit 42883d0899
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 193 additions and 153 deletions
Show Stats Download Patch File Download Diff File

259
core/stores/redis/redis.go
Unescape Escape View File

@ -30,7 +30,7 @@ type (
Score int64 Score int64
} }
// thread-safe // Redis defines a redis node/cluster. It is thread-safe.
Redis struct { Redis struct {
Addr string Addr string
Type string Type string
@ -86,9 +86,9 @@ func (s *Redis) Blpop(redisNode RedisNode, key string) (string, error) {
if len(vals) < 2 { if len(vals) < 2 {
return "", fmt.Errorf("no value on key: %s", key) return "", fmt.Errorf("no value on key: %s", key)
} else {
return vals[1], nil
} }
return vals[1], nil
} }
func (s *Redis) BlpopEx(redisNode RedisNode, key string) (string, bool, error) { func (s *Redis) BlpopEx(redisNode RedisNode, key string) (string, bool, error) {
@ -103,9 +103,9 @@ func (s *Redis) BlpopEx(redisNode RedisNode, key string) (string, bool, error) {
if len(vals) < 2 { if len(vals) < 2 {
return "", false, fmt.Errorf("no value on key: %s", key) return "", false, fmt.Errorf("no value on key: %s", key)
} else {
return vals[1], true, nil
} }
return vals[1], true, nil
} }
func (s *Redis) Del(keys ...string) (val int, err error) { func (s *Redis) Del(keys ...string) (val int, err error) {
@ -115,12 +115,13 @@ func (s *Redis) Del(keys ...string) (val int, err error) {
return err return err
} }
if v, err := conn.Del(keys...).Result(); err != nil { v, err := conn.Del(keys...).Result()
if err != nil {
return err return err
} else { }
val = int(v) val = int(v)
return nil return nil
}
}, acceptable) }, acceptable)
return return
@ -147,12 +148,13 @@ func (s *Redis) Exists(key string) (val bool, err error) {
return err return err
} }
if v, err := conn.Exists(key).Result(); err != nil { v, err := conn.Exists(key).Result()
if err != nil {
return err return err
} else { }
val = v == 1 val = v == 1
return nil return nil
}
}, acceptable) }, acceptable)
return return
@ -187,12 +189,13 @@ func (s *Redis) GeoAdd(key string, geoLocation ...*GeoLocation) (val int64, err
return err return err
} }
if v, err := conn.GeoAdd(key, geoLocation...).Result(); err != nil { v, err := conn.GeoAdd(key, geoLocation...).Result()
if err != nil {
return err return err
} else { }
val = v val = v
return nil return nil
}
}, acceptable) }, acceptable)
return return
} }
@ -204,12 +207,13 @@ func (s *Redis) GeoDist(key string, member1, member2, unit string) (val float64,
return err return err
} }
if v, err := conn.GeoDist(key, member1, member2, unit).Result(); err != nil { v, err := conn.GeoDist(key, member1, member2, unit).Result()
if err != nil {
return err return err
} else { }
val = v val = v
return nil return nil
}
}, acceptable) }, acceptable)
return return
} }
@ -221,12 +225,13 @@ func (s *Redis) GeoHash(key string, members ...string) (val []string, err error)
return err return err
} }
if v, err := conn.GeoHash(key, members...).Result(); err != nil { v, err := conn.GeoHash(key, members...).Result()
if err != nil {
return err return err
} else { }
val = v val = v
return nil return nil
}
}, acceptable) }, acceptable)
return return
} }
@ -238,12 +243,13 @@ func (s *Redis) GeoRadius(key string, longitude, latitude float64, query *GeoRad
return err return err
} }
if v, err := conn.GeoRadius(key, longitude, latitude, query).Result(); err != nil { v, err := conn.GeoRadius(key, longitude, latitude, query).Result()
if err != nil {
return err return err
} else { }
val = v val = v
return nil return nil
}
}, acceptable) }, acceptable)
return return
} }
@ -254,12 +260,13 @@ func (s *Redis) GeoRadiusByMember(key, member string, query *GeoRadiusQuery) (va
return err return err
} }
if v, err := conn.GeoRadiusByMember(key, member, query).Result(); err != nil { v, err := conn.GeoRadiusByMember(key, member, query).Result()
if err != nil {
return err return err
} else { }
val = v val = v
return nil return nil
}
}, acceptable) }, acceptable)
return return
} }
@ -271,12 +278,13 @@ func (s *Redis) GeoPos(key string, members ...string) (val []*GeoPos, err error)
return err return err
} }
if v, err := conn.GeoPos(key, members...).Result(); err != nil { v, err := conn.GeoPos(key, members...).Result()
if err != nil {
return err return err
} else { }
val = v val = v
return nil return nil
}
}, acceptable) }, acceptable)
return return
} }
@ -307,12 +315,13 @@ func (s *Redis) GetBit(key string, offset int64) (val int, err error) {
return err return err
} }
if v, err := conn.GetBit(key, offset).Result(); err != nil { v, err := conn.GetBit(key, offset).Result()
if err != nil {
return err return err
} else { }
val = int(v) val = int(v)
return nil return nil
}
}, acceptable) }, acceptable)
return return
@ -325,12 +334,13 @@ func (s *Redis) Hdel(key, field string) (val bool, err error) {
return err return err
} }
if v, err := conn.HDel(key, field).Result(); err != nil { v, err := conn.HDel(key, field).Result()
if err != nil {
return err return err
} else { }
val = v == 1 val = v == 1
return nil return nil
}
}, acceptable) }, acceptable)
return return
@ -385,12 +395,13 @@ func (s *Redis) Hincrby(key, field string, increment int) (val int, err error) {
return err return err
} }
if v, err := conn.HIncrBy(key, field, int64(increment)).Result(); err != nil { v, err := conn.HIncrBy(key, field, int64(increment)).Result()
if err != nil {
return err return err
} else { }
val = int(v) val = int(v)
return nil return nil
}
}, acceptable) }, acceptable)
return return
@ -417,12 +428,13 @@ func (s *Redis) Hlen(key string) (val int, err error) {
return err return err
} }
if v, err := conn.HLen(key).Result(); err != nil { v, err := conn.HLen(key).Result()
if err != nil {
return err return err
} else { }
val = int(v) val = int(v)
return nil return nil
}
}, acceptable) }, acceptable)
return return
@ -435,12 +447,13 @@ func (s *Redis) Hmget(key string, fields ...string) (val []string, err error) {
return err return err
} }
if v, err := conn.HMGet(key, fields...).Result(); err != nil { v, err := conn.HMGet(key, fields...).Result()
if err != nil {
return err return err
} else { }
val = toStrings(v) val = toStrings(v)
return nil return nil
}
}, acceptable) }, acceptable)
return return
@ -564,12 +577,13 @@ func (s *Redis) Llen(key string) (val int, err error) {
return err return err
} }
if v, err := conn.LLen(key).Result(); err != nil { v, err := conn.LLen(key).Result()
if err != nil {
return err return err
} else { }
val = int(v) val = int(v)
return nil return nil
}
}, acceptable) }, acceptable)
return return
@ -596,12 +610,13 @@ func (s *Redis) Lpush(key string, values ...interface{}) (val int, err error) {
return err return err
} }
if v, err := conn.LPush(key, values...).Result(); err != nil { v, err := conn.LPush(key, values...).Result()
if err != nil {
return err return err
} else { }
val = int(v) val = int(v)
return nil return nil
}
}, acceptable) }, acceptable)
return return
@ -628,12 +643,13 @@ func (s *Redis) Lrem(key string, count int, value string) (val int, err error) {
return err return err
} }
if v, err := conn.LRem(key, int64(count), value).Result(); err != nil { v, err := conn.LRem(key, int64(count), value).Result()
if err != nil {
return err return err
} else { }
val = int(v) val = int(v)
return nil return nil
}
}, acceptable) }, acceptable)
return return
@ -646,12 +662,13 @@ func (s *Redis) Mget(keys ...string) (val []string, err error) {
return err return err
} }
if v, err := conn.MGet(keys...).Result(); err != nil { v, err := conn.MGet(keys...).Result()
if err != nil {
return err return err
} else { }
val = toStrings(v) val = toStrings(v)
return nil return nil
}
}, acceptable) }, acceptable)
return return
@ -678,12 +695,13 @@ func (s *Redis) Pfadd(key string, values ...interface{}) (val bool, err error) {
return err return err
} }
if v, err := conn.PFAdd(key, values...).Result(); err != nil { v, err := conn.PFAdd(key, values...).Result()
if err != nil {
return err return err
} else { }
val = v == 1 val = v == 1
return nil return nil
}
}, acceptable) }, acceptable)
return return
@ -724,13 +742,14 @@ func (s *Redis) Ping() (val bool) {
return nil return nil
} }
if v, err := conn.Ping().Result(); err != nil { v, err := conn.Ping().Result()
if err != nil {
val = false val = false
return nil return nil
} else { }
val = v == "PONG" val = v == "PONG"
return nil return nil
}
}, acceptable) }, acceptable)
return return
@ -772,12 +791,13 @@ func (s *Redis) Rpush(key string, values ...interface{}) (val int, err error) {
return err return err
} }
if v, err := conn.RPush(key, values...).Result(); err != nil { v, err := conn.RPush(key, values...).Result()
if err != nil {
return err return err
} else { }
val = int(v) val = int(v)
return nil return nil
}
}, acceptable) }, acceptable)
return return
@ -790,12 +810,13 @@ func (s *Redis) Sadd(key string, values ...interface{}) (val int, err error) {
return err return err
} }
if v, err := conn.SAdd(key, values...).Result(); err != nil { v, err := conn.SAdd(key, values...).Result()
if err != nil {
return err return err
} else { }
val = int(v) val = int(v)
return nil return nil
}
}, acceptable) }, acceptable)
return return
@ -911,6 +932,7 @@ func (s *Redis) Sismember(key string, value interface{}) (val bool, err error) {
if err != nil { if err != nil {
return err return err
} }
val, err = conn.SIsMember(key, value).Result() val, err = conn.SIsMember(key, value).Result()
return err return err
}, acceptable) }, acceptable)
@ -925,12 +947,13 @@ func (s *Redis) Srem(key string, values ...interface{}) (val int, err error) {
return err return err
} }
if v, err := conn.SRem(key, values...).Result(); err != nil { v, err := conn.SRem(key, values...).Result()
if err != nil {
return err return err
} else { }
val = int(v) val = int(v)
return nil return nil
}
}, acceptable) }, acceptable)
return return
@ -999,12 +1022,13 @@ func (s *Redis) Sunionstore(destination string, keys ...string) (val int, err er
return err return err
} }
if v, err := conn.SUnionStore(destination, keys...).Result(); err != nil { v, err := conn.SUnionStore(destination, keys...).Result()
if err != nil {
return err return err
} else { }
val = int(v) val = int(v)
return nil return nil
}
}, acceptable) }, acceptable)
return return
@ -1031,12 +1055,13 @@ func (s *Redis) Sdiffstore(destination string, keys ...string) (val int, err err
return err return err
} }
if v, err := conn.SDiffStore(destination, keys...).Result(); err != nil { v, err := conn.SDiffStore(destination, keys...).Result()
if err != nil {
return err return err
} else { }
val = int(v) val = int(v)
return nil return nil
}
}, acceptable) }, acceptable)
return return
@ -1049,12 +1074,13 @@ func (s *Redis) Ttl(key string) (val int, err error) {
return err return err
} }
if duration, err := conn.TTL(key).Result(); err != nil { duration, err := conn.TTL(key).Result()
if err != nil {
return err return err
} else { }
val = int(duration / time.Second) val = int(duration / time.Second)
return nil return nil
}
}, acceptable) }, acceptable)
return return
@ -1094,12 +1120,13 @@ func (s *Redis) Zadds(key string, ps ...Pair) (val int64, err error) {
zs = append(zs, z) zs = append(zs, z)
} }
if v, err := conn.ZAdd(key, zs...).Result(); err != nil { v, err := conn.ZAdd(key, zs...).Result()
if err != nil {
return err return err
} else { }
val = v val = v
return nil return nil
}
}, acceptable) }, acceptable)
return return
@ -1112,12 +1139,13 @@ func (s *Redis) Zcard(key string) (val int, err error) {
return err return err
} }
if v, err := conn.ZCard(key).Result(); err != nil { v, err := conn.ZCard(key).Result()
if err != nil {
return err return err
} else { }
val = int(v) val = int(v)
return nil return nil
}
}, acceptable) }, acceptable)
return return
@ -1130,13 +1158,13 @@ func (s *Redis) Zcount(key string, start, stop int64) (val int, err error) {
return err return err
} }
if v, err := conn.ZCount(key, strconv.FormatInt(start, 10), v, err := conn.ZCount(key, strconv.FormatInt(start, 10), strconv.FormatInt(stop, 10)).Result()
strconv.FormatInt(stop, 10)).Result(); err != nil { if err != nil {
return err return err
} else { }
val = int(v) val = int(v)
return nil return nil
}
}, acceptable) }, acceptable)
return return
@ -1149,12 +1177,13 @@ func (s *Redis) Zincrby(key string, increment int64, field string) (val int64, e
return err return err
} }
if v, err := conn.ZIncrBy(key, float64(increment), field).Result(); err != nil { v, err := conn.ZIncrBy(key, float64(increment), field).Result()
if err != nil {
return err return err
} else { }
val = int64(v) val = int64(v)
return nil return nil
}
}, acceptable) }, acceptable)
return return
@ -1167,12 +1196,13 @@ func (s *Redis) Zscore(key string, value string) (val int64, err error) {
return err return err
} }
if v, err := conn.ZScore(key, value).Result(); err != nil { v, err := conn.ZScore(key, value).Result()
if err != nil {
return err return err
} else { }
val = int64(v) val = int64(v)
return nil return nil
}
}, acceptable) }, acceptable)
return return
@ -1199,12 +1229,13 @@ func (s *Redis) Zrem(key string, values ...interface{}) (val int, err error) {
return err return err
} }
if v, err := conn.ZRem(key, values...).Result(); err != nil { v, err := conn.ZRem(key, values...).Result()
if err != nil {
return err return err
} else { }
val = int(v) val = int(v)
return nil return nil
}
}, acceptable) }, acceptable)
return return
@ -1217,13 +1248,14 @@ func (s *Redis) Zremrangebyscore(key string, start, stop int64) (val int, err er
return err return err
} }
if v, err := conn.ZRemRangeByScore(key, strconv.FormatInt(start, 10), v, err := conn.ZRemRangeByScore(key, strconv.FormatInt(start, 10),
strconv.FormatInt(stop, 10)).Result(); err != nil { strconv.FormatInt(stop, 10)).Result()
if err != nil {
return err return err
} else { }
val = int(v) val = int(v)
return nil return nil
}
}, acceptable) }, acceptable)
return return
@ -1236,12 +1268,13 @@ func (s *Redis) Zremrangebyrank(key string, start, stop int64) (val int, err err
return err return err
} }
if v, err := conn.ZRemRangeByRank(key, start, stop).Result(); err != nil { v, err := conn.ZRemRangeByRank(key, start, stop).Result()
if err != nil {
return err return err
} else { }
val = int(v) val = int(v)
return nil return nil
}
}, acceptable) }, acceptable)
return return
@ -1268,12 +1301,13 @@ func (s *Redis) ZrangeWithScores(key string, start, stop int64) (val []Pair, err
return err return err
} }
if v, err := conn.ZRangeWithScores(key, start, stop).Result(); err != nil { v, err := conn.ZRangeWithScores(key, start, stop).Result()
if err != nil {
return err return err
} else { }
val = toPairs(v) val = toPairs(v)
return nil return nil
}
}, acceptable) }, acceptable)
return return
@ -1286,12 +1320,13 @@ func (s *Redis) ZRevRangeWithScores(key string, start, stop int64) (val []Pair,
return err return err
} }
if v, err := conn.ZRevRangeWithScores(key, start, stop).Result(); err != nil { v, err := conn.ZRevRangeWithScores(key, start, stop).Result()
if err != nil {
return err return err
} else { }
val = toPairs(v) val = toPairs(v)
return nil return nil
}
}, acceptable) }, acceptable)
return return

4
rest/internal/security/contentsecurity.go
Unescape Escape View File

@ -118,9 +118,9 @@ func VerifySignature(r *http.Request, securityHeader *ContentSecurityHeader, tol
if passed { if passed {
return httpx.CodeSignaturePass return httpx.CodeSignaturePass
} else {
return httpx.CodeSignatureInvalidToken
} }
return httpx.CodeSignatureInvalidToken
} }
func computeBodySignature(r *http.Request) string { func computeBodySignature(r *http.Request) string {

9
tools/goctl/model/sql/template/find.go
Unescape Escape View File

@ -1,6 +1,6 @@
package template package template
// 通过id查询 // FindOne defines find row by id.
var FindOne = ` var FindOne = `
func (m *default{{.upperStartCamelObject}}Model) FindOne({{.lowerStartCamelPrimaryKey}} {{.dataType}}) (*{{.upperStartCamelObject}}, error) { func (m *default{{.upperStartCamelObject}}Model) FindOne({{.lowerStartCamelPrimaryKey}} {{.dataType}}) (*{{.upperStartCamelObject}}, error) {
{{if .withCache}}{{.cacheKey}} {{if .withCache}}{{.cacheKey}}
@ -30,7 +30,7 @@ func (m *default{{.upperStartCamelObject}}Model) FindOne({{.lowerStartCamelPrima
} }
` `
// 通过指定字段查询 // FindOneByField defines find row by field.
var FindOneByField = ` var FindOneByField = `
func (m *default{{.upperStartCamelObject}}Model) FindOneBy{{.upperField}}({{.in}}) (*{{.upperStartCamelObject}}, error) { func (m *default{{.upperStartCamelObject}}Model) FindOneBy{{.upperField}}({{.in}}) (*{{.upperStartCamelObject}}, error) {
{{if .withCache}}{{.cacheKey}} {{if .withCache}}{{.cacheKey}}
@ -63,6 +63,8 @@ func (m *default{{.upperStartCamelObject}}Model) FindOneBy{{.upperField}}({{.in}
} }
}{{end}} }{{end}}
` `
// FindOneByFieldExtraMethod defines find row by field with extras.
var FindOneByFieldExtraMethod = ` var FindOneByFieldExtraMethod = `
func (m *default{{.upperStartCamelObject}}Model) formatPrimary(primary interface{}) string { func (m *default{{.upperStartCamelObject}}Model) formatPrimary(primary interface{}) string {
return fmt.Sprintf("%s%v", {{.primaryKeyLeft}}, primary) return fmt.Sprintf("%s%v", {{.primaryKeyLeft}}, primary)
@ -74,5 +76,8 @@ func (m *default{{.upperStartCamelObject}}Model) queryPrimary(conn sqlx.SqlConn,
} }
` `
// FindOneMethod defines find row method.
var FindOneMethod = `FindOne({{.lowerStartCamelPrimaryKey}} {{.dataType}}) (*{{.upperStartCamelObject}}, error)` var FindOneMethod = `FindOne({{.lowerStartCamelPrimaryKey}} {{.dataType}}) (*{{.upperStartCamelObject}}, error)`
// FindOneByFieldMethod defines find row by field method.
var FindOneByFieldMethod = `FindOneBy{{.upperField}}({{.in}}) (*{{.upperStartCamelObject}}, error) ` var FindOneByFieldMethod = `FindOneBy{{.upperField}}({{.in}}) (*{{.upperStartCamelObject}}, error) `

4
zrpc/internal/auth/auth.go
Unescape Escape View File

@ -60,9 +60,9 @@ func (a *Authenticator) validate(app, token string) error {
if err != nil { if err != nil {
if a.strict { if a.strict {
return status.Error(codes.Internal, err.Error()) return status.Error(codes.Internal, err.Error())
} else {
return nil
} }
return nil
} }
if token != expect { if token != expect {

Write Preview
Loading…
Cancel
Save