Merge branch 'release/v1.26.5'

bububa · Aug 21, 2024 · 9f825ab · 9f825ab
2 parents 8cc4580 + 8e9fdd4
commit 9f825ab
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 6 deletions.
diff --git a/marketing-api/api/eventmanager/all_assets_detail.go b/marketing-api/api/eventmanager/all_assets_detail.go
@@ -16,7 +16,7 @@ import (
 //   - 账户下不返回已删除资产的资产详情信息
 func AllAssetsDetail(clt *core.SDKClient, accessToken string, req *eventmanager.AllAssetsDetailRequest) ([]eventmanager.AssetDetail, error) {
 	var resp eventmanager.AllAssetsDetailResponse
-	if err := clt.Get("2/tools/event/all_assets/detail/", req, &resp, accessToken); err != nil {
+	if err := clt.GetAPI("2/tools/event/all_assets/detail/", req, &resp, accessToken); err != nil {
 		return nil, err
 	}
 	return resp.Data.List, nil

diff --git a/marketing-api/api/eventmanager/all_assets_list.go b/marketing-api/api/eventmanager/all_assets_list.go
@@ -16,7 +16,7 @@ import (
 //   - 账户下不返回已删除的资产
 func AllAssetsList(clt *core.SDKClient, accessToken string, req *eventmanager.AllAssetsListRequest) (*eventmanager.AllAssetsListResult, error) {
 	var resp eventmanager.AllAssetsListResponse
-	if err := clt.Get("2/tools/event/all_assets/list/", req, &resp, accessToken); err != nil {
+	if err := clt.GetAPI("2/tools/event/all_assets/list/", req, &resp, accessToken); err != nil {
 		return nil, err
 	}
 	return resp.Data, nil

diff --git a/marketing-api/core/client.go b/marketing-api/core/client.go
@@ -100,11 +100,28 @@ func (c *SDKClient) Copy() *SDKClient {
 
 // Post post api
 func (c *SDKClient) Post(gw string, req model.PostRequest, resp model.Response, accessToken string) error {
+	return c.post(BASE_URL, gw, req, resp, accessToken)
+}
+
+func (c *SDKClient) PostAPI(gw string, req model.PostRequest, resp model.Response, accessToken string) error {
+	return c.post(API_BASE_URL, gw, req, resp, accessToken)
+}
+
+// Get get api
+func (c *SDKClient) Get(gw string, req model.GetRequest, resp model.Response, accessToken string) error {
+	return c.get(BASE_URL, gw, req, resp, accessToken)
+}
+
+func (c *SDKClient) GetAPI(gw string, req model.GetRequest, resp model.Response, accessToken string) error {
+	return c.get(API_BASE_URL, gw, req, resp, accessToken)
+}
+
+func (c *SDKClient) post(base string, gw string, req model.PostRequest, resp model.Response, accessToken string) error {
 	var reqBytes []byte
 	if req != nil {
 		reqBytes = req.Encode()
 	}
-	reqUrl := util.StringsJoin(BASE_URL, gw)
+	reqUrl := util.StringsJoin(base, gw)
 	httpReq, err := http.NewRequest("POST", reqUrl, bytes.NewReader(reqBytes))
 	if err != nil {
 		return err
@@ -126,9 +143,8 @@ func (c *SDKClient) Post(gw string, req model.PostRequest, resp model.Response,
 	return c.fetch(httpReq, resp)
 }
 
-// Get get api
-func (c *SDKClient) Get(gw string, req model.GetRequest, resp model.Response, accessToken string) error {
-	reqUrl := util.StringsJoin(BASE_URL, gw)
+func (c *SDKClient) get(base string, gw string, req model.GetRequest, resp model.Response, accessToken string) error {
+	reqUrl := util.StringsJoin(base, gw)
 	if req != nil {
 		reqUrl = util.StringsJoin(reqUrl, "?", req.Encode())
 	}

diff --git a/marketing-api/core/const.go b/marketing-api/core/const.go
@@ -3,6 +3,8 @@ package core
 const (
 	// BASE_URL 默认APIgateway
 	BASE_URL = "https://ad.oceanengine.com/open_api/"
+	// API_BASE_URL 默认APIgateway
+	API_BASE_URL = "https://api.oceanengine.com/open_api/"
 	// ANALYTICS_URL 转化回传API gateway
 	ANALYTICS_URL = "https://analytics.oceanengine.com/api/v2/"
 	// ANALYTICSV1_URL 电话转化回传API gateway