xiugai

customerdata/src/historytask.go

@@ -40,7 +40,7 @@ func HistoryTask(name string) {
 		if projectAppidMap[appId] {
 			start := time.Now().Unix()
 			log.Println("加载projectId---开始")
-			InitProjectId()
+			InitProjectId(appId)
 			end := time.Now().Unix()
 			log.Println("加载projectId---结束,耗时", end-start, "秒")
 		}

customerdata/src/task.go

@@ -71,7 +71,7 @@ func GetCustomerData() {
 		if projectAppidMap[appId] {
 			start := time.Now().Unix()
 			log.Println("加载projectId---开始")
-			InitProjectId()
+			InitProjectId(appId)
 			end := time.Now().Unix()
 			log.Println("加载projectId---结束,耗时", end-start, "秒")
 		} else {

customerdata/src/util.go

@@ -801,7 +801,7 @@ func GetProjectId(id string) string {
 	return projectId
 }
 
-func InitProjectId() {
+func InitProjectId(appid string) {
 	session := MgoSave.GetMgoConn()
 	count := 0
 	defer func() {
@@ -809,7 +809,7 @@ func InitProjectId() {
 		log.Printf("本次共取到%d个projectId\n", count)
 	}()
 	save := Sysconfig["save"].(map[string]interface{})
-	query := map[string]interface{}{"appid": Sysconfig["project_appid"]}
+	query := map[string]interface{}{"appid": appid}
 	field := map[string]interface{}{"projectId": 1}
 	iter := session.DB(qu.ObjToString(save["db"])).C(SaveColl).Find(query).Select(field).Sort("_id").Iter()
 	thisData := map[string]interface{}{}

src/history/historytask.go

@@ -6,6 +6,7 @@ import (
 	mongoutil "qfw/mongodb"
 	qu "qfw/util"
 	"strings"
+	"sync"
 	"time"
 	. "util"
 
@@ -53,9 +54,11 @@ func (this *HistoryData) HistoryTask(history_id string) {
 		if ProjectAppidMap[appId] {
 			start := time.Now().Unix()
 			log.Println("加载projectId---开始")
-			InitProjectId()
+			InitProjectId(appId)
 			end := time.Now().Unix()
 			log.Println("加载projectId---结束,耗时", end-start, "秒")
+		} else {
+			projectIdMap = sync.Map{}
 		}
 		//
 		tag_rule, ok := c["tag_rules"].([]interface{})

src/history/util_history.go

@@ -893,7 +893,7 @@ func GetProjectId(id string) string {
 	return projectId
 }
 
-func InitProjectId() {
+func InitProjectId(appid string) {
 	session := MgoSave.GetMgoConn()
 	count := 0
 	defer func() {
@@ -901,7 +901,7 @@ func InitProjectId() {
 		log.Printf("本次共取到%d个projectId\n", count)
 	}()
 	save := Sysconfig["save"].(map[string]interface{})
-	query := map[string]interface{}{"appid": Sysconfig["project_appid"]}
+	query := map[string]interface{}{"appid": appid}
 	field := map[string]interface{}{"projectId": 1}
 	iter := session.DB(qu.ObjToString(save["db"])).C(SaveColl).Find(query).Select(field).Sort("_id").Iter()
 	thisData := map[string]interface{}{}