feat: refine structure

alomerry · Mar 18, 2024 · 89f8b90 · 89f8b90
1 parent 8c38ebc
commit 89f8b90
Show file tree

Hide file tree

Showing 43 changed files with 11 additions and 160 deletions.
diff --git a/.githooks/install-git-hooks.sh b/.githooks/install-git-hooks.sh
diff --git a/.githooks/pre-push b/.githooks/pre-push
diff --git a/README.md b/README.md
@@ -14,10 +14,10 @@ go-tools contains several tools
 
 ## Usage
 
-- [DNS](./dns/README.md)
+- [DNS](modules/dns/README.md)
 - [pusher](./pusher/README.md)
 - [sgs delay](./sgs/README.md)
-- [copier](./copier/README.md)
+- [copier](modules/copier/README.md)
 - algorithm
 
 ## Copier

diff --git a/cmd/cmd.go b/cmd/cmd.go
diff --git a/cmd/dns.go b/cmd/dns.go
diff --git a/cmd/pusher.go b/cmd/pusher.go
diff --git a/cmd/sgs.go b/cmd/sgs.go
diff --git a/copier/convertor.go → modules/copier/convertor.go b/copier/convertor.go → modules/copier/convertor.go
diff --git a/copier/copier.go → modules/copier/copier.go b/copier/copier.go → modules/copier/copier.go
diff --git a/copier/example_test.go → modules/copier/example_test.go b/copier/example_test.go → modules/copier/example_test.go
diff --git a/copier/mapper.go → modules/copier/mapper.go b/copier/mapper.go → modules/copier/mapper.go
diff --git a/dns/README.md → modules/dns/README.md b/dns/README.md → modules/dns/README.md
diff --git a/dns/client.go → modules/dns/client.go b/dns/client.go → modules/dns/client.go
@@ -2,8 +2,8 @@ package dns
 
 import (
 	"fmt"
-	dnsImpl "github.com/alomerry/go-tools/dns/impl"
-	"github.com/alomerry/go-tools/dns/utils"
+	impl2 "github.com/alomerry/go-tools/modules/dns/impl"
+	"github.com/alomerry/go-tools/modules/dns/utils"
 	"github.com/spf13/viper"
 	"os"
 )
@@ -60,15 +60,15 @@ func (c *client) SetDomainA() {
 		// TODO 抽出循环中
 		switch impl {
 		case IMPL_CF:
-			cf := &dnsImpl.Cloudflare{
+			cf := &impl2.Cloudflare{
 				Secret:  os.Getenv(CF_SK),
 				ZoneId:  os.Getenv(CF_ZONE),
 				Domains: viper.GetStringSlice("domains"),
 				NewAddr: utils.GetIpv4AddrFromUrl(),
 			}
 			cf.UpsertDomainRecords()
 		case IMPL_ALI:
-			ali := &dnsImpl.Alidns{
+			ali := &impl2.Alidns{
 				AK:      os.Getenv(ALI_AK),
 				SK:      os.Getenv(ALI_SK),
 				Domains: viper.GetStringSlice("domains"),

diff --git a/dns/impl/alidns.go → modules/dns/impl/alidns.go b/dns/impl/alidns.go → modules/dns/impl/alidns.go
@@ -8,7 +8,7 @@ import (
 	"crypto/sha256"
 	"encoding/base64"
 	"fmt"
-	"github.com/alomerry/go-tools/dns/internal"
+	"github.com/alomerry/go-tools/modules/dns/internal"
 	"hash"
 	"io"
 	"log"

diff --git a/dns/impl/cloudflare.go → modules/dns/impl/cloudflare.go b/dns/impl/cloudflare.go → modules/dns/impl/cloudflare.go
@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
-	"github.com/alomerry/go-tools/dns/internal"
+	"github.com/alomerry/go-tools/modules/dns/internal"
 	"log"
 	"net/http"
 )

diff --git a/dns/impl/config.go → modules/dns/impl/config.go b/dns/impl/config.go → modules/dns/impl/config.go
diff --git a/dns/internal/core.go → modules/dns/internal/core.go b/dns/internal/core.go → modules/dns/internal/core.go
diff --git a/dns/utils/utils.go → modules/dns/utils/utils.go b/dns/utils/utils.go → modules/dns/utils/utils.go
@@ -1,7 +1,7 @@
 package utils
 
 import (
-	"github.com/alomerry/go-tools/dns/internal"
+	"github.com/alomerry/go-tools/modules/dns/internal"
 	"io"
 	"log"
 	"net/http"

diff --git a/pusher/README_ZH.md → modules/pusher/README_ZH.md b/pusher/README_ZH.md → modules/pusher/README_ZH.md
diff --git a/pusher/component/oss/kodo/kodo.go → modules/pusher/component/oss/kodo/kodo.go b/pusher/component/oss/kodo/kodo.go → modules/pusher/component/oss/kodo/kodo.go
diff --git a/pusher/component/oss/kodo/request.go → modules/pusher/component/oss/kodo/request.go b/pusher/component/oss/kodo/request.go → modules/pusher/component/oss/kodo/request.go
diff --git a/pusher/component/oss/oss.go → modules/pusher/component/oss/oss.go b/pusher/component/oss/oss.go → modules/pusher/component/oss/oss.go
diff --git a/pusher/config/example.toml → modules/pusher/config/example.toml b/pusher/config/example.toml → modules/pusher/config/example.toml
diff --git a/pusher/main.go → modules/pusher/main.go b/pusher/main.go → modules/pusher/main.go
diff --git a/pusher/modes/client.go → modules/pusher/modes/client.go b/pusher/modes/client.go → modules/pusher/modes/client.go
diff --git a/pusher/modes/config.go → modules/pusher/modes/config.go b/pusher/modes/config.go → modules/pusher/modes/config.go
diff --git a/pusher/modes/pusher/pusher.go → modules/pusher/modes/pusher/pusher.go b/pusher/modes/pusher/pusher.go → modules/pusher/modes/pusher/pusher.go
diff --git a/pusher/modes/syncer/syncer.go → modules/pusher/modes/syncer/syncer.go b/pusher/modes/syncer/syncer.go → modules/pusher/modes/syncer/syncer.go
diff --git a/pusher/modes/task.go → modules/pusher/modes/task.go b/pusher/modes/task.go → modules/pusher/modes/task.go
diff --git a/pusher/share/errors.go → modules/pusher/share/errors.go b/pusher/share/errors.go → modules/pusher/share/errors.go
diff --git a/pusher/share/interface.go → modules/pusher/share/interface.go b/pusher/share/interface.go → modules/pusher/share/interface.go
diff --git a/pusher/share/share.go → modules/pusher/share/share.go b/pusher/share/share.go → modules/pusher/share/share.go
diff --git a/pusher/utils/utils.go → modules/pusher/utils/utils.go b/pusher/utils/utils.go → modules/pusher/utils/utils.go
diff --git a/pusher/utils/watcher.go → modules/pusher/utils/watcher.go b/pusher/utils/watcher.go → modules/pusher/utils/watcher.go
diff --git a/sgs/.gitignore → modules/sgs/.gitignore b/sgs/.gitignore → modules/sgs/.gitignore
diff --git a/sgs/README.md → modules/sgs/README.md b/sgs/README.md → modules/sgs/README.md
diff --git a/sgs/delay/delay_reason.go → modules/sgs/delay/delay_reason.go b/sgs/delay/delay_reason.go → modules/sgs/delay/delay_reason.go
diff --git a/sgs/delay/delay_summary.go → modules/sgs/delay/delay_summary.go b/sgs/delay/delay_summary.go → modules/sgs/delay/delay_summary.go
@@ -9,8 +9,8 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/alomerry/go-tools/sgs/tools"
-	"github.com/alomerry/go-tools/sgs/utils"
+	"github.com/alomerry/go-tools/modules/sgs/tools"
+	"github.com/alomerry/go-tools/modules/sgs/utils"
 	"github.com/emirpasic/gods/stacks"
 	"github.com/emirpasic/gods/stacks/arraystack"
 	"github.com/spf13/cast"

diff --git a/sgs/tools/merge_excel.go → modules/sgs/tools/merge_excel.go b/sgs/tools/merge_excel.go → modules/sgs/tools/merge_excel.go
diff --git a/sgs/utils/sort.go → modules/sgs/utils/sort.go b/sgs/utils/sort.go → modules/sgs/utils/sort.go
diff --git a/sgs/utils/utils.go → modules/sgs/utils/utils.go b/sgs/utils/utils.go → modules/sgs/utils/utils.go
diff --git a/sgs/utils/utils_test.go → modules/sgs/utils/utils_test.go b/sgs/utils/utils_test.go → modules/sgs/utils/utils_test.go
diff --git a/sgs/utils/xlsx.go → modules/sgs/utils/xlsx.go b/sgs/utils/xlsx.go → modules/sgs/utils/xlsx.go