fix: rename manager module to git.zkcoi.com/zkcoi/Meshray-Manager
- 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:
@@ -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 精度丢失)
|
||||
|
||||
@@ -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"
|
||||
)
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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"
|
||||
)
|
||||
|
||||
|
||||
@@ -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"
|
||||
)
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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"
|
||||
)
|
||||
|
||||
@@ -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"
|
||||
)
|
||||
|
||||
|
||||
@@ -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"
|
||||
)
|
||||
|
||||
@@ -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"
|
||||
)
|
||||
|
||||
@@ -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"
|
||||
)
|
||||
|
||||
@@ -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"
|
||||
)
|
||||
|
||||
@@ -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"
|
||||
)
|
||||
|
||||
@@ -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"
|
||||
)
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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"
|
||||
)
|
||||
|
||||
|
||||
@@ -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"
|
||||
)
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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"
|
||||
)
|
||||
|
||||
@@ -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"
|
||||
)
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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"
|
||||
)
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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"
|
||||
)
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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"
|
||||
)
|
||||
|
||||
|
||||
@@ -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"
|
||||
)
|
||||
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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"
|
||||
)
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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"
|
||||
)
|
||||
|
||||
@@ -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"
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user