Merge branch 'feature/v4.8.72' into dev/v4.8.72_zsy

src/jfw/front/front.go

@@ -1144,7 +1144,7 @@ func (f *Front) TSGuide() error {
 				}
 				nsqPath, _ := config.Sysconfig["nsq"].(string)
 				nsq_topic, _ := config.Sysconfig["nsq_topic"].(string)
-				jy.Publish(public.Mgo_Log, nsqPath, nsq_topic, "task", userid, jy.Jywx_node1, map[string]interface{}{
+				jy.Publish(public.Mgo_Log, nsqPath, nsq_topic, "task", util.ObjToString(f.GetSession("mgoUserId")), jy.Jywx_node1, map[string]interface{}{
 					"code":       1015, //首次订阅
 					"types":      "subscribeKeyWords",
 					"num":        50,

src/jfw/front/login.go

@@ -202,7 +202,6 @@ func (l *Login) Login() error {
 						if ok {
 							result["userInfo"] = userInfo
 							go anonymousLogin(l.Session(), l.Cookie("JYTrustedId"))
-							fmt.Println("##############")
 							jy.Publish(public.Mgo_Log, nsqPath, nsq_topic, "task", _id, jy.Jyweb_node2, map[string]interface{}{
 								"code":       1007, //绑定手机号任务
 								"types":      "bindPhone",

src/jfw/modules/app/src/app/front/login.go

@@ -570,7 +570,7 @@ func (l *Login) Register() error {
 					l.DelSession("registerStep")
 					jy.ClearPhoneIdentSession(l.Session())
 
-					jy.Publish(public.Mgo_Log, nsqPath, nsq_topic, "task", qutil.ObjToString(l.GetSession("userId")), jy.Jyapp_node1, map[string]interface{}{
+					jy.Publish(public.Mgo_Log, nsqPath, nsq_topic, "task", qutil.ObjToString(l.GetSession("mgoUserId")), jy.Jyapp_node1, map[string]interface{}{
 						"code":       1014, //下载app任务
 						"types":      "downloadApp",
 						"num":        50,
@@ -581,7 +581,7 @@ func (l *Login) Register() error {
 				if errStr == "y" {
 					returnSign = afterLogin(data, l.Session(), rid, oid, phoneType, channel, deviceId, true, l.ResponseWriter)
 
-					jy.Publish(public.Mgo_Log, nsqPath, nsq_topic, "task", qutil.ObjToString(l.GetSession("userId")), jy.Jyapp_node1, map[string]interface{}{
+					jy.Publish(public.Mgo_Log, nsqPath, nsq_topic, "task", qutil.ObjToString(l.GetSession("mgoUserId")), jy.Jyapp_node1, map[string]interface{}{
 						"code":       1014, //下载app任务
 						"types":      "downloadApp",
 						"num":        50,

src/jfw/modules/bigmember/src/service/follow/enterprise.go

@@ -150,7 +150,7 @@ func (this *FollowEnt) AddFollow() {
 			return nil, err
 		}
 		//	首次完成关注企业可获得积分
-		jy.Publish(db.Mgo_Log, config.Config.Nsq, config.Config.Nsq_topic, "task", userId, jy.Jywx_node1, map[string]interface{}{
+		jy.Publish(db.Mgo_Log, config.Config.Nsq, config.Config.Nsq_topic, "task", qutil.ObjToString(this.GetSession("mgoUserId")), jy.Jywx_node1, map[string]interface{}{
 			"code":       1012, //关注企业
 			"types":      "followEnt",
 			"num":        50,

src/jfw/modules/bigmember/src/service/follow/project.go

@@ -54,7 +54,7 @@ func (this *FollowProject) AddProject() {
 		}
 
 		//	首次完成项目关注可获得积分
-		jy.Publish(db.Mgo_Log, config.Config.Nsq, config.Config.Nsq_topic, "task", userId, jy.Jywx_node1, map[string]interface{}{
+		jy.Publish(db.Mgo_Log, config.Config.Nsq, config.Config.Nsq_topic, "task", qutil.ObjToString(this.GetSession("mgoUserId")), jy.Jywx_node1, map[string]interface{}{
 			"code":       1013, //关注项目
 			"types":      "followProject",
 			"num":        50,

src/jfw/modules/publicapply/src/subscribePush/entity/keyWords.go

@@ -272,7 +272,7 @@ func AddKeyWordsFree(types, userId, classIndex, className, keywordsIndex, keywor
 			//判断是新增
 			if (keywordCount == "" || keywordCount == "0") || keywordCount == keywordsIndex {
 				//设置关键词送积分
-				jy.Publish(db.Mgo_Log, config.Config.Nsq, config.Config.NsqTopic, "task", userId, jy.Jywx_node1, map[string]interface{}{
+				jy.Publish(db.Mgo_Log, config.Config.Nsq, config.Config.NsqTopic, "task", qutil.ObjToString(session.Get("mgoUserId")), jy.Jywx_node1, map[string]interface{}{
 					"code":       1015, //首次订阅
 					"types":      "subscribeKeyWords",
 					"num":        50,
@@ -357,7 +357,7 @@ func AddKeyWords(types, userId, classIndex, className, keywordsIndex, keywordNam
 		//判断是新增
 		if (keywordCount == "" || keywordCount == "0") || keywordCount == keywordsIndex {
 			//设置关键词送积分
-			jy.Publish(db.Mgo_Log, config.Config.Nsq, config.Config.NsqTopic, "task", userId, jy.Jywx_node1, map[string]interface{}{
+			jy.Publish(db.Mgo_Log, config.Config.Nsq, config.Config.NsqTopic, "task", qutil.ObjToString(session.Get("mgoUserId")), jy.Jywx_node1, map[string]interface{}{
 				"code":       1015, //首次订阅
 				"types":      "subscribeKeyWords",
 				"num":        50,

src/jfw/modules/subscribepay/src/entity/basePack.go

@@ -60,7 +60,7 @@ func (this *UseBalanceStruct) fileConsume() (r map[string]interface{}, m string,
 		} else {
 			r = fileAttachRpc(_fileName, _id)
 		}
-		go func(this *UseBalanceStruct, r map[string]interface{}) {
+		/*go func(this *UseBalanceStruct, r map[string]interface{}) {
 			data := make(map[string]interface{})
 			data["p_type"] = "大会员用户附件下载"
 			data["p_userid"] = this.UserId
@@ -72,7 +72,8 @@ func (this *UseBalanceStruct) fileConsume() (r map[string]interface{}, m string,
 			if util.MQFW.Save("filehistroy", data) == "" {
 				log.Println("大会员附件下载-历史记录异常：" + this.UserId)
 			}
-		}(this, r)
+		}(this, r)*/
+		this.saveJyConsumePackList()
 	} else {
 		isExists := false
 		//查询当月附件下载历史记录-如是已下载过的附件不再扣除次数

src/web/staticres/public-pc/js/article-content.js

@@ -15,7 +15,7 @@ var pointTask = {
   },
   getQuery: function () {
     // {"from":"task","point":"followProject_50"}
-    var r = sessionStorage.getItem('point-task-query')
+    var r = sessionStorage.getItem('point-task-query-login-clear')
     if (r) {
       this.query = JSON.parse(r)
     } else {
@@ -24,7 +24,7 @@ var pointTask = {
   },
   clearPointQuery: function () {
     // 剑鱼币任务：query传参丢失，所以采用sessionStorage
-    sessionStorage.removeItem('point-task-query')
+    sessionStorage.removeItem('point-task-query-login-clear')
   },
   getPointFromType: function (type) {
     var from = this.query.from
@@ -2467,6 +2467,10 @@ function showFileSomeDom () {
   // 免费用户展示可下载一次提示(免费用户且没有体验过附件下载权益的展示)
   $('.free-download .text').text(window.filePackAccount.number)
   if (window.isFree) {
+    // 免费用户未留过资。次数为0，则值置为1，点击按钮引导留资
+    if (window.freeFile == 0 && window.filePackAccount.number == 0) {
+      $('.free-download .text').text(1)
+    }
     if (window.freeFile == 0 || window.filePackAccount.number > 0) {
       // 展示按钮
       $('.free-download').css('display', 'inline-block')
@@ -2640,7 +2644,7 @@ $(function() {
   // 免费下载一次点击
   $('.free-download').on('click', function() {
     // 免费用户，留过资，点击则无响应
-    if (window.isFree && window.freeNum !== 0) {
+    if (window.isFree && window.filePackAccount.number > 0) {
       return
     }
     // 弹窗留资弹框，第一个参数为source，第二个是留资成功后是否需要刷新页面 可不传，不传即为不刷新