Merge branch 'develop' of 192.168.3.17:zhanghongbo/qfw into develop

weixin/src/qfw/weixin/msgtxtchandler.go

@@ -44,7 +44,7 @@ func MsgTxtHandler(w ResponseWriter, r *Request) {
 		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关闭),man3重启积分(man33关闭),man4重启微信认证(man44关闭))。\n输入q或Q离开。")
 		return
-	} else if r.Content == "抽奖" { //进入抽奖环节
+	} else if cj_reg.MatchString(r.Content) { //进入抽奖环节
 		if time.Now().Unix() > 1455552000 { //活动过期 ，过期后，这段代码要删除
 			//TODO
 			w.ReplyText("抱歉，活动已结束！敬请期待下一次抽奖活动，注意看预告哟……")
@@ -52,7 +52,7 @@ 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 == "福牌" { //进入抽奖环节
+	} else if fp_reg.MatchString(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.ReplyText(fmt.Sprintf(wf.SysConfig.Activity["tuenCards"], targeturl))
 	} else if strings.HasPrefix(r.Content, "内部报名") { //绑定拓普员工姓名

weixin/src/qfw/weixin/weixin.go

@@ -16,11 +16,15 @@ var WELCOME_MSG string
 var OWELCOME_MSG string
 var digitreg *regexp.Regexp = regexp.MustCompile("^\\d+$")
 
+//weixin admin
 var mids = map[string]bool{}
 var reg = regexp.MustCompile("^([a-z]+)(\\d.*)$")
 var subreg = regexp.MustCompile("^(\\d+)([smhd]{0,1})$")
 var DIR = ""
 
+//活动指令
+var cj_reg, fp_reg *regexp.Regexp
+
 func InitWeixinSdk() {
 	keyword_voice_reg, _ = regexp.Compile("查询|搜索|检索|看|找|查|搜")
 	clear_voice_reg, _ = regexp.Compile("!|！|\\s+")
@@ -28,7 +32,8 @@ func InitWeixinSdk() {
 	chat_bye, _ = regexp.Compile("再见|拜拜|不说了|不聊了")
 	WELCOME_MSG = wf.SysConfig.WelcomeTip
 	OWELCOME_MSG = wf.SysConfig.OWelcomeTip
-
+	cj_reg, _ = regexp.Compile("抽奖")
+	fp_reg, _ = regexp.Compile("福牌|翻牌")
 	//
 	for _, v := range wf.SysConfig.Mids {
 		mids[v] = true