diff --git a/Dockerfile b/Dockerfile index 9af814d..fd64a33 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,11 +1,35 @@ -FROM ubuntu:20.04 +# 第一阶段:构建 +FROM golang:1.24.0 AS builder + +ENV GOPROXY=https://goproxy.cn,direct + +WORKDIR /build + +# 复制Go模块文件 +COPY go.mod go.sum ./ +RUN go mod download + +# 复制源代码 +COPY . . + +# 编译 +RUN GOOS=linux GOARCH=amd64 go build -ldflags '-w -s' -o bin/proxy_linux_amd64 cmd/main/main.go + +# 第二阶段:运行环境 +FROM ubuntu:24.04 AS runner WORKDIR /app -COPY ./bin/proxy_server_linux_amd64 /app/proxy +RUN apt-get update && apt-get install -y ca-certificates + +# 从构建阶段复制编译好的二进制文件 +COPY --from=builder /build/bin/proxy_linux_amd64 /app/proxy + +# 设置可执行权限 RUN chmod +x /app/proxy -EXPOSE $APP_CTRL_PORT -EXPOSE $APP_PROXY_PORT +# 声明暴露端口 +EXPOSE 8080 +# 启动平台服务 CMD ["/app/proxy"] \ No newline at end of file diff --git a/README.md b/README.md index f630721..4a759ee 100644 --- a/README.md +++ b/README.md @@ -1,52 +1,14 @@ -## todo - -可配置 logger,不直接使用 slog - -授权测试,两种协议,三种认证方式 - -连接计时数据清理,避免堆泄露 - -找一个其他方式即时关闭未成功建立数据通道的连接 - -排查下套接字重复的问题 - -建立通道时,发送的 dst 和 tag 等信息,可以用字节表示而非 string,提高效率 - -建立数据通道失败后,根据用户所选协议返回对应失败响应 - - -可配配置环境变量 - -- 输出级别 -- 退出等待时间 -- 数据通道连接超时等待时间 -- 目标地址连接超时等待时间 - -### 长期 - -协程池化 - -数据通道池化 - -数据通道支持 tcp 多路复用(分离逻辑流) - -👆 进阶黑魔法 multipath tcp + 多路复用 - -切换到 gnet - ## 开发相关 -### 环境变量 +### 目录结构 -> 环境变量只记录在程序中用到的变量 -> -> **构建期变量**,比如 docker-compose 中的变量,以及其他配套服务的环境变量,直接写死 +server/fwd: 服务端核心代码 -新增环境变量时,需要确保两个位置正确传递了变量 - -1. 在对应端的 .env.sample 文件中添加变量 -2. 复制到 .env 文件中,并修改变量值 -3. 在 docker-compose.yml 和程序中使用变量 +- core: 核心代码,目前主要是连接管理 +- dispatcher: 请求处理器,负责解析传入协议,并将请求分发到对应的处理器 +- http: http 处理器,负责处理 http 请求 +- socks: socks5 处理器,负责处理 socks5 请求 +- repo: 状态仓库,所有有状态数据都通过 repo 中的接口与外部服务交互 ### 更新测试环境 @@ -59,7 +21,6 @@ 2. 通知并等待所有正在运行的 conn 处理协程全部关闭(user, data, ctrl) 3. 结束所有保存且未使用的 conn 连接(user, ctrl) - ### 代码清理 检查 slog 级别: diff --git a/build.ps1 b/build.ps1 deleted file mode 100644 index 5d839c9..0000000 --- a/build.ps1 +++ /dev/null @@ -1,60 +0,0 @@ -Remove-Job * - -$tasks = 0 -$start = Get-Date - -$tasks++ -Write-Output "building proxy server for windows amd64..." -Start-Job -ScriptBlock { - $env:GOOS = "windows"; $env:GOARCH = "amd64"; go build -ldflags '-w -s' -o bin/proxy_server_win_amd64.exe cmd/server/main.go -} | Out-Null - -$tasks++ -Write-Output "building proxy server for linux amd64..." -Start-Job -ScriptBlock { - $env:GOOS = "linux"; $env:GOARCH = "amd64"; go build -ldflags '-w -s' -o bin/proxy_server_linux_amd64 cmd/server/main.go -} | Out-Null - -$tasks++ -Write-Output "building proxy server for linux arm64..." -Start-Job -ScriptBlock { - $env:GOOS = "linux"; $env:GOARCH = "arm64"; go build -ldflags '-w -s' -o bin/proxy_server_linux_arm64 cmd/server/main.go -} | Out-Null - -$tasks++ -Write-Output "building proxy client for windows amd64..." -Start-Job -ScriptBlock { - $env:GOOS = "windows"; $env:GOARCH = "amd64"; go build -ldflags '-w -s' -o bin/proxy_client_win_amd64.exe cmd/client/main.go -} | Out-Null - -$tasks++ -Write-Output "building proxy client for linux amd64..." -Start-Job -ScriptBlock { - $env:GOOS = "linux"; $env:GOARCH = "amd64"; go build -ldflags '-w -s' -o bin/proxy_client_linux_amd64 cmd/client/main.go -} | Out-Null - -$tasks++ -Write-Output "building proxy client for linux arm64..." -Start-Job -ScriptBlock { - $env:GOOS = "linux"; $env:GOARCH = "arm64"; go build -ldflags '-w -s' -o bin/proxy_client_linux_arm64 cmd/client/main.go -} | Out-Null - -# Wait for all jobs to complete -while ($tasks -gt 0) -{ - foreach ($job in Get-Job) - { - if ($job.State -eq "Completed") - { - $tasks-- - $job | Receive-Job - $job | Remove-Job - } - } -} - -$end = Get-Date - -Write-Output "build completed" -Write-Output "time taken: $( ($end - $start).TotalSeconds ) seconds" -Write-Output "output files are in ./bin/" \ No newline at end of file diff --git a/go.mod b/go.mod index dccc52b..48ee8da 100644 --- a/go.mod +++ b/go.mod @@ -9,20 +9,15 @@ require ( github.com/mattn/go-colorable v0.1.14 github.com/pkg/errors v0.9.1 github.com/soheilhy/cmux v0.1.5 - github.com/tsenart/vegeta v11.4.0+incompatible gorm.io/driver/postgres v1.5.11 gorm.io/gen v0.3.26 gorm.io/gorm v1.25.12 ) require ( - github.com/bmizerany/perks v0.0.0-20230307044200-03f9df79da1e // indirect github.com/bytedance/sonic v1.12.8 // indirect github.com/bytedance/sonic/loader v0.2.3 // indirect - github.com/c2h5oh/datasize v0.0.0-20231215233829-aa82cc1e6500 // indirect github.com/cloudwego/base64x v0.1.5 // indirect - github.com/dgryski/go-gk v0.0.0-20200319235926-a69029f61654 // indirect - github.com/dgryski/go-lttb v0.0.0-20230207170358-f8fc36cdbff1 // indirect github.com/gabriel-vasile/mimetype v1.4.8 // indirect github.com/gin-contrib/sse v1.0.0 // indirect github.com/go-playground/locales v0.14.1 // indirect @@ -30,31 +25,25 @@ require ( github.com/go-playground/validator/v10 v10.22.0 // indirect github.com/go-sql-driver/mysql v1.7.0 // indirect github.com/goccy/go-json v0.10.5 // indirect - github.com/influxdata/tdigest v0.0.1 // indirect github.com/jackc/pgpassfile v1.0.0 // indirect github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect github.com/jackc/pgx/v5 v5.5.5 // indirect github.com/jackc/puddle/v2 v2.2.1 // indirect github.com/jinzhu/inflection v1.0.0 // indirect github.com/jinzhu/now v1.1.5 // indirect - github.com/josharian/intern v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/cpuid/v2 v2.2.9 // indirect github.com/kr/text v0.2.0 // indirect github.com/leodido/go-urn v1.4.0 // indirect - github.com/mailru/easyjson v0.9.0 // indirect github.com/mattn/go-isatty v0.0.20 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pelletier/go-toml/v2 v2.2.3 // indirect github.com/rogpeppe/go-internal v1.13.1 // indirect - github.com/streadway/quantile v0.0.0-20220407130108-4246515d968d // indirect - github.com/tsenart/go-tsz v0.0.0-20180814235614-0bd30b3df1c3 // indirect github.com/twitchyliquid64/golang-asm v0.15.1 // indirect github.com/ugorji/go/codec v1.2.12 // indirect golang.org/x/arch v0.14.0 // indirect golang.org/x/crypto v0.33.0 // indirect - golang.org/x/exp v0.0.0-20220927162542-c76eaa363f9d // indirect golang.org/x/mod v0.22.0 // indirect golang.org/x/net v0.35.0 // indirect golang.org/x/sync v0.11.0 // indirect diff --git a/go.sum b/go.sum index fe0ca16..f9c1dac 100644 --- a/go.sum +++ b/go.sum @@ -1,12 +1,8 @@ -github.com/bmizerany/perks v0.0.0-20230307044200-03f9df79da1e h1:mWOqoK5jV13ChKf/aF3plwQ96laasTJgZi4f1aSOu+M= -github.com/bmizerany/perks v0.0.0-20230307044200-03f9df79da1e/go.mod h1:ac9efd0D1fsDb3EJvhqgXRbFx7bs2wqZ10HQPeU8U/Q= github.com/bytedance/sonic v1.12.8 h1:4xYRVRlXIgvSZ4e8iVTlMF5szgpXd4AfvuWgA8I8lgs= github.com/bytedance/sonic v1.12.8/go.mod h1:uVvFidNmlt9+wa31S1urfwwthTWteBgG0hWuoKAXTx8= github.com/bytedance/sonic/loader v0.1.1/go.mod h1:ncP89zfokxS5LZrJxl5z0UJcsk4M4yY2JpfqGeCtNLU= github.com/bytedance/sonic/loader v0.2.3 h1:yctD0Q3v2NOGfSWPLPvG2ggA2kV6TS6s4wioyEqssH0= github.com/bytedance/sonic/loader v0.2.3/go.mod h1:N8A3vUdtUebEY2/VQC0MyhYeKUFosQU6FxH2JmUe6VI= -github.com/c2h5oh/datasize v0.0.0-20231215233829-aa82cc1e6500 h1:6lhrsTEnloDPXyeZBvSYvQf8u86jbKehZPVDDlkgDl4= -github.com/c2h5oh/datasize v0.0.0-20231215233829-aa82cc1e6500/go.mod h1:S/7n9copUssQ56c7aAgHqftWO4LTf4xY6CGWt8Bc+3M= github.com/cloudwego/base64x v0.1.5 h1:XPciSp1xaq2VCSt6lF0phncD4koWyULpl5bUxbfCyP4= github.com/cloudwego/base64x v0.1.5/go.mod h1:0zlkT4Wn5C6NdauXdJRhSKRlJvmclQ1hhJgA0rcu/8w= github.com/cloudwego/iasm v0.2.0/go.mod h1:8rXZaNYT2n95jn+zTI1sDr+IgcD2GVs0nlbbQPiEFhY= @@ -14,10 +10,6 @@ github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ3 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/dgryski/go-gk v0.0.0-20200319235926-a69029f61654 h1:XOPLOMn/zT4jIgxfxSsoXPxkrzz0FaCHwp33x5POJ+Q= -github.com/dgryski/go-gk v0.0.0-20200319235926-a69029f61654/go.mod h1:qm+vckxRlDt0aOla0RYJJVeqHZlWfOm2UIxHaqPB46E= -github.com/dgryski/go-lttb v0.0.0-20230207170358-f8fc36cdbff1 h1:dxwR3CStJdJamsIoMPCmxuIfBAPTgmzvFax+MvFav3M= -github.com/dgryski/go-lttb v0.0.0-20230207170358-f8fc36cdbff1/go.mod h1:UwftcHUI/qTYvLAxrWmANuRckf8+08O3C3hwStvkhDU= github.com/gabriel-vasile/mimetype v1.4.8 h1:FfZ3gj38NjllZIeJAmMhr+qKL8Wu+nOoI3GqacKw1NM= github.com/gabriel-vasile/mimetype v1.4.8/go.mod h1:ByKUIKGjh1ODkGM1asKUbQZOLGrPjydw3hYPU2YU9t8= github.com/gin-contrib/sse v1.0.0 h1:y3bT1mUWUxDpW4JLQg/HnTqV4rozuW4tC9eFKTxYI9E= @@ -41,12 +33,9 @@ github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 h1:au07oEsX2xN0kt github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0= github.com/golang-sql/sqlexp v0.1.0 h1:ZCD6MBpcuOVfGVqsEmY5/4FtYiKz6tSyUv9LPEDei6A= github.com/golang-sql/sqlexp v0.1.0/go.mod h1:J4ad9Vo8ZCWQ2GMrC4UCQy1JpCbwU9m3EOqtpKwwwHI= -github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= -github.com/influxdata/tdigest v0.0.1 h1:XpFptwYmnEKUqmkcDjrzffswZ3nvNeevbUSLPP/ZzIY= -github.com/influxdata/tdigest v0.0.1/go.mod h1:Z0kXnxzbTC2qrx4NaIzYkE1k66+6oEDQTvL95hQFh5Y= github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM= github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg= github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a h1:bbPeKD0xmW/Y25WS6cokEszi5g+S0QxI/d45PkRi7Nk= @@ -63,8 +52,6 @@ github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ= github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0= github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4= -github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY= -github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= @@ -79,8 +66,6 @@ github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ= github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI= github.com/lmittmann/tint v1.0.7 h1:D/0OqWZ0YOGZ6AyC+5Y2kD8PBEzBk6rFHVSfOqCkF9Y= github.com/lmittmann/tint v1.0.7/go.mod h1:HIS3gSy7qNwGCj+5oRjAutErFBl4BzdQP6cJZ0NfMwE= -github.com/mailru/easyjson v0.9.0 h1:PrnmzHw7262yW8sTBwxi1PdJA3Iw/EKBa8psRf7d9a4= -github.com/mailru/easyjson v0.9.0/go.mod h1:1+xMtQp2MRNVL/V1bOzuP3aP8VNwRW55fQUto+XFtTU= github.com/mattn/go-colorable v0.1.14 h1:9A9LHSqF/7dyVVX6g0U9cwm9pG3kP9gSzcuIPHPsaIE= github.com/mattn/go-colorable v0.1.14/go.mod h1:6LmQG8QLFO4G5z1gPvYEzlUgJ2wF+stgPZH1UqBm1s8= github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= @@ -105,8 +90,6 @@ github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o= github.com/soheilhy/cmux v0.1.5 h1:jjzc5WVemNEDTLwv9tlmemhC73tI08BNOIGwBOo10Js= github.com/soheilhy/cmux v0.1.5/go.mod h1:T7TcVDs9LWfQgPlPsdngu6I6QIoyIFZDDC6sNE1GqG0= -github.com/streadway/quantile v0.0.0-20220407130108-4246515d968d h1:X4+kt6zM/OVO6gbJdAfJR60MGPsqCzbtXNnjoGqdfAs= -github.com/streadway/quantile v0.0.0-20220407130108-4246515d968d/go.mod h1:lbP8tGiBjZ5YWIc2fzuRpTaz0b/53vT6PEs3QuAWzuU= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= @@ -119,10 +102,6 @@ github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= -github.com/tsenart/go-tsz v0.0.0-20180814235614-0bd30b3df1c3 h1:pcQGQzTwCg//7FgVywqge1sW9Yf8VMsMdG58MI5kd8s= -github.com/tsenart/go-tsz v0.0.0-20180814235614-0bd30b3df1c3/go.mod h1:SWZznP1z5Ki7hDT2ioqiFKEse8K9tU2OUvaRI0NeGQo= -github.com/tsenart/vegeta v11.4.0+incompatible h1:VJjC5xPmxymgIIzHgUsYTE0xVoBSikw1mIOsSgUSWx4= -github.com/tsenart/vegeta v11.4.0+incompatible/go.mod h1:Smz/ZWfhKRcyDDChZkG3CyTHdj87lHzio/HOCkbndXM= github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI= github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08= github.com/ugorji/go/codec v1.2.12 h1:9LC83zGrHhuUA9l16C9AHXAqEV/2wBQ4nkvumAE65EE= @@ -133,9 +112,6 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.33.0 h1:IOBPskki6Lysi0lo9qQvbxiQ+FvsCC/YWOecCHAixus= golang.org/x/crypto v0.33.0/go.mod h1:bVdXmD7IV/4GdElGPozy6U7lWdRXA4qyRVGJV57uQ5M= -golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/exp v0.0.0-20220927162542-c76eaa363f9d h1:3wgmvnqHUJ8SxiNWwea5NCzTwAVfhTtuV+0ClVFlClc= -golang.org/x/exp v0.0.0-20220927162542-c76eaa363f9d/go.mod h1:cyybsKvd6eL0RnXn6p/Grxp8F5bW7iYuBgsNCOHpMYE= golang.org/x/mod v0.22.0 h1:D4nJWe9zXqHOmWqj4VMOJhvzj7bEZg4wEYa759z1pH4= golang.org/x/mod v0.22.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= @@ -154,13 +130,9 @@ golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM= golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY= -golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.28.0 h1:WuB6qZ4RPCQo5aP3WdKZS7i595EdWqWR8vqJTlwTVK8= golang.org/x/tools v0.28.0/go.mod h1:dcIOrVd3mfQKTgrDVQHqCPMWy6lnhfhtX3hLXYVLfRw= -gonum.org/v1/gonum v0.0.0-20181121035319-3f7ecaa7e8ca h1:PupagGYwj8+I4ubCxcmcBRk3VlUWtTg5huQpZR9flmE= -gonum.org/v1/gonum v0.0.0-20181121035319-3f7ecaa7e8ca/go.mod h1:Y+Yx5eoAFn32cQvJDxZx5Dpnq+c3wtXuadVZAcxbbBo= -gonum.org/v1/netlib v0.0.0-20181029234149-ec6d1f5cefe6/go.mod h1:wa6Ws7BG/ESfp6dHfk7C6KdzKA7wR7u/rKwOGE66zvw= google.golang.org/protobuf v1.36.5 h1:tPhr+woSbjfYvY6/GPufUoYizxw1cF/yFoxJ2fmpwlM= google.golang.org/protobuf v1.36.5/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/server/fwd/auth/auth.go b/server/fwd/auth/auth.go index 48f6d67..8793e3a 100644 --- a/server/fwd/auth/auth.go +++ b/server/fwd/auth/auth.go @@ -4,7 +4,7 @@ import ( "log/slog" "net" "proxy-server/server/fwd/core" - "proxy-server/server/pkg/models" + "proxy-server/server/fwd/repo" "proxy-server/server/pkg/orm" "strconv" "time" @@ -38,8 +38,8 @@ func CheckIp(conn net.Conn, proto Protocol) (*core.AuthContext, error) { // 查询权限记录 slog.Debug("用户 " + remoteHost + " 请求连接到 " + _localPort) - var channels []models.Channel - err = orm.DB.Find(&channels, &models.Channel{ + var channels []repo.Channel + err = orm.DB.Find(&channels, &repo.Channel{ AuthIp: true, UserAddr: remoteHost, NodePort: localPort, @@ -84,8 +84,8 @@ func CheckPass(conn net.Conn, proto Protocol, username, password string) (*core. } // 查询权限记录 - var channel models.Channel - err = orm.DB.Take(&channel, &models.Channel{ + var channel repo.Channel + err = orm.DB.Take(&channel, &repo.Channel{ AuthPass: true, Username: username, NodePort: localPort, diff --git a/server/fwd/ctrl.go b/server/fwd/ctrl.go index e9e93b3..53af34d 100644 --- a/server/fwd/ctrl.go +++ b/server/fwd/ctrl.go @@ -9,8 +9,8 @@ import ( "proxy-server/server/fwd/core" "proxy-server/server/fwd/dispatcher" "proxy-server/server/fwd/metrics" + "proxy-server/server/fwd/repo" "proxy-server/server/pkg/env" - "proxy-server/server/pkg/models" "proxy-server/server/pkg/orm" "strconv" "strings" @@ -93,8 +93,8 @@ func (s *Service) processCtrlConn(conn net.Conn) error { } // 检查客户端 - var node models.Node - err = orm.DB.Take(&node, &models.Node{ + var node repo.Node + err = orm.DB.Take(&node, &repo.Node{ Name: name, }).Error if err != nil { diff --git a/server/pkg/models/channel.go b/server/fwd/repo/channel.go similarity index 95% rename from server/pkg/models/channel.go rename to server/fwd/repo/channel.go index f0870bd..8710f8d 100644 --- a/server/pkg/models/channel.go +++ b/server/fwd/repo/channel.go @@ -1,4 +1,4 @@ -package models +package repo import ( "time" diff --git a/server/pkg/models/node.go b/server/fwd/repo/node.go similarity index 93% rename from server/pkg/models/node.go rename to server/fwd/repo/node.go index 1cf57df..f2bae94 100644 --- a/server/pkg/models/node.go +++ b/server/fwd/repo/node.go @@ -1,4 +1,4 @@ -package models +package repo import "gorm.io/gorm" diff --git a/server/pkg/models/user-ip.go b/server/pkg/models/user-ip.go deleted file mode 100644 index 403cd69..0000000 --- a/server/pkg/models/user-ip.go +++ /dev/null @@ -1,9 +0,0 @@ -package models - -import "gorm.io/gorm" - -type UserIp struct { - gorm.Model - UserId uint - IpAddress string -} diff --git a/server/pkg/models/user.go b/server/pkg/models/user.go deleted file mode 100644 index d29f664..0000000 --- a/server/pkg/models/user.go +++ /dev/null @@ -1,14 +0,0 @@ -package models - -import "gorm.io/gorm" - -type User struct { - gorm.Model - Password string - Username string - Email string - Phone string - Name string - - Channels []Channel `gorm:"foreignKey:UserId"` -}