renzheng 9 gadi atpakaļ
vecāks
revīzija
8d52f6143e

+ 2 - 1
weixin/src/config.json

@@ -32,7 +32,8 @@
 	"activity":{
 		"activitycode":"topcj",
 		"title":"企明星新年抽奖活动进行中",
-		"picurl":"http://www.qimingxing.info/images/choujiang2.png"
+		"picurl":"http://www.qimingxing.info/images/choujiang2.png",
+		"tuenCards":"小主,来抢新年福牌了!\n剑鱼君派送神秘福牌!\n<a href='%s'>小主快快点这里翻福牌!</a>",
 	},"weixinautorpl":"小主的吩咐我们已经收到了,请留下您的联系方式(手机号或qq号),企明星客服会在下一个工作日9:00-17:00给小主回复哦!",
 	"creditRpc":"127.0.0.1:8765",
 	"subscribemonitorcyc":3,

+ 11 - 2
weixin/src/qfw/weixin/msgtxtchandler.go

@@ -22,7 +22,12 @@ func MsgTxtHandler(w ResponseWriter, r *Request) {
 			if us.Type == "robot" {
 				w.ReplyText("再见了小主人,记得想我呦。")
 			} else {
-				w.ReplyText("您已经退出企明星会员认证程序。")
+				if us.Type == "wxadmin" {
+					w.ReplyText("您已经退出微信管理。")
+
+				} else {
+					w.ReplyText("您已经退出企明星会员认证程序。")
+				}
 			}
 			delete(UserSession, r.FromUserName)
 		}
@@ -37,7 +42,7 @@ func MsgTxtHandler(w ResponseWriter, r *Request) {
 		}
 	} else if r.Content == "微信管理" && mids[openid] {
 		UserSession[r.FromUserName] = NewUserSession("wxadmin")
-		w.ReplyText("您已进入微信管理,请输入指令操作:\n1.查看抽奖模式(指令:f0)\n2.切换抽奖模式(指令:c*,*为数字。如c0(自动模式),c1(手动模式1),c2(手动模式2),c3(手动模式3))\n3.统计抽奖结果(tjr*,tjr120(最近两分钟),tjr120-1200(最近两分钟至最近20分钟之间的))\n4.统计新用户数(tju*)\n5.服务器情况监测(ser0)\n6服务管理(man*,man1重启主程序(man11关闭),man2重启微信,man3重启积分(man33关闭),man4重启微信认证(man44关闭))。\n输入q或Q离开。")
+		w.ReplyText("您已进入微信管理,请输入指令操作:\n1.查看抽奖模式(指令:f0)\n2.切换抽奖模式(指令:c*,*为数字。如c0(自动模式),c1(手动模式1),c2(手动模式2),c3(手动模式3))\n3.统计抽奖结果(tjr*,tjr120(最近两分钟),tjr120-1200(最近两分钟至最近20分钟之间的))\n4.统计新用户数(tju*)\n5.服务器情况监测(ser0)\n6服务管理(man*,man1重启主程序(man11关闭),man3重启积分(man33关闭),man4重启微信认证(man44关闭))。\n输入q或Q离开。")
 		return
 	} else if r.Content == "抽奖" { //进入抽奖环节
 		if time.Now().Unix() > 1455465600 { //活动过期 ,过期后,这段代码要删除
@@ -47,6 +52,10 @@ func MsgTxtHandler(w ResponseWriter, r *Request) {
 			targeturl := fmt.Sprintf("http://%s/activity/%s/%s", wf.SysConfig.Domain, wf.SysConfig.Activity["activitycode"], se.EncodeString(r.FromUserName))
 			w.ReplyNews([]Article{Article{PicUrl: wf.SysConfig.Activity["picurl"], Title: wf.SysConfig.Activity["title"], Url: targeturl}})
 		}
+	} else if r.Content == "翻牌" { //进入抽奖环节
+		targeturl := fmt.Sprintf("https://open.weixin.qq.com/connect/oauth2/authorize?appid=%s&redirect_uri=http://%s/weixinoauth/action/%s&response_type=code&scope=snsapi_base&state=1#wechat_redirect", wf.SysConfig.Appid, wf.SysConfig.Domain, "turncards")
+		//w.ReplyNews([]Article{Article{Title: wf.SysConfig.Activity["tuenCards"], Url: targeturl,Description:}})
+		w.ReplyText(fmt.Sprintf(wf.SysConfig.Activity["tuenCards"], targeturl))
 	} else if strings.HasPrefix(r.Content, "内部报名") { //绑定拓普员工姓名
 		tmp := strings.Fields(r.Content)
 		//log.Println(tmp, len(tmp))

+ 7 - 6
weixin/src/qfw/weixin/wxadmin.go

@@ -16,11 +16,10 @@ import (
 
 func processWxAdmin(openid, content string, w ResponseWriter, r *Request) {
 	util.Try(func() {
-
 		if openid != "" {
 			b, cmd, qleng, unit, var1, var2 := checkContent(content)
 			if b {
-				resStr := "结果"
+				resStr := "结果:"
 				switch cmd {
 				case "f":
 					//查看抽奖模式
@@ -39,7 +38,7 @@ func processWxAdmin(openid, content string, w ResponseWriter, r *Request) {
 					qu1 := M{"$gte": var1}
 					if qleng == 2 { //取区间
 						qu1 = M{"$gte": var2, "$lte": var1}
-					} else {
+					} else if qleng != 1 {
 						w.ReplyText("指令异常,请重新输入。")
 						return
 					}
@@ -64,7 +63,7 @@ func processWxAdmin(openid, content string, w ResponseWriter, r *Request) {
 					qu1 := M{"$gte": var1}
 					if qleng == 2 { //取区间
 						qu1 = M{"$gte": var2, "$lte": var1}
-					} else {
+					} else if qleng != 1 {
 						w.ReplyText("指令异常,请重新输入。")
 						return
 					}
@@ -77,7 +76,7 @@ func processWxAdmin(openid, content string, w ResponseWriter, r *Request) {
 						if res != nil && len(res) > 0 {
 							sum := 0
 							for _, v := range res {
-								resStr += "\n" + util.If(v["_id"] == nil, "黑名单用户", "正常用户").(string) + ":" + fmt.Sprintf("%x", v["count"])
+								resStr += "\n" + util.If(v["_id"] == nil, "正常用户", "黑名单用户").(string) + ":" + fmt.Sprintf("%d", v["count"].(int))
 								sum += v["count"].(int)
 							}
 							resStr += "\n" + "总数:" + fmt.Sprintf("%d", sum)
@@ -106,11 +105,13 @@ func processWxAdmin(openid, content string, w ResponseWriter, r *Request) {
 						resStr = "关闭主程序完成"
 					case 2:
 						//重启weixin
+						/**
 						cmdstr := getNewCmd(DIR+"/weixin", "weixin")
 						if len(cmdstr) > 0 {
 							execCmd(DIR+"/weixin", "weixin", cmdstr, true)
 						}
-						resStr = "重启微信程序完成"
+						**/
+						resStr = "不支持重启微信"
 					case 22:
 						//不能关闭微信
 						break