Browse Source

fix: no error if no data in database

master
OhYee 2 years ago
parent
commit
4aa9915c24
Signed by: OhYee
GPG Key ID: 5A9E1F63ED274FBB
  1. 39
      api/layout.go
  2. 21
      api/pkg/variable/type.go

39
api/layout.go

@ -5,6 +5,7 @@ import ( @@ -5,6 +5,7 @@ import (
"github.com/OhYee/blotter/api/pkg/menu"
"github.com/OhYee/blotter/api/pkg/post"
"github.com/OhYee/blotter/api/pkg/variable"
"github.com/OhYee/rainbow/log"
"github.com/OhYee/blotter/mongo"
"github.com/OhYee/blotter/register"
@ -14,7 +15,7 @@ import ( @@ -14,7 +15,7 @@ import (
// LayoutResponse response of layout api
type LayoutResponse struct {
Menus []menu.Type `json:"menus"`
View int `json:"view"`
View int64 `json:"view"`
Beian string `json:"beian"`
BlogName string `json:"blog_name"`
Friends []friends.Simple `json:"friends"`
@ -59,55 +60,57 @@ func Layout(context register.HandleContext) (err error) { @@ -59,55 +60,57 @@ func Layout(context register.HandleContext) (err error) {
if err != nil {
return
}
res.View = int(m["view"].(float64))
if err = m.SetInt64("view", &res.View); err != nil {
log.Error.Println(err)
}
if err = m.SetString("beian", &res.Beian); err != nil {
return
log.Error.Println(err)
}
if err = m.SetString("blog_name", &res.BlogName); err != nil {
return
log.Error.Println(err)
}
if err = m.SetString("email", &res.Email); err != nil {
return
log.Error.Println(err)
}
if err = m.SetString("github", &res.Github); err != nil {
return
log.Error.Println(err)
}
if err = m.SetString("qq", &res.QQ); err != nil {
return
log.Error.Println(err)
}
if res.Friends, err = friends.GetSimpleFriends(); err != nil {
return
log.Error.Println(err)
}
if err = m.SetBool("grey", &res.Grey, false); err != nil {
return
log.Error.Println(err)
}
if err = m.SetString("root", &res.Root); err != nil {
return
log.Error.Println(err)
}
if err = m.SetString("avatar", &res.Avatar); err != nil {
return
log.Error.Println(err)
}
if err = m.SetString("author", &res.Author); err != nil {
return
log.Error.Println(err)
}
if err = m.SetString("from", &res.From); err != nil {
return
log.Error.Println(err)
}
if err = m.SetString("head", &res.Head); err != nil {
return
log.Error.Println(err)
}
if err = m.SetString("ad_show", &res.ADShow); err != nil {
return
log.Error.Println(err)
}
if err = m.SetString("ad_inner", &res.ADInner); err != nil {
return
log.Error.Println(err)
}
if err = m.SetString("ad_text", &res.ADText); err != nil {
return
log.Error.Println(err)
}
context.ReturnJSON(res)
err = context.ReturnJSON(res)
return
}

21
api/pkg/variable/type.go

@ -53,11 +53,28 @@ func (v Variables) SetInt64(key string, value *int64) (err error) { @@ -53,11 +53,28 @@ func (v Variables) SetInt64(key string, value *int64) (err error) {
err = errors.New("Can not get value of %s", key)
return
}
if *value, ok = t.(int64); !ok {
switch t.(type) {
case int:
*value = int64(t.(int))
case int8:
*value = int64(t.(int8))
case int16:
*value = int64(t.(int16))
case int32:
*value = int64(t.(int32))
case int64:
*value = int64(t.(int64))
case float32:
*value = int64(t.(float32))
case float64:
*value = int64(t.(float64))
default:
err = errors.New("Value of %s is %s %T, not %t", key, t, *value)
return
}
return err
return
}
// SetArray set value of key to int64

Loading…
Cancel
Save