liulei/baseapi
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://e.coding.net/rosydev/baseapi

Browse Source
This commit is contained in:
richboo111
2023-03-21 15:26:28 +08:00
parent a01dfe715f edd680602b
commit 5280148134
7 changed files with 326 additions and 327 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
platformapi/tiktok_shop/ascription_place/dd_test.go
View File

@@ -6,7 +6,7 @@ import (
)
func TestAscriptionPlace(t *testing.T) {
p, err := Find("13146872779")
p, err := Find("17146563473")
fmt.Println(p)
fmt.Println(err)
}

89
platformapi/uinapp/uin_app_test.go
View File

@@ -1,10 +1,9 @@
package uinapp
import (
"git.rosy.net.cn/baseapi/utils"
"fmt"
"git.rosy.net.cn/jx-callback/globals"
"testing"
"time"
)
var (
@@ -18,55 +17,45 @@ func TestGetToken(t *testing.T) {
globals.SugarLogger.Debug("result := %v", err)
}
func TestSendMsgAndroid(t *testing.T) {
api.SendMsgByUinApp(SendMsgReq{
RequestId: utils.Int64ToStr(time.Now().UnixNano()),
GroupName: "",
Audience: AudienceCid{CId: []string{android}},
Settings: SendMsgSetting{},
PushMessage: PushMessageDetail{
Notification: PushMessageDetailNotification{
Title: "测试消息推送[个推推送消息参数]",
Body: "吃早饭了没得[个推推送消息参数]",
BigText: "这是个什么东西[个推推送消息参数]",
BigImage: "",
Logo: "",
LogoUrl: "",
ChannelId: "",
ChannelName: "",
ChannelLevel: 0,
ClickType: "startapp",
Intent: "",
Url: "",
Payload: "",
NotifyId: 0,
RingName: "",
BadgeAddNum: 0,
ThreadId: "",
func TestCidSend(t *testing.T) {
err := api.SendMsgByUinApp(map[string]interface{}{
"request_id": "12345237568ydfd2",
"settings": map[string]interface{}{
"ttl": 7200000,
},
"audience": map[string]interface{}{
"cid": []string{"808ba3cebba05782f82063d590b738a3"},
},
"push_message": map[string]interface{}{
"transmission": "{'type':'new','title':'火车南站店','content':'老板，您来新订单了，请尽快接单！'}",
},
"push_channel": map[string]interface{}{
"android": map[string]interface{}{
"ups": map[string]interface{}{
"transmission": "厂商透传消息",
},
},
"ios": map[string]interface{}{
"type": "notify",
"payload": "{'type':'new','title':'火车南站店','content':'老板，您来新订单了，请尽快接单！'}",
"aps": map[string]interface{}{
"alert": map[string]interface{}{
"title": "火车南站店",
"body": "新订单",
},
"content-available": 0,
"sound": "自定义铃声，设置为包含后缀名的完整文件名，示例值：ring.mp3",
"category": "在客户端通知栏触发特定的action和button显示",
},
"auto_badge": "+1",
"multimedia": []map[string]interface{}{
{
"url": "https://xxx",
"type": 1,
"only_wifi": false},
},
},
},
PushChannel: PushChannelDetail{
//Ios: IosApsDetail{},
Android: AndroidPushChannelDetail{Ups: AndroidPushChannelUps{
Notification: AndroidPushChannelNotification{
Title: "测试消息推送[厂商推送消息参数]",
Body: "吃早饭了没得[厂商推送消息参数]",
ClickType: "startapp",
Intent: "",
Url: "",
NotifyId: 0,
},
Transmission: "",
Revoke: struct {
OldTaskId string `json:"old_task_id"`
}{},
Options: struct {
Constraint string `json:"constraint"`
Key string `json:"key"`
Value interface{} `json:"value"`
}{},
}},
Mp: MpPushChannelDetail{},
},
})
fmt.Println(err)
}

22
platformapi/uinapp/uinapp_model.go
View File

@@ -109,17 +109,19 @@ type IosPushChannelAps struct {
ContentState struct{} `json:"content-state"` // type为liveactivity时必填
}
type MultimediaIos struct {
Url string `json:"url"` // 多媒体资源地址
TypeMultimedia int64 `json:"type"` // 资源类型（1.图片，2.音频，3.视频）
OnlyWifi bool `json:"only_wifi"` // 是否只在wifi环境下加载，如果设置成true,但未使用wifi时，会展示成普通通知
}
type IosApsDetail struct {
NotifyType string `json:"type"` // notify默认通知消息 voip：voip语音推送，notify：apns通知消息，liveactivity：灵动岛推送(不支持p12证书)
Aps IosPushChannelAps `json:"aps"` // 推送通知消息内容
AutoBadge string `json:""` // 用于计算icon上显示的数字，还可以实现显示数字的自动增减，如“+1”、 “-1”、 “1” 等，计算结果将覆盖badge
Payload string `json:"payload"` // 增加自定义的数据
Multimedia []struct { // 多媒体设置
Url string `json:"url"` // 多媒体资源地址
TypeMultimedia int64 `json:"type"` // 资源类型（1.图片，2.音频，3.视频）
OnlyWifi bool `json:"only_wifi"` // 是否只在wifi环境下加载，如果设置成true,但未使用wifi时，会展示成普通通知
} `json:"multimedia"` // 多媒体设置
ApnsCollapseId string `json:"apns-collapse-id"` // 使用相同的apns-collapse-id可以覆盖之前的消息
NotifyType string `json:"type"` // notify默认通知消息 voip：voip语音推送，notify：apns通知消息，liveactivity：灵动岛推送(不支持p12证书)
Aps IosPushChannelAps `json:"aps"` // 推送通知消息内容
AutoBadge string `json:""` // 用于计算icon上显示的数字，还可以实现显示数字的自动增减，如“+1”、 “-1”、 “1” 等，计算结果将覆盖badge
Payload string `json:"payload"` // 增加自定义的数据
Multimedia []MultimediaIos `json:"multimedia"` // 多媒体设置
ApnsCollapseId string `json:"apns-collapse-id"` // 使用相同的apns-collapse-id可以覆盖之前的消息
}
type AndroidPushChannelUps struct {

15
platformapi/uinapp/uinapp_send_msg.go
View File

@@ -1,9 +1,12 @@
package uinapp
import (
"encoding/json"
"errors"
"fmt"
"git.rosy.net.cn/baseapi/utils"
"net/http"
"strings"
)
type SendMsgRes struct {
@@ -16,13 +19,15 @@ type SendMsgRes struct {
} `json:"data"`
}
func (a *API) SendMsgByUinApp(parma SendMsgReq) error {
if err := a.CheckTokenIsExpire(); err != nil {
func (a *API) SendMsgByUinApp(parma map[string]interface{}) error {
if _, err := a.CheckTokenIsExpire(); err != nil {
return err
}
result, err := a.AccessAPI(BaseUrl+a.appId, PushMsgByCid, http.MethodPost, utils.Struct2MapByJson(parma))
if err != nil {
data, _ := json.Marshal(parma)
fmt.Println(string(data))
result, err := a.AccessAPI(BaseUrl+a.appId, PushMsgByCid, http.MethodPost, parma)
if err != nil && !strings.Contains(err.Error(), "success") {
return err
}
@@ -30,7 +35,7 @@ func (a *API) SendMsgByUinApp(parma SendMsgReq) error {
if err := utils.Map2StructByJson(result, &sendMsgRes, false); err != nil {
return err
}
if sendMsgRes.Code != 200 {
if sendMsgRes.Code != 0 {
return errors.New(sendMsgRes.Msg)
}
return nil

7
platformapi/uinapp/uinapp_token.go
View File

@@ -122,10 +122,11 @@ func (a *API) GetUinAppToken() error {
// CheckTokenIsExpire 校验头肯是否过期
// 注：鉴权接口每分钟最大调用量为100次，每天最大调用量为10万次，建议开发者妥善管理token，以免达到限制，影响推送.感觉不做缓存也够用了!
func (a *API) CheckTokenIsExpire() error {
func (a *API) CheckTokenIsExpire() (string, error) {
// 没有token或者token过期了
if a.token == "" || a.expireTime == "" || utils.Str2Int64(a.expireTime) < (time.Now().UnixNano()/1e6) {
return a.GetUinAppToken()
a.GetUinAppToken()
return a.token, nil
}
return nil
return a.token, nil
}

435
platformapi/unipushapi/unipushapi.go
View File

@@ -1,219 +1,220 @@
package unipushapi
import (
"crypto/sha256"
"encoding/hex"
"encoding/json"
"fmt"
"net/http"
"strings"
"sync"
"time"
"git.rosy.net.cn/baseapi/platformapi"
"git.rosy.net.cn/baseapi/utils"
)
const (
prodURL = "https://restapi.getui.com/v2"
authAction = "auth"
SuccessOffLine = "successed_offline"
SuccessONLine = "successed_online"
)
type TokenInfo struct {
ExpireTime string `json:"expire_time"`
Token string `json:"token"`
}
type API struct {
token string
appID string
appKey string
appSecret string
masterSecret string
client *http.Client
config *platformapi.APIConfig
locker sync.RWMutex
}
func New(appID, appKey, appSecret, masterSecret string, config ...*platformapi.APIConfig) *API {
curConfig := platformapi.DefAPIConfig
if len(config) > 0 {
curConfig = *config[0]
}
return &API{
appID: appID,
appKey: appKey,
appSecret: appSecret,
masterSecret: masterSecret,
client: &http.Client{Timeout: curConfig.ClientTimeout},
config: &curConfig,
}
}
func (a *API) signParam(appKey string, time int64, masterSecret string) (sig string) {
//方法一：
//创建一个基于SHA256算法的hash.Hash接口的对象
hash := sha256.New()
//输入数据
hash.Write([]byte(appKey + utils.Int64ToStr(time) + masterSecret))
//计算哈希值
bytes := hash.Sum(nil)
//将字符串编码为16进制格式,返回字符串
hashCode := hex.EncodeToString(bytes)
//返回哈希值
return hashCode
}
func (a *API) AccessAPI(action string, bizParams map[string]interface{}) (retVal map[string]interface{}, err error) {
params := make(map[string]interface{})
time := time.Now().UnixNano() / 1e6
params["timestamp"] = utils.Int64ToStr(time)
params["appkey"] = a.appKey
params["sign"] = a.signParam(a.appKey, time, a.masterSecret)
result, _ := json.MarshalIndent(params, "", " ")
fullURL := utils.GenerateGetURL(prodURL+"/"+a.appID, action, nil)
err = platformapi.AccessPlatformAPIWithRetry(a.client,
func() *http.Request {
request, _ := http.NewRequest(http.MethodPost, fullURL, strings.NewReader(string(result)))
if action != authAction {
request.Header.Set("token", a.CBGetToken())
}
request.Header.Set("Content-Type", "application/json;charset=utf-8")
return request
},
a.config,
func(response *http.Response, bodyStr string, jsonResult1 map[string]interface{}) (errLevel string, err error) {
if jsonResult1 == nil {
return platformapi.ErrLevelRecoverableErr, fmt.Errorf("mapData is nil")
}
if err == nil {
if jsonResult1["msg"].(string) != "success" {
errLevel = platformapi.ErrLevelGeneralFail
err = utils.NewErrorCode(jsonResult1["msg"].(string), utils.Int64ToStr(utils.MustInterface2Int64(jsonResult1["code"])))
}
retVal = jsonResult1["data"].(map[string]interface{})
}
return errLevel, err
})
return retVal, err
}
func (a *API) AccessAPI2(action string, bizParams map[string]interface{}) (retVal map[string]interface{}, err error) {
result, _ := json.MarshalIndent(bizParams, "", " ")
fullURL := utils.GenerateGetURL(prodURL+"/"+a.appID, action, nil)
err = platformapi.AccessPlatformAPIWithRetry(a.client,
func() *http.Request {
request, _ := http.NewRequest(http.MethodPost, fullURL, strings.NewReader(string(result)))
request.Header.Set("token", a.CBGetToken())
request.Header.Set("Content-Type", "application/json;charset=utf-8")
return request
},
a.config,
func(response *http.Response, bodyStr string, jsonResult1 map[string]interface{}) (errLevel string, err error) {
if jsonResult1 == nil {
return platformapi.ErrLevelRecoverableErr, fmt.Errorf("mapData is nil")
}
if err == nil {
if jsonResult1["msg"].(string) != "success" {
errLevel = platformapi.ErrLevelGeneralFail
err = utils.NewErrorCode(jsonResult1["msg"].(string), utils.Int64ToStr(utils.MustInterface2Int64(jsonResult1["code"])))
}
retVal = jsonResult1
}
return errLevel, err
})
return retVal, err
}
func (a *API) CBSetToken(newToken string) bool {
curToken := a.CBGetToken()
if curToken != newToken {
a.locker.Lock()
defer a.locker.Unlock()
a.token = newToken
return true
}
return false
}
func (a *API) CBGetToken() string {
a.locker.RLock()
defer a.locker.RUnlock()
return a.token
}
func (a *API) CBRetrieveToken() (tokenInfo *TokenInfo, err error) {
result, err := a.AccessAPI("auth", nil)
if err != nil {
return nil, err
}
tokenInfo = &TokenInfo{
Token: utils.Interface2String(result["token"]),
ExpireTime: utils.Interface2String(result["expire_time"]),
}
a.CBSetToken(tokenInfo.Token)
return tokenInfo, nil
}
type PushMsg struct {
Notificatio Notification `json:"notification"`
}
type Notification struct {
Title string `json:"title"`
Body string `json:"body"`
ClickType string `json:"click_type"`
URL string `json:"url"`
}
type Audience struct {
CID []string `json:"cid"`
}
type Settings struct {
TTL int `json:"ttl"`
}
type Transmission struct {
Transmission string `json:"transmission"`
}
func (a *API) PushToSingle(cid string, transmission bool, notification *Notification) (status string, err error) {
params := map[string]interface{}{
"request_id": utils.GetUUID(),
"audience": &Audience{
[]string{cid},
},
}
if !transmission {
params["push_message"] = &PushMsg{
Notificatio: Notification{
Title: notification.Title,
Body: notification.Body,
ClickType: "startapp", //打开应用首页
},
}
} else {
params["push_message"] = &Transmission{
Transmission: notification.Body,
}
}
result2, err := a.AccessAPI2("push/single/cid", params)
if err != nil {
return "", err
} else {
for _, v := range result2["data"].(map[string]interface{}) {
for _, vv := range v.(map[string]interface{}) {
if vv.(string) != "" {
status = vv.(string)
}
}
}
}
return status, nil
}
//
//import (
// "crypto/sha256"
// "encoding/hex"
// "encoding/json"
// "fmt"
// "net/http"
// "strings"
// "sync"
// "time"
//
// "git.rosy.net.cn/baseapi/platformapi"
// "git.rosy.net.cn/baseapi/utils"
//)
//
//const (
// prodURL = "https://restapi.getui.com/v2"
//
// authAction = "auth"
// SuccessOffLine = "successed_offline"
// SuccessONLine = "successed_online"
//)
//
//type TokenInfo struct {
// ExpireTime string `json:"expire_time"`
// Token string `json:"token"`
//}
//
//type API struct {
// token string
// appID string
// appKey string
// appSecret string
// masterSecret string
//
// client *http.Client
// config *platformapi.APIConfig
// locker sync.RWMutex
//}
//
//func New(appID, appKey, appSecret, masterSecret string, config ...*platformapi.APIConfig) *API {
// curConfig := platformapi.DefAPIConfig
// if len(config) > 0 {
// curConfig = *config[0]
// }
// return &API{
// appID: appID,
// appKey: appKey,
// appSecret: appSecret,
// masterSecret: masterSecret,
//
// client: &http.Client{Timeout: curConfig.ClientTimeout},
// config: &curConfig,
// }
//}
//
//func (a *API) signParam(appKey string, time int64, masterSecret string) (sig string) {
// //方法一：
// //创建一个基于SHA256算法的hash.Hash接口的对象
// hash := sha256.New()
// //输入数据
// hash.Write([]byte(appKey + utils.Int64ToStr(time) + masterSecret))
// //计算哈希值
// bytes := hash.Sum(nil)
// //将字符串编码为16进制格式,返回字符串
// hashCode := hex.EncodeToString(bytes)
// //返回哈希值
// return hashCode
//}
//
//func (a *API) AccessAPI(action string, bizParams map[string]interface{}) (retVal map[string]interface{}, err error) {
// params := make(map[string]interface{})
// time := time.Now().UnixNano() / 1e6
// params["timestamp"] = utils.Int64ToStr(time)
// params["appkey"] = a.appKey
// params["sign"] = a.signParam(a.appKey, time, a.masterSecret)
// result, _ := json.MarshalIndent(params, "", " ")
// fullURL := utils.GenerateGetURL(prodURL+"/"+a.appID, action, nil)
// err = platformapi.AccessPlatformAPIWithRetry(a.client,
// func() *http.Request {
// request, _ := http.NewRequest(http.MethodPost, fullURL, strings.NewReader(string(result)))
// if action != authAction {
// request.Header.Set("token", a.CBGetToken())
// }
// request.Header.Set("Content-Type", "application/json;charset=utf-8")
// return request
// },
// a.config,
// func(response *http.Response, bodyStr string, jsonResult1 map[string]interface{}) (errLevel string, err error) {
// if jsonResult1 == nil {
// return platformapi.ErrLevelRecoverableErr, fmt.Errorf("mapData is nil")
// }
// if err == nil {
// if jsonResult1["msg"].(string) != "success" {
// errLevel = platformapi.ErrLevelGeneralFail
// err = utils.NewErrorCode(jsonResult1["msg"].(string), utils.Int64ToStr(utils.MustInterface2Int64(jsonResult1["code"])))
// }
// retVal = jsonResult1["data"].(map[string]interface{})
// }
// return errLevel, err
// })
// return retVal, err
//}
//
//func (a *API) AccessAPI2(action string, bizParams map[string]interface{}) (retVal map[string]interface{}, err error) {
// result, _ := json.MarshalIndent(bizParams, "", " ")
// fullURL := utils.GenerateGetURL(prodURL+"/"+a.appID, action, nil)
// err = platformapi.AccessPlatformAPIWithRetry(a.client,
// func() *http.Request {
// request, _ := http.NewRequest(http.MethodPost, fullURL, strings.NewReader(string(result)))
// request.Header.Set("token", a.CBGetToken())
// request.Header.Set("Content-Type", "application/json;charset=utf-8")
// return request
// },
// a.config,
// func(response *http.Response, bodyStr string, jsonResult1 map[string]interface{}) (errLevel string, err error) {
// if jsonResult1 == nil {
// return platformapi.ErrLevelRecoverableErr, fmt.Errorf("mapData is nil")
// }
// if err == nil {
// if jsonResult1["msg"].(string) != "success" {
// errLevel = platformapi.ErrLevelGeneralFail
// err = utils.NewErrorCode(jsonResult1["msg"].(string), utils.Int64ToStr(utils.MustInterface2Int64(jsonResult1["code"])))
// }
// retVal = jsonResult1
// }
// return errLevel, err
// })
// return retVal, err
//}
//
//func (a *API) CBSetToken(newToken string) bool {
// curToken := a.CBGetToken()
// if curToken != newToken {
// a.locker.Lock()
// defer a.locker.Unlock()
// a.token = newToken
// return true
// }
// return false
//}
//
//func (a *API) CBGetToken() string {
// a.locker.RLock()
// defer a.locker.RUnlock()
// return a.token
//}
//
//func (a *API) CBRetrieveToken() (tokenInfo *TokenInfo, err error) {
// result, err := a.AccessAPI("auth", nil)
// if err != nil {
// return nil, err
// }
// tokenInfo = &TokenInfo{
// Token: utils.Interface2String(result["token"]),
// ExpireTime: utils.Interface2String(result["expire_time"]),
// }
// a.CBSetToken(tokenInfo.Token)
// return tokenInfo, nil
//}
//
//type PushMsg struct {
// Notificatio Notification `json:"notification"`
//}
//
//type Notification struct {
// Title string `json:"title"`
// Body string `json:"body"`
// ClickType string `json:"click_type"`
// URL string `json:"url"`
//}
//
//type Audience struct {
// CID []string `json:"cid"`
//}
//
//type Settings struct {
// TTL int `json:"ttl"`
//}
//
//type Transmission struct {
// Transmission string `json:"transmission"`
//}
//
//func (a *API) PushToSingle(cid string, transmission bool, notification *Notification) (status string, err error) {
// params := map[string]interface{}{
// "request_id": utils.GetUUID(),
// "audience": &Audience{
// []string{cid},
// },
// }
// if !transmission {
// params["push_message"] = &PushMsg{
// Notificatio: Notification{
// Title: notification.Title,
// Body: notification.Body,
// ClickType: "startapp", //打开应用首页
// },
// }
// } else {
// params["push_message"] = &Transmission{
// Transmission: notification.Body,
// }
// }
// result2, err := a.AccessAPI2("push/single/cid", params)
// if err != nil {
// return "", err
// } else {
// for _, v := range result2["data"].(map[string]interface{}) {
// for _, vv := range v.(map[string]interface{}) {
// if vv.(string) != "" {
// status = vv.(string)
// }
// }
// }
// }
// return status, nil
//}

83
platformapi/unipushapi/unipushapi_test.go
View File

@@ -1,43 +1,44 @@
package unipushapi
import (
"testing"
"git.rosy.net.cn/baseapi"
"git.rosy.net.cn/baseapi/utils"
"go.uber.org/zap"
)
var (
api *API
sugarLogger *zap.SugaredLogger
)
func init() {
logger, _ := zap.NewDevelopment()
sugarLogger = logger.Sugar()
baseapi.Init(sugarLogger)
api = New("5lyyrvHODG6wC8Sdr3a9h", "iFrkUDmR2g5eqQpfh2kQ57", "WTn53qd6WAAdLMXfmXvzb7", "dGZcR0XGGg7H5Pd7FR3n47")
api.CBSetToken("cf74937695849a89bcb414e49f03702416b49024a49e7f62570280f99eb63b58")
// ef364b677911fa64d41a25d22d5e155065c4898046be65ddd627fa6c8cd87c2e
}
func TestCBRetrieveToken(t *testing.T) {
result, err := api.CBRetrieveToken()
if err != nil {
t.Fatal(err.Error())
}
t.Log(utils.Format4Output(result, false))
}
func TestPushToSingle(t *testing.T) {
result, err := api.PushToSingle("8aa96ba065a29a0135c5151819fb1666", false, &Notification{
Title: "测试",
Body: "测测测",
})
if err != nil {
t.Fatal(err.Error())
}
t.Log(utils.Format4Output(result, false))
// RASS_0911_1517001ff419d4699a0be17ac3f04a54
}
//
//import (
// "testing"
//
// "git.rosy.net.cn/baseapi"
// "git.rosy.net.cn/baseapi/utils"
// "go.uber.org/zap"
//)
//
//var (
// api *API
// sugarLogger *zap.SugaredLogger
//)
//
//func init() {
// logger, _ := zap.NewDevelopment()
// sugarLogger = logger.Sugar()
// baseapi.Init(sugarLogger)
// api = New("5lyyrvHODG6wC8Sdr3a9h", "iFrkUDmR2g5eqQpfh2kQ57", "WTn53qd6WAAdLMXfmXvzb7", "dGZcR0XGGg7H5Pd7FR3n47")
// api.CBSetToken("cf74937695849a89bcb414e49f03702416b49024a49e7f62570280f99eb63b58")
// // ef364b677911fa64d41a25d22d5e155065c4898046be65ddd627fa6c8cd87c2e
//}
//
//func TestCBRetrieveToken(t *testing.T) {
// result, err := api.CBRetrieveToken()
// if err != nil {
// t.Fatal(err.Error())
// }
// t.Log(utils.Format4Output(result, false))
//}
//
//func TestPushToSingle(t *testing.T) {
// result, err := api.PushToSingle("8aa96ba065a29a0135c5151819fb1666", false, &Notification{
// Title: "测试",
// Body: "测测测",
// })
// if err != nil {
// t.Fatal(err.Error())
// }
// t.Log(utils.Format4Output(result, false))
// // RASS_0911_1517001ff419d4699a0be17ac3f04a54
//}