diff --git a/CHANGELOG.md b/CHANGELOG.md index 8b9473e..7fb08e2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,25 @@ # 变更日志 (CHANGELOG) +## 2026-07-15 修正 manager 模块路径为 `git.zkcoi.com/zkcoi/Meshray-Manager` + +### 背景 +Gitea 仓库名大小写不敏感：`zkcoi/meshray` 与 `zkcoi/Meshray`（core 仓库）会被视为 +同一仓库，导致原模块路径 `git.zkcoi.com/zkcoi/meshray` 经 `go get` 会解析到 core 仓库 +（其根模块为 `git.zkcoi.com/zkcoi/meshray/core`），而非本管理器。为使模块路径与仓库名 +`zkcoi/Meshray-Manager` 一致、可从网络正确拉取，特此更名。 + +### 改动 +- `go.mod`：`module git.zkcoi.com/zkcoi/meshray` → `module git.zkcoi.com/zkcoi/Meshray-Manager`。 +- 全仓 `.go` 导入：`git.zkcoi.com/zkcoi/meshray/{internal,web,pkg}/...` → + `git.zkcoi.com/zkcoi/Meshray-Manager/...`（正则 `meshray/(?!core/)` 仅替换自有包， + 保留对 core 模块 `git.zkcoi.com/zkcoi/meshray/core` 的引用）。 +- core 模块路径 `git.zkcoi.com/zkcoi/meshray/core` 与仓库 `zkcoi/Meshray` 保持不变， + 仍可经 `go get` 正确解析；`go.mod` 中 `require` / `replace .../meshray/core => ../Meshray` 不变。 +- `README.md` / `deploy/scripts/install.sh` 的仓库地址同步改为 `zkcoi/Meshray-Manager`。 + +### 验证 +- `go build ./...` → 0（全仓编译通过，core 引用未被误改）。 + ## 2026-07-15 仓库拆分：core 独立为 `meshray/core`，wg-go 集成迁移至 `internal/ctr/corebind` ### 背景（架构决策） diff --git a/README.md b/README.md index 618bed5..b28b5ce 100644 --- a/README.md +++ b/README.md @@ -4,8 +4,8 @@ > **💤 项目状态：个人练手的 Vibecoding 项目，目前已暂时搁置，后续有时间再继续完善。** -[![Version](https://img.shields.io/badge/version-2.3.x-blue.svg)](https://git.zkcoi.com/zkcoi/meshray) -[![Status](https://img.shields.io/badge/status-paused-lightgrey.svg)](https://git.zkcoi.com/zkcoi/meshray) +[![Version](https://img.shields.io/badge/version-2.3.x-blue.svg)](https://git.zkcoi.com/zkcoi/Meshray-Manager) +[![Status](https://img.shields.io/badge/status-paused-lightgrey.svg)](https://git.zkcoi.com/zkcoi/Meshray-Manager) [![Go Version](https://img.shields.io/badge/go-1.21+-green.svg)](https://golang.org) [![License](https://img.shields.io/badge/license-MIT-blue.svg)](LICENSE) @@ -172,7 +172,7 @@ meshray/ ```bash # 克隆项目 -git clone https://git.zkcoi.com/zkcoi/meshray.git +git clone https://git.zkcoi.com/zkcoi/Meshray-Manager.git cd meshray # 安装依赖 diff --git a/cmd/mr-wg/main.go b/cmd/mr-wg/main.go index a9354f7..62cd1d2 100644 --- a/cmd/mr-wg/main.go +++ b/cmd/mr-wg/main.go @@ -23,7 +23,7 @@ import ( meshraycore "git.zkcoi.com/zkcoi/meshray/core/engine" "git.zkcoi.com/zkcoi/meshray/core/connect" - corebind "git.zkcoi.com/zkcoi/meshray/internal/ctr/corebind" + corebind "git.zkcoi.com/zkcoi/Meshray-Manager/internal/ctr/corebind" "go.uber.org/zap" "golang.zx2c4.com/wireguard/conn" "golang.zx2c4.com/wireguard/device" diff --git a/cmd/reset-password/main.go b/cmd/reset-password/main.go index 658d21b..ae5512a 100644 --- a/cmd/reset-password/main.go +++ b/cmd/reset-password/main.go @@ -5,9 +5,9 @@ import ( "fmt" "os" - "git.zkcoi.com/zkcoi/meshray/internal/config" - "git.zkcoi.com/zkcoi/meshray/internal/service" - store "git.zkcoi.com/zkcoi/meshray/internal/store/sqlite" + "git.zkcoi.com/zkcoi/Meshray-Manager/internal/config" + "git.zkcoi.com/zkcoi/Meshray-Manager/internal/service" + store "git.zkcoi.com/zkcoi/Meshray-Manager/internal/store/sqlite" "github.com/spf13/cobra" ) diff --git a/cmd/testembed/main.go b/cmd/testembed/main.go index c83e0ad..2c13134 100644 --- a/cmd/testembed/main.go +++ b/cmd/testembed/main.go @@ -4,7 +4,7 @@ import ( "fmt" "io/fs" - "git.zkcoi.com/zkcoi/meshray/web" + "git.zkcoi.com/zkcoi/Meshray-Manager/web" ) func main() { diff --git a/deploy/scripts/install.sh b/deploy/scripts/install.sh index 48b9c7c..39fc906 100644 --- a/deploy/scripts/install.sh +++ b/deploy/scripts/install.sh @@ -38,7 +38,7 @@ sudo mkdir -p /opt/meshray/backups # 下载 MeshRay（需要从 GitHub Releases 下载） echo "📦 正在下载 MeshRay ${MESHRAY_VERSION}..." # TODO: 替换为真实的下载链接 -# wget -q https://git.zkcoi.com/zkcoi/meshray/releases/download/${MESHRAY_VERSION}/meshray-linux-${ARCH}.tar.gz +# wget -q https://git.zkcoi.com/zkcoi/Meshray-Manager/releases/download/${MESHRAY_VERSION}/meshray-linux-${ARCH}.tar.gz # tar -xzf meshray-linux-${ARCH}.tar.gz # sudo mv meshray $INSTALL_DIR/ diff --git a/go.mod b/go.mod index 85423a0..8dbc6ae 100644 --- a/go.mod +++ b/go.mod @@ -1,12 +1,12 @@ -module git.zkcoi.com/zkcoi/meshray +module git.zkcoi.com/zkcoi/Meshray-Manager go 1.26.0 // 开源契约层（管理器与 meshray-core 共享，独立叶子模块，避免 module 级循环依赖） replace git.zkcoi.com/zkcoi/meshray-contract => ./pkg/contract -// 核心转发引擎 meshray（去中心化 frp 本体 + 9 层传输）：独立仓库，零 wireguard 依赖。 -// 模块路径为 git.zkcoi.com/zkcoi/meshray/core（避免与本品 meshray 模块路径冲突）。 +// 核心转发引擎 meshray（去中心化 frp 本体 + 9 层传输）：独立仓库 zkcoi/Meshray，零 wireguard 依赖。 +// 其模块路径为 git.zkcoi.com/zkcoi/meshray/core（仓库名 Meshray 与本品 Meshray-Manager 大小写有别、互不相干）。 // 管理器经此 replace 引用本地核心，wg-go 集成（corebind）在本仓库内，二者隔离。 replace git.zkcoi.com/zkcoi/meshray/core => ../Meshray diff --git a/internal/api/dto/responses.go b/internal/api/dto/responses.go index 38b925f..1d59100 100644 --- a/internal/api/dto/responses.go +++ b/internal/api/dto/responses.go @@ -3,7 +3,7 @@ package dto import ( "fmt" - "git.zkcoi.com/zkcoi/meshray/internal/model" + "git.zkcoi.com/zkcoi/Meshray-Manager/internal/model" ) // NetworkResponse 网络响应 DTO（ID 为字符串格式，避免 JavaScript 精度丢失） diff --git a/internal/api/handler/admin.go b/internal/api/handler/admin.go index 1f48edd..c5475a3 100644 --- a/internal/api/handler/admin.go +++ b/internal/api/handler/admin.go @@ -3,7 +3,7 @@ package handler import ( "net/http" - "git.zkcoi.com/zkcoi/meshray/internal/service" + "git.zkcoi.com/zkcoi/Meshray-Manager/internal/service" "github.com/gin-gonic/gin" "go.uber.org/zap" ) diff --git a/internal/api/handler/dashboard.go b/internal/api/handler/dashboard.go index f97c75c..5fcb6ae 100644 --- a/internal/api/handler/dashboard.go +++ b/internal/api/handler/dashboard.go @@ -9,8 +9,8 @@ import ( "strconv" "time" - "git.zkcoi.com/zkcoi/meshray/internal/model" - sqlite "git.zkcoi.com/zkcoi/meshray/internal/store/sqlite" + "git.zkcoi.com/zkcoi/Meshray-Manager/internal/model" + sqlite "git.zkcoi.com/zkcoi/Meshray-Manager/internal/store/sqlite" "github.com/gin-gonic/gin" "github.com/shirou/gopsutil/v4/cpu" "github.com/shirou/gopsutil/v4/disk" diff --git a/internal/api/handler/ddns.go b/internal/api/handler/ddns.go index bc1d378..d9c60a4 100644 --- a/internal/api/handler/ddns.go +++ b/internal/api/handler/ddns.go @@ -3,7 +3,7 @@ package handler import ( "net/http" - "git.zkcoi.com/zkcoi/meshray/internal/service" + "git.zkcoi.com/zkcoi/Meshray-Manager/internal/service" "github.com/gin-gonic/gin" ) diff --git a/internal/api/handler/ddns_stats.go b/internal/api/handler/ddns_stats.go index 39aa6fc..0f9632f 100644 --- a/internal/api/handler/ddns_stats.go +++ b/internal/api/handler/ddns_stats.go @@ -5,7 +5,7 @@ import ( "net/http" "time" - "git.zkcoi.com/zkcoi/meshray/internal/model" + "git.zkcoi.com/zkcoi/Meshray-Manager/internal/model" "github.com/gin-gonic/gin" "gorm.io/gorm" ) diff --git a/internal/api/handler/ddns_usage.go b/internal/api/handler/ddns_usage.go index a233c3f..0edf77d 100644 --- a/internal/api/handler/ddns_usage.go +++ b/internal/api/handler/ddns_usage.go @@ -7,8 +7,8 @@ import ( "regexp" "strings" - "git.zkcoi.com/zkcoi/meshray/internal/model" - "git.zkcoi.com/zkcoi/meshray/pkg/shortid" + "git.zkcoi.com/zkcoi/Meshray-Manager/internal/model" + "git.zkcoi.com/zkcoi/Meshray-Manager/pkg/shortid" "github.com/gin-gonic/gin" "github.com/google/uuid" "go.uber.org/zap" diff --git a/internal/api/handler/device.go b/internal/api/handler/device.go index 64c8787..6371639 100644 --- a/internal/api/handler/device.go +++ b/internal/api/handler/device.go @@ -4,9 +4,9 @@ import ( "net/http" "strconv" - "git.zkcoi.com/zkcoi/meshray/internal/api/dto" - "git.zkcoi.com/zkcoi/meshray/internal/model" - "git.zkcoi.com/zkcoi/meshray/internal/service" + "git.zkcoi.com/zkcoi/Meshray-Manager/internal/api/dto" + "git.zkcoi.com/zkcoi/Meshray-Manager/internal/model" + "git.zkcoi.com/zkcoi/Meshray-Manager/internal/service" "github.com/gin-gonic/gin" "go.uber.org/zap" ) diff --git a/internal/api/handler/ip_detect.go b/internal/api/handler/ip_detect.go index 729758b..893c62d 100644 --- a/internal/api/handler/ip_detect.go +++ b/internal/api/handler/ip_detect.go @@ -3,7 +3,7 @@ package handler import ( "net/http" - "git.zkcoi.com/zkcoi/meshray/internal/service" + "git.zkcoi.com/zkcoi/Meshray-Manager/internal/service" "github.com/gin-gonic/gin" ) diff --git a/internal/api/handler/network.go b/internal/api/handler/network.go index 62c72f7..d32c66b 100644 --- a/internal/api/handler/network.go +++ b/internal/api/handler/network.go @@ -6,10 +6,10 @@ import ( "strings" "time" - "git.zkcoi.com/zkcoi/meshray/internal/api/dto" - "git.zkcoi.com/zkcoi/meshray/internal/model" - "git.zkcoi.com/zkcoi/meshray/internal/service" - sqlite "git.zkcoi.com/zkcoi/meshray/internal/store/sqlite" + "git.zkcoi.com/zkcoi/Meshray-Manager/internal/api/dto" + "git.zkcoi.com/zkcoi/Meshray-Manager/internal/model" + "git.zkcoi.com/zkcoi/Meshray-Manager/internal/service" + sqlite "git.zkcoi.com/zkcoi/Meshray-Manager/internal/store/sqlite" "github.com/gin-gonic/gin" "go.uber.org/zap" ) diff --git a/internal/api/handler/pending_join.go b/internal/api/handler/pending_join.go index c895f78..e03bf1b 100644 --- a/internal/api/handler/pending_join.go +++ b/internal/api/handler/pending_join.go @@ -5,9 +5,9 @@ import ( "strconv" "time" - "git.zkcoi.com/zkcoi/meshray/internal/model" - "git.zkcoi.com/zkcoi/meshray/internal/service" - sqlite "git.zkcoi.com/zkcoi/meshray/internal/store/sqlite" + "git.zkcoi.com/zkcoi/Meshray-Manager/internal/model" + "git.zkcoi.com/zkcoi/Meshray-Manager/internal/service" + sqlite "git.zkcoi.com/zkcoi/Meshray-Manager/internal/store/sqlite" "github.com/gin-gonic/gin" "go.uber.org/zap" ) diff --git a/internal/api/handler/policy.go b/internal/api/handler/policy.go index 6bc0924..76954f0 100644 --- a/internal/api/handler/policy.go +++ b/internal/api/handler/policy.go @@ -4,9 +4,9 @@ import ( "net/http" "strconv" - "git.zkcoi.com/zkcoi/meshray/internal/api/dto" - "git.zkcoi.com/zkcoi/meshray/internal/model" - "git.zkcoi.com/zkcoi/meshray/internal/service" + "git.zkcoi.com/zkcoi/Meshray-Manager/internal/api/dto" + "git.zkcoi.com/zkcoi/Meshray-Manager/internal/model" + "git.zkcoi.com/zkcoi/Meshray-Manager/internal/service" "github.com/gin-gonic/gin" "go.uber.org/zap" ) diff --git a/internal/api/handler/service.go b/internal/api/handler/service.go index fe310c8..ba65ffb 100644 --- a/internal/api/handler/service.go +++ b/internal/api/handler/service.go @@ -3,8 +3,8 @@ package handler import ( "net/http" - "git.zkcoi.com/zkcoi/meshray/internal/model" - "git.zkcoi.com/zkcoi/meshray/internal/service" + "git.zkcoi.com/zkcoi/Meshray-Manager/internal/model" + "git.zkcoi.com/zkcoi/Meshray-Manager/internal/service" "github.com/gin-gonic/gin" "go.uber.org/zap" ) diff --git a/internal/api/handler/settings.go b/internal/api/handler/settings.go index b4515ef..8f03040 100644 --- a/internal/api/handler/settings.go +++ b/internal/api/handler/settings.go @@ -3,7 +3,7 @@ package handler import ( "net/http" - "git.zkcoi.com/zkcoi/meshray/internal/service" + "git.zkcoi.com/zkcoi/Meshray-Manager/internal/service" "github.com/gin-gonic/gin" "go.uber.org/zap" ) diff --git a/internal/api/handler/system_config.go b/internal/api/handler/system_config.go index 513fc92..e071807 100644 --- a/internal/api/handler/system_config.go +++ b/internal/api/handler/system_config.go @@ -6,7 +6,7 @@ import ( "os/exec" "time" - "git.zkcoi.com/zkcoi/meshray/internal/service" + "git.zkcoi.com/zkcoi/Meshray-Manager/internal/service" "github.com/gin-gonic/gin" "go.uber.org/zap" ) diff --git a/internal/api/handler/ws.go b/internal/api/handler/ws.go index 5ffccc2..8bb9fa8 100644 --- a/internal/api/handler/ws.go +++ b/internal/api/handler/ws.go @@ -5,9 +5,9 @@ import ( "net/http" "time" - "git.zkcoi.com/zkcoi/meshray/internal/ctr" - "git.zkcoi.com/zkcoi/meshray/internal/model" - "git.zkcoi.com/zkcoi/meshray/internal/store/sqlite" + "git.zkcoi.com/zkcoi/Meshray-Manager/internal/ctr" + "git.zkcoi.com/zkcoi/Meshray-Manager/internal/model" + "git.zkcoi.com/zkcoi/Meshray-Manager/internal/store/sqlite" "github.com/gin-gonic/gin" "github.com/gorilla/websocket" "go.uber.org/zap" diff --git a/internal/api/middleware/auth.go b/internal/api/middleware/auth.go index 6738fc7..1570b80 100644 --- a/internal/api/middleware/auth.go +++ b/internal/api/middleware/auth.go @@ -6,8 +6,8 @@ import ( "strings" "time" - "git.zkcoi.com/zkcoi/meshray/internal/service" - "git.zkcoi.com/zkcoi/meshray/internal/store/sqlite" + "git.zkcoi.com/zkcoi/Meshray-Manager/internal/service" + "git.zkcoi.com/zkcoi/Meshray-Manager/internal/store/sqlite" "github.com/gin-gonic/gin" "github.com/golang-jwt/jwt/v5" "go.uber.org/zap" diff --git a/internal/api/server.go b/internal/api/server.go index e2906c8..8fa3137 100644 --- a/internal/api/server.go +++ b/internal/api/server.go @@ -16,15 +16,15 @@ import ( "strings" "time" - "git.zkcoi.com/zkcoi/meshray/internal/api/handler" - "git.zkcoi.com/zkcoi/meshray/internal/api/middleware" - "git.zkcoi.com/zkcoi/meshray/internal/config" - "git.zkcoi.com/zkcoi/meshray/internal/ctr" - corehandler "git.zkcoi.com/zkcoi/meshray/internal/handler" - "git.zkcoi.com/zkcoi/meshray/internal/model" - "git.zkcoi.com/zkcoi/meshray/internal/service" - "git.zkcoi.com/zkcoi/meshray/internal/store/sqlite" - "git.zkcoi.com/zkcoi/meshray/web" + "git.zkcoi.com/zkcoi/Meshray-Manager/internal/api/handler" + "git.zkcoi.com/zkcoi/Meshray-Manager/internal/api/middleware" + "git.zkcoi.com/zkcoi/Meshray-Manager/internal/config" + "git.zkcoi.com/zkcoi/Meshray-Manager/internal/ctr" + corehandler "git.zkcoi.com/zkcoi/Meshray-Manager/internal/handler" + "git.zkcoi.com/zkcoi/Meshray-Manager/internal/model" + "git.zkcoi.com/zkcoi/Meshray-Manager/internal/service" + "git.zkcoi.com/zkcoi/Meshray-Manager/internal/store/sqlite" + "git.zkcoi.com/zkcoi/Meshray-Manager/web" "github.com/gin-gonic/gin" "github.com/shirou/gopsutil/v4/cpu" "go.uber.org/zap" diff --git a/internal/ctr/core_enable.go b/internal/ctr/core_enable.go index ccb8c6f..90afd59 100644 --- a/internal/ctr/core_enable.go +++ b/internal/ctr/core_enable.go @@ -5,4 +5,4 @@ // 默认构建不编译本文件，因此管理器可独立编译、以标准 WireGuard 直连运行。 package ctr -import _ "git.zkcoi.com/zkcoi/meshray/internal/ctr/corebind" +import _ "git.zkcoi.com/zkcoi/Meshray-Manager/internal/ctr/corebind" diff --git a/internal/handler/backup.go b/internal/handler/backup.go index ec412cf..96ef330 100644 --- a/internal/handler/backup.go +++ b/internal/handler/backup.go @@ -7,7 +7,7 @@ import ( "path/filepath" "time" - "git.zkcoi.com/zkcoi/meshray/internal/service" + "git.zkcoi.com/zkcoi/Meshray-Manager/internal/service" "github.com/gin-gonic/gin" "go.uber.org/zap" "gorm.io/gorm" diff --git a/internal/handler/ddns.go b/internal/handler/ddns.go index 9421fca..2383605 100644 --- a/internal/handler/ddns.go +++ b/internal/handler/ddns.go @@ -3,7 +3,7 @@ package handler import ( "net/http" - "git.zkcoi.com/zkcoi/meshray/internal/service" + "git.zkcoi.com/zkcoi/Meshray-Manager/internal/service" "github.com/gin-gonic/gin" ) diff --git a/internal/handler/ddns_stats.go b/internal/handler/ddns_stats.go index e989965..bd0a4ae 100644 --- a/internal/handler/ddns_stats.go +++ b/internal/handler/ddns_stats.go @@ -5,7 +5,7 @@ import ( "net/http" "time" - "git.zkcoi.com/zkcoi/meshray/internal/model" + "git.zkcoi.com/zkcoi/Meshray-Manager/internal/model" "github.com/gin-gonic/gin" "gorm.io/gorm" ) diff --git a/internal/handler/notification.go b/internal/handler/notification.go index 7b4cf2d..b1216ac 100644 --- a/internal/handler/notification.go +++ b/internal/handler/notification.go @@ -5,8 +5,8 @@ import ( "net/http" "time" - "git.zkcoi.com/zkcoi/meshray/internal/model" - "git.zkcoi.com/zkcoi/meshray/internal/service" + "git.zkcoi.com/zkcoi/Meshray-Manager/internal/model" + "git.zkcoi.com/zkcoi/Meshray-Manager/internal/service" "github.com/gin-gonic/gin" "go.uber.org/zap" "gorm.io/gorm" diff --git a/internal/scheduler/ddns_updater.go b/internal/scheduler/ddns_updater.go index c8efc3a..b3e8f99 100644 --- a/internal/scheduler/ddns_updater.go +++ b/internal/scheduler/ddns_updater.go @@ -6,8 +6,8 @@ import ( "sync" "time" - "git.zkcoi.com/zkcoi/meshray/internal/model" - "git.zkcoi.com/zkcoi/meshray/internal/service" + "git.zkcoi.com/zkcoi/Meshray-Manager/internal/model" + "git.zkcoi.com/zkcoi/Meshray-Manager/internal/service" "go.uber.org/zap" "gorm.io/gorm" ) diff --git a/internal/service/ddns.go b/internal/service/ddns.go index fcc6a9b..6a5cd50 100644 --- a/internal/service/ddns.go +++ b/internal/service/ddns.go @@ -18,7 +18,7 @@ import ( "sync" "time" - "git.zkcoi.com/zkcoi/meshray/internal/model" + "git.zkcoi.com/zkcoi/Meshray-Manager/internal/model" "github.com/google/uuid" "gorm.io/gorm" ) diff --git a/internal/service/ddns_operation.go b/internal/service/ddns_operation.go index bebdc20..8e4bd5c 100644 --- a/internal/service/ddns_operation.go +++ b/internal/service/ddns_operation.go @@ -5,8 +5,8 @@ import ( "fmt" "time" - "git.zkcoi.com/zkcoi/meshray/internal/dnsprovider" - "git.zkcoi.com/zkcoi/meshray/internal/model" + "git.zkcoi.com/zkcoi/Meshray-Manager/internal/dnsprovider" + "git.zkcoi.com/zkcoi/Meshray-Manager/internal/model" "github.com/libdns/libdns" "go.uber.org/zap" "gorm.io/gorm" diff --git a/internal/service/device.go b/internal/service/device.go index 5873db9..47ddbda 100644 --- a/internal/service/device.go +++ b/internal/service/device.go @@ -8,9 +8,9 @@ import ( "net" "strconv" - "git.zkcoi.com/zkcoi/meshray/internal/ctr" - "git.zkcoi.com/zkcoi/meshray/internal/model" - "git.zkcoi.com/zkcoi/meshray/internal/store/sqlite" + "git.zkcoi.com/zkcoi/Meshray-Manager/internal/ctr" + "git.zkcoi.com/zkcoi/Meshray-Manager/internal/model" + "git.zkcoi.com/zkcoi/Meshray-Manager/internal/store/sqlite" "golang.org/x/crypto/curve25519" "gorm.io/gorm" ) diff --git a/internal/service/meshseed.go b/internal/service/meshseed.go index e04634c..9e5b835 100644 --- a/internal/service/meshseed.go +++ b/internal/service/meshseed.go @@ -8,8 +8,8 @@ import ( "fmt" "time" - "git.zkcoi.com/zkcoi/meshray/internal/model" - sqlite "git.zkcoi.com/zkcoi/meshray/internal/store/sqlite" + "git.zkcoi.com/zkcoi/Meshray-Manager/internal/model" + sqlite "git.zkcoi.com/zkcoi/Meshray-Manager/internal/store/sqlite" "go.uber.org/zap" "golang.org/x/crypto/ed25519" "gorm.io/gorm" diff --git a/internal/service/network.go b/internal/service/network.go index cd33d56..08a9031 100644 --- a/internal/service/network.go +++ b/internal/service/network.go @@ -8,10 +8,10 @@ import ( "fmt" "net" - "git.zkcoi.com/zkcoi/meshray/internal/ctr" - "git.zkcoi.com/zkcoi/meshray/internal/model" - "git.zkcoi.com/zkcoi/meshray/internal/store/sqlite" - "git.zkcoi.com/zkcoi/meshray/pkg/idutil" + "git.zkcoi.com/zkcoi/Meshray-Manager/internal/ctr" + "git.zkcoi.com/zkcoi/Meshray-Manager/internal/model" + "git.zkcoi.com/zkcoi/Meshray-Manager/internal/store/sqlite" + "git.zkcoi.com/zkcoi/Meshray-Manager/pkg/idutil" "go.uber.org/zap" "gorm.io/gorm" ) diff --git a/internal/service/notification.go b/internal/service/notification.go index 1d47fae..a40cf12 100644 --- a/internal/service/notification.go +++ b/internal/service/notification.go @@ -5,7 +5,7 @@ import ( "sync" "time" - "git.zkcoi.com/zkcoi/meshray/internal/model" + "git.zkcoi.com/zkcoi/Meshray-Manager/internal/model" "github.com/gin-gonic/gin" "go.uber.org/zap" "gorm.io/gorm" diff --git a/internal/service/pending_join.go b/internal/service/pending_join.go index 1310565..1ae3477 100644 --- a/internal/service/pending_join.go +++ b/internal/service/pending_join.go @@ -7,8 +7,8 @@ import ( "strings" "time" - "git.zkcoi.com/zkcoi/meshray/internal/model" - "git.zkcoi.com/zkcoi/meshray/internal/store/sqlite" + "git.zkcoi.com/zkcoi/Meshray-Manager/internal/model" + "git.zkcoi.com/zkcoi/Meshray-Manager/internal/store/sqlite" "gorm.io/gorm" ) diff --git a/internal/service/policy.go b/internal/service/policy.go index a909be7..8597c25 100644 --- a/internal/service/policy.go +++ b/internal/service/policy.go @@ -3,8 +3,8 @@ package service import ( "errors" - "git.zkcoi.com/zkcoi/meshray/internal/model" - "git.zkcoi.com/zkcoi/meshray/internal/store/sqlite" + "git.zkcoi.com/zkcoi/Meshray-Manager/internal/model" + "git.zkcoi.com/zkcoi/Meshray-Manager/internal/store/sqlite" "gorm.io/gorm" ) diff --git a/internal/service/service.go b/internal/service/service.go index 0335e3f..6dea615 100644 --- a/internal/service/service.go +++ b/internal/service/service.go @@ -9,9 +9,9 @@ import ( "strings" "time" - "git.zkcoi.com/zkcoi/meshray/internal/dnsprovider" - "git.zkcoi.com/zkcoi/meshray/internal/model" - "git.zkcoi.com/zkcoi/meshray/internal/store/sqlite" + "git.zkcoi.com/zkcoi/Meshray-Manager/internal/dnsprovider" + "git.zkcoi.com/zkcoi/Meshray-Manager/internal/model" + "git.zkcoi.com/zkcoi/Meshray-Manager/internal/store/sqlite" "github.com/google/uuid" "github.com/libdns/libdns" "gorm.io/gorm" diff --git a/internal/service/settings.go b/internal/service/settings.go index 81c6b57..39f31bd 100644 --- a/internal/service/settings.go +++ b/internal/service/settings.go @@ -5,8 +5,8 @@ import ( "errors" "fmt" - "git.zkcoi.com/zkcoi/meshray/internal/model" - sqlite "git.zkcoi.com/zkcoi/meshray/internal/store/sqlite" + "git.zkcoi.com/zkcoi/Meshray-Manager/internal/model" + sqlite "git.zkcoi.com/zkcoi/Meshray-Manager/internal/store/sqlite" "go.uber.org/zap" "gorm.io/gorm" ) diff --git a/internal/service/system_config.go b/internal/service/system_config.go index 5b42a9b..42a03c6 100644 --- a/internal/service/system_config.go +++ b/internal/service/system_config.go @@ -3,8 +3,8 @@ package service import ( "errors" - "git.zkcoi.com/zkcoi/meshray/internal/model" - "git.zkcoi.com/zkcoi/meshray/internal/store/sqlite" + "git.zkcoi.com/zkcoi/Meshray-Manager/internal/model" + "git.zkcoi.com/zkcoi/Meshray-Manager/internal/store/sqlite" "go.uber.org/zap" "golang.org/x/crypto/bcrypt" "gorm.io/gorm" diff --git a/internal/service/user.go b/internal/service/user.go index be9dc97..c02f0a9 100644 --- a/internal/service/user.go +++ b/internal/service/user.go @@ -5,8 +5,8 @@ import ( "encoding/base64" "errors" - "git.zkcoi.com/zkcoi/meshray/internal/model" - "git.zkcoi.com/zkcoi/meshray/internal/store/sqlite" + "git.zkcoi.com/zkcoi/Meshray-Manager/internal/model" + "git.zkcoi.com/zkcoi/Meshray-Manager/internal/store/sqlite" "golang.org/x/crypto/bcrypt" "gorm.io/gorm" ) diff --git a/internal/store/sqlite/store.go b/internal/store/sqlite/store.go index 3cee772..4d35bc5 100644 --- a/internal/store/sqlite/store.go +++ b/internal/store/sqlite/store.go @@ -3,7 +3,7 @@ package sqlite import ( "fmt" - "git.zkcoi.com/zkcoi/meshray/internal/model" + "git.zkcoi.com/zkcoi/Meshray-Manager/internal/model" "github.com/glebarez/sqlite" "gorm.io/gorm" )