Startsida Utforska Hjälp
Logga in
qmx
/
jy
14
0
Fork 0
Filer Ärenden 2 Pull-förfrågningar 0 Wiki
Bläddra i källkod

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

xuzhiheng 5 år sedan
förälder
a3b86deb70 c6fb4cf8b0
incheckning
6ecc57c313
4 ändrade filer med 30 tillägg och 4 borttagningar
Delad Vy Visa Diff Statistik
  1. 19 1
      src/jfw/modules/pushsubscribe/src/push/job/timetask.go
  2. 9 1
      src/jfw/modules/subscribepay/src/timetask/timetask.go
  3. 1 1
      src/web/staticres/vipsubscribe/js/personal_info.js
  4. 1 1
      src/web/templates/weixin/vipsubscribe/choose_area.html

+ 19 - 1
src/jfw/modules/pushsubscribe/src/push/job/timetask.go
Visa fil 

@@ -2,10 +2,14 @@ package job
 
 
 import (
 
 	"log"
 
+	. "public"
 
 	. "push/config"
 
 	"qfw/util"
 
+	"qfw/util/mongodb"
 
 	"strings"
 
 	"time"
 
+
 
+	"github.com/donnie4w/go-logger/logger"
 
 )
 
 
 type TimeTask struct{}
 
@@ -13,7 +17,21 @@ type TimeTask struct{}
 
 func (t *TimeTask) Run() {
 
 	go t.push() //推送
 
 	go t.move() //迁移数据
 
-
 
+	go t.crontab("01:00", func() {
 
+		logger.Error("开始每天1点删除过期关联项目数据错误。。。")
 
+		sess := mongodb.GetMgoConn()
 
+		defer mongodb.DestoryMongoConn(sess)
 
+		_, err := sess.DB(DbName).C(Pushspace_project).RemoveAll(map[string]interface{}{
 
+			"createtime": map[string]interface{}{
 
+				"$lt": time.Now().AddDate(0, -3, 0).Unix(),
 
+			},
 
+		})
 
+		if err != nil {
 
+			logger.Error("每天1点删除过期关联项目数据错误", err)
 
+		} else {
 
+			logger.Error("每天1点删除过期关联项目数据错误结束。。。")
 
+		}
 
+	})
 
 }
 
 func (t *TimeTask) push() {
 
 	for _, v := range Config.OtherPushTimes {

+ 9 - 1
src/jfw/modules/subscribepay/src/timetask/timetask.go
Visa fil 

@@ -99,8 +99,16 @@ func checkIsExpire() {
 
 						"i_vip_expire_tip": 2,
 
 					},
 
 				})
 
+				delSess := util.MQFW.GetMgoConn()
 
+				defer util.MQFW.DestoryMongoConn(delSess)
 
 				for _, pushColl := range []string{"pushspace", "pushspace_temp", "pushspace_vip", "pushspace_fail", "pushspace_project"} {
 
-					util.MQFW.Del(pushColl, map[string]interface{}{"userid": _id})
 
+					log.Println("用户", _id, "已到期开始删除", pushColl, "表数据。。。")
 
+					_, err := delSess.DB("qfw").C(pushColl).RemoveAll(map[string]interface{}{"userid": _id})
 
+					if err != nil {
 
+						log.Println("用户", _id, "已到期删除", pushColl, "表数据出错", err)
 
+					} else {
 
+						log.Println("用户", _id, "已到期删除", pushColl, "表数据结束。。。")
 
+					}
 
 				}
 
 				log.Println("用户", _id, i_vip_status, l_vip_endtime, "修改已到期状态")
 
 			} else if l_vip_endtime-now_unix <= threeday && i_vip_expire_tip != 1 && i_vip_expire_tip != -1 {

+ 1 - 1
src/web/staticres/vipsubscribe/js/personal_info.js
Visa fil 

@@ -30,7 +30,7 @@
 
 var flags = [false, false, false, false, false];
 
 function checkAll() {
 
     for (f in flags) {
 
-        if (f==2) continue
 
+        //if (f==2) continue
 
         if (!flags[f]) {
 
             isDisabled(false);
 
             return;

+ 1 - 1
src/web/templates/weixin/vipsubscribe/choose_area.html
Visa fil 

@@ -12,7 +12,7 @@
 
     <link rel="stylesheet" type="text/css" href="/vipsubscribe/css/base.css?v={{Msg "seo" "version"}}" />
 
     <link rel="stylesheet" type="text/css" href="/vipsubscribe/iconfont/iconfont.css?v={{Msg "seo" "version"}}" />
 
     <link rel="stylesheet" href="/vipsubscribe/css/public.css?v={{Msg "seo" "version"}}">
 
-    <link rel="stylesheet" href="/vipsubscribe/css/choose_area.css?v=1{{Msg "seo" "version"}}">
 
+    <link rel="stylesheet" href="/vipsubscribe/css/choose_area.css?v={{Msg "seo" "version"}}">
 
 </head>
 
 
 <body>