修改credit

common/src/qfw/util/encrypt_test.go

@@ -11,8 +11,8 @@ import (
 //加密解密测试
 func TestEncrypt(t *testing.T) {
 	se := &SimpleEncrypt{Key: "topnet"}
-
-	log.Println(se.EncodeString("oJULtwzXo6EFV1Ah-XeyRBimXGM8,ff,ff,swordfishaction"))
+	log.Println(GetSubDay(1453683600 + 8*3600))
+	log.Println(se.EncodeString("oJULtw0Cv3nuo4jUb8wpAaR-g2Fk,ff,ff,swordfishaction"))
 	log.Println(se.DecodeString("GyUlIhEDDjcfWCAyIl4xBkgsERYiLAwZLCg9VkkSEkMWCEkHAwACCgMdBwcRDREdGwE="))
 }
 

core/src/web/templates/common/login.html

@@ -11,9 +11,6 @@
 	width: 520px;
 	height: 440px;
 }
-.loginModal .text-primary{
-	color: #ff5a5f !important;
-}
 .loginForm{
 	text-align:left;
 }

credit/src/config.json

@@ -48,7 +48,7 @@
         "swordfish_closeTitle": "剑鱼服务暂停提醒",
         "swordfish_close": "您的剑鱼服务已经到期,已经暂停，请及时续费。",
         "swordfish_payTitle": "剑鱼服务订单提醒",
-        "swordfish_pay": "您已成功续订剑鱼，扣除%d积分，剩余%d积分，剑鱼服务时长到:%s",
+        "swordfish_pay": "您已成功订阅剑鱼，扣除%d积分，剩余%d积分，剑鱼服务时长到:%s",
         "give": "转赠提醒",
         "give_pay": "转赠扣除提醒",
         "recharge": "充值成功提醒",

credit/src/main.go

@@ -210,12 +210,12 @@ func TimerSwordFishFromUser() {
 						}).Iter()
 
 						for tmp := make(map[string]interface{}); query.Next(tmp); {
-							log.Println(tmp)
+							//log.Println("user:", tmp)
 							util.Try(func() {
 								tmpCode := tmp["o_msgset"].(map[string]interface{})[typeName].(map[string]interface{})
 								endDate := tmpCode["l_enddate"].(int64)
 								sub64 := util.GetSubDay(endDate) //(endDate - next64) / 86400
-								log.Println("======---====", sub64)
+								//log.Println("天数：", sub64)
 								if sub64 <= 0 {
 									//自动扣费
 									doSubCreditByUser(util.BsonIdToSId(tmp["_id"]), tmp["s_m_openid"].(string), typeName, code, &next, tmp)
@@ -227,7 +227,9 @@ func TimerSwordFishFromUser() {
 										}
 									}
 								}
-							}, func(e interface{}) {})
+							}, func(e interface{}) {
+								log.Println("提前提示发送ERROR:", e)
+							})
 							tmp = make(map[string]interface{})
 						}
 					}
@@ -256,7 +258,7 @@ func doSubCreditByUser(userId, umid, typeName, code string, next *time.Time, use
 			bsub = true
 		}
 		if bsub { //扣分操作
-			newDate := next.AddDate(0, 1, -1)
+			newDate := next.AddDate(0, 1, 0)
 			creditDoc := map[string]interface{}{
 				"s_uid":     userId,
 				"s_umid":    umid,

credit/src/qfw/creditrpc/creditrpc.go

@@ -272,7 +272,7 @@ func (c *CreditRpc) OutCreadit(param *qrpc.CreditData, replay *int) error {
 		var newDate time.Time
 		switch first {
 		case "A":
-			newDate = GetTimeByNow(now, Hour).AddDate(0, 1, -1)
+			newDate = GetTimeByNow(now, Hour).AddDate(0, 1, 0)
 			creditDoc["l_enddate"] = newDate.Unix()
 			creditDoc["i_valid"] = 1
 			if param.OtherParam != nil {

push/src/config.json

@@ -1 +1,63 @@
-{"bid":{"interval":60,"lastpushtime":"2015-10-10 10:10:10"},"bidStartTime":"2015-12-30 17:28:48","bidTitle":"亲！剑鱼为您速报最新鲜的中标信息啦","bidViewDomain":"192.168.3.132","durationMinutes":10,"fixPush":"oJULtwzXo6EFV1Ah-XeyRBimXGM8","mail_bid":"\u003cdiv\u003e%s\u003c/div\u003e，想了解更多信息，请访问http://www.qimingxing.info。","maxPushSize":50,"mgoAddr":"192.168.3.18:27080","mgoSize":10,"province":{"上海":9,"云南":25,"内蒙古":5,"北京":1,"台湾":32,"吉林":7,"四川":13,"天津":2,"宁夏":30,"安徽":12,"山东":15,"山西":4,"广东":19,"广西":20,"新疆":31,"江苏":10,"江西":14,"河北":3,"河南":16,"浙江":11,"海南":21,"湖北":17,"湖南":18,"澳门":34,"甘肃":28,"福建":13,"西藏":26,"贵州":24,"辽宁":6,"重庆":22,"陕西":27,"青海":29,"香港":33,"黑龙江":8},"pushInfoScopeDays":50,"rpcPort":"8766","smtpAddr":"smtp.exmail.qq.com","smtpFromUser":"企明星","smtpPort":465,"smtpPwd":"qy123456","smtpUser":"qyfw@topnet.net.cn","tenderStartTime":"2015-12-30 17:28:48","tenderTitle":"亲！剑鱼为您速报最新鲜的招标信息啦","weixinRpcServer":"127.0.0.1:82","weixin_bid":"\u003cdiv\u003e%s最新招标信息\u003c/div\u003e\u003cdiv\u003e%s\u003c/div\u003e","wxRpcRemark":"请到网站个人中心查看详细."}
+{
+    "bid": {
+        "interval": 60,
+        "lastpushtime": "2015-10-10 10:10:10"
+    },
+    "bidStartTime": "2015-12-30 17:28:48",
+    "bidTitle": "亲！剑鱼为您速报最新鲜的中标信息啦",
+    "bidViewDomain": "192.168.3.132",
+    "durationMinutes": 10,
+    "fixPush": "oJULtwzXo6EFV1Ah-XeyRBimXGM8",
+    "mail_bid": "\u003cdiv\u003e%s\u003c/div\u003e，想了解更多信息，请访问http://www.qimingxing.info。",
+    "maxPushSize": 50,
+    "mgoAddr": "192.168.3.18:27080",
+    "mgoSize": 10,
+    "province": {
+        "上海": 9,
+        "云南": 25,
+        "内蒙古": 5,
+        "北京": 1,
+        "台湾": 32,
+        "吉林": 7,
+        "四川": 13,
+        "天津": 2,
+        "宁夏": 30,
+        "安徽": 12,
+        "山东": 15,
+        "山西": 4,
+        "广东": 19,
+        "广西": 20,
+        "新疆": 31,
+        "江苏": 10,
+        "江西": 14,
+        "河北": 3,
+        "河南": 16,
+        "浙江": 11,
+        "海南": 21,
+        "湖北": 17,
+        "湖南": 18,
+        "澳门": 34,
+        "甘肃": 28,
+        "福建": 13,
+        "西藏": 26,
+        "贵州": 24,
+        "辽宁": 6,
+        "重庆": 22,
+        "陕西": 27,
+        "青海": 29,
+        "香港": 33,
+        "黑龙江": 8
+    },
+    "pushInfoScopeDays": 50,
+    "rpcPort": "8766",
+    "smtpAddr": "smtp.exmail.qq.com",
+    "smtpFromUser": "企明星",
+    "smtpPort": 465,
+    "smtpPwd": "qy123456",
+    "smtpUser": "qyfw@topnet.net.cn",
+    "tenderStartTime": "2015-12-30 17:28:48",
+    "tenderTitle": "亲！剑鱼为您速报最新鲜的招标信息啦",
+    "weixinRpcServer": "127.0.0.1:82",
+    "weixin_bid": "\u003cdiv\u003e%s最新招标信息\u003c/div\u003e\u003cdiv\u003e%s\u003c/div\u003e",
+    "wxRpcRemark": "请到网站个人中心查看详细."
+}