errcode

internal/push/content_struct/content.go

@@ -1,85 +0,0 @@
-/*
-** description("").
-** copyright('open-im,www.open-im.io').
-** author("fg,Gordon@tuoyun.net").
-** time(2021/5/27 11:24).
- */
-package content_struct
-
-import (
-	"encoding/json"
-)
-
-type Content struct {
-	IsDisplay int32  `json:"isDisplay"`
-	ID        string `json:"id"`
-	Text      string `json:"text"`
-}
-
-func NewContentStructString(isDisplay int32, ID string, text string) string {
-	c := Content{IsDisplay: isDisplay, ID: ID, Text: text}
-	return c.contentToString()
-}
-
-func (c *Content) contentToString() string {
-	data, _ := json.Marshal(c)
-	dataString := string(data)
-	return dataString
-}
-
-type groupMemberFullInfo struct {
-	GroupId  string `json:"groupID"`
-	UserId   string `json:"userId"`
-	Role     int    `json:"role"`
-	JoinTime uint64 `json:"joinTime"`
-	NickName string `json:"nickName"`
-	FaceUrl  string `json:"faceUrl"`
-}
-
-type AgreeOrRejectGroupMember struct {
-	GroupId  string `json:"groupID"`
-	UserId   string `json:"userId"`
-	Role     int    `json:"role"`
-	JoinTime uint64 `json:"joinTime"`
-	NickName string `json:"nickName"`
-	FaceUrl  string `json:"faceUrl"`
-	Reason   string `json:"reason"`
-}
-type AtTextContent struct {
-	Text       string   `json:"text"`
-	AtUserList []string `json:"atUserList"`
-	IsAtSelf   bool     `json:"isAtSelf"`
-}
-
-type CreateGroupSysMsg struct {
-	uIdCreator     string                `creatorUid`
-	initMemberList []groupMemberFullInfo `json: initMemberList`
-	CreateTime     uint64                `json:"CreateTime"`
-	Text           string                `json:"text"`
-}
-
-type NotificationContent struct {
-	IsDisplay   int32  `json:"isDisplay"`
-	DefaultTips string `json:"defaultTips"`
-	Detail      string `json:"detail"`
-}
-
-func (c *NotificationContent) ContentToString() string {
-	data, _ := json.Marshal(c)
-	dataString := string(data)
-	return dataString
-}
-
-type KickGroupMemberApiReq struct {
-	GroupID     string   `json:"groupID"`
-	UidList     []string `json:"uidList"`
-	Reason      string   `json:"reason"`
-	OperationID string   `json:"operationID"`
-}
-
-func NewCreateGroupSysMsgString(create *CreateGroupSysMsg, text string) string {
-	create.Text = text
-	jstring, _ := json.Marshal(create)
-
-	return string(jstring)
-}

internal/push/jpush/push.go

