Merge remote-tracking branch 'origin/dev4.6.2.1' into dev4.6.2.1

src/jfw/modules/publicapply/src/a/jylog.go

@@ -30,7 +30,7 @@ var LogPath = "./jylog"
 func init() {
 	os.Mkdir(LogPath, os.ModePerm)
 	//默认保留15天内的日志，-1为永久保留
-	// initLog(15)
+	initLog(15)
 }
 
 func initLog(saveDay int) {

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

@@ -34,11 +34,11 @@ func (this *KeyWordsSet) UpdateKeyWords() map[string]interface{} {
 	if this.Type == "m" && power.Status < 0 {
 		return map[string]interface{}{"flag": false, "msg": "暂无权限"}
 	}
-	types := "o_vipjy"
+	types := "o_jy"
 	if this.Type == "m" {
 		types = "o_member_jy"
-	} else if this.Type == "" {
-		types = "o_jy"
+	} else if this.Type == "v" {
+		types = "o_vipjy"
 	}
 	//付费用户
 	if power.Status > 0 || power.VipStatus > 0 {
@@ -484,11 +484,11 @@ func (this *UpdateOther) UpdateOther() map[string]interface{} {
 	if this.Type == "m" && power.Status < 0 {
 		return map[string]interface{}{"flag": false, "msg": "暂无权限"}
 	}
-	types := "o_vipjy"
+	types := "o_jy"
 	if this.Type == "m" {
 		types = "o_member_jy"
-	} else if this.Type == "f" {
-		types = "o_jy"
+	} else if this.Type == "v" {
+		types = "o_vipjy"
 	}
 	setMap := func() map[string]interface{} {
 		switch this.PageType {