fix bug
This commit is contained in:
parent
3c2896e06d
commit
2131e6862f
@ -232,11 +232,11 @@ func (p *PasswordHash) CheckPassword(pass, hash string) bool {
|
||||
func (p *PasswordHash) genSaltPrivate(input string) string {
|
||||
s := strings.Builder{}
|
||||
s.WriteString("$P$")
|
||||
min := 30
|
||||
mins := 30
|
||||
if p.iterationCountLog2+5 < 30 {
|
||||
min = p.iterationCountLog2 + 5
|
||||
mins = p.iterationCountLog2 + 5
|
||||
}
|
||||
s.WriteString(string(p.itoa64[min]))
|
||||
s.WriteString(string(p.itoa64[mins]))
|
||||
s.WriteString(p.Encode64(input, 6))
|
||||
return s.String()
|
||||
}
|
||||
|
@ -124,12 +124,8 @@ func categoryArgs(_ ...any) map[string]string {
|
||||
|
||||
func Category(h *wp.Handle, id string, blockParser ParserBlock) (func() string, error) {
|
||||
counter := number.Counters[int]()
|
||||
var err error
|
||||
conf := GetCategoryConf(blockParser)
|
||||
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if conf == nil {
|
||||
return nil, errors.New("解析block-category配置错误")
|
||||
}
|
||||
|
@ -192,7 +192,7 @@ func (i *IndexParams) ParseAuthors() (err error) {
|
||||
username := i.Ctx.Param("author")
|
||||
if username != "" {
|
||||
allUsername, er := cache.GetAllUsername(i.Ctx)
|
||||
if err != nil {
|
||||
if er != nil {
|
||||
err = er
|
||||
return
|
||||
}
|
||||
|
@ -137,7 +137,7 @@ func SetStrAnyVal[T any](m map[string]any, k string, v T, delimiter ...string) {
|
||||
m[kk[0]] = map[string]any{}
|
||||
mx = m[kk[0]].(map[string]any)
|
||||
}
|
||||
for i, _ := range kk[0 : len(kk)-2] {
|
||||
for i := range kk[0 : len(kk)-2] {
|
||||
key := kk[i+1]
|
||||
mm, ok := mx[key]
|
||||
if !ok {
|
||||
@ -159,7 +159,7 @@ func SetAnyAnyVal[T any](m map[any]any, v T, k ...any) {
|
||||
m[k[0]] = v
|
||||
return
|
||||
}
|
||||
for i, _ := range k[0 : len(k)-1] {
|
||||
for i := range k[0 : len(k)-1] {
|
||||
key := k[0 : i+1]
|
||||
mm, ok := GetAnyAnyMapVal[map[any]any](m, key...)
|
||||
if !ok {
|
||||
|
@ -29,7 +29,7 @@ func finds[T Model](db dbQuery, ctx context.Context, q *QueryCondition) (r []T,
|
||||
setTable[T](q)
|
||||
if len(q.RelationFn) < 1 {
|
||||
sq, args, er := BuildQuerySql(q)
|
||||
if err != nil {
|
||||
if er != nil {
|
||||
err = er
|
||||
return
|
||||
}
|
||||
@ -113,7 +113,7 @@ func chunk[T Model, R any](db dbQuery, ctx context.Context, perLimit int, fn fun
|
||||
rr, err = finds[T](db, ctx, q)
|
||||
}
|
||||
offset += perLimit
|
||||
if (err != nil && err != sql.ErrNoRows) || len(rr) < 1 {
|
||||
if (err != nil && !errors.Is(err, sql.ErrNoRows)) || len(rr) < 1 {
|
||||
return
|
||||
}
|
||||
for _, t := range rr {
|
||||
|
Loading…
Reference in New Issue
Block a user