🎨 Refactor package for public import

nitezs · Sep 17, 2024 · e504a6c · e504a6c
1 parent 3cfa4bd
commit e504a6c
Show file tree

Hide file tree

Showing 21 changed files with 67 additions and 49 deletions.
diff --git a/api/handler/clash.go b/api/handler/clash.go
@@ -2,9 +2,10 @@ package handler
 
 import (
 	"net/http"
-	"sub2clash/config"
-	"sub2clash/model"
-	"sub2clash/validator"
+
+	"github.com/nitezs/sub2clash/config"
+	"github.com/nitezs/sub2clash/model"
+	"github.com/nitezs/sub2clash/validator"
 
 	"github.com/gin-gonic/gin"
 	"gopkg.in/yaml.v3"

diff --git a/api/handler/default.go b/api/handler/default.go
@@ -9,11 +9,12 @@ import (
 	"sort"
 	"strconv"
 	"strings"
-	"sub2clash/common"
-	"sub2clash/logger"
-	"sub2clash/model"
-	"sub2clash/parser"
-	"sub2clash/validator"
+
+	"github.com/nitezs/sub2clash/common"
+	"github.com/nitezs/sub2clash/logger"
+	"github.com/nitezs/sub2clash/model"
+	"github.com/nitezs/sub2clash/parser"
+	"github.com/nitezs/sub2clash/validator"
 
 	"go.uber.org/zap"
 	"gopkg.in/yaml.v3"

diff --git a/api/handler/meta.go b/api/handler/meta.go
@@ -3,9 +3,10 @@ package handler
 import (
 	_ "embed"
 	"net/http"
-	"sub2clash/config"
-	"sub2clash/model"
-	"sub2clash/validator"
+
+	"github.com/nitezs/sub2clash/config"
+	"github.com/nitezs/sub2clash/model"
+	"github.com/nitezs/sub2clash/validator"
 
 	"github.com/gin-gonic/gin"
 	"gopkg.in/yaml.v3"

diff --git a/api/handler/short_link.go b/api/handler/short_link.go
@@ -7,11 +7,11 @@ import (
 	"strings"
 	"time"
 
-	"sub2clash/common"
-	"sub2clash/common/database"
-	"sub2clash/config"
-	"sub2clash/model"
-	"sub2clash/validator"
+	"github.com/nitezs/sub2clash/common"
+	"github.com/nitezs/sub2clash/common/database"
+	"github.com/nitezs/sub2clash/config"
+	"github.com/nitezs/sub2clash/model"
+	"github.com/nitezs/sub2clash/validator"
 
 	"github.com/gin-gonic/gin"
 )

diff --git a/api/route.go b/api/route.go
@@ -5,9 +5,10 @@ import (
 	"html/template"
 	"log"
 	"net/http"
-	"sub2clash/api/handler"
-	"sub2clash/constant"
-	"sub2clash/middleware"
+
+	"github.com/nitezs/sub2clash/api/handler"
+	"github.com/nitezs/sub2clash/constant"
+	"github.com/nitezs/sub2clash/middleware"
 
 	"github.com/gin-gonic/gin"
 )

diff --git a/common/database/database.go b/common/database/database.go
@@ -5,7 +5,7 @@ import (
 	"errors"
 	"path/filepath"
 
-	"sub2clash/model"
+	"github.com/nitezs/sub2clash/model"
 
 	"go.etcd.io/bbolt"
 )

diff --git a/common/get.go b/common/get.go
@@ -3,8 +3,9 @@ package common
 import (
 	"errors"
 	"net/http"
-	"sub2clash/config"
 	"time"
+
+	"github.com/nitezs/sub2clash/config"
 )
 
 type GetConfig struct {

diff --git a/common/proxy.go b/common/proxy.go
@@ -2,10 +2,11 @@ package common
 
 import (
 	"strings"
-	"sub2clash/constant"
-	"sub2clash/logger"
-	"sub2clash/model"
-	"sub2clash/parser"
+
+	"github.com/nitezs/sub2clash/constant"
+	"github.com/nitezs/sub2clash/logger"
+	"github.com/nitezs/sub2clash/model"
+	"github.com/nitezs/sub2clash/parser"
 
 	"go.uber.org/zap"
 )

diff --git a/common/rule.go b/common/rule.go
@@ -3,7 +3,8 @@ package common
 import (
 	"fmt"
 	"strings"
-	"sub2clash/model"
+
+	"github.com/nitezs/sub2clash/model"
 )
 
 func PrependRuleProvider(

diff --git a/common/sub.go b/common/sub.go
@@ -8,9 +8,10 @@ import (
 	"net/http"
 	"os"
 	"path/filepath"
-	"sub2clash/config"
 	"sync"
 	"time"
+
+	"github.com/nitezs/sub2clash/config"
 )
 
 var subsDir = "subs"

diff --git a/common/write_default_template.go b/common/write_default_template.go
@@ -3,7 +3,8 @@ package common
 import (
 	"os"
 	"path/filepath"
-	"sub2clash/config"
+
+	"github.com/nitezs/sub2clash/config"
 )
 
 func writeTemplate(path string, template string) error {

diff --git a/go.mod b/go.mod
@@ -1,4 +1,4 @@
-module sub2clash
+module github.com/nitezs/sub2clash
 
 go 1.21
 

diff --git a/main.go b/main.go
@@ -4,11 +4,12 @@ import (
 	_ "embed"
 	"io"
 	"strconv"
-	"sub2clash/api"
-	"sub2clash/common"
-	"sub2clash/common/database"
-	"sub2clash/config"
-	"sub2clash/logger"
+
+	"github.com/nitezs/sub2clash/api"
+	"github.com/nitezs/sub2clash/common"
+	"github.com/nitezs/sub2clash/common/database"
+	"github.com/nitezs/sub2clash/config"
+	"github.com/nitezs/sub2clash/logger"
 
 	"github.com/gin-gonic/gin"
 	"go.uber.org/zap"

diff --git a/middleware/logger.go b/middleware/logger.go
@@ -2,9 +2,10 @@ package middleware
 
 import (
 	"strconv"
-	"sub2clash/logger"
 	"time"
 
+	"github.com/nitezs/sub2clash/logger"
+
 	"github.com/gin-gonic/gin"
 	"go.uber.org/zap"
 )

diff --git a/parser/hysteria.go b/parser/hysteria.go
@@ -5,8 +5,9 @@ import (
 	"net/url"
 	"strconv"
 	"strings"
-	"sub2clash/constant"
-	"sub2clash/model"
+
+	"github.com/nitezs/sub2clash/constant"
+	"github.com/nitezs/sub2clash/model"
 )
 
 func ParseHysteria(proxy string) (model.Proxy, error) {

diff --git a/parser/hysteria2.go b/parser/hysteria2.go
@@ -4,8 +4,9 @@ import (
 	"fmt"
 	"net/url"
 	"strings"
-	"sub2clash/constant"
-	"sub2clash/model"
+
+	"github.com/nitezs/sub2clash/constant"
+	"github.com/nitezs/sub2clash/model"
 )
 
 func ParseHysteria2(proxy string) (model.Proxy, error) {

diff --git a/parser/shadowsocks.go b/parser/shadowsocks.go
@@ -4,8 +4,9 @@ import (
 	"fmt"
 	"net/url"
 	"strings"
-	"sub2clash/constant"
-	"sub2clash/model"
+
+	"github.com/nitezs/sub2clash/constant"
+	"github.com/nitezs/sub2clash/model"
 )
 
 func ParseShadowsocks(proxy string) (model.Proxy, error) {

diff --git a/parser/shadowsocksr.go b/parser/shadowsocksr.go
@@ -4,8 +4,9 @@ import (
 	"net/url"
 	"strconv"
 	"strings"
-	"sub2clash/constant"
-	"sub2clash/model"
+
+	"github.com/nitezs/sub2clash/constant"
+	"github.com/nitezs/sub2clash/model"
 )
 
 func ParseShadowsocksR(proxy string) (model.Proxy, error) {

diff --git a/parser/trojan.go b/parser/trojan.go
@@ -4,8 +4,9 @@ import (
 	"fmt"
 	"net/url"
 	"strings"
-	"sub2clash/constant"
-	"sub2clash/model"
+
+	"github.com/nitezs/sub2clash/constant"
+	"github.com/nitezs/sub2clash/model"
 )
 
 func ParseTrojan(proxy string) (model.Proxy, error) {

diff --git a/parser/vless.go b/parser/vless.go
@@ -4,8 +4,9 @@ import (
 	"fmt"
 	"net/url"
 	"strings"
-	"sub2clash/constant"
-	"sub2clash/model"
+
+	"github.com/nitezs/sub2clash/constant"
+	"github.com/nitezs/sub2clash/model"
 )
 
 func ParseVless(proxy string) (model.Proxy, error) {

diff --git a/parser/vmess.go b/parser/vmess.go
@@ -5,8 +5,9 @@ import (
 	"net/url"
 	"strconv"
 	"strings"
-	"sub2clash/constant"
-	"sub2clash/model"
+
+	"github.com/nitezs/sub2clash/constant"
+	"github.com/nitezs/sub2clash/model"
 )
 
 func ParseVmess(proxy string) (model.Proxy, error) {