Skip to content

Commit

Permalink
Merge pull request #5 from wuzhican/master
Browse files Browse the repository at this point in the history 
Fix: module reference error
  • Loading branch information
@lilendian0x00
lilendian0x00 authored Mar 6, 2024
2 parents 94e9d69 + a3cb105 commit d614f8e
Show file tree
Hide file tree
Showing 19 changed files with 77 additions and 60 deletions.
13 changes: 7 additions & 6 deletions cmd/net/http.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,17 @@ package net

import (
"fmt"
"github.com/fatih/color"
"github.com/gocarina/gocsv"
"github.com/spf13/cobra"
"os"
"sort"
"strings"
"sync"
"xray-knife/utils"
"xray-knife/utils/customlog"
"xray-knife/xray"

"github.com/fatih/color"
"github.com/gocarina/gocsv"
"github.com/lilendian0x00/xray-knife/utils"
"github.com/lilendian0x00/xray-knife/utils/customlog"
"github.com/lilendian0x00/xray-knife/xray"
"github.com/spf13/cobra"
)

var (
Expand Down
10 changes: 6 additions & 4 deletions cmd/net/icmp.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,14 @@ package net

import (
"fmt"
"github.com/spf13/cobra"
"net"
"os"
"xray-knife/network"
"xray-knife/utils/customlog"
"xray-knife/xray"

"github.com/lilendian0x00/xray-knife/utils/customlog"
"github.com/lilendian0x00/xray-knife/xray"

"github.com/lilendian0x00/xray-knife/network"
"github.com/spf13/cobra"
)

var (
Expand Down
5 changes: 3 additions & 2 deletions cmd/net/tcp.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@ import (
"net"
"os"
"time"
"xray-knife/utils/customlog"
"xray-knife/xray"

"github.com/lilendian0x00/xray-knife/utils/customlog"
"github.com/lilendian0x00/xray-knife/xray"

"github.com/spf13/cobra"
)
Expand Down
9 changes: 5 additions & 4 deletions cmd/parse/parse.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,13 @@ package parse
import (
"bufio"
"fmt"
"github.com/fatih/color"
"github.com/spf13/cobra"
"os"
"time"
"xray-knife/utils"
"xray-knife/xray"

"github.com/fatih/color"
"github.com/lilendian0x00/xray-knife/utils"
"github.com/lilendian0x00/xray-knife/xray"
"github.com/spf13/cobra"
)

var (
Expand Down
15 changes: 8 additions & 7 deletions cmd/proxy/proxy.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,6 @@ package proxy
import (
"bufio"
"fmt"
"github.com/fatih/color"
"github.com/spf13/cobra"
"github.com/xtls/xray-core/core"
"log"
"math/rand"
"os"
Expand All @@ -14,10 +11,14 @@ import (
"strconv"
"syscall"
"time"
"xray-knife/cmd/net"
"xray-knife/utils"
"xray-knife/utils/customlog"
"xray-knife/xray"

"github.com/fatih/color"
"github.com/lilendian0x00/xray-knife/cmd/net"
"github.com/lilendian0x00/xray-knife/utils"
"github.com/lilendian0x00/xray-knife/utils/customlog"
"github.com/lilendian0x00/xray-knife/xray"
"github.com/spf13/cobra"
"github.com/xtls/xray-core/core"
)

var (
Expand Down
15 changes: 8 additions & 7 deletions cmd/root.go
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,19 @@
package cmd

import (
"github.com/spf13/cobra"
"os"
"xray-knife/cmd/net"
"xray-knife/cmd/parse"
"xray-knife/cmd/proxy"
"xray-knife/cmd/scan"
"xray-knife/cmd/subs"

"github.com/lilendian0x00/xray-knife/cmd/net"
"github.com/lilendian0x00/xray-knife/cmd/parse"
"github.com/lilendian0x00/xray-knife/cmd/proxy"
"github.com/lilendian0x00/xray-knife/cmd/scan"
"github.com/lilendian0x00/xray-knife/cmd/subs"
"github.com/spf13/cobra"
)

// rootCmd represents the base command when called without any subcommands
var rootCmd = &cobra.Command{
Use: "xray-knife",
Use: "github.com/lilendian0x00/xray-knife",
Short: "Swiss Army Knife for xray-core",
Long: ``,
Version: "2.8.16",
Expand Down
5 changes: 3 additions & 2 deletions cmd/scan/cfscanner.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@ package scan
import (
"os"
"strings"
"xray-knife/utils"
"xray-knife/utils/customlog"

"github.com/lilendian0x00/xray-knife/utils"
"github.com/lilendian0x00/xray-knife/utils/customlog"

"github.com/spf13/cobra"
)
Expand Down
9 changes: 5 additions & 4 deletions cmd/subs/fetch.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,13 @@ package subs

import (
"fmt"
"github.com/spf13/cobra"
"os"
"strings"
"xray-knife/utils"
"xray-knife/utils/customlog"
"xray-knife/xray"

"github.com/lilendian0x00/xray-knife/utils"
"github.com/lilendian0x00/xray-knife/utils/customlog"
"github.com/lilendian0x00/xray-knife/xray"
"github.com/spf13/cobra"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module xray-knife
module github.com/lilendian0x00/xray-knife

go 1.21.4

Expand Down
2 changes: 1 addition & 1 deletion main.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package main

import (
"xray-knife/cmd"
"github.com/lilendian0x00/xray-knife/cmd"
)

func main() {
Expand Down
7 changes: 4 additions & 3 deletions network/icmp.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,14 @@ import (
"encoding/binary"
"errors"
"fmt"
"golang.org/x/net/icmp"
"golang.org/x/net/ipv4"
"math/rand"
"net"
"os"
"time"
"xray-knife/utils/customlog"

"github.com/lilendian0x00/xray-knife/utils/customlog"
"golang.org/x/net/icmp"
"golang.org/x/net/ipv4"
)

type IcmpPacket struct {
Expand Down
6 changes: 3 additions & 3 deletions scanner/scanner.go
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package scanner

import (
"xray-knife/speedtester"
"xray-knife/speedtester/cloudflare"
"xray-knife/utils/customlog"
"github.com/lilendian0x00/xray-knife/speedtester"
"github.com/lilendian0x00/xray-knife/speedtester/cloudflare"
"github.com/lilendian0x00/xray-knife/utils/customlog"
)

type CFScanner struct {
Expand Down
5 changes: 3 additions & 2 deletions speedtester/speedtest.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,9 @@ import (
"net"
"net/http"
"time"
"xray-knife/network/customtls"
"xray-knife/speedtester/custom"

"github.com/lilendian0x00/xray-knife/network/customtls"
"github.com/lilendian0x00/xray-knife/speedtester/custom"
)

type SpeedTester struct {
Expand Down
3 changes: 2 additions & 1 deletion utils/utils.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ import (
"os/exec"
"runtime"
"strings"
"xray-knife/utils/customlog"

"github.com/lilendian0x00/xray-knife/utils/customlog"
)

func Base64Decode(b64 string) ([]byte, error) {
Expand Down
3 changes: 2 additions & 1 deletion xray/examiner.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ import (
"fmt"
"strings"
"time"
"xray-knife/speedtester/cloudflare"

"github.com/lilendian0x00/xray-knife/speedtester/cloudflare"
)

type Result struct {
Expand Down
7 changes: 4 additions & 3 deletions xray/shadowsocks.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,13 @@ import (
"encoding/json"
"errors"
"fmt"
"github.com/fatih/color"
"github.com/xtls/xray-core/infra/conf"
"net"
"net/url"
"strings"
"xray-knife/utils"

"github.com/fatih/color"
"github.com/lilendian0x00/xray-knife/utils"
"github.com/xtls/xray-core/infra/conf"
)

func (s *Shadowsocks) Parse(configLink string) error {
Expand Down
9 changes: 5 additions & 4 deletions xray/socks.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,16 @@ package xray
import (
"encoding/json"
"fmt"
"github.com/fatih/color"
net2 "github.com/xtls/xray-core/common/net"
"github.com/xtls/xray-core/infra/conf"
"log"
"net"
"net/url"
"strconv"
"strings"
"xray-knife/utils"

"github.com/fatih/color"
"github.com/lilendian0x00/xray-knife/utils"
net2 "github.com/xtls/xray-core/common/net"
"github.com/xtls/xray-core/infra/conf"
)

func (s *Socks) Parse(configLink string) error {
Expand Down
5 changes: 3 additions & 2 deletions xray/subscription.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@ import (
"log"
"net/url"
"strings"
"xray-knife/utils"
"xray-knife/utils/customlog"

"github.com/lilendian0x00/xray-knife/utils"
"github.com/lilendian0x00/xray-knife/utils/customlog"
)

// TODO: Make a database to store subscriptions
Expand Down
7 changes: 4 additions & 3 deletions xray/vmess.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,13 @@ package xray
import (
"encoding/json"
"fmt"
"github.com/fatih/color"
"github.com/xtls/xray-core/infra/conf"
"net"
"net/url"
"strings"
"xray-knife/utils"

"github.com/fatih/color"
"github.com/lilendian0x00/xray-knife/utils"
"github.com/xtls/xray-core/infra/conf"
)

func method1(v *Vmess, link string) error {
Expand Down

0 comments on commit d614f8e

Please sign in to comment.