diff --git a/kernel/model/liandi.go b/kernel/model/liandi.go index 97740388a..cd8c098cd 100644 --- a/kernel/model/liandi.go +++ b/kernel/model/liandi.go @@ -302,7 +302,9 @@ func refreshAnnouncement() { } if !exist { existingAnnouncements = append(existingAnnouncements, announcement) - newAnnouncements = append(newAnnouncements, announcement) + if Conf.CloudRegion == announcement.Region { + newAnnouncements = append(newAnnouncements, announcement) + } } } diff --git a/kernel/model/updater.go b/kernel/model/updater.go index a61ea1b61..b370a589a 100644 --- a/kernel/model/updater.go +++ b/kernel/model/updater.go @@ -211,9 +211,10 @@ func sha256Hash(filename string) (ret string, err error) { } type Announcement struct { - Id string `json:"id"` - Title string `json:"title"` - URL string `json:"url"` + Id string `json:"id"` + Title string `json:"title"` + URL string `json:"url"` + Region int `json:"region"` } func GetAnnouncements() (ret []*Announcement) { @@ -231,9 +232,10 @@ func GetAnnouncements() (ret []*Announcement) { for _, announcement := range announcements { ann := announcement.(map[string]interface{}) ret = append(ret, &Announcement{ - Id: ann["id"].(string), - Title: ann["title"].(string), - URL: ann["url"].(string), + Id: ann["id"].(string), + Title: ann["title"].(string), + URL: ann["url"].(string), + Region: int(ann["region"].(float64)), }) } return