merge 12.0

controllers/yanxuan_special.go

@@ -108,7 +108,7 @@ func (this *YanxuanSpecialController) Detail() {
 		return
 	}
 
-	if item.Status != 3 {
+	if item.Status != 3 && item.Status != 2 {
 		br.Msg = "获取失败，专栏未发布"
 		br.ErrMsg = "获取失败, Err:" + tmpErr.Error()
 		return

models/cygx_yanxuan_special_company.go

@@ -33,3 +33,11 @@ func GetYanxuanSpecialCompany(keyword string) (IndustryNames []string, err error
 	_, err = o.Raw(sql).QueryRows(&IndustryNames)
 	return
 }
+
+func DelYanxuanSpecialCompany() (err error) {
+	o := orm.NewOrm()
+	sql := ``
+	sql = `DELETE FROM cygx_yanxuan_special_company `
+	_, err = o.Raw(sql).Exec()
+	return
+}

services/cygx_yanxuan_special_company.go

@@ -1,14 +1,27 @@
 package services
 
 import (
+	"context"
 	"encoding/json"
 	"fmt"
 	"hongze/hongze_cygx/models"
+	"hongze/hongze_cygx/utils"
 	"io/ioutil"
 	"net/http"
 )
 
-func GetStocksFromVmp()  {
+func GetStocksFromVmp(cont context.Context) (err error) {
+	defer func() {
+		if err != nil {
+			fmt.Println("err：", err)
+			go utils.SendAlarmMsg("更新上市公司表失败"+err.Error(), 2)
+		}
+	}()
+	err = models.DelYanxuanSpecialCompany()
+	if err != nil {
+		fmt.Println("获取上市公司信息失败 Err:%s", err.Error())
+		return
+	}
 	getUrl := "https://vmp.hzinsights.com/v2api/articles/stock"
 	result, err := http.Get(getUrl)
 	if err != nil {

services/task.go

@@ -119,6 +119,9 @@ func Task() {
 
 		cygxActivityRestrictSignupByTask := task.NewTask("cygxActivityRestrictSignupByTask", "0 */10 6-23 * * *", CygxActivityRestrictSignupByTask)
 		task.AddTask("cygxActivityRestrictSignupByTask", cygxActivityRestrictSignupByTask) //定时任务处理为到会人员的爽约
+
+		getStocksFromVmp := task.NewTask("getStocksFromVmp", "0 40 3 * * *", GetStocksFromVmp)
+		task.AddTask("getStocksFromVmp", getStocksFromVmp) //定时任务更新上市公司表
 	}
 	if utils.RunMode != "release" {
 		getArticleListByApi := task.NewTask("getArticleListByApi", "0 */60 * * * *", GetArticleListByApi) //通过三方接口获取策略平台上的文章