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

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

@@ -1,17 +1,17 @@
 package wx
 
 import (
+	. "app.yhyue.com/moapp/jybase/mongodb"
+	"app.yhyue.com/moapp/jybase/sms"
+	"app.yhyue.com/moapp/jypkg/common/src/qfw/util/jy"
+	"bp.jydev.jianyu360.cn/BaseService/userCenter/rpc/pb"
 	"encoding/json"
 	"fmt"
+	"github.com/gogf/gf/v2/util/gconv"
 	"jy/src/jfw/modules/weixin/src/config"
 	"jy/src/jfw/modules/weixin/src/service"
 	"net/url"
 
-	. "app.yhyue.com/moapp/jybase/mongodb"
-	"app.yhyue.com/moapp/jypkg/common/src/qfw/util/jy"
-	"bp.jydev.jianyu360.cn/BaseService/userCenter/rpc/pb"
-	"github.com/gogf/gf/v2/util/gconv"
-
 	"jy/src/jfw/modules/weixin/src/tools"
 	"log"
 	"net/http"
@@ -976,6 +976,7 @@ func UnSubscribe(w ResponseWriter, r *Request) {
 		if openid != "" {
 			redis.Del("push", "remind&&"+openid)
 		}
+		log.Println("发送状态", gconv.Bool(config.Sysconfig["isSend"]))
 		if gconv.Bool(config.Sysconfig["isSend"]) {
 			unfollowSendMail(openid)
 		}
@@ -1000,6 +1001,7 @@ func unfollowSendMail(openid string) (int64, string) {
 	}
 	if PhoneReg.MatchString(phone) {
 		jy.SendSMS(gconv.String(config.Sysconfig["smsServiceRpc"]), phone, "测试使用")
+		sms.SendSms(gconv.String(config.Sysconfig["smsServiceRpc"]), gconv.String(config.Sysconfig["unfollowMailId"]), phone, gconv.String(config.Sysconfig["unfollowContent"]))
 		return 1, ""
 	}
 	return -1, "发送失败"