From 18c5ccc775380dac15ff76f0862cee6fcfae5887 Mon Sep 17 00:00:00 2001 From: Matrix-X Date: Mon, 10 Feb 2025 00:20:05 +0800 Subject: [PATCH] update(module) --- README.md | 2 +- go.mod | 12 +++++++----- internal/kernel/accessToken.go | 8 ++++---- internal/kernel/baseClient.go | 8 ++++---- internal/service/douyin/douyin.go | 2 +- internal/service/redbook/redbook.go | 2 +- internal/service/wechat/core/accessTokenHandler.go | 4 ++-- internal/service/wechat/core/client.go | 14 +++++++------- .../service/wechat/core/response/accessToken.go | 2 +- internal/service/wechat/officialAccount/base.go | 2 +- .../wechat/officialAccount/material/client.go | 12 ++++++------ .../material/response/addMaterial.go | 2 +- .../officialAccount/material/response/addNews.go | 2 +- .../material/response/batchGetMaterial.go | 2 +- .../material/response/getMaterial.go | 2 +- .../material/response/getMaterialCount.go | 2 +- .../service/wechat/officialAccount/media/client.go | 8 ++++---- .../officialAccount/media/response/response.go | 2 +- .../wechat/officialAccount/publish/client.go | 8 ++++---- .../officialAccount/publish/response/draft.go | 2 +- .../officialAccount/publish/response/publish.go | 2 +- .../wechat/officialAccount/response/base.go | 2 +- .../wechat/officialAccount/response/media.go | 2 +- internal/service/wechat/officialAccount/service.go | 4 ++-- main.go | 8 ++++---- pkg/client/mediaX.go | 8 ++++---- 26 files changed, 63 insertions(+), 61 deletions(-) diff --git a/README.md b/README.md index 71cbe56..7abfb5f 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ MediaX 是一个支持多平台内容发布的轻量级 SDK，旨在帮助开发 1. 初始化项目并下载 MediaX： ```bash - go get github.com/ArtisanCloud/MediaX/v1 + go get github.com/ArtisanCloud/MediaX ``` 2. 创建一个简单的示例，本项目作者正在自己系统中使用，陆续会迭代版本： diff --git a/go.mod b/go.mod index cfb70a5..4eb7ba6 100644 --- a/go.mod +++ b/go.mod @@ -1,12 +1,16 @@ -module github.com/ArtisanCloud/MediaX/v1 +module github.com/ArtisanCloud/MediaX go 1.18 //replace github.com/ArtisanCloud/PowerSocialite/v3 => ../../../../PowerWechat/PowerSocialite -replace github.com/ArtisanCloud/MediaXCore => ../MediaXCore +//replace github.com/ArtisanCloud/MediaXCore => ../MediaXCore -require github.com/ArtisanCloud/MediaXCore v0.0.0-20250207094210-bd092bfda3be +require ( + github.com/ArtisanCloud/MediaXCore v1.0.0 + github.com/redis/go-redis/v9 v9.7.0 + gopkg.in/yaml.v3 v3.0.1 +) require ( github.com/cespare/xxhash/v2 v2.2.0 // indirect @@ -14,10 +18,8 @@ require ( github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect github.com/kr/pretty v0.3.1 // indirect github.com/pkg/errors v0.9.1 // indirect - github.com/redis/go-redis/v9 v9.7.0 // indirect github.com/stretchr/testify v1.9.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect - gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/internal/kernel/accessToken.go b/internal/kernel/accessToken.go index e8a6d89..ed5a124 100644 --- a/internal/kernel/accessToken.go +++ b/internal/kernel/accessToken.go @@ -7,10 +7,10 @@ import ( "encoding/json" "errors" "fmt" - request2 "github.com/ArtisanCloud/MediaX/v1/internal/kernel/request" - "github.com/ArtisanCloud/MediaX/v1/internal/kernel/response" - response2 "github.com/ArtisanCloud/MediaX/v1/internal/kernel/response" - "github.com/ArtisanCloud/MediaX/v1/pkg/client/config" + request2 "github.com/ArtisanCloud/MediaX/internal/kernel/request" + "github.com/ArtisanCloud/MediaX/internal/kernel/response" + response2 "github.com/ArtisanCloud/MediaX/internal/kernel/response" + "github.com/ArtisanCloud/MediaX/pkg/client/config" "github.com/ArtisanCloud/MediaXCore/pkg/cache" "github.com/ArtisanCloud/MediaXCore/pkg/http/contract" "github.com/ArtisanCloud/MediaXCore/pkg/http/helper" diff --git a/internal/kernel/baseClient.go b/internal/kernel/baseClient.go index 0bd8a91..6ca6936 100644 --- a/internal/kernel/baseClient.go +++ b/internal/kernel/baseClient.go @@ -3,10 +3,10 @@ package kernel import ( "context" "fmt" - request2 "github.com/ArtisanCloud/MediaX/v1/internal/kernel/request" - response2 "github.com/ArtisanCloud/MediaX/v1/internal/kernel/response" - "github.com/ArtisanCloud/MediaX/v1/pkg/client/config" - "github.com/ArtisanCloud/MediaX/v1/pkg/utils" + request2 "github.com/ArtisanCloud/MediaX/internal/kernel/request" + response2 "github.com/ArtisanCloud/MediaX/internal/kernel/response" + "github.com/ArtisanCloud/MediaX/pkg/client/config" + "github.com/ArtisanCloud/MediaX/pkg/utils" "github.com/ArtisanCloud/MediaXCore/pkg/cache" "github.com/ArtisanCloud/MediaXCore/pkg/http/contract" "github.com/ArtisanCloud/MediaXCore/pkg/http/helper" diff --git a/internal/service/douyin/douyin.go b/internal/service/douyin/douyin.go index 06213a1..88843b1 100644 --- a/internal/service/douyin/douyin.go +++ b/internal/service/douyin/douyin.go @@ -1,7 +1,7 @@ package douyin import ( - "github.com/ArtisanCloud/MediaX/v1/pkg/client/config" + "github.com/ArtisanCloud/MediaX/pkg/client/config" "github.com/ArtisanCloud/MediaXCore/pkg/cache" "github.com/ArtisanCloud/MediaXCore/pkg/http/contract" "github.com/ArtisanCloud/MediaXCore/pkg/http/helper" diff --git a/internal/service/redbook/redbook.go b/internal/service/redbook/redbook.go index 729ba4d..97d09d7 100644 --- a/internal/service/redbook/redbook.go +++ b/internal/service/redbook/redbook.go @@ -1,7 +1,7 @@ package redbook import ( - "github.com/ArtisanCloud/MediaX/v1/pkg/client/config" + "github.com/ArtisanCloud/MediaX/pkg/client/config" "github.com/ArtisanCloud/MediaXCore/pkg/cache" "github.com/ArtisanCloud/MediaXCore/pkg/http/contract" "github.com/ArtisanCloud/MediaXCore/pkg/http/helper" diff --git a/internal/service/wechat/core/accessTokenHandler.go b/internal/service/wechat/core/accessTokenHandler.go index 89e87cb..802ee8b 100644 --- a/internal/service/wechat/core/accessTokenHandler.go +++ b/internal/service/wechat/core/accessTokenHandler.go @@ -1,8 +1,8 @@ package core import ( - "github.com/ArtisanCloud/MediaX/v1/internal/kernel" - "github.com/ArtisanCloud/MediaX/v1/pkg/client/config" + "github.com/ArtisanCloud/MediaX/internal/kernel" + "github.com/ArtisanCloud/MediaX/pkg/client/config" "github.com/ArtisanCloud/MediaXCore/pkg/cache" "github.com/ArtisanCloud/MediaXCore/pkg/logger" "github.com/ArtisanCloud/MediaXCore/utils/object" diff --git a/internal/service/wechat/core/client.go b/internal/service/wechat/core/client.go index 6d4b55d..6c640e9 100644 --- a/internal/service/wechat/core/client.go +++ b/internal/service/wechat/core/client.go @@ -2,13 +2,13 @@ package core import ( "bytes" - "github.com/ArtisanCloud/MediaX/v1/internal/kernel" - response2 "github.com/ArtisanCloud/MediaX/v1/internal/kernel/response" - "github.com/ArtisanCloud/MediaX/v1/internal/service/wechat/core/response" - "github.com/ArtisanCloud/MediaX/v1/internal/service/wechat/officialAccount/material" - "github.com/ArtisanCloud/MediaX/v1/internal/service/wechat/officialAccount/media" - "github.com/ArtisanCloud/MediaX/v1/internal/service/wechat/officialAccount/publish" - "github.com/ArtisanCloud/MediaX/v1/pkg/client/config" + "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/config" "github.com/ArtisanCloud/MediaXCore/pkg/cache" "github.com/ArtisanCloud/MediaXCore/pkg/logger" "io" diff --git a/internal/service/wechat/core/response/accessToken.go b/internal/service/wechat/core/response/accessToken.go index 1f9e276..d98d82f 100644 --- a/internal/service/wechat/core/response/accessToken.go +++ b/internal/service/wechat/core/response/accessToken.go @@ -1,6 +1,6 @@ package response -import "github.com/ArtisanCloud/MediaX/v1/internal/kernel/response" +import "github.com/ArtisanCloud/MediaX/internal/kernel/response" type WeChatAccessTokenRes struct { response.AccessTokenRes diff --git a/internal/service/wechat/officialAccount/base.go b/internal/service/wechat/officialAccount/base.go index b219585..186e211 100644 --- a/internal/service/wechat/officialAccount/base.go +++ b/internal/service/wechat/officialAccount/base.go @@ -2,7 +2,7 @@ package officialAccount import ( "context" - "github.com/ArtisanCloud/MediaX/v1/internal/service/wechat/officialAccount/response" + "github.com/ArtisanCloud/MediaX/internal/service/wechat/officialAccount/response" ) func (srv *WeChatOfficialAccountService) GetCallbackIP(ctx context.Context) (*response.GetCallBackIPRes, error) { diff --git a/internal/service/wechat/officialAccount/material/client.go b/internal/service/wechat/officialAccount/material/client.go index a566d9d..0131a60 100644 --- a/internal/service/wechat/officialAccount/material/client.go +++ b/internal/service/wechat/officialAccount/material/client.go @@ -2,12 +2,12 @@ package material import ( "context" - "github.com/ArtisanCloud/MediaX/v1/internal/kernel" - request2 "github.com/ArtisanCloud/MediaX/v1/internal/kernel/request" - response3 "github.com/ArtisanCloud/MediaX/v1/internal/service/wechat/core/response" - "github.com/ArtisanCloud/MediaX/v1/internal/service/wechat/officialAccount/material/request" - "github.com/ArtisanCloud/MediaX/v1/internal/service/wechat/officialAccount/material/response" - response2 "github.com/ArtisanCloud/MediaX/v1/internal/service/wechat/officialAccount/response" + "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" "github.com/ArtisanCloud/MediaXCore/utils/object" "net/http" "os" diff --git a/internal/service/wechat/officialAccount/material/response/addMaterial.go b/internal/service/wechat/officialAccount/material/response/addMaterial.go index edca875..41e76a7 100644 --- a/internal/service/wechat/officialAccount/material/response/addMaterial.go +++ b/internal/service/wechat/officialAccount/material/response/addMaterial.go @@ -1,6 +1,6 @@ package response -import "github.com/ArtisanCloud/MediaX/v1/internal/service/wechat/core/response" +import "github.com/ArtisanCloud/MediaX/internal/service/wechat/core/response" type MaterialAddMaterialRes struct { response.OfficialAccountRes diff --git a/internal/service/wechat/officialAccount/material/response/addNews.go b/internal/service/wechat/officialAccount/material/response/addNews.go index 253214e..d7c32de 100644 --- a/internal/service/wechat/officialAccount/material/response/addNews.go +++ b/internal/service/wechat/officialAccount/material/response/addNews.go @@ -1,6 +1,6 @@ package response -import "github.com/ArtisanCloud/MediaX/v1/internal/service/wechat/core/response" +import "github.com/ArtisanCloud/MediaX/internal/service/wechat/core/response" type MaterialAddNewsRes struct { response.OfficialAccountRes diff --git a/internal/service/wechat/officialAccount/material/response/batchGetMaterial.go b/internal/service/wechat/officialAccount/material/response/batchGetMaterial.go index e3975d3..1b2db24 100644 --- a/internal/service/wechat/officialAccount/material/response/batchGetMaterial.go +++ b/internal/service/wechat/officialAccount/material/response/batchGetMaterial.go @@ -1,7 +1,7 @@ package response import ( - "github.com/ArtisanCloud/MediaX/v1/internal/service/wechat/core/response" + "github.com/ArtisanCloud/MediaX/internal/service/wechat/core/response" "github.com/ArtisanCloud/MediaXCore/utils/object" ) diff --git a/internal/service/wechat/officialAccount/material/response/getMaterial.go b/internal/service/wechat/officialAccount/material/response/getMaterial.go index 21b489e..eea66dc 100644 --- a/internal/service/wechat/officialAccount/material/response/getMaterial.go +++ b/internal/service/wechat/officialAccount/material/response/getMaterial.go @@ -1,7 +1,7 @@ package response import ( - "github.com/ArtisanCloud/MediaX/v1/internal/service/wechat/core/response" + "github.com/ArtisanCloud/MediaX/internal/service/wechat/core/response" ) type NewsItems struct { diff --git a/internal/service/wechat/officialAccount/material/response/getMaterialCount.go b/internal/service/wechat/officialAccount/material/response/getMaterialCount.go index 5f28065..7771d9c 100644 --- a/internal/service/wechat/officialAccount/material/response/getMaterialCount.go +++ b/internal/service/wechat/officialAccount/material/response/getMaterialCount.go @@ -1,7 +1,7 @@ package response import ( - "github.com/ArtisanCloud/MediaX/v1/internal/service/wechat/core/response" + "github.com/ArtisanCloud/MediaX/internal/service/wechat/core/response" ) type MaterialGetMaterialCountRes struct { diff --git a/internal/service/wechat/officialAccount/media/client.go b/internal/service/wechat/officialAccount/media/client.go index da9ec0b..72a8e3b 100644 --- a/internal/service/wechat/officialAccount/media/client.go +++ b/internal/service/wechat/officialAccount/media/client.go @@ -4,10 +4,10 @@ import ( "context" "errors" "fmt" - "github.com/ArtisanCloud/MediaX/v1/internal/kernel" - "github.com/ArtisanCloud/MediaX/v1/internal/service/wechat/officialAccount/media/response" - response2 "github.com/ArtisanCloud/MediaX/v1/internal/service/wechat/officialAccount/response" - "github.com/ArtisanCloud/MediaX/v1/pkg/utils" + "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/utils" "github.com/ArtisanCloud/MediaXCore/utils/object" "net/http" "os" diff --git a/internal/service/wechat/officialAccount/media/response/response.go b/internal/service/wechat/officialAccount/media/response/response.go index ac309af..7bdacac 100644 --- a/internal/service/wechat/officialAccount/media/response/response.go +++ b/internal/service/wechat/officialAccount/media/response/response.go @@ -1,7 +1,7 @@ package response import ( - "github.com/ArtisanCloud/MediaX/v1/internal/service/wechat/core/response" + "github.com/ArtisanCloud/MediaX/internal/service/wechat/core/response" "github.com/ArtisanCloud/MediaXCore/utils/object" ) diff --git a/internal/service/wechat/officialAccount/publish/client.go b/internal/service/wechat/officialAccount/publish/client.go index 2a7ba7b..36c4b0b 100644 --- a/internal/service/wechat/officialAccount/publish/client.go +++ b/internal/service/wechat/officialAccount/publish/client.go @@ -2,10 +2,10 @@ package publish import ( "context" - "github.com/ArtisanCloud/MediaX/v1/internal/kernel" - response2 "github.com/ArtisanCloud/MediaX/v1/internal/service/wechat/core/response" - "github.com/ArtisanCloud/MediaX/v1/internal/service/wechat/officialAccount/publish/request" - "github.com/ArtisanCloud/MediaX/v1/internal/service/wechat/officialAccount/publish/response" + "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" "github.com/ArtisanCloud/MediaXCore/utils/object" ) diff --git a/internal/service/wechat/officialAccount/publish/response/draft.go b/internal/service/wechat/officialAccount/publish/response/draft.go index a0af338..e77a251 100644 --- a/internal/service/wechat/officialAccount/publish/response/draft.go +++ b/internal/service/wechat/officialAccount/publish/response/draft.go @@ -1,7 +1,7 @@ package response import ( - "github.com/ArtisanCloud/MediaX/v1/internal/service/wechat/core/response" + "github.com/ArtisanCloud/MediaX/internal/service/wechat/core/response" ) type DraftAddRes struct { diff --git a/internal/service/wechat/officialAccount/publish/response/publish.go b/internal/service/wechat/officialAccount/publish/response/publish.go index c94f4cc..500e1f0 100644 --- a/internal/service/wechat/officialAccount/publish/response/publish.go +++ b/internal/service/wechat/officialAccount/publish/response/publish.go @@ -1,6 +1,6 @@ package response -import "github.com/ArtisanCloud/MediaX/v1/internal/service/wechat/core/response" +import "github.com/ArtisanCloud/MediaX/internal/service/wechat/core/response" type PublishSubmitRes struct { response.OfficialAccountRes diff --git a/internal/service/wechat/officialAccount/response/base.go b/internal/service/wechat/officialAccount/response/base.go index 08baa2a..bc5898e 100644 --- a/internal/service/wechat/officialAccount/response/base.go +++ b/internal/service/wechat/officialAccount/response/base.go @@ -1,6 +1,6 @@ package response -import "github.com/ArtisanCloud/MediaX/v1/internal/service/wechat/core/response" +import "github.com/ArtisanCloud/MediaX/internal/service/wechat/core/response" type GetCallBackIPRes struct { response.OfficialAccountRes diff --git a/internal/service/wechat/officialAccount/response/media.go b/internal/service/wechat/officialAccount/response/media.go index 9b6e364..9f370aa 100644 --- a/internal/service/wechat/officialAccount/response/media.go +++ b/internal/service/wechat/officialAccount/response/media.go @@ -1,6 +1,6 @@ package response -import "github.com/ArtisanCloud/MediaX/v1/internal/service/wechat/core/response" +import "github.com/ArtisanCloud/MediaX/internal/service/wechat/core/response" type HeaderMediaRes struct { response.OfficialAccountRes diff --git a/internal/service/wechat/officialAccount/service.go b/internal/service/wechat/officialAccount/service.go index a81e535..420eac9 100644 --- a/internal/service/wechat/officialAccount/service.go +++ b/internal/service/wechat/officialAccount/service.go @@ -1,8 +1,8 @@ package officialAccount import ( - "github.com/ArtisanCloud/MediaX/v1/internal/service/wechat/core" - "github.com/ArtisanCloud/MediaX/v1/pkg/client/config" + "github.com/ArtisanCloud/MediaX/internal/service/wechat/core" + "github.com/ArtisanCloud/MediaX/pkg/client/config" "github.com/ArtisanCloud/MediaXCore/pkg/cache" "github.com/ArtisanCloud/MediaXCore/pkg/logger" ) diff --git a/main.go b/main.go index 35c62ec..0ed06f6 100644 --- a/main.go +++ b/main.go @@ -2,10 +2,10 @@ package main import ( "context" - "github.com/ArtisanCloud/MediaX/v1/pkg/client" - config2 "github.com/ArtisanCloud/MediaX/v1/pkg/client/config" - "github.com/ArtisanCloud/MediaX/v1/pkg/utils" - "github.com/ArtisanCloud/MediaX/v1/pkg/utils/fmt" + "github.com/ArtisanCloud/MediaX/pkg/client" + config2 "github.com/ArtisanCloud/MediaX/pkg/client/config" + "github.com/ArtisanCloud/MediaX/pkg/utils" + "github.com/ArtisanCloud/MediaX/pkg/utils/fmt" "github.com/ArtisanCloud/MediaXCore/pkg/cache" "github.com/ArtisanCloud/MediaXCore/pkg/logger/config" "github.com/redis/go-redis/v9" diff --git a/pkg/client/mediaX.go b/pkg/client/mediaX.go index 3d83f5a..55903fa 100644 --- a/pkg/client/mediaX.go +++ b/pkg/client/mediaX.go @@ -1,10 +1,10 @@ package client import ( - "github.com/ArtisanCloud/MediaX/v1/internal/service/douyin" - "github.com/ArtisanCloud/MediaX/v1/internal/service/redbook" - "github.com/ArtisanCloud/MediaX/v1/internal/service/wechat/officialAccount" - "github.com/ArtisanCloud/MediaX/v1/pkg/client/config" + "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/MediaXCore/pkg/cache" "github.com/ArtisanCloud/MediaXCore/pkg/logger" )