Merge branch 'release' into dev4.7.8

src/jfw/front/supsearch.go

@@ -13,6 +13,7 @@ import (
 	"qfw/util/redis"
 	"strconv"
 	"strings"
+	"sync"
 	"time"
 
 	"github.com/SKatiyar/qr"
@@ -35,6 +36,7 @@ var industrylist map[string][]string
 var sortArray []string
 var PCS_index map[string]interface{}
 var PCS_time int
+var PCSLock = &sync.Mutex{}
 
 //
 func init() {
@@ -46,7 +48,9 @@ func init() {
 		time.Sleep(time.Second * 5)
 		PCS_task()
 	}()
+	PCSLock.Lock()
 	PCS_index = map[string]interface{}{}
+	PCSLock.Unlock()
 }
 
 //定时清理搜索列表页 从redis获取存入内存中的数据
@@ -60,7 +64,9 @@ func PCS_task() {
 		select {
 		case <-timer.C:
 			{
+				PCSLock.Lock()
 				PCS_index = map[string]interface{}{}
+				PCSLock.Unlock()
 				timer.Reset(time.Hour * time.Duration(PCS_time))
 			}
 		}
@@ -75,6 +81,8 @@ func PCS_list(page_type string) interface{} {
 	if page_type == "" {
 		_page_type = "page_index"
 	}
+	PCSLock.Lock()
+	defer PCSLock.Unlock()
 	if PCS_index[_page_type] == nil {
 		PCS_index[_page_type] = Newbids(page_type)[0]
 	}