Merge branch 'dev_v4.10.0.5_wh' of qmx/jy into hotfix/v4.10.0.5

src/jfw/modules/weixin/src/config.json

@@ -12,7 +12,7 @@
   },
   "mysql": {
     "dbName": "jianyu",
-    "address" : "192.168.3.14:4000",
+    "address": "192.168.3.14:4000",
     "userName": "root",
     "passWord": "=PDT49#80Z!RVv52_z",
     "maxOpenConns": 5,
@@ -167,5 +167,8 @@
   "phrasesReplyText": "%s %s行业专属购买链接：<a href='%s'>点击</a>",
   "miniProgramActivateReplyText": "%s %s 点此查看：<a href='%s'>%s</a>",
   "subKFReplyText": "⚠重要提醒⚠\n因微信服务号消息折叠（隐藏）到一起，使您无法第一时间收到重要消息推送，为避免遗漏重要商机，3步将公众号置顶\n\n第1步：点击右上角“ ”\n第2步：点击右上角“…”\n第3步：点击“置顶公众号”",
-  "replySwitch": false
+  "replySwitch": false,
+  "smsServiceRpc": "127.0.0.1:932",
+  "isSend": true,
+  "unfollowMailId": "01"
 }

src/jfw/modules/weixin/src/wx/wx.go

@@ -986,7 +986,7 @@ func UnSubscribe(w ResponseWriter, r *Request) {
 // 取关发送短信
 func unfollowSendMail(openid string) (int64, string) {
 	m, b := tools.MQFW.FindOneByField("user", `{"s_m_openid":"`+openid+`","s_unionid":{"$ne":"`+openid+`"}}`, `{"s_m_phone":1,"s_phone":1,"_id",1}`)
-	log.Println("取关发短信", m, b)
+	log.Println("取关发短信", openid)
 	if !b && m == nil {
 		return -1, "未查询到用户"
 	}
@@ -1000,8 +1000,8 @@ func unfollowSendMail(openid string) (int64, string) {
 		return -1, "找不到手机号"
 	}
 	if PhoneReg.MatchString(phone) {
-		log.Println(gconv.String(config.Sysconfig["smsServiceRpc"]), gconv.String(config.Sysconfig["unfollowMailId"]), phone, gconv.String(config.Sysconfig["unfollowContent"]))
-		sms.SendSms(gconv.String(config.Sysconfig["smsServiceRpc"]), gconv.String(config.Sysconfig["unfollowMailId"]), phone, gconv.String(config.Sysconfig["unfollowContent"]))
+		log.Println(gconv.String(config.Sysconfig["smsServiceRpc"]), gconv.String(config.Sysconfig["unfollowMailId"]), phone, "")
+		sms.SendSms(gconv.String(config.Sysconfig["smsServiceRpc"]), gconv.String(config.Sysconfig["unfollowMailId"]), phone, "")
 		return 1, ""
 	}
 	return -1, "发送失败"