Rain-Bus/nCovTrack-Backend
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: statistic upstream url change & save article to private

Browse Source
This commit is contained in:
Zhaolong
2022-04-27 23:12:20 +08:00
parent b92598ecc4
commit 09b8e8e262
6 changed files with 13 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
service/article/article.go
View File

@@ -7,32 +7,31 @@ import (
)
//ListPublishedArticles list the articles published, use to show the articles to all people
func ListPublishedArticles() *[]models.ListArtile {
func ListPublishedArticles() *[]models.ListArticle {
return listArticles(1, 0)
}
func ListPublishedArticlesByUser(id int) *[]models.ListArtile {
func ListPublishedArticlesByUser(id int) *[]models.ListArticle {
return listArticles(1, id)
}
//ListAllArticles list all articles(without not published)
// TODO: need only show the user's not published article
func ListNotPublishedArticlesByUser(id int) *[]models.ListArtile {
//ListNotPublishedArticlesByUser list all articles(without not published)
func ListNotPublishedArticlesByUser(id int) *[]models.ListArticle {
return listArticles(0, id)
}
func listArticles(isPublish int, createUser int) *[]models.ListArtile {
func listArticles(isPublish int, createUser int) *[]models.ListArticle {
queryStr := "back_article.is_delete = 0 AND is_publish = " + strconv.Itoa(isPublish)
if createUser != 0 {
queryStr += " AND create_user = " + strconv.Itoa(createUser)
}
var res []models.ListArtile
var res []models.ListArticle
global.Db.Table("back_article").
Select("back_user.username, back_article.*").
Joins("join back_user on back_article.create_user=back_user.id").
Where(queryStr).Find(&res)
if res == nil {
res = []models.ListArtile{}
res = []models.ListArticle{}
}
return &res
}

8
service/statistics/cache.go
View File

@@ -45,13 +45,9 @@ type AreaSlice []models.AreaInfo
func cacheNCovStatistics() {
resp := utils.GetWhioutHeader(global.CHINA_NCOV_STATISTIC_URL)
var nCovRes map[string]string
var nCovRes map[string]interface{}
json.Unmarshal([]byte(resp), &nCovRes)
var nCovResData map[string]interface{}
err := json.Unmarshal([]byte(nCovRes["data"]), &nCovResData)
if err != nil {
panic(err)
}
nCovResData := (nCovRes["data"].(map[string]interface{}))["diseaseh5Shelf"].(map[string]interface{})
if !needToRecache(nCovResData) {
return
}