Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update(module) #9

Merged
merged 1 commit into from
Feb 9, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ MediaX 是一个支持多平台内容发布的轻量级 SDK,旨在帮助开发
1. 初始化项目并下载 MediaX:

```bash
go get github.com/ArtisanCloud/MediaX/v1
go get github.com/ArtisanCloud/MediaX
```

2. 创建一个简单的示例,本项目作者正在自己系统中使用,陆续会迭代版本:
Expand Down
12 changes: 7 additions & 5 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,23 +1,25 @@
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
github.com/clbanning/mxj/v2 v2.7.0 // indirect
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
)
8 changes: 4 additions & 4 deletions internal/kernel/accessToken.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
8 changes: 4 additions & 4 deletions internal/kernel/baseClient.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion internal/service/douyin/douyin.go
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
2 changes: 1 addition & 1 deletion internal/service/redbook/redbook.go
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
4 changes: 2 additions & 2 deletions internal/service/wechat/core/accessTokenHandler.go
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
14 changes: 7 additions & 7 deletions internal/service/wechat/core/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion internal/service/wechat/core/response/accessToken.go
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion internal/service/wechat/officialAccount/base.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
12 changes: 6 additions & 6 deletions internal/service/wechat/officialAccount/material/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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"
)

Expand Down
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
8 changes: 4 additions & 4 deletions internal/service/wechat/officialAccount/media/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
@@ -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"
)

Expand Down
8 changes: 4 additions & 4 deletions internal/service/wechat/officialAccount/publish/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion internal/service/wechat/officialAccount/response/base.go
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion internal/service/wechat/officialAccount/response/media.go
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions internal/service/wechat/officialAccount/service.go
Original file line number Diff line number Diff line change
@@ -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"
)
Expand Down
8 changes: 4 additions & 4 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
8 changes: 4 additions & 4 deletions pkg/client/mediaX.go
Original file line number Diff line number Diff line change
@@ -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"
)
Expand Down