Merge branch 'dev2.10.3' of http://192.168.3.207:10080/qmx/jy into dev2.10.3

src/config.json

@@ -320,5 +320,5 @@
     "appPushServiceRpc": "127.0.0.1:5566",
     "openPlatformUrl": "https://open-jytest.jianyu360.cn/",
     "sessionEnctryFlushCorn": "0 0 0 1 * ?",
-    "PCS_time":30
+    "PCS_time":24
 }

src/jfw/front/search.go

@@ -18,6 +18,8 @@ type Search struct {
 	mainSearch    xweb.Mapper `xweb:"/jylab/mainSearch"` //剑鱼标讯搜索主页面
 	searchKeyword xweb.Mapper `xweb:"/jylab/searchKeyword/(.*)"`
 	getHK         xweb.Mapper `xweb:"/jylab/mainSearch/getHK"` //获取历史记录，订阅关键词
+	/********************剑鱼标讯搜索dev2.10.2**************************/
+	wxInfo xweb.Mapper `xweb:"/jylab/wxjssdk/info"` //剑鱼标讯微信端jssdk接口信息
 
 }
 
@@ -25,6 +27,36 @@ func init() {
 	xweb.AddAction(&Search{})
 }
 
+//剑鱼标讯微信端jssdk接口信息
+func (s *Search) WxInfo() error {
+	defer util.Catch()
+	var url = s.GetString("url")
+	var openid = ""
+	if s.Session().Get("s_m_openid") != nil {
+		openid = s.Session().Get("s_m_openid").(string)
+	}
+	var nickname = ""
+	if s.Session().Get("s_nickname") != nil {
+		nickname = s.Session().Get("s_nickname").(string)
+	}
+	var avatar = ""
+	if s.Session().Get("s_avatar") != nil {
+		avatar = s.Session().Get("s_avatar").(string)
+	}
+	var res = map[string]interface{}{
+		"signature": wx.SignJSSDK(url),
+		"openid":    openid,
+		"nickname":  nickname,
+		"avatar":    avatar,
+		"url":       s.Site() + s.Url(),
+	}
+	s.ServeJson(map[string]interface{}{
+		"res": res,
+	})
+	return nil
+}
+
+//
 func (s *Search) MainSearch() error {
 	userid := s.GetSession("userId")
 

src/jfw/front/supsearch.go

@@ -52,6 +52,7 @@ func init() {
 		time.Sleep(time.Second * 5)
 		PCS_task()
 	}()
+	PCS_index = map[string]interface{}{}
 }
 
 //定时清理搜索列表页 从redis获取存入内存中的数据
@@ -80,6 +81,7 @@ func PCS_list(page_type string) interface{} {
 	if page_type == "" {
 		_page_type = "page_index"
 	}
+	log.Println(_page_type, "------", PCS_index[_page_type])
 	if PCS_index[_page_type] == nil {
 		PCS_index[_page_type] = Newbids(page_type)[0]
 	}
@@ -433,6 +435,7 @@ func getindustrys() (industry map[string][]string, sortArray []string) {
 //
 func Newbids(p string) []interface{} {
 	pages, _ := redis.Get("other", "index_list"+p).([]interface{})
+	log.Println("----------------:", len(pages))
 	if len(pages) == 0 {
 		var list *[]map[string]interface{}
 		subtype := ""

src/jfw/modules/app/src/web/templates/vipsubscribe/vip_seniorset.html

@@ -268,7 +268,7 @@
 					<li onclick="docheck('1',this)" dataid="1">
 						实时推送
 						<img src="{{Msg "seo" "cdn"}}/jyapp/images/wxkeyset/checked.png?v={{Msg "seo" "version"}}" class="checked-img">
-						<span>上午8点至晚上10点</span>
+						<span>上午8点至晚上10点不定时推送</span>
 					</li>
           <li onclick="docheck('2',this)" dataid="2">
 						每天推送

src/jfw/modules/pushsubscribe/src/match/config.json

@@ -6,7 +6,7 @@
 	"vipMaxPushSize":2000,
 	"mgoAddr":"192.168.3.128:27080",
 	"mgoSize":10,
-	"testIds":["5d9fe93a27573439d033b294"],
+	"testIds":["5ed463f327573456002068d3"],
 	"filterReg":"^(项目|中标|公告)$",
 	"retainReg":"[\\p{Han}a-zA-Z0-9]",
 	"matchPoolSize":60,
@@ -32,7 +32,7 @@
 		"安监":"应急管理",
 		"地震":"应急管理",
 		"文化":"文旅",
-		"旅游":"旅游",
+		"旅游":"文旅",
 		"银监":"银保监",
 		"保监":"银保监"
 	}

src/jfw/modules/pushsubscribe/src/push/job/nothingjob.go

@@ -35,6 +35,9 @@ func (n *NothingJob) PushNothing(ratetype int) {
 	all := mongodb.Find("user", query, nil, `{"_id":1,"s_nickname":1,"o_vipjy":1,"a_jpushid":1,"s_jpushid":1,"s_opushid":1,"s_m_openid":1,"s_appponetype":1,"i_applystatus":1}`, false, 0, 0)
 	t, _ := time.ParseInLocation("2006-01-02", time.Now().Format("2006-01-02"), time.Local)
 	for _, v := range *all {
+		if v["o_vipjy"] == nil {
+			continue
+		}
 		ratemode := util.IntAll(v["o_vipjy"].(map[string]interface{})["i_ratemode"])
 		userid := util.BsonIdToSId(v["_id"])
 		day1, day2 := n.ComputTime(ratemode, t)

src/jfw/modules/pushsubscribe/src/push/job/pushjob.go

@@ -13,7 +13,6 @@ import (
 	"qfw/util/mail"
 	"qfw/util/mongodb"
 	"strconv"
-	"strings"
 	"sync"
 	"time"
 
@@ -276,7 +275,7 @@ func (p *PushJob) doPush(pusher Pusher, taskType int, pushWay *putil.PushWay, u
 		if IsVipUser(u.VipStatus) {
 			according = Config.Vip_mail_according
 		} else {
-			according = fmt.Sprintf(Config.Mail_according, strings.Replace(strings.Join(u.Keys, ";"), "+", " ", -1))
+			according = Config.Mail_according
 		}
 		html := fmt.Sprintf(Config.Mail_html, according, pushParam.MailContent)
 		isPushOk := p.sendMail(u.Email, Config.Mail_title, html, nil)

src/web/staticres/wxswordfish/initShare.js

@@ -0,0 +1,17 @@
+var PageShareInit = function(isentry,activecode,id){
+	$.ajax({
+		type: "POST",
+		url: "/jylab/wxjssdk/info",
+		data: {"url":location.href.split('#')[0]},
+		dataType: "json",
+		traditional: true,
+		success: function(r){
+			console.log(r.res)
+			if (r.res){
+				var res = r.res;
+				//获取微信jssdk信息 初始化分享
+				initShare(res["signature"],res["openid"],isentry,activecode,res["nickname"],res["avatar"],id);
+			}
+		}
+	})
+}

src/web/templates/weixin/search/mainSearch.html

@@ -20,7 +20,8 @@
 <script src="{{Msg "seo" "cdn"}}/mobiscroll/mobiscroll.min.js"></script>
 {{include "/common/weixin.html"}}
 <script type="text/javascript" src="https://api.map.baidu.com/api?v=2.0&ak=DD279b2a90afdf0ae7a3796787a0742e"></script>
-<script src="{{Msg "seo" "cdn"}}/wxswordfish/share.js?v={{Msg "seo" "version"}}9"></script>
+<script src="{{Msg "seo" "cdn"}}/wxswordfish/initShare.js?v={{Msg "seo" "version"}}"></script>
+<script src="{{Msg "seo" "cdn"}}/wxswordfish/share.js?v={{Msg "seo" "version"}}2"></script>
 <script src="{{Msg "seo" "cdn"}}/js/dropload.js?v={{Msg "seo" "version"}}"></script>
 <script type="text/javascript" src="{{Msg "seo" "cdn"}}/js/wxEntsesearch.js?v={{Msg "seo" "version"}}"></script>
 <script type="text/javascript" src="{{Msg "seo" "cdn"}}/js/wxSupersearch.js?v={{Msg "seo" "version"}}"></script>
@@ -41,7 +42,8 @@
 	var pageSize = {{.T.pageSize}};
 	var encode = {{ConEncode "/jylab/mainSearch/"}};
 	var searchWord = {{.T.searchWord}};
-	initShare({{.T.signature}},{{.T.openid}},2,"jy_extend",{{.T.nickname}},{{.T.avatar}},"",{{.T.i_applystatus}});
+	//initShare({{.T.signature}},{{.T.openid}},2,"jy_extend",{{.T.nickname}},{{.T.avatar}},"",{{.T.i_applystatus}});
+  PageShareInit(2,"jy_extend","")
 	SuperSearch.ZBADDRESS = {{Msg "seo" "ZBADDRESS"}};
 	SuperSearch.industry = {{.T.industry}};
 	SuperSearch.sortArray = {{.T.sortArray}};