fenzhihebing

src/config.json

@@ -99,5 +99,6 @@
     "192.168.3.240:2379"
   ],
   "pushGrpcServer": "192.168.3.11:5565",
-  "tidb": "jianyu:top@123@tcp(192.168.3.109:4000)/convertlabsync?charset=utf8mb4&parseTime=true&loc=Local"
+  "tidb": "jianyu:top@123@tcp(192.168.3.109:4000)/convertlabsync?charset=utf8mb4&parseTime=true&loc=Local",
+  "smsServiceRpc": "127.0.0.1:932"
 }

src/config/config.go

@@ -50,6 +50,7 @@ type SysConfig struct {
 	Etcd           []string          `json:"etcd"`
 	PushGrpcServer string            `json:"pushGrpcServer"`
 	Tidb           string            `json:"tidb"`
+	SmsServiceRpc  string            `json:"smsServiceRpc"`
 }
 
 var SysConfigs SysConfig

src/customerService/newsService.go

@@ -657,9 +657,8 @@ func SendMsg(param *Message, sendStatus int) (int, error) {
 			if err != nil {
 				log.Println("迭代数据出错", err)
 			}
-			//log.Println("单条数据：", user.UserId)
+
 			userId := user.UserId
-			i++
 			if config.SysConfigs.UserIdMap[userId] != "" {
 				userId = config.SysConfigs.UserIdMap[userId]
 			}
@@ -669,6 +668,8 @@ func SendMsg(param *Message, sendStatus int) (int, error) {
 			} else {
 				projectIdMap.Store(userId, true)
 			}
+			log.Println("单条数据用户id：", user.UserId)
+			i++
 			userIds += userId + ","
 
 			//查询mongo库用户信息
@@ -712,9 +713,12 @@ func SendMsg(param *Message, sendStatus int) (int, error) {
 			if appVersion > "3.0.3" {
 				go util.AppGrpcPush(dt, otherPushId, jgPushId, phoneType, appPushUrl)
 			}
+			log.Println("用户数量:", i)
 			if i == 100 {
+				log.Println("100用户开始发送消息：", len(userIds))
 				//调用消息中台
 				util.MultipleSaveMessage(msg, userIds, userNames)
+				log.Println("100个用户发送消息完成......")
 				userNames = ""
 				userIds = ""
 				i = 0
@@ -722,8 +726,10 @@ func SendMsg(param *Message, sendStatus int) (int, error) {
 
 		}
 		if i > 0 {
+			log.Println("最后一批用户开始发送消息：", len(userIds))
 			//调用中台接口
 			util.MultipleSaveMessage(msg, userIds, userNames)
+			log.Println("最后一批用户发送消息：完成")
 			userNames = ""
 			userIds = ""
 			i = 0

src/github.com/baiy/Cadmin-server-go/system/index/index.go

@@ -246,13 +246,17 @@ func Code(context *admin.Context) (interface{}, error) {
 
 //根据模板发送短信,模板是运营商设定的。
 //第三个参数是可变参数，可以传入多个，但要和模板相匹配
-func SendSMS(tplcode /*模板代码*/, mobile /*手机号码*/ string, param map[string]string) {
-	tmp := []string{}
-	for k, v := range param {
-		tmp = append(tmp, "#"+k+"#="+v)
-	}
-	text := strings.Join(tmp, "&")
-	sms.SendSms(mobile, tplcode, text)
+//func SendSMS(tplcode /*模板代码*/, mobile /*手机号码*/ string, param map[string]string) {
+//	tmp := []string{}
+//	for k, v := range param {
+//		tmp = append(tmp, "#"+k+"#="+v)
+//	}
+//	text := strings.Join(tmp, "&")
+//	sms.SendSms(mobile, tplcode, text)
+//}
+
+func SendSMS(address, mobile string, params ...string) {
+	sms.SendSms(address, "01", mobile, params...)
 }
 
 //发送验证码
@@ -279,8 +283,8 @@ func SendPhoneIdentCode(context *admin.Context, phone string) bool {
 		log.Println("session1保存错误,验证码")
 	}
 	//发送短信
-	param := map[string]string{"code": s_ranNum}
+	//param := map[string]string{"code": s_ranNum}
 	log.Println("短信验证码", phone, s_ranNum)
-	SendSMS("2828060", phone, param)
+	SendSMS(SysConfigs.SmsServiceRpc, phone, s_ranNum)
 	return true
 }

src/github.com/baiy/Cadmin-server-go/system/user/user.go

@@ -1,6 +1,7 @@
 package user
 
 import (
+	. "config"
 	"errors"
 	"github.com/gorilla/sessions"
 	"log"
@@ -147,9 +148,9 @@ func SendPhoneIdentCode(context *admin.Context, phone string) bool {
 		log.Println("session1保存错误,验证码")
 	}
 	//发送短信
-	param := map[string]string{"code": s_ranNum}
+	//param := map[string]string{"code": s_ranNum}
 	log.Println("短信验证码", phone, s_ranNum)
-	index_.SendSMS("2828060", phone, param)
+	index_.SendSMS(SysConfigs.SmsServiceRpc, phone, s_ranNum)
 	return true
 }
 

src/task/task2.go

@@ -401,7 +401,7 @@ func TaskSaveMsg(msgId int, msg *map[string]interface{}, androidUrl, iosUrl stri
 		}
 		//log.Println("单条数据：", user.UserId)
 		userId := user.UserId
-		i++
+
 		if config.SysConfigs.UserIdMap[userId] != "" {
 			userId = config.SysConfigs.UserIdMap[userId]
 		}
@@ -414,6 +414,7 @@ func TaskSaveMsg(msgId int, msg *map[string]interface{}, androidUrl, iosUrl stri
 		} else {
 			projectIdMap.Store(userId, true)
 		}
+		i++
 		userIds += userId + ","
 		//查询mongo库用户信息
 		userData := &map[string]interface{}{}
@@ -456,19 +457,24 @@ func TaskSaveMsg(msgId int, msg *map[string]interface{}, androidUrl, iosUrl stri
 		if appVersion > "3.0.3" {
 			go util.AppGrpcPush(dt, otherPushId, jgPushId, phoneType, appPushUrl)
 		}
+		log.Println("用户数量:", i)
 		if i == 100 {
 			//调用中台接口
+			log.Println("定时发送中100个用户开始发送消息")
 			util.MultipleSaveMessage(msg1, userIds, userNames)
 			userNames = ""
 			userIds = ""
 			i = 0
+			log.Println("定时发送中100个用户发送消息完成")
 		}
 	}
 	if i > 0 {
 		//调用中台接口
+		log.Println("定时发送中最后一批用户开始发送消息")
 		util.MultipleSaveMessage(msg1, userIds, userNames)
 		userNames = ""
 		userIds = ""
+		log.Println("定时发送中最后一批用户发送消息完成")
 	}
 	log.Println("定时任务,获取分组及分组下用户耗时：", time.Since(st))
 	sendStatus := 4

src/util/common.go

@@ -145,7 +145,7 @@ func PurchaseUserBalance(params map[string]interface{}) bool {
 }
 
 func MultipleSaveMessage(msg map[string]interface{}, userIds, userNames string) {
-	log.Println("开始调用中台接口。。。。")
+	log.Println("开始调用中台接口保存消息")
 	//log.Println("调用批量保存消息接口")
 	//bs, _ := json.Marshal(saveData)
 	//resp, err := CommonPost(qutil.ObjToString(config.SysConfigs.MessageCenter["MultipleSaveMsgUrl"]), url.Values{
@@ -169,6 +169,7 @@ func MultipleSaveMessage(msg map[string]interface{}, userIds, userNames string)
 	}
 	req.Header.Add("Content-Type", "application/json")
 	res, err := client.Do(req)
+	log.Println("调用中台api返回结果")
 	log.Println(res, err)
 	defer res.Body.Close()