From 4083a42978b45368f75672afd31037b8a2d2aece Mon Sep 17 00:00:00 2001 From: naiba Date: Wed, 11 Nov 2020 10:07:45 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=9A=20from=20p14yground=20to=20naiba?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build.yml | 8 ++++---- Dockerfile.agent | 2 +- Dockerfile.dashboard | 2 +- README.md | 6 +++--- cmd/agent/main.go | 10 +++++----- cmd/dashboard/controller/common_page.go | 8 ++++---- cmd/dashboard/controller/controller.go | 4 ++-- cmd/dashboard/controller/guest_page.go | 4 ++-- cmd/dashboard/controller/member_api.go | 6 +++--- cmd/dashboard/controller/member_page.go | 4 ++-- cmd/dashboard/controller/oauth2.go | 6 +++--- cmd/dashboard/main.go | 8 ++++---- cmd/dashboard/rpc/rpc.go | 4 ++-- go.mod | 2 +- model/monitor.go | 2 +- model/server.go | 2 +- pkg/mygin/auth.go | 4 ++-- pkg/mygin/error.go | 2 +- pkg/mygin/mygin.go | 4 ++-- resource/template/common/footer.html | 2 +- resource/template/common/menu.html | 2 +- service/dao/dao.go | 4 ++-- service/monitor/monitor.go | 4 ++-- service/rpc/auth.go | 2 +- service/rpc/nezha.go | 6 +++--- 25 files changed, 54 insertions(+), 54 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 104d9f3..467ee47 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -11,8 +11,8 @@ jobs: env: DockerPassword: ${{ secrets.PACKAGE_TOKEN }} run: | - docker build --no-cache -t docker.pkg.github.com/p14yground/nezha/agent -f Dockerfile.agent . - docker build --no-cache -t docker.pkg.github.com/p14yground/nezha/dashboard -f Dockerfile.dashboard . + docker build --no-cache -t docker.pkg.github.com/naiba/nezha/agent -f Dockerfile.agent . + docker build --no-cache -t docker.pkg.github.com/naiba/nezha/dashboard -f Dockerfile.dashboard . docker login -u naiba -p $DockerPassword docker.pkg.github.com - docker push docker.pkg.github.com/p14yground/nezha/agent - docker push docker.pkg.github.com/p14yground/nezha/dashboard + docker push docker.pkg.github.com/naiba/nezha/agent + docker push docker.pkg.github.com/naiba/nezha/dashboard diff --git a/Dockerfile.agent b/Dockerfile.agent index 10f48c0..e14dc88 100644 --- a/Dockerfile.agent +++ b/Dockerfile.agent @@ -3,7 +3,7 @@ RUN apk --no-cache --no-progress add \ gcc git musl-dev WORKDIR /agent COPY . . -RUN cd cmd/agent && go build -o app -ldflags="-s -w -X github.com/p14yground/nezha/service/dao.Version=$(git rev-parse HEAD)" +RUN cd cmd/agent && go build -o app -ldflags="-s -w -X github.com/naiba/nezha/service/dao.Version=$(git rev-parse HEAD)" FROM alpine:latest RUN apk --no-cache --no-progress add \ diff --git a/Dockerfile.dashboard b/Dockerfile.dashboard index 7d9425e..8e421fb 100644 --- a/Dockerfile.dashboard +++ b/Dockerfile.dashboard @@ -3,7 +3,7 @@ RUN apk --no-cache --no-progress add \ gcc git musl-dev WORKDIR /dashboard COPY . . -RUN cd cmd/dashboard && go build -o app -ldflags="-s -w -X github.com/p14yground/nezha/service/dao.Version=$(git rev-parse HEAD)" +RUN cd cmd/dashboard && go build -o app -ldflags="-s -w -X github.com/naiba/nezha/service/dao.Version=$(git rev-parse HEAD)" FROM alpine:latest RUN apk --no-cache --no-progress add \ diff --git a/README.md b/README.md index 23677bf..a2f67f8 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ C/S 采用 gRPC 通信，客户端通过添加主机生成的单独 Token 上报 services: dashboard: - image: docker.pkg.github.com/p14yground/nezha/dashboard + image: docker.pkg.github.com/naiba/nezha/dashboard restart: always volumes: - ./data:/dashboard/data @@ -42,7 +42,7 @@ C/S 采用 gRPC 通信，客户端通过添加主机生成的单独 Token 上报 - 8008:80 - 5555:5555 agent: - image: docker.pkg.github.com/p14yground/nezha/agent + image: docker.pkg.github.com/naiba/nezha/agent restart: always depends_on: - dashboard @@ -123,7 +123,7 @@ C/S 采用 gRPC 通信，客户端通过添加主机生成的单独 Token 上报 services: agent: - image: docker.pkg.github.com/p14yground/nezha/agent + image: docker.pkg.github.com/naiba/nezha/agent restart: always environment: - ID=1 #节点ID，启动后在管理后台添加后显示 diff --git a/cmd/agent/main.go b/cmd/agent/main.go index 79f031c..c936310 100644 --- a/cmd/agent/main.go +++ b/cmd/agent/main.go @@ -11,11 +11,11 @@ import ( "github.com/spf13/cobra" "google.golang.org/grpc" - "github.com/p14yground/nezha/model" - pb "github.com/p14yground/nezha/proto" - "github.com/p14yground/nezha/service/dao" - "github.com/p14yground/nezha/service/monitor" - "github.com/p14yground/nezha/service/rpc" + "github.com/naiba/nezha/model" + pb "github.com/naiba/nezha/proto" + "github.com/naiba/nezha/service/dao" + "github.com/naiba/nezha/service/monitor" + "github.com/naiba/nezha/service/rpc" ) var ( diff --git a/cmd/dashboard/controller/common_page.go b/cmd/dashboard/controller/common_page.go index a6a759a..cb2f2b4 100644 --- a/cmd/dashboard/controller/common_page.go +++ b/cmd/dashboard/controller/common_page.go @@ -8,10 +8,10 @@ import ( "github.com/gin-gonic/gin" "github.com/gorilla/websocket" - "github.com/p14yground/nezha/model" - "github.com/p14yground/nezha/pkg/mygin" - pb "github.com/p14yground/nezha/proto" - "github.com/p14yground/nezha/service/dao" + "github.com/naiba/nezha/model" + "github.com/naiba/nezha/pkg/mygin" + pb "github.com/naiba/nezha/proto" + "github.com/naiba/nezha/service/dao" ) type commonPage struct { diff --git a/cmd/dashboard/controller/controller.go b/cmd/dashboard/controller/controller.go index a8416f9..bff034e 100644 --- a/cmd/dashboard/controller/controller.go +++ b/cmd/dashboard/controller/controller.go @@ -8,8 +8,8 @@ import ( "code.cloudfoundry.org/bytefmt" "github.com/gin-gonic/gin" - "github.com/p14yground/nezha/pkg/mygin" - "github.com/p14yground/nezha/service/dao" + "github.com/naiba/nezha/pkg/mygin" + "github.com/naiba/nezha/service/dao" ) // ServeWeb .. diff --git a/cmd/dashboard/controller/guest_page.go b/cmd/dashboard/controller/guest_page.go index 54aa162..a663209 100644 --- a/cmd/dashboard/controller/guest_page.go +++ b/cmd/dashboard/controller/guest_page.go @@ -4,8 +4,8 @@ import ( "net/http" "github.com/gin-gonic/gin" - "github.com/p14yground/nezha/pkg/mygin" - "github.com/p14yground/nezha/service/dao" + "github.com/naiba/nezha/pkg/mygin" + "github.com/naiba/nezha/service/dao" "golang.org/x/oauth2" "golang.org/x/oauth2/github" ) diff --git a/cmd/dashboard/controller/member_api.go b/cmd/dashboard/controller/member_api.go index 3af88b6..63b3e6d 100644 --- a/cmd/dashboard/controller/member_api.go +++ b/cmd/dashboard/controller/member_api.go @@ -9,9 +9,9 @@ import ( "github.com/gin-gonic/gin" "github.com/naiba/com" - "github.com/p14yground/nezha/model" - "github.com/p14yground/nezha/pkg/mygin" - "github.com/p14yground/nezha/service/dao" + "github.com/naiba/nezha/model" + "github.com/naiba/nezha/pkg/mygin" + "github.com/naiba/nezha/service/dao" ) type memberAPI struct { diff --git a/cmd/dashboard/controller/member_page.go b/cmd/dashboard/controller/member_page.go index df8baac..bc5e378 100644 --- a/cmd/dashboard/controller/member_page.go +++ b/cmd/dashboard/controller/member_page.go @@ -4,8 +4,8 @@ import ( "net/http" "github.com/gin-gonic/gin" - "github.com/p14yground/nezha/pkg/mygin" - "github.com/p14yground/nezha/service/dao" + "github.com/naiba/nezha/pkg/mygin" + "github.com/naiba/nezha/service/dao" ) type memberPage struct { diff --git a/cmd/dashboard/controller/oauth2.go b/cmd/dashboard/controller/oauth2.go index 45c776c..e6cea50 100644 --- a/cmd/dashboard/controller/oauth2.go +++ b/cmd/dashboard/controller/oauth2.go @@ -11,9 +11,9 @@ import ( GitHubAPI "github.com/google/go-github/v28/github" "golang.org/x/oauth2" - "github.com/p14yground/nezha/model" - "github.com/p14yground/nezha/pkg/mygin" - "github.com/p14yground/nezha/service/dao" + "github.com/naiba/nezha/model" + "github.com/naiba/nezha/pkg/mygin" + "github.com/naiba/nezha/service/dao" ) type oauth2controller struct { diff --git a/cmd/dashboard/main.go b/cmd/dashboard/main.go index 9da77fe..5f3e22d 100644 --- a/cmd/dashboard/main.go +++ b/cmd/dashboard/main.go @@ -8,10 +8,10 @@ import ( _ "github.com/jinzhu/gorm/dialects/sqlite" "github.com/patrickmn/go-cache" - "github.com/p14yground/nezha/cmd/dashboard/controller" - "github.com/p14yground/nezha/cmd/dashboard/rpc" - "github.com/p14yground/nezha/model" - "github.com/p14yground/nezha/service/dao" + "github.com/naiba/nezha/cmd/dashboard/controller" + "github.com/naiba/nezha/cmd/dashboard/rpc" + "github.com/naiba/nezha/model" + "github.com/naiba/nezha/service/dao" ) func init() { diff --git a/cmd/dashboard/rpc/rpc.go b/cmd/dashboard/rpc/rpc.go index 0adac6b..a11dc62 100644 --- a/cmd/dashboard/rpc/rpc.go +++ b/cmd/dashboard/rpc/rpc.go @@ -6,8 +6,8 @@ import ( "google.golang.org/grpc" - pb "github.com/p14yground/nezha/proto" - rpcService "github.com/p14yground/nezha/service/rpc" + pb "github.com/naiba/nezha/proto" + rpcService "github.com/naiba/nezha/service/rpc" ) // ServeRPC ... diff --git a/go.mod b/go.mod index 63d07a1..3ff29e9 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/p14yground/nezha +module github.com/naiba/nezha go 1.13 diff --git a/model/monitor.go b/model/monitor.go index 2b59a10..3d01c4b 100644 --- a/model/monitor.go +++ b/model/monitor.go @@ -3,7 +3,7 @@ package model import ( "fmt" - pb "github.com/p14yground/nezha/proto" + pb "github.com/naiba/nezha/proto" ) const ( diff --git a/model/server.go b/model/server.go index 5369b0a..e31b8c4 100644 --- a/model/server.go +++ b/model/server.go @@ -3,7 +3,7 @@ package model import ( "time" - pb "github.com/p14yground/nezha/proto" + pb "github.com/naiba/nezha/proto" ) // Server .. diff --git a/pkg/mygin/auth.go b/pkg/mygin/auth.go index 6938886..5370c4d 100644 --- a/pkg/mygin/auth.go +++ b/pkg/mygin/auth.go @@ -7,8 +7,8 @@ import ( "github.com/gin-gonic/gin" - "github.com/p14yground/nezha/model" - "github.com/p14yground/nezha/service/dao" + "github.com/naiba/nezha/model" + "github.com/naiba/nezha/service/dao" ) // AuthorizeOption .. diff --git a/pkg/mygin/error.go b/pkg/mygin/error.go index 46330d9..5cf80ed 100644 --- a/pkg/mygin/error.go +++ b/pkg/mygin/error.go @@ -5,7 +5,7 @@ import ( "github.com/gin-gonic/gin" - "github.com/p14yground/nezha/model" + "github.com/naiba/nezha/model" ) // ErrInfo .. diff --git a/pkg/mygin/mygin.go b/pkg/mygin/mygin.go index 2dc89e2..eaae823 100644 --- a/pkg/mygin/mygin.go +++ b/pkg/mygin/mygin.go @@ -6,8 +6,8 @@ import ( "github.com/gin-gonic/gin" - "github.com/p14yground/nezha/model" - "github.com/p14yground/nezha/service/dao" + "github.com/naiba/nezha/model" + "github.com/naiba/nezha/service/dao" ) // CommonEnvironment .. diff --git a/resource/template/common/footer.html b/resource/template/common/footer.html index 9fb31be..a8465ae 100644 --- a/resource/template/common/footer.html +++ b/resource/template/common/footer.html @@ -1,7 +1,7 @@ {{define "common/footer"}}
- 本系统由 哪吒面板 build · {{.Version}} 强力驱动 + 本系统由 哪吒面板 build · {{.Version}} 强力驱动
diff --git a/resource/template/common/menu.html b/resource/template/common/menu.html index c520d08..7bbe323 100644 --- a/resource/template/common/menu.html +++ b/resource/template/common/menu.html @@ -9,7 +9,7 @@ 服务器 {{end}}
- 反馈 + 反馈
{{if .Admin}}
diff --git a/service/dao/dao.go b/service/dao/dao.go index 35f1af1..089c342 100644 --- a/service/dao/dao.go +++ b/service/dao/dao.go @@ -6,8 +6,8 @@ import ( "github.com/jinzhu/gorm" "github.com/patrickmn/go-cache" - "github.com/p14yground/nezha/model" - pb "github.com/p14yground/nezha/proto" + "github.com/naiba/nezha/model" + pb "github.com/naiba/nezha/proto" ) // Conf .. diff --git a/service/monitor/monitor.go b/service/monitor/monitor.go index 6891df4..e48195c 100644 --- a/service/monitor/monitor.go +++ b/service/monitor/monitor.go @@ -15,8 +15,8 @@ import ( "github.com/shirou/gopsutil/mem" "github.com/shirou/gopsutil/net" - "github.com/p14yground/nezha/model" - "github.com/p14yground/nezha/service/dao" + "github.com/naiba/nezha/model" + "github.com/naiba/nezha/service/dao" ) type ipDotSbGeoIP struct { diff --git a/service/rpc/auth.go b/service/rpc/auth.go index 512a545..71c963f 100644 --- a/service/rpc/auth.go +++ b/service/rpc/auth.go @@ -3,7 +3,7 @@ package rpc import ( "context" - "github.com/p14yground/nezha/service/dao" + "github.com/naiba/nezha/service/dao" "google.golang.org/grpc/codes" "google.golang.org/grpc/metadata" "google.golang.org/grpc/status" diff --git a/service/rpc/nezha.go b/service/rpc/nezha.go index 1b033a4..02eff59 100644 --- a/service/rpc/nezha.go +++ b/service/rpc/nezha.go @@ -5,9 +5,9 @@ import ( "log" "time" - "github.com/p14yground/nezha/model" - pb "github.com/p14yground/nezha/proto" - "github.com/p14yground/nezha/service/dao" + "github.com/naiba/nezha/model" + pb "github.com/naiba/nezha/proto" + "github.com/naiba/nezha/service/dao" ) // NezhaHandler ..