@@ -35,24 +35,24 @@ func (j *JPush) SetAlias(cid, alias string) (resp string, err error) {
 
 func (j *JPush) Push(accounts []string, title, detailContent, operationID string, opts push.PushOpts) (string, error) {
 
-	var pf requestBody.Platform
+	var pf requestbody.Platform
 	pf.SetAll()
-	var au requestBody.Audience
+	var au requestbody.Audience
 	au.SetAlias(accounts)
-	var no requestBody.Notification
+	var no requestbody.Notification
 
-	var extras requestBody.Extras
+	var extras requestbody.Extras
 	if opts.Signal.ClientMsgID != "" {
 		extras.ClientMsgID = opts.Signal.ClientMsgID
 	}
 	no.IOSEnableMutableContent()
 	no.SetExtras(extras)
 	no.SetAlert(title)
-	var me requestBody.Message
+	var me requestbody.Message
 	me.SetMsgContent(detailContent)
-	var o requestBody.Options
+	var o requestbody.Options
 	o.SetApnsProduction(config.Config.IOSPush.Production)
-	var po requestBody.PushObj
+	var po requestbody.PushObj
 	po.SetPlatform(&pf)
 	po.SetAudience(&au)
 	po.SetNotification(&no)

internal/push/jpush/requestbody/audience.go

@@ -1,4 +1,4 @@
-package requestBody
+package requestbody
 
 const (
 	TAG             = "tag"

internal/push/jpush/requestbody/message.go

@@ -1,4 +1,4 @@
-package requestBody
+package requestbody
 
 type Message struct {
 	MsgContent  string                 `json:"msg_content"`

internal/push/jpush/requestbody/notification.go

@@ -1,4 +1,4 @@
-package requestBody
+package requestbody
 
 import (
 	"Open_IM/pkg/common/config"

internal/push/jpush/requestbody/options.go

@@ -1,4 +1,4 @@
-package requestBody
+package requestbody
 
 type Options struct {
 	ApnsProduction bool `json:"apns_production"`

internal/push/jpush/requestbody/platform.go

@@ -1,4 +1,4 @@
-package requestBody
+package requestbody
 
 import (
 	"Open_IM/pkg/common/constant"

internal/push/jpush/requestbody/pushobj.go

@@ -1,4 +1,4 @@
-package requestBody
+package requestbody
 
 type PushObj struct {
 	Platform     interface{} `json:"platform"`

internal/push/logic/callback.go

@@ -7,7 +7,7 @@ import (
 	"Open_IM/pkg/common/constant"
 	"Open_IM/pkg/common/http"
 	"Open_IM/pkg/common/log"
-	common "Open_IM/pkg/proto/sdk_ws"
+	common "Open_IM/pkg/proto/sdkws"
 	"Open_IM/pkg/utils"
 	http2 "net/http"
 )

internal/push/mobpush/push.go

@@ -26,23 +26,21 @@ func newGetuiClient() *MobPush {
 }
 
 func (j *MobPush) Push(accounts []string, alert, detailContent, operationID string, opts push.PushOpts) (string, error) {
-
-	var target requestParams.PushTarget
-
+	var target requestparams.PushTarget
 	target.SetAlias(accounts)
 	target.SetTarget(2)
 
-	var no requestParams.PushNotify
+	var no requestparams.PushNotify
 	no.SetType(1)
 	no.SetIosProduction(1)
 	no.SetPlats([]int{1, 2})
 	no.SetContent(alert)
 
-	var forward requestParams.PushForward
+	var forward requestparams.PushForward
 	forward.SetNextType(2)
 	forward.SetScheme(config.Config.Push.Mob.Scheme)
 
-	var po requestParams.PushObj
+	var po requestparams.PushObj
 	po.SetSource("webapi")
 	po.SetAppkey(config.Config.Push.Mob.AppKey)
 	po.SetPushTarget(&target)

internal/push/mobpush/requestparams/pushForward.go

@@ -1,4 +1,4 @@
-package requestParams
+package requestparams
 
 type PushForward struct {
 	NextType int    `json:"nextType"`

internal/push/mobpush/requestparams/pushNotify.go

@@ -1,4 +1,4 @@
-package requestParams
+package requestparams
 
 type PushNotify struct {
 	Plats         []int  `json:"plats,omitempty"`

internal/push/mobpush/requestparams/pushObj.go

@@ -1,4 +1,4 @@
-package requestParams
+package requestparams
 
 type PushObj struct {
 	Source      interface{} `json:"source"`

internal/push/mobpush/requestparams/pushTarget.go

@@ -1,4 +1,4 @@
-package requestParams
+package requestparams
 
 type PushTarget struct {
 	Target interface{} `json:"target,omitempty"`

internal/push/sdk/tpns-server-sdk-go/go/auth/auth.go

@@ -1,62 +0,0 @@
-package auth
-
-import (
-	"crypto/hmac"
-	"crypto/sha256"
-	"encoding/base64"
-	b64 "encoding/base64"
-	"encoding/hex"
-	"fmt"
-	"net/http"
-	"strconv"
-	"time"
-)
-
-type Auther struct {
-	AccessID  string
-	SecretKey string
-}
-
-var UseSignAuthored = true
-
-func (a *Auther) Auth(req *http.Request, useSignAuthored bool, auth Auther, reqBody string) {
-
-	if useSignAuthored {
-		now := time.Now()
-		timeStamp := now.Unix()
-		req.Header.Add("AccessId", auth.AccessID)
-		req.Header.Add("TimeStamp", strconv.Itoa(int(timeStamp)))
-		sign := GenSign(uint64(timeStamp), auth.AccessID, auth.SecretKey, reqBody)
-		req.Header.Add("Sign", sign)
-	} else {
-		author := makeAuthHeader(a.AccessID, a.SecretKey)
-		//log.Printf("author string:%v", author)
-		req.Header.Add("Authorization", author)
-	}
-	//req.Header.Add("Content-Type", "application/json")
-}
-
-func makeAuthHeader(appID, secretKey string) string {
-	base64Str := base64.StdEncoding.EncodeToString(
-		[]byte(
-			fmt.Sprintf("%s:%s", appID, secretKey),
-		),
-	)
-	return fmt.Sprintf("Basic %s", base64Str)
-}
-
-func GenSign(timeStamp uint64, accessId string, secretKey, requestBody string) string {
-	signBody := strconv.Itoa(int(timeStamp)) + accessId + requestBody
-	// Create a new HMAC by defining the hash type and the key (as byte array)
-	h := hmac.New(sha256.New, []byte(secretKey))
-	// Write Data to it
-	h.Write([]byte(signBody))
-
-	// Get result and encode as hexadecimal string
-	sha := hex.EncodeToString(h.Sum(nil))
-	//fmt.Println()
-	//fmt.Println("timeStamp: " + strconv.Itoa(int(timeStamp)) + " accessID:" + accessId + " body:" + requestBody)
-	sEnc := b64.StdEncoding.EncodeToString([]byte(sha))
-	//fmt.Println("final Result " + sEnc)
-	return sEnc
-}

internal/push/sdk/tpns-server-sdk-go/go/client/client.go

@@ -1,18 +0,0 @@
-package client
-
-import (
-	"net/http"
-	"time"
-)
-
-func New() *http.Client {
-	return &http.Client{
-		Transport: &http.Transport{
-			MaxIdleConns:        100,
-			MaxIdleConnsPerHost: 100,
-			IdleConnTimeout:     30 * time.Second,
-			DisableCompression:  false,
-			DisableKeepAlives:   false,
-		},
-	}
-}

internal/push/sdk/tpns-server-sdk-go/go/common/http_helper.go

@@ -1,62 +0,0 @@
-package common
-
-import (
-	tpns "Open_IM/internal/push/sdk/tpns-server-sdk-go/go"
-	"encoding/json"
-	"fmt"
-	"io/ioutil"
-	"net/http"
-)
-
-func PushAndGetResult(pushReq *http.Request) {
-	c := &http.Client{}
-	rsp, err := c.Do(pushReq)
-	fmt.Println()
-	if err != nil {
-		//fmt.Printf("http err:%v", err)
-		return
-	}
-	defer rsp.Body.Close()
-	body, err := ioutil.ReadAll(rsp.Body)
-	//fmt.Printf("http ReadAll err:%v, body:%v  ", err, string(body))
-	if err != nil {
-		return
-	}
-	r := &tpns.CommonRsp{}
-	json.Unmarshal(body, r)
-	//fmt.Printf("push result: %+v", r)
-}
-
-func UploadFile(req *http.Request) (int, error) {
-	client := &http.Client{}
-	resp, err := client.Do(req)
-	if err != nil {
-		return 0, err
-	}
-
-	defer resp.Body.Close()
-	body, err := ioutil.ReadAll(resp.Body)
-	if err != nil {
-		return 0, err
-	}
-
-	if resp.StatusCode != http.StatusOK {
-		return 0, fmt.Errorf("response error, status: %s, body: %s", resp.Status, string(body))
-	}
-
-	type uploadResponse struct {
-		RetCode  int    `json:"retCode"`
-		ErrMsg   string `json:"errMsg"`
-		UploadId int    `json:"uploadId"`
-	}
-
-	var ur uploadResponse
-	if err := json.Unmarshal(body, &ur); err != nil {
-		return 0, err
-	}
-
-	if ur.RetCode != 0 {
-		return 0, fmt.Errorf("response with %d:%s", ur.RetCode, ur.ErrMsg)
-	}
-	return ur.UploadId, nil
-}

internal/push/sdk/tpns-server-sdk-go/go/common/json_helper.go

@@ -1,8 +0,0 @@
-package common
-
-import "encoding/json"
-
-func ToJson(v interface{}) string {
-	bs, _ := json.Marshal(v)
-	return string(bs)
-}

internal/push/sdk/tpns-server-sdk-go/go/def.go

@@ -1,256 +0,0 @@
-package tpns
-
-type CommonRspEnv string
-
-const (
-	// EnvProd
-	EnvProd CommonRspEnv = "product"
-	// EnvDev
-	EnvDev CommonRspEnv = "dev"
-)
-
-type CommonRsp struct {
-	// TODO: doc this
-	Seq int64 `json:"seq"`
-
-	PushID string `json:"push_id"`
-
-	RetCode int `json:"ret_code"`
-
-	Environment CommonRspEnv `json:"environment"`
-
-	ErrMsg string `json:"err_msg,omitempty"`
-
-	Result map[string]string `json:"result,omitempty"`
-}
-
-type AudienceType string
-
-const (
-	AdAll AudienceType = "all"
-
-	AdTag AudienceType = "tag"
-
-	AdToken AudienceType = "token"
-
-	AdTokenList AudienceType = "token_list"
-
-	AdAccount AudienceType = "account"
-
-	AdAccountList AudienceType = "account_list"
-
-	AdPackageAccount AudienceType = "package_account_push"
-
-	AdPackageToken AudienceType = "package_token_push"
-)
-
-// MessageType push API message_type
-type MessageType string
-
-const (
-	MsgTypeNotify MessageType = "notify"
-
-	MsgTypeMessage MessageType = "message"
-)
-
-type Request struct {
-	AudienceType AudienceType `json:"audience_type"`
-
-	Message Message `json:"message"`
-
-	MessageType MessageType `json:"message_type"`
-
-	Tag []TagRule `json:"tag_rules,omitempty"`
-
-	TokenList []string `json:"token_list,omitempty"`
-
-	AccountList []string `json:"account_list,omitempty"`
-
-	Environment CommonRspEnv `json:"environment,omitempty"`
-
-	UploadId int `json:"upload_id,omitempty"`
-
-	ExpireTime int `json:"expire_time,omitempty"`
-
-	SendTime string `json:"send_time,omitempty"`
-
-	MultiPkg bool `json:"multi_pkg,omitempty"`
-
-	PlanId string `json:"plan_id,omitempty"`
-
-	AccountPushType int `json:"account_push_type,omitempty"`
-
-	PushSpeed int `json:"push_speed,omitempty"`
-
-	CollapseId int `json:"collapse_id"`
-
-	TPNSOnlinePushType int `json:"tpns_online_push_type"`
-
-	ChannelRules []*ChannelDistributeRule `json:"channel_rules,omitempty"`
-
-	LoopParam     *PushLoopParam `json:"loop_param,omitempty"`
-	ForceCollapse bool           `json:"force_collapse"`
-}
-
-type TagListOperation string
-
-type ChannelDistributeRule struct {
-	ChannelName string `json:"channel"`
-	Disable     bool   `json:"disable"`
-}
-
-type PushLoopParam struct {
-	StartDate string `json:"startDate"`
-
-	EndDate string `json:"endDate"`
-
-	LoopType PushLoopType `json:"loopType"`
-
-	LoopDayIndexs []uint32 `json:"loopDayIndexs"`
-
-	DayTimes []string `json:"dayTimes"`
-}
-
-type PushLoopType int32
-
-const (
-	TagListOpAnd TagListOperation = "AND"
-
-	TagListOpOr TagListOperation = "OR"
-)
-
-type TagType string
-
-const (
-	XGAutoProvince      TagType = "xg_auto_province"
-	XGAutoActive        TagType = "xg_auto_active"
-	XGUserDefine        TagType = "xg_user_define"
-	XGAutoVersion       TagType = "xg_auto_version"
-	XGAutoSdkversion    TagType = "xg_auto_sdkversion"
-	XGAutoDevicebrand   TagType = "xg_auto_devicebrand"
-	XGAutoDeviceversion TagType = "xg_auto_deviceversion"
-	XGAutoCountry       TagType = "xg_auto_country"
-)
-
-type TagRule struct {
-	TagItems []TagItem `json:"tag_items"`
-
-	IsNot bool `json:"is_not"`
-
-	Operator TagListOperation `json:"operator"`
-}
-
-type TagItem struct {
-	// 标签
-	Tags          []string         `json:"tags"`
-	IsNot         bool             `json:"is_not"`
-	TagsOperator  TagListOperation `json:"tags_operator"`
-	ItemsOperator TagListOperation `json:"items_operator"`
-	TagType       TagType          `json:"tag_type"`
-}
-
-type Message struct {
-	Title   string `json:"title,omitempty"`
-	Content string `json:"content,omitempty"`
-
-	AcceptTime []AcceptTimeItem `json:"accept_time,omitempty"`
-
-	Android *AndroidParams `json:"android,omitempty"`
-
-	IOS *IOSParams `json:"ios,omitempty"`
-
-	ThreadId string `json:"thread_id,omitempty"`
-
-	ThreadSumtext string `json:"thread_sumtext,omitempty"`
-
-	XGMediaResources string `json:"xg_media_resources,omitempty"`
-
-	XGMediaAudioResources string `json:"xg_media_audio_resources,omitempty"`
-}
-
-type AcceptTimeItem struct {
-	Start HourAndMin `json:"start,omitempty"`
-	End   HourAndMin `json:"end,omitempty"`
-}
-
-type HourAndMin struct {
-	Hour string `json:"hour,omitempty"`
-	Min  string `json:"min,omitempty"`
-}
-
-type AndroidParams struct {
-	BuilderId *int `json:"builder_id,omitempty"`
-
-	Ring *int `json:"ring,omitempty"`
-
-	RingRaw string `json:"ring_raw,omitempty"`
-
-	Vibrate *int `json:"vibrate,omitempty"`
-
-	Lights *int `json:"lights,omitempty"`
-
-	Clearable *int `json:"clearable,omitempty"`
-
-	IconType *int `json:"icon_type"`
-
-	IconRes string `json:"icon_res,omitempty"`
-
-	StyleId *int `json:"style_id,omitempty"`
-
-	SmallIcon string `json:"small_icon,omitempty"`
-
-	Action *Action `json:"action,omitempty"`
-
-	CustomContent string `json:"custom_content,omitempty"`
-
-	ShowType *int `json:"show_type,omitempty"`
-
-	NChId string `json:"n_ch_id,omitempty"`
-
-	NChName string `json:"n_ch_name,omitempty"`
-
-	HwChId string `json:"hw_ch_id,omitempty"`
-
-	XmChId string `json:"xm_ch_id,omitempty"`
-
-	OppoChId string `json:"oppo_ch_id,omitempty"`
-
-	VivoChId string `json:"vivo_ch_id,omitempty"`
-
-	BadgeType *int `json:"badge_type,omitempty"`
-
-	IconColor *int `json:"icon_color,omitempty"`
-}
-
-type Action struct {
-	ActionType *int    `json:"action_type,omitempty"`
-	Activity   string  `json:"activity"`
-	AtyAttr    AtyAttr `json:"aty_attr,omitempty"`
-	Intent     string  `json:"intent"`
-	Browser    Browser `json:"browser,omitempty"`
-}
-
-type Browser struct {
-	Url     string `json:"url,omitempty"`
-	Confirm *int   `json:"confirm,omitempty"`
-}
-
-type AtyAttr struct {
-	AttrIf *int `json:"if,omitempty"`
-	Pf     *int `json:"pf,omitempty"`
-}
-
-type IOSParams struct {
-	Aps *Aps `json:"aps,omitempty"`
-
-	CustomContent string `json:"custom_content,omitempty"`
-}
-
-type Aps struct {
-	Alert               map[string]string `json:"alert,omitempty"`
-	BadgeType           *int              `json:"badge_type,omitempty"`
-	Category            string            `json:"category,omitempty"`
-	ContentAvailableInt *int              `json:"content-available,omitempty"`
-	MutableContent      *int              `json:"mutable-content,omitempty"`
-	Sound               string            `json:"sound,omitempty"`
-}

internal/push/sdk/tpns-server-sdk-go/go/req/req.go

@@ -1,403 +0,0 @@
-package req
-
-import (
-	tpns "Open_IM/internal/push/sdk/tpns-server-sdk-go/go"
-	"bytes"
-	"encoding/json"
-	"io"
-	"mime/multipart"
-	"net/http"
-	"os"
-	"path/filepath"
-)
-
-var PushURL = "https://api.tpns.tencent.com/v3/push/app"
-
-//var PushURL = "https://test.api.tpns.tencent.com/v3/push/app"
-
-func URL(url string) {
-	PushURL = url
-}
-
-type ReqOpt func(*tpns.Request)
-
-func NewPush(req *tpns.Request, opts ...ReqOpt) (*http.Request, string, error) {
-	return NewPushReq(req, opts...)
-}
-
-func NewUploadFileRequest(host string, file string) (*http.Request, error) {
-	fp, err := os.Open(file)
-	if err != nil {
-		return nil, err
-	}
-
-	defer fp.Close()
-	body := &bytes.Buffer{}
-	writer := multipart.NewWriter(body)
-	part, err := writer.CreateFormFile("file", filepath.Base(fp.Name()))
-	if err != nil {
-		return nil, err
-	}
-
-	io.Copy(part, fp)
-	writer.Close()
-	url := host + "/v3/push/package/upload"
-	req, err := http.NewRequest("POST", url, body)
-	if err != nil {
-		return nil, err
-	}
-	req.Header.Add("Content-Type", writer.FormDataContentType())
-
-	return req, nil
-}
-
-func NewSingleAccountPush(
-	message tpns.Message,
-	account string,
-	opts ...ReqOpt,
-) (*http.Request, string, error) {
-	req := &tpns.Request{
-		MessageType:  tpns.MsgTypeNotify,
-		AudienceType: tpns.AdAccountList,
-		AccountList:  []string{account},
-		Message:      message,
-	}
-	return NewPushReq(req, opts...)
-}
-
-func NewListAccountPush(
-	accounts []string, message tpns.Message,
-	opts ...ReqOpt,
-) (*http.Request, string, error) {
-	req := &tpns.Request{
-		MessageType:  tpns.MsgTypeNotify,
-		AudienceType: tpns.AdAccountList,
-		AccountList:  accounts,
-		Message:      message,
-		Environment:  tpns.EnvDev,
-	}
-	return NewPushReq(req, opts...)
-}
-
-func NewTokenPush(
-	tokens []string, message tpns.Message,
-	opts ...ReqOpt,
-) (*http.Request, string, error) {
-	req := &tpns.Request{
-		MessageType:  tpns.MsgTypeNotify,
-		AudienceType: tpns.AdTokenList,
-		TokenList:    tokens,
-		Message:      message,
-		Environment:  tpns.EnvProd,
-	}
-	//fmt.Printf("reqBody :%v", common.ToJson(req))
-	//fmt.Println()
-	return NewPushReq(req, opts...)
-}
-
-func NewTagsPush(
-	tagList []tpns.TagRule, message tpns.Message,
-	opts ...ReqOpt,
-) (*http.Request, string, error) {
-	req := &tpns.Request{
-		MessageType:  tpns.MsgTypeNotify,
-		AudienceType: tpns.AdTag,
-		Tag:          tagList,
-		Message:      message,
-	}
-	//fmt.Printf("reqBody :%v", common.ToJson(req))
-	//fmt.Println()
-	return NewPushReq(req, opts...)
-}
-
-func NewAllPush(
-	message tpns.Message,
-	opts ...ReqOpt,
-) (*http.Request, string, error) {
-	req := &tpns.Request{
-		MessageType:  tpns.MsgTypeNotify,
-		AudienceType: tpns.AdAll,
-		Message:      message,
-	}
-	return NewPushReq(req, opts...)
-}
-
-func NewAccountPackagePush(
-	message tpns.Message,
-	opts ...ReqOpt,
-) (*http.Request, string, error) {
-	req := &tpns.Request{
-		MessageType:  tpns.MsgTypeNotify,
-		AudienceType: tpns.AdPackageAccount,
-		Message:      message,
-	}
-	return NewPushReq(req, opts...)
-}
-
-func NewTokenPackagePush(
-	message tpns.Message,
-	opts ...ReqOpt,
-) (*http.Request, string, error) {
-	req := &tpns.Request{
-		MessageType:  tpns.MsgTypeNotify,
-		AudienceType: tpns.AdPackageToken,
-		Message:      message,
-	}
-	return NewPushReq(req, opts...)
-}
-
-func NewPushReq(req *tpns.Request, opts ...ReqOpt) (request *http.Request, reqBody string, err error) {
-	for _, opt := range opts {
-		opt(req)
-	}
-	bodyBytes, err := json.Marshal(req)
-	if err != nil {
-		return nil, "", err
-	}
-	reqBody = string(bodyBytes)
-	//fmt.Printf("NewPushReq req:%v", reqBody)
-	request, err = http.NewRequest("POST", PushURL, bytes.NewReader(bodyBytes))
-	if err != nil {
-		return nil, "", err
-	}
-	request.Header.Add("Content-Type", "application/json")
-	return
-}
-
-func EnvProd() ReqOpt {
-	return func(r *tpns.Request) {
-		r.Environment = tpns.EnvProd
-	}
-}
-
-func EnvDev() ReqOpt {
-	return func(r *tpns.Request) {
-		r.Environment = tpns.EnvDev
-	}
-}
-
-func Title(t string) ReqOpt {
-	return func(r *tpns.Request) {
-		r.Message.Title = t
-		if r.Message.IOS != nil {
-			if r.Message.IOS.Aps != nil {
-				r.Message.IOS.Aps.Alert["title"] = t
-			} else {
-				r.Message.IOS.Aps = &tpns.Aps{
-					Alert: map[string]string{"title": t},
-				}
-			}
-		} else {
-			r.Message.IOS = &tpns.IOSParams{
-				Aps: &tpns.Aps{
-					Alert: map[string]string{"title": t},
-				},
-			}
-		}
-	}
-}
-
-func Content(c string) ReqOpt {
-	return func(r *tpns.Request) {
-		r.Message.Content = c
-		if r.Message.IOS != nil {
-			if r.Message.IOS.Aps != nil {
-				r.Message.IOS.Aps.Alert["body"] = c
-			} else {
-				r.Message.IOS.Aps = &tpns.Aps{
-					Alert: map[string]string{"body": c},
-				}
-			}
-		} else {
-			r.Message.IOS = &tpns.IOSParams{
-				Aps: &tpns.Aps{
-					Alert: map[string]string{"body": c},
-				},
-			}
-		}
-	}
-}
-
-func Ring(ring *int) ReqOpt {
-	return func(r *tpns.Request) {
-		r.Message.Android.Ring = ring
-	}
-}
-
-func RingRaw(rr string) ReqOpt {
-	return func(r *tpns.Request) {
-		r.Message.Android.RingRaw = rr
-	}
-}
-
-func Vibrate(v *int) ReqOpt {
-	return func(r *tpns.Request) {
-		r.Message.Android.Vibrate = v
-	}
-}
-
-func Lights(l *int) ReqOpt {
-	return func(r *tpns.Request) {
-		r.Message.Android.Lights = l
-	}
-}
-
-func Clearable(c *int) ReqOpt {
-	return func(r *tpns.Request) {
-		r.Message.Android.Clearable = c
-	}
-}
-
-func IconType(it *int) ReqOpt {
-	return func(r *tpns.Request) {
-		r.Message.Android.IconType = it
-	}
-}
-
-func IconRes(ir string) ReqOpt {
-	return func(r *tpns.Request) {
-		r.Message.Android.IconRes = ir
-	}
-}
-
-func AndroidCustomContent(ct string) ReqOpt {
-	return func(r *tpns.Request) {
-		r.Message.Android.CustomContent = ct
-	}
-}
-
-func Aps(aps *tpns.Aps) ReqOpt {
-	return func(r *tpns.Request) {
-		r.Message.IOS.Aps = aps
-	}
-}
-
-func AudienceType(at tpns.AudienceType) ReqOpt {
-	return func(r *tpns.Request) {
-		r.AudienceType = at
-	}
-}
-
-func Message(m tpns.Message) ReqOpt {
-	return func(r *tpns.Request) {
-		r.Message = m
-	}
-}
-
-func TokenList(tl []string) ReqOpt {
-	return func(r *tpns.Request) {
-		r.TokenList = tl
-	}
-}
-
-func TokenListAdd(t string) ReqOpt {
-	return func(r *tpns.Request) {
-		if r.TokenList != nil {
-			r.TokenList = append(r.TokenList, t)
-		} else {
-			r.TokenList = []string{t}
-		}
-	}
-}
-
-func AccountList(al []string) ReqOpt {
-	return func(r *tpns.Request) {
-		r.AccountList = al
-	}
-}
-
-//ChannelDistributeRules
-func AddChannelRules(ChannelRules []*tpns.ChannelDistributeRule) ReqOpt {
-	return func(r *tpns.Request) {
-		r.ChannelRules = ChannelRules
-	}
-}
-
-//ChannelDistributeRules
-func AddLoopParam(loopParam *tpns.PushLoopParam) ReqOpt {
-	return func(r *tpns.Request) {
-		r.LoopParam = loopParam
-	}
-}
-
-func AccountListAdd(a string) ReqOpt {
-	return func(r *tpns.Request) {
-		if r.AccountList != nil {
-			r.AccountList = append(r.AccountList, a)
-		} else {
-			r.AccountList = []string{a}
-		}
-	}
-}
-
-func MessageType(t tpns.MessageType) ReqOpt {
-	return func(r *tpns.Request) {
-		r.MessageType = t
-	}
-}
-
-func AddMultiPkg(multipPkg bool) ReqOpt {
-	return func(r *tpns.Request) {
-		r.MultiPkg = multipPkg
-	}
-}
-
-func AddForceCollapse(forceCollapse bool) ReqOpt {
-	return func(r *tpns.Request) {
-		r.ForceCollapse = forceCollapse
-	}
-}
-
-func AddTPNSOnlinePushType(onlinePushType int) ReqOpt {
-	return func(r *tpns.Request) {
-		r.TPNSOnlinePushType = onlinePushType
-	}
-}
-
-func AddCollapseId(collapseId int) ReqOpt {
-	return func(r *tpns.Request) {
-		r.CollapseId = collapseId
-	}
-}
-
-func AddPushSpeed(pushSpeed int) ReqOpt {
-	return func(r *tpns.Request) {
-		r.PushSpeed = pushSpeed
-	}
-}
-
-func AddAccountPushType(accountPushType int) ReqOpt {
-	return func(r *tpns.Request) {
-		r.AccountPushType = accountPushType
-	}
-}
-
-func AddPlanId(planId string) ReqOpt {
-	return func(r *tpns.Request) {
-		r.PlanId = planId
-	}
-}
-
-func AddSendTime(sendTime string) ReqOpt {
-	return func(r *tpns.Request) {
-		r.SendTime = sendTime
-	}
-}
-
-func AddExpireTime(expireTime int) ReqOpt {
-	return func(r *tpns.Request) {
-		r.ExpireTime = expireTime
-	}
-}
-
-func AddUploadId(UploadId int) ReqOpt {
-	return func(r *tpns.Request) {
-		r.UploadId = UploadId
-	}
-}
-
-func AddEnvironment(Environment tpns.CommonRspEnv) ReqOpt {
-	return func(r *tpns.Request) {
-		r.Environment = Environment
-	}
-}