zkcoi/Meshray-Manager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: rename manager module to git.zkcoi.com/zkcoi/Meshray-Manager

Browse Source 
- go.mod module path matches repo zkcoi/Meshray-Manager (case-distinct from zkcoi/Meshray/core)
- rewrite internal imports meshray/{internal,web,pkg} -> Meshray-Manager/... (core refs kept)
- sync README.md / install.sh repo URLs; add CHANGELOG entry
This commit is contained in:
zkcoi
2026-07-15 16:25:46 +08:00
parent 59e3059246
commit e9ca2f7d70
43 changed files with 107 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGELOG.md
+20
View File
@@ -1,5 +1,25 @@
# 变更日志 (CHANGELOG) # 变更日志 (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` ## 2026-07-15 仓库拆分：core 独立为 `meshray/core`，wg-go 集成迁移至 `internal/ctr/corebind`
### 背景（架构决策） ### 背景（架构决策）
README.md
+3 -3
View File
@@ -4,8 +4,8 @@
> **💤 项目状态：个人练手的 Vibecoding 项目，目前已暂时搁置，后续有时间再继续完善。** > **💤 项目状态：个人练手的 Vibecoding 项目，目前已暂时搁置，后续有时间再继续完善。**
[![Version](https://img.shields.io/badge/version-2.3.x-blue.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) [![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) [![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) [![License](https://img.shields.io/badge/license-MIT-blue.svg)](LICENSE)
@@ -172,7 +172,7 @@ meshray/
```bash ```bash
# 克隆项目 # 克隆项目
git clone https://git.zkcoi.com/zkcoi/meshray.git git clone https://git.zkcoi.com/zkcoi/Meshray-Manager.git
cd meshray cd meshray
# 安装依赖 # 安装依赖
cmd/mr-wg/main.go
+1 -1
View File
@@ -23,7 +23,7 @@ import (
meshraycore "git.zkcoi.com/zkcoi/meshray/core/engine" meshraycore "git.zkcoi.com/zkcoi/meshray/core/engine"
"git.zkcoi.com/zkcoi/meshray/core/connect" "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" "go.uber.org/zap"
"golang.zx2c4.com/wireguard/conn" "golang.zx2c4.com/wireguard/conn"
"golang.zx2c4.com/wireguard/device" "golang.zx2c4.com/wireguard/device"
cmd/reset-password/main.go
+3 -3
View File
@@ -5,9 +5,9 @@ import (
"fmt" "fmt"
"os" "os"
"git.zkcoi.com/zkcoi/meshray/internal/config" "git.zkcoi.com/zkcoi/Meshray-Manager/internal/config"
"git.zkcoi.com/zkcoi/meshray/internal/service" "git.zkcoi.com/zkcoi/Meshray-Manager/internal/service"
store "git.zkcoi.com/zkcoi/meshray/internal/store/sqlite" store "git.zkcoi.com/zkcoi/Meshray-Manager/internal/store/sqlite"
"github.com/spf13/cobra" "github.com/spf13/cobra"
) )
cmd/testembed/main.go
+1 -1
View File
@@ -4,7 +4,7 @@ import (
"fmt" "fmt"
"io/fs" "io/fs"
"git.zkcoi.com/zkcoi/meshray/web" "git.zkcoi.com/zkcoi/Meshray-Manager/web"
) )
func main() { func main() {
deploy/scripts/install.sh
+1 -1
View File
@@ -38,7 +38,7 @@ sudo mkdir -p /opt/meshray/backups
# 下载 MeshRay（需要从 GitHub Releases 下载） # 下载 MeshRay（需要从 GitHub Releases 下载）
echo "📦 正在下载 MeshRay ${MESHRAY_VERSION}..." echo "📦 正在下载 MeshRay ${MESHRAY_VERSION}..."
# TODO: 替换为真实的下载链接 # 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 # tar -xzf meshray-linux-${ARCH}.tar.gz
# sudo mv meshray $INSTALL_DIR/ # sudo mv meshray $INSTALL_DIR/
go.mod
+3 -3
View File
@@ -1,12 +1,12 @@
module git.zkcoi.com/zkcoi/meshray module git.zkcoi.com/zkcoi/Meshray-Manager
go 1.26.0 go 1.26.0
// 开源契约层（管理器与 meshray-core 共享，独立叶子模块，避免 module 级循环依赖） // 开源契约层（管理器与 meshray-core 共享，独立叶子模块，避免 module 级循环依赖）
replace git.zkcoi.com/zkcoi/meshray-contract => ./pkg/contract replace git.zkcoi.com/zkcoi/meshray-contract => ./pkg/contract
// 核心转发引擎 meshray（去中心化 frp 本体 + 9 层传输）：独立仓库，零 wireguard 依赖。 // 核心转发引擎 meshray（去中心化 frp 本体 + 9 层传输）：独立仓库 zkcoi/Meshray，零 wireguard 依赖。
// 模块路径为 git.zkcoi.com/zkcoi/meshray/core（避免与本品 meshray 模块路径冲突）。 // 其模块路径为 git.zkcoi.com/zkcoi/meshray/core（仓库名 Meshray 与本品 Meshray-Manager 大小写有别、互不相干）。
// 管理器经此 replace 引用本地核心，wg-go 集成（corebind）在本仓库内，二者隔离。 // 管理器经此 replace 引用本地核心，wg-go 集成（corebind）在本仓库内，二者隔离。
replace git.zkcoi.com/zkcoi/meshray/core => ../Meshray replace git.zkcoi.com/zkcoi/meshray/core => ../Meshray
internal/api/dto/responses.go
+1 -1
View File
@@ -3,7 +3,7 @@ package dto
import ( import (
"fmt" "fmt"
"git.zkcoi.com/zkcoi/meshray/internal/model" "git.zkcoi.com/zkcoi/Meshray-Manager/internal/model"
) )
// NetworkResponse 网络响应 DTO（ID 为字符串格式，避免 JavaScript 精度丢失） // NetworkResponse 网络响应 DTO（ID 为字符串格式，避免 JavaScript 精度丢失）
internal/api/handler/admin.go
+1 -1
View File
@@ -3,7 +3,7 @@ package handler
import ( import (
"net/http" "net/http"
"git.zkcoi.com/zkcoi/meshray/internal/service" "git.zkcoi.com/zkcoi/Meshray-Manager/internal/service"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"go.uber.org/zap" "go.uber.org/zap"
) )
internal/api/handler/dashboard.go
+2 -2
View File
@@ -9,8 +9,8 @@ import (
"strconv" "strconv"
"time" "time"
"git.zkcoi.com/zkcoi/meshray/internal/model" "git.zkcoi.com/zkcoi/Meshray-Manager/internal/model"
sqlite "git.zkcoi.com/zkcoi/meshray/internal/store/sqlite" sqlite "git.zkcoi.com/zkcoi/Meshray-Manager/internal/store/sqlite"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"github.com/shirou/gopsutil/v4/cpu" "github.com/shirou/gopsutil/v4/cpu"
"github.com/shirou/gopsutil/v4/disk" "github.com/shirou/gopsutil/v4/disk"
internal/api/handler/ddns.go
+1 -1
View File
@@ -3,7 +3,7 @@ package handler
import ( import (
"net/http" "net/http"
"git.zkcoi.com/zkcoi/meshray/internal/service" "git.zkcoi.com/zkcoi/Meshray-Manager/internal/service"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
) )
internal/api/handler/ddns_stats.go
+1 -1
View File
@@ -5,7 +5,7 @@ import (
"net/http" "net/http"
"time" "time"
"git.zkcoi.com/zkcoi/meshray/internal/model" "git.zkcoi.com/zkcoi/Meshray-Manager/internal/model"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"gorm.io/gorm" "gorm.io/gorm"
) )
internal/api/handler/ddns_usage.go
+2 -2
View File
@@ -7,8 +7,8 @@ import (
"regexp" "regexp"
"strings" "strings"
"git.zkcoi.com/zkcoi/meshray/internal/model" "git.zkcoi.com/zkcoi/Meshray-Manager/internal/model"
"git.zkcoi.com/zkcoi/meshray/pkg/shortid" "git.zkcoi.com/zkcoi/Meshray-Manager/pkg/shortid"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"github.com/google/uuid" "github.com/google/uuid"
"go.uber.org/zap" "go.uber.org/zap"
internal/api/handler/device.go
+3 -3
View File
@@ -4,9 +4,9 @@ import (
"net/http" "net/http"
"strconv" "strconv"
"git.zkcoi.com/zkcoi/meshray/internal/api/dto" "git.zkcoi.com/zkcoi/Meshray-Manager/internal/api/dto"
"git.zkcoi.com/zkcoi/meshray/internal/model" "git.zkcoi.com/zkcoi/Meshray-Manager/internal/model"
"git.zkcoi.com/zkcoi/meshray/internal/service" "git.zkcoi.com/zkcoi/Meshray-Manager/internal/service"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"go.uber.org/zap" "go.uber.org/zap"
) )
internal/api/handler/ip_detect.go
+1 -1
View File
@@ -3,7 +3,7 @@ package handler
import ( import (
"net/http" "net/http"
"git.zkcoi.com/zkcoi/meshray/internal/service" "git.zkcoi.com/zkcoi/Meshray-Manager/internal/service"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
) )
internal/api/handler/network.go
+4 -4
View File
@@ -6,10 +6,10 @@ import (
"strings" "strings"
"time" "time"
"git.zkcoi.com/zkcoi/meshray/internal/api/dto" "git.zkcoi.com/zkcoi/Meshray-Manager/internal/api/dto"
"git.zkcoi.com/zkcoi/meshray/internal/model" "git.zkcoi.com/zkcoi/Meshray-Manager/internal/model"
"git.zkcoi.com/zkcoi/meshray/internal/service" "git.zkcoi.com/zkcoi/Meshray-Manager/internal/service"
sqlite "git.zkcoi.com/zkcoi/meshray/internal/store/sqlite" sqlite "git.zkcoi.com/zkcoi/Meshray-Manager/internal/store/sqlite"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"go.uber.org/zap" "go.uber.org/zap"
) )
internal/api/handler/pending_join.go
+3 -3
View File
@@ -5,9 +5,9 @@ import (
"strconv" "strconv"
"time" "time"
"git.zkcoi.com/zkcoi/meshray/internal/model" "git.zkcoi.com/zkcoi/Meshray-Manager/internal/model"
"git.zkcoi.com/zkcoi/meshray/internal/service" "git.zkcoi.com/zkcoi/Meshray-Manager/internal/service"
sqlite "git.zkcoi.com/zkcoi/meshray/internal/store/sqlite" sqlite "git.zkcoi.com/zkcoi/Meshray-Manager/internal/store/sqlite"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"go.uber.org/zap" "go.uber.org/zap"
) )
internal/api/handler/policy.go
+3 -3
View File
@@ -4,9 +4,9 @@ import (
"net/http" "net/http"
"strconv" "strconv"
"git.zkcoi.com/zkcoi/meshray/internal/api/dto" "git.zkcoi.com/zkcoi/Meshray-Manager/internal/api/dto"
"git.zkcoi.com/zkcoi/meshray/internal/model" "git.zkcoi.com/zkcoi/Meshray-Manager/internal/model"
"git.zkcoi.com/zkcoi/meshray/internal/service" "git.zkcoi.com/zkcoi/Meshray-Manager/internal/service"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"go.uber.org/zap" "go.uber.org/zap"
) )
internal/api/handler/service.go
+2 -2
View File
@@ -3,8 +3,8 @@ package handler
import ( import (
"net/http" "net/http"
"git.zkcoi.com/zkcoi/meshray/internal/model" "git.zkcoi.com/zkcoi/Meshray-Manager/internal/model"
"git.zkcoi.com/zkcoi/meshray/internal/service" "git.zkcoi.com/zkcoi/Meshray-Manager/internal/service"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"go.uber.org/zap" "go.uber.org/zap"
) )
internal/api/handler/settings.go
+1 -1
View File
@@ -3,7 +3,7 @@ package handler
import ( import (
"net/http" "net/http"
"git.zkcoi.com/zkcoi/meshray/internal/service" "git.zkcoi.com/zkcoi/Meshray-Manager/internal/service"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"go.uber.org/zap" "go.uber.org/zap"
) )
internal/api/handler/system_config.go
+1 -1
View File
@@ -6,7 +6,7 @@ import (
"os/exec" "os/exec"
"time" "time"
"git.zkcoi.com/zkcoi/meshray/internal/service" "git.zkcoi.com/zkcoi/Meshray-Manager/internal/service"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"go.uber.org/zap" "go.uber.org/zap"
) )
internal/api/handler/ws.go
+3 -3
View File
@@ -5,9 +5,9 @@ import (
"net/http" "net/http"
"time" "time"
"git.zkcoi.com/zkcoi/meshray/internal/ctr" "git.zkcoi.com/zkcoi/Meshray-Manager/internal/ctr"
"git.zkcoi.com/zkcoi/meshray/internal/model" "git.zkcoi.com/zkcoi/Meshray-Manager/internal/model"
"git.zkcoi.com/zkcoi/meshray/internal/store/sqlite" "git.zkcoi.com/zkcoi/Meshray-Manager/internal/store/sqlite"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"github.com/gorilla/websocket" "github.com/gorilla/websocket"
"go.uber.org/zap" "go.uber.org/zap"
internal/api/middleware/auth.go
+2 -2
View File
@@ -6,8 +6,8 @@ import (
"strings" "strings"
"time" "time"
"git.zkcoi.com/zkcoi/meshray/internal/service" "git.zkcoi.com/zkcoi/Meshray-Manager/internal/service"
"git.zkcoi.com/zkcoi/meshray/internal/store/sqlite" "git.zkcoi.com/zkcoi/Meshray-Manager/internal/store/sqlite"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"github.com/golang-jwt/jwt/v5" "github.com/golang-jwt/jwt/v5"
"go.uber.org/zap" "go.uber.org/zap"
internal/api/server.go
+9 -9
View File
@@ -16,15 +16,15 @@ import (
"strings" "strings"
"time" "time"
"git.zkcoi.com/zkcoi/meshray/internal/api/handler" "git.zkcoi.com/zkcoi/Meshray-Manager/internal/api/handler"
"git.zkcoi.com/zkcoi/meshray/internal/api/middleware" "git.zkcoi.com/zkcoi/Meshray-Manager/internal/api/middleware"
"git.zkcoi.com/zkcoi/meshray/internal/config" "git.zkcoi.com/zkcoi/Meshray-Manager/internal/config"
"git.zkcoi.com/zkcoi/meshray/internal/ctr" "git.zkcoi.com/zkcoi/Meshray-Manager/internal/ctr"
corehandler "git.zkcoi.com/zkcoi/meshray/internal/handler" corehandler "git.zkcoi.com/zkcoi/Meshray-Manager/internal/handler"
"git.zkcoi.com/zkcoi/meshray/internal/model" "git.zkcoi.com/zkcoi/Meshray-Manager/internal/model"
"git.zkcoi.com/zkcoi/meshray/internal/service" "git.zkcoi.com/zkcoi/Meshray-Manager/internal/service"
"git.zkcoi.com/zkcoi/meshray/internal/store/sqlite" "git.zkcoi.com/zkcoi/Meshray-Manager/internal/store/sqlite"
"git.zkcoi.com/zkcoi/meshray/web" "git.zkcoi.com/zkcoi/Meshray-Manager/web"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"github.com/shirou/gopsutil/v4/cpu" "github.com/shirou/gopsutil/v4/cpu"
"go.uber.org/zap" "go.uber.org/zap"
internal/ctr/core_enable.go
+1 -1
View File
@@ -5,4 +5,4 @@
// 默认构建不编译本文件，因此管理器可独立编译、以标准 WireGuard 直连运行。 // 默认构建不编译本文件，因此管理器可独立编译、以标准 WireGuard 直连运行。
package ctr package ctr
import _ "git.zkcoi.com/zkcoi/meshray/internal/ctr/corebind" import _ "git.zkcoi.com/zkcoi/Meshray-Manager/internal/ctr/corebind"
internal/handler/backup.go
+1 -1
View File
@@ -7,7 +7,7 @@ import (
"path/filepath" "path/filepath"
"time" "time"
"git.zkcoi.com/zkcoi/meshray/internal/service" "git.zkcoi.com/zkcoi/Meshray-Manager/internal/service"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"go.uber.org/zap" "go.uber.org/zap"
"gorm.io/gorm" "gorm.io/gorm"
internal/handler/ddns.go
+1 -1
View File
@@ -3,7 +3,7 @@ package handler
import ( import (
"net/http" "net/http"
"git.zkcoi.com/zkcoi/meshray/internal/service" "git.zkcoi.com/zkcoi/Meshray-Manager/internal/service"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
) )
internal/handler/ddns_stats.go
+1 -1
View File
@@ -5,7 +5,7 @@ import (
"net/http" "net/http"
"time" "time"
"git.zkcoi.com/zkcoi/meshray/internal/model" "git.zkcoi.com/zkcoi/Meshray-Manager/internal/model"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"gorm.io/gorm" "gorm.io/gorm"
) )
internal/handler/notification.go
+2 -2
View File
@@ -5,8 +5,8 @@ import (
"net/http" "net/http"
"time" "time"
"git.zkcoi.com/zkcoi/meshray/internal/model" "git.zkcoi.com/zkcoi/Meshray-Manager/internal/model"
"git.zkcoi.com/zkcoi/meshray/internal/service" "git.zkcoi.com/zkcoi/Meshray-Manager/internal/service"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"go.uber.org/zap" "go.uber.org/zap"
"gorm.io/gorm" "gorm.io/gorm"
internal/scheduler/ddns_updater.go
+2 -2
View File
@@ -6,8 +6,8 @@ import (
"sync" "sync"
"time" "time"
"git.zkcoi.com/zkcoi/meshray/internal/model" "git.zkcoi.com/zkcoi/Meshray-Manager/internal/model"
"git.zkcoi.com/zkcoi/meshray/internal/service" "git.zkcoi.com/zkcoi/Meshray-Manager/internal/service"
"go.uber.org/zap" "go.uber.org/zap"
"gorm.io/gorm" "gorm.io/gorm"
) )
internal/service/ddns.go
+1 -1
View File
@@ -18,7 +18,7 @@ import (
"sync" "sync"
"time" "time"
"git.zkcoi.com/zkcoi/meshray/internal/model" "git.zkcoi.com/zkcoi/Meshray-Manager/internal/model"
"github.com/google/uuid" "github.com/google/uuid"
"gorm.io/gorm" "gorm.io/gorm"
) )
internal/service/ddns_operation.go
+2 -2
View File
@@ -5,8 +5,8 @@ import (
"fmt" "fmt"
"time" "time"
"git.zkcoi.com/zkcoi/meshray/internal/dnsprovider" "git.zkcoi.com/zkcoi/Meshray-Manager/internal/dnsprovider"
"git.zkcoi.com/zkcoi/meshray/internal/model" "git.zkcoi.com/zkcoi/Meshray-Manager/internal/model"
"github.com/libdns/libdns" "github.com/libdns/libdns"
"go.uber.org/zap" "go.uber.org/zap"
"gorm.io/gorm" "gorm.io/gorm"
internal/service/device.go
+3 -3
View File
@@ -8,9 +8,9 @@ import (
"net" "net"
"strconv" "strconv"
"git.zkcoi.com/zkcoi/meshray/internal/ctr" "git.zkcoi.com/zkcoi/Meshray-Manager/internal/ctr"
"git.zkcoi.com/zkcoi/meshray/internal/model" "git.zkcoi.com/zkcoi/Meshray-Manager/internal/model"
"git.zkcoi.com/zkcoi/meshray/internal/store/sqlite" "git.zkcoi.com/zkcoi/Meshray-Manager/internal/store/sqlite"
"golang.org/x/crypto/curve25519" "golang.org/x/crypto/curve25519"
"gorm.io/gorm" "gorm.io/gorm"
) )
internal/service/meshseed.go
+2 -2
View File
@@ -8,8 +8,8 @@ import (
"fmt" "fmt"
"time" "time"
"git.zkcoi.com/zkcoi/meshray/internal/model" "git.zkcoi.com/zkcoi/Meshray-Manager/internal/model"
sqlite "git.zkcoi.com/zkcoi/meshray/internal/store/sqlite" sqlite "git.zkcoi.com/zkcoi/Meshray-Manager/internal/store/sqlite"
"go.uber.org/zap" "go.uber.org/zap"
"golang.org/x/crypto/ed25519" "golang.org/x/crypto/ed25519"
"gorm.io/gorm" "gorm.io/gorm"
internal/service/network.go
+4 -4
View File
@@ -8,10 +8,10 @@ import (
"fmt" "fmt"
"net" "net"
"git.zkcoi.com/zkcoi/meshray/internal/ctr" "git.zkcoi.com/zkcoi/Meshray-Manager/internal/ctr"
"git.zkcoi.com/zkcoi/meshray/internal/model" "git.zkcoi.com/zkcoi/Meshray-Manager/internal/model"
"git.zkcoi.com/zkcoi/meshray/internal/store/sqlite" "git.zkcoi.com/zkcoi/Meshray-Manager/internal/store/sqlite"
"git.zkcoi.com/zkcoi/meshray/pkg/idutil" "git.zkcoi.com/zkcoi/Meshray-Manager/pkg/idutil"
"go.uber.org/zap" "go.uber.org/zap"
"gorm.io/gorm" "gorm.io/gorm"
) )
internal/service/notification.go
+1 -1
View File
@@ -5,7 +5,7 @@ import (
"sync" "sync"
"time" "time"
"git.zkcoi.com/zkcoi/meshray/internal/model" "git.zkcoi.com/zkcoi/Meshray-Manager/internal/model"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"go.uber.org/zap" "go.uber.org/zap"
"gorm.io/gorm" "gorm.io/gorm"
internal/service/pending_join.go
+2 -2
View File
@@ -7,8 +7,8 @@ import (
"strings" "strings"
"time" "time"
"git.zkcoi.com/zkcoi/meshray/internal/model" "git.zkcoi.com/zkcoi/Meshray-Manager/internal/model"
"git.zkcoi.com/zkcoi/meshray/internal/store/sqlite" "git.zkcoi.com/zkcoi/Meshray-Manager/internal/store/sqlite"
"gorm.io/gorm" "gorm.io/gorm"
) )
internal/service/policy.go
+2 -2
View File
@@ -3,8 +3,8 @@ package service
import ( import (
"errors" "errors"
"git.zkcoi.com/zkcoi/meshray/internal/model" "git.zkcoi.com/zkcoi/Meshray-Manager/internal/model"
"git.zkcoi.com/zkcoi/meshray/internal/store/sqlite" "git.zkcoi.com/zkcoi/Meshray-Manager/internal/store/sqlite"
"gorm.io/gorm" "gorm.io/gorm"
) )
internal/service/service.go
+3 -3
View File
@@ -9,9 +9,9 @@ import (
"strings" "strings"
"time" "time"
"git.zkcoi.com/zkcoi/meshray/internal/dnsprovider" "git.zkcoi.com/zkcoi/Meshray-Manager/internal/dnsprovider"
"git.zkcoi.com/zkcoi/meshray/internal/model" "git.zkcoi.com/zkcoi/Meshray-Manager/internal/model"
"git.zkcoi.com/zkcoi/meshray/internal/store/sqlite" "git.zkcoi.com/zkcoi/Meshray-Manager/internal/store/sqlite"
"github.com/google/uuid" "github.com/google/uuid"
"github.com/libdns/libdns" "github.com/libdns/libdns"
"gorm.io/gorm" "gorm.io/gorm"
internal/service/settings.go
+2 -2
View File
@@ -5,8 +5,8 @@ import (
"errors" "errors"
"fmt" "fmt"
"git.zkcoi.com/zkcoi/meshray/internal/model" "git.zkcoi.com/zkcoi/Meshray-Manager/internal/model"
sqlite "git.zkcoi.com/zkcoi/meshray/internal/store/sqlite" sqlite "git.zkcoi.com/zkcoi/Meshray-Manager/internal/store/sqlite"
"go.uber.org/zap" "go.uber.org/zap"
"gorm.io/gorm" "gorm.io/gorm"
) )
internal/service/system_config.go
+2 -2
View File
@@ -3,8 +3,8 @@ package service
import ( import (
"errors" "errors"
"git.zkcoi.com/zkcoi/meshray/internal/model" "git.zkcoi.com/zkcoi/Meshray-Manager/internal/model"
"git.zkcoi.com/zkcoi/meshray/internal/store/sqlite" "git.zkcoi.com/zkcoi/Meshray-Manager/internal/store/sqlite"
"go.uber.org/zap" "go.uber.org/zap"
"golang.org/x/crypto/bcrypt" "golang.org/x/crypto/bcrypt"
"gorm.io/gorm" "gorm.io/gorm"
internal/service/user.go
+2 -2
View File
@@ -5,8 +5,8 @@ import (
"encoding/base64" "encoding/base64"
"errors" "errors"
"git.zkcoi.com/zkcoi/meshray/internal/model" "git.zkcoi.com/zkcoi/Meshray-Manager/internal/model"
"git.zkcoi.com/zkcoi/meshray/internal/store/sqlite" "git.zkcoi.com/zkcoi/Meshray-Manager/internal/store/sqlite"
"golang.org/x/crypto/bcrypt" "golang.org/x/crypto/bcrypt"
"gorm.io/gorm" "gorm.io/gorm"
) )
internal/store/sqlite/store.go
+1 -1
View File
@@ -3,7 +3,7 @@ package sqlite
import ( import (
"fmt" "fmt"
"git.zkcoi.com/zkcoi/meshray/internal/model" "git.zkcoi.com/zkcoi/Meshray-Manager/internal/model"
"github.com/glebarez/sqlite" "github.com/glebarez/sqlite"
"gorm.io/gorm" "gorm.io/gorm"
) )