Merge pull request #12 from ArtisanCloud/develop

refact(client): expose service to pkg
ArtisanCloud · Feb 11, 2025 · 692febc · 692febc
2 parents 6093525 + dc5bc20
commit 692febc
Show file tree

Hide file tree

Showing 30 changed files with 33 additions and 35 deletions.
diff --git a/internal/service/douyin/douyin.go → pkg/client/douyin/douyin.go b/internal/service/douyin/douyin.go → pkg/client/douyin/douyin.go
diff --git a/pkg/client/mediaX.go b/pkg/client/mediaX.go
@@ -1,10 +1,10 @@
 package client
 
 import (
-	"github.com/ArtisanCloud/MediaX/internal/service/douyin"
-	"github.com/ArtisanCloud/MediaX/internal/service/redbook"
-	"github.com/ArtisanCloud/MediaX/internal/service/wechat/officialAccount"
 	"github.com/ArtisanCloud/MediaX/pkg/client/config"
+	"github.com/ArtisanCloud/MediaX/pkg/client/douyin"
+	"github.com/ArtisanCloud/MediaX/pkg/client/redbook"
+	"github.com/ArtisanCloud/MediaX/pkg/client/wechat/officialAccount"
 	"github.com/ArtisanCloud/MediaXCore/pkg/cache"
 	"github.com/ArtisanCloud/MediaXCore/pkg/logger"
 )

diff --git a/internal/service/redbook/redbook.go → pkg/client/redbook/redbook.go b/internal/service/redbook/redbook.go → pkg/client/redbook/redbook.go
diff --git a/internal/service/wechat/README.md → pkg/client/wechat/README.md b/internal/service/wechat/README.md → pkg/client/wechat/README.md
diff --git a/...service/wechat/core/accessTokenHandler.go → pkg/client/wechat/core/accessTokenHandler.go b/...service/wechat/core/accessTokenHandler.go → pkg/client/wechat/core/accessTokenHandler.go
diff --git a/internal/service/wechat/core/client.go → pkg/client/wechat/core/client.go b/internal/service/wechat/core/client.go → pkg/client/wechat/core/client.go
@@ -4,10 +4,11 @@ import (
 	"bytes"
 	"github.com/ArtisanCloud/MediaX/internal/kernel"
 	response2 "github.com/ArtisanCloud/MediaX/internal/kernel/response"
-	"github.com/ArtisanCloud/MediaX/internal/service/wechat/core/response"
-	"github.com/ArtisanCloud/MediaX/internal/service/wechat/officialAccount/material"
-	"github.com/ArtisanCloud/MediaX/internal/service/wechat/officialAccount/media"
-	"github.com/ArtisanCloud/MediaX/internal/service/wechat/officialAccount/publish"
+	"github.com/ArtisanCloud/MediaX/pkg/client/wechat/core/response"
+	"github.com/ArtisanCloud/MediaX/pkg/client/wechat/officialAccount/material"
+	"github.com/ArtisanCloud/MediaX/pkg/client/wechat/officialAccount/media"
+	"github.com/ArtisanCloud/MediaX/pkg/client/wechat/officialAccount/publish"
+
 	"github.com/ArtisanCloud/MediaX/pkg/client/config"
 	"github.com/ArtisanCloud/MediaXCore/pkg/cache"
 	"github.com/ArtisanCloud/MediaXCore/pkg/logger"

diff --git a/...rvice/wechat/core/response/accessToken.go → ...lient/wechat/core/response/accessToken.go b/...rvice/wechat/core/response/accessToken.go → ...lient/wechat/core/response/accessToken.go
diff --git a/...rnal/service/wechat/core/response/base.go → pkg/client/wechat/core/response/base.go b/...rnal/service/wechat/core/response/base.go → pkg/client/wechat/core/response/base.go
diff --git a/...al/service/wechat/officialAccount/base.go → pkg/client/wechat/officialAccount/base.go b/...al/service/wechat/officialAccount/base.go → pkg/client/wechat/officialAccount/base.go
@@ -2,7 +2,7 @@ package officialAccount
 
 import (
 	"context"
-	"github.com/ArtisanCloud/MediaX/internal/service/wechat/officialAccount/response"
+	"github.com/ArtisanCloud/MediaX/pkg/client/wechat/officialAccount/response"
 )
 
 func (srv *WeChatOfficialAccountService) GetCallbackIP(ctx context.Context) (*response.GetCallBackIPRes, error) {

diff --git a/...wechat/officialAccount/material/client.go → ...wechat/officialAccount/material/client.go b/...wechat/officialAccount/material/client.go → ...wechat/officialAccount/material/client.go
@@ -4,10 +4,11 @@ import (
 	"context"
 	"github.com/ArtisanCloud/MediaX/internal/kernel"
 	request2 "github.com/ArtisanCloud/MediaX/internal/kernel/request"
-	response3 "github.com/ArtisanCloud/MediaX/internal/service/wechat/core/response"
-	"github.com/ArtisanCloud/MediaX/internal/service/wechat/officialAccount/material/request"
-	"github.com/ArtisanCloud/MediaX/internal/service/wechat/officialAccount/material/response"
-	response2 "github.com/ArtisanCloud/MediaX/internal/service/wechat/officialAccount/response"
+	response2 "github.com/ArtisanCloud/MediaX/pkg/client/wechat/core/response"
+	"github.com/ArtisanCloud/MediaX/pkg/client/wechat/officialAccount/material/request"
+	"github.com/ArtisanCloud/MediaX/pkg/client/wechat/officialAccount/material/response"
+	response3 "github.com/ArtisanCloud/MediaX/pkg/client/wechat/officialAccount/response"
+
 	"github.com/ArtisanCloud/MediaXCore/utils/object"
 	"net/http"
 	"os"
@@ -163,7 +164,7 @@ func (client *Client) UploadArticleImage(ctx context.Context, path string) (*res
 // https://developers.weixin.qq.com/doc/offiaccount/Asset_Management/Getting_Permanent_Assets.html
 func (client *Client) GetMaterial(ctx context.Context, mediaID string) (*http.Response, error) {
 
-	header := &response2.HeaderMediaRes{}
+	header := &response3.HeaderMediaRes{}
 	res, err := client.RequestRaw(ctx, "cgi-bin/material/get_material", http.MethodPost, &object.HashMap{
 		"form_params": &object.HashMap{
 			"media_id": mediaID,
@@ -205,9 +206,9 @@ func (client *Client) GetNews(ctx context.Context, mediaID string) (*response.Ma
 
 // 删除永久素材
 // https://developers.weixin.qq.com/doc/offiaccount/Asset_Management/Deleting_Permanent_Assets.html
-func (client *Client) Delete(ctx context.Context, mediaID string) (*response3.OfficialAccountRes, error) {
+func (client *Client) Delete(ctx context.Context, mediaID string) (*response2.OfficialAccountRes, error) {
 
-	result := &response3.OfficialAccountRes{}
+	result := &response2.OfficialAccountRes{}
 
 	options := &object.HashMap{
 		"media_id": mediaID,

diff --git a/...alAccount/material/request/AddMaterial.go → ...alAccount/material/request/AddMaterial.go b/...alAccount/material/request/AddMaterial.go → ...alAccount/material/request/AddMaterial.go
diff --git a/...ficialAccount/material/request/AddNews.go → ...ficialAccount/material/request/AddNews.go b/...ficialAccount/material/request/AddNews.go → ...ficialAccount/material/request/AddNews.go
diff --git a/...ount/material/request/batchGetMaterial.go → ...ount/material/request/batchGetMaterial.go b/...ount/material/request/batchGetMaterial.go → ...ount/material/request/batchGetMaterial.go
diff --git a/...ialAccount/material/request/updateNews.go → ...ialAccount/material/request/updateNews.go b/...ialAccount/material/request/updateNews.go → ...ialAccount/material/request/updateNews.go
diff --git a/...lAccount/material/response/addMaterial.go → ...lAccount/material/response/addMaterial.go b/...lAccount/material/response/addMaterial.go → ...lAccount/material/response/addMaterial.go
@@ -1,6 +1,6 @@
 package response
 
-import "github.com/ArtisanCloud/MediaX/internal/service/wechat/core/response"
+import "github.com/ArtisanCloud/MediaX/pkg/client/wechat/core/response"
 
 type MaterialAddMaterialRes struct {
 	response.OfficialAccountRes

diff --git a/...icialAccount/material/response/addNews.go → ...icialAccount/material/response/addNews.go b/...icialAccount/material/response/addNews.go → ...icialAccount/material/response/addNews.go
@@ -1,6 +1,6 @@
 package response
 
-import "github.com/ArtisanCloud/MediaX/internal/service/wechat/core/response"
+import "github.com/ArtisanCloud/MediaX/pkg/client/wechat/core/response"
 
 type MaterialAddNewsRes struct {
 	response.OfficialAccountRes

diff --git a/...unt/material/response/batchGetMaterial.go → ...unt/material/response/batchGetMaterial.go b/...unt/material/response/batchGetMaterial.go → ...unt/material/response/batchGetMaterial.go
@@ -1,7 +1,7 @@
 package response
 
 import (
-	"github.com/ArtisanCloud/MediaX/internal/service/wechat/core/response"
+	"github.com/ArtisanCloud/MediaX/pkg/client/wechat/core/response"
 	"github.com/ArtisanCloud/MediaXCore/utils/object"
 )
 

diff --git a/...lAccount/material/response/getMaterial.go → ...lAccount/material/response/getMaterial.go b/...lAccount/material/response/getMaterial.go → ...lAccount/material/response/getMaterial.go
@@ -1,7 +1,7 @@
 package response
 
 import (
-	"github.com/ArtisanCloud/MediaX/internal/service/wechat/core/response"
+	"github.com/ArtisanCloud/MediaX/pkg/client/wechat/core/response"
 )
 
 type NewsItems struct {

diff --git a/...unt/material/response/getMaterialCount.go → ...unt/material/response/getMaterialCount.go b/...unt/material/response/getMaterialCount.go → ...unt/material/response/getMaterialCount.go
@@ -1,8 +1,6 @@
 package response
 
-import (
-	"github.com/ArtisanCloud/MediaX/internal/service/wechat/core/response"
-)
+import "github.com/ArtisanCloud/MediaX/pkg/client/wechat/core/response"
 
 type MaterialGetMaterialCountRes struct {
 	response.OfficialAccountRes

diff --git a/...ce/wechat/officialAccount/media/client.go → ...nt/wechat/officialAccount/media/client.go b/...ce/wechat/officialAccount/media/client.go → ...nt/wechat/officialAccount/media/client.go
@@ -5,8 +5,8 @@ import (
 	"errors"
 	"fmt"
 	"github.com/ArtisanCloud/MediaX/internal/kernel"
-	"github.com/ArtisanCloud/MediaX/internal/service/wechat/officialAccount/media/response"
-	response2 "github.com/ArtisanCloud/MediaX/internal/service/wechat/officialAccount/response"
+	"github.com/ArtisanCloud/MediaX/pkg/client/wechat/officialAccount/media/response"
+	response2 "github.com/ArtisanCloud/MediaX/pkg/client/wechat/officialAccount/response"
 	"github.com/ArtisanCloud/MediaX/pkg/utils"
 	"github.com/ArtisanCloud/MediaXCore/utils/object"
 	"net/http"

diff --git a/...fficialAccount/media/response/response.go → ...fficialAccount/media/response/response.go b/...fficialAccount/media/response/response.go → ...fficialAccount/media/response/response.go
@@ -1,7 +1,7 @@
 package response
 
 import (
-	"github.com/ArtisanCloud/MediaX/internal/service/wechat/core/response"
+	"github.com/ArtisanCloud/MediaX/pkg/client/wechat/core/response"
 	"github.com/ArtisanCloud/MediaXCore/utils/object"
 )
 

diff --git a/.../wechat/officialAccount/publish/client.go → .../wechat/officialAccount/publish/client.go b/.../wechat/officialAccount/publish/client.go → .../wechat/officialAccount/publish/client.go
@@ -3,9 +3,9 @@ package publish
 import (
 	"context"
 	"github.com/ArtisanCloud/MediaX/internal/kernel"
-	response2 "github.com/ArtisanCloud/MediaX/internal/service/wechat/core/response"
-	"github.com/ArtisanCloud/MediaX/internal/service/wechat/officialAccount/publish/request"
-	"github.com/ArtisanCloud/MediaX/internal/service/wechat/officialAccount/publish/response"
+	response2 "github.com/ArtisanCloud/MediaX/pkg/client/wechat/core/response"
+	"github.com/ArtisanCloud/MediaX/pkg/client/wechat/officialAccount/publish/request"
+	"github.com/ArtisanCloud/MediaX/pkg/client/wechat/officialAccount/publish/response"
 	"github.com/ArtisanCloud/MediaXCore/utils/object"
 )
 

diff --git a/.../officialAccount/publish/request/draft.go → .../officialAccount/publish/request/draft.go b/.../officialAccount/publish/request/draft.go → .../officialAccount/publish/request/draft.go
diff --git a/...fficialAccount/publish/request/publish.go → ...fficialAccount/publish/request/publish.go b/...fficialAccount/publish/request/publish.go → ...fficialAccount/publish/request/publish.go
diff --git a/...officialAccount/publish/response/draft.go → ...officialAccount/publish/response/draft.go b/...officialAccount/publish/response/draft.go → ...officialAccount/publish/response/draft.go
@@ -1,8 +1,6 @@
 package response
 
-import (
-	"github.com/ArtisanCloud/MediaX/internal/service/wechat/core/response"
-)
+import "github.com/ArtisanCloud/MediaX/pkg/client/wechat/core/response"
 
 type DraftAddRes struct {
 	response.OfficialAccountRes

diff --git a/...ficialAccount/publish/response/publish.go → ...ficialAccount/publish/response/publish.go b/...ficialAccount/publish/response/publish.go → ...ficialAccount/publish/response/publish.go
@@ -1,6 +1,6 @@
 package response
 
-import "github.com/ArtisanCloud/MediaX/internal/service/wechat/core/response"
+import "github.com/ArtisanCloud/MediaX/pkg/client/wechat/core/response"
 
 type PublishSubmitRes struct {
 	response.OfficialAccountRes

diff --git a/...ce/wechat/officialAccount/request/base.go → ...nt/wechat/officialAccount/request/base.go b/...ce/wechat/officialAccount/request/base.go → ...nt/wechat/officialAccount/request/base.go
diff --git a/...e/wechat/officialAccount/response/base.go → ...t/wechat/officialAccount/response/base.go b/...e/wechat/officialAccount/response/base.go → ...t/wechat/officialAccount/response/base.go
@@ -1,6 +1,6 @@
 package response
 
-import "github.com/ArtisanCloud/MediaX/internal/service/wechat/core/response"
+import "github.com/ArtisanCloud/MediaX/pkg/client/wechat/core/response"
 
 type GetCallBackIPRes struct {
 	response.OfficialAccountRes

diff --git a/.../wechat/officialAccount/response/media.go → .../wechat/officialAccount/response/media.go b/.../wechat/officialAccount/response/media.go → .../wechat/officialAccount/response/media.go
@@ -1,6 +1,6 @@
 package response
 
-import "github.com/ArtisanCloud/MediaX/internal/service/wechat/core/response"
+import "github.com/ArtisanCloud/MediaX/pkg/client/wechat/core/response"
 
 type HeaderMediaRes struct {
 	response.OfficialAccountRes

diff --git a/...service/wechat/officialAccount/service.go → pkg/client/wechat/officialAccount/service.go b/...service/wechat/officialAccount/service.go → pkg/client/wechat/officialAccount/service.go
@@ -1,8 +1,8 @@
 package officialAccount
 
 import (
-	"github.com/ArtisanCloud/MediaX/internal/service/wechat/core"
 	"github.com/ArtisanCloud/MediaX/pkg/client/config"
+	"github.com/ArtisanCloud/MediaX/pkg/client/wechat/core"
 	"github.com/ArtisanCloud/MediaXCore/pkg/cache"
 	"github.com/ArtisanCloud/MediaXCore/pkg/logger"
 )