Merge branch 'cygx_4.1' of hongze/hongze_cygx into master

models/article.go

@@ -152,21 +152,21 @@ func GetArticleDetailById(articleId int) (item *ArticleDetail, err error) {
 
 func GetSellerList(articleId int) (items []*SellerRep, err error) {
 	o := orm.NewOrm()
-	o.Using("tactics")
-	sql := `SELECT
-		ac.phone_number as  seller_mobile,
-		ac.name as  seller_name
-		FROM
-		article_author AS au
-		INNER JOIN account_client as ac ON au.author_id = ac.phone_number
-		WHERE article_id = ?`
-
+	//o.Using("tactics")
 	//sql := `SELECT
-	//	au.mobile as  seller_mobile,
-	//	au.name as  seller_name
+	//	ac.phone_number as  seller_mobile,
+	//	ac.name as  seller_name
 	//	FROM
-	//	cygx_article_author AS au
+	//	article_author AS au
+	//	INNER JOIN account_client as ac ON au.author_id = ac.phone_number
 	//	WHERE article_id = ?`
+
+	sql := `SELECT
+		au.mobile as  seller_mobile,
+		au.name as  seller_name
+		FROM
+		cygx_article_author AS au
+		WHERE article_id = ?`
 	_, err = o.Raw(sql, articleId).QueryRows(&items)
 	return
 }

services/task.go

@@ -16,12 +16,12 @@ func Task() {
 	fmt.Println("start")
 	//同步数据
 	if utils.RunMode == "release" {
-		syncTacticsListAddreport := task.NewTask("syncTacticsListAddreport", "0 */5 * * * *", SyncTacticsListAddreport) //同步文章
-		task.AddTask("syncTacticsListAddreport", syncTacticsListAddreport)
+		//syncTacticsListAddreport := task.NewTask("syncTacticsListAddreport", "0 */5 * * * *", SyncTacticsListAddreport) //同步文章
+		//task.AddTask("syncTacticsListAddreport", syncTacticsListAddreport)
 
 		getSummarytoEs := task.NewTask("getSummarytoEs", "0 */30 * * * *", GetSummarytoEs) //同步纪要库内容到Es
 		task.AddTask("getSummarytoEs", getSummarytoEs)
-	} else {
+		//} else {
 		getArticleListByApi := task.NewTask("getArticleListByApi", "0 */5 * * * *", GetArticleListByApi) //通过三方接口获取策略平台上的文章
 		task.AddTask("getArticleListByApi", getArticleListByApi)
 	}