diff --git a/LICENSE b/LICENSE index cab0a66..0a0e486 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2020 changba-server +Copyright (c) 2020 changba Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index 5700647..a0b38e6 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,10 @@ # NSQ Proxy NSQ Proxy是Golang开发的NSQ和Worker之间的中间件,根据数据库配置,负责消息转发。NSQProxy启动后,接受NSQD队列内容,然后通过HTTP/FastCGI/CBNSQ等协议转发给Worker机执行。在唱吧内部使用2年,高效稳定的处理着每日数十亿条消息。 -[![go report card](https://goreportcard.com/badge/github.com/changba-server/nsqproxy "go report card")](https://goreportcard.com/report/github.com/changba-server/nsqproxy) -[![MIT license](https://img.shields.io/badge/license-MIT-brightgreen.svg)](https://github.com/changba-server/nsqproxy/blob/master/LICENSE) -[![Downloads](https://img.shields.io/github/downloads/changba-server/nsqproxy/total.svg)](https://github.com/changba-server/nsqproxy/releases) -[![Release](https://img.shields.io/github/release/changba-server/nsqproxy.svg?label=Release)](https://github.com/changba-server/nsqproxy/releases) +[![go report card](https://goreportcard.com/badge/github.com/changba/nsqproxy "go report card")](https://goreportcard.com/report/github.com/changba/nsqproxy) +[![MIT license](https://img.shields.io/badge/license-MIT-brightgreen.svg)](https://github.com/changba/nsqproxy/blob/master/LICENSE) +[![Downloads](https://img.shields.io/github/downloads/changba/nsqproxy/total.svg)](https://github.com/changba/nsqproxy/releases) +[![Release](https://img.shields.io/github/release/changba/nsqproxy.svg?label=Release)](https://github.com/changba/nsqproxy/releases) ## 解决的问题 @@ -41,7 +41,7 @@ NSQ Proxy是Golang开发的NSQ和Worker之间的中间件,根据数据库配 #### 二进制安装 -* 下载最新版本的压缩包 https://github.com/changba-server/nsqproxy/releases +* 下载最新版本的压缩包 https://github.com/changba/nsqproxy/releases * 解压 * 启动(注意替换为自己的MySQL信息) `./nsqproxy -dbHost=127.0.0.1 -dbPort=3306 -dbUsername=root -dbPassword=rootpsd -dbName=nsqproxy -logLevel=debug -nsqlookupdHTTP=127.0.0.1:4161` * 命令行 `curl http://0.0.0.0:19421/status` 输出ok @@ -50,7 +50,7 @@ NSQ Proxy是Golang开发的NSQ和Worker之间的中间件,根据数据库配 #### 源码安装 * 要求Go1.13及以上 -* 下载本项目 `go get github.com/changba-server/nsqproxy` +* 下载本项目 `go get github.com/changba/nsqproxy` * `cd nsqproxy` * `export GO111MODULE=on` * 编译 `make build` @@ -94,4 +94,4 @@ NSQ Proxy是Golang开发的NSQ和Worker之间的中间件,根据数据库配 © [Changba.com](https://changba.com), 2020~time.Now -Released under the [MIT License](https://github.com/changba-server/nsqproxy/blob/main/LICENSE) \ No newline at end of file +Released under the [MIT License](https://github.com/changba/nsqproxy/blob/main/LICENSE) \ No newline at end of file diff --git a/cmd/nsqproxy.go b/cmd/nsqproxy.go index f4608c9..0f799cb 100644 --- a/cmd/nsqproxy.go +++ b/cmd/nsqproxy.go @@ -4,13 +4,13 @@ package main //go:generate statik -src=../web/public/ -dest=../internal -f import ( - "github.com/changba-server/nsqproxy/config" - "github.com/changba-server/nsqproxy/internal/backup" - "github.com/changba-server/nsqproxy/internal/httper" - "github.com/changba-server/nsqproxy/internal/model" - "github.com/changba-server/nsqproxy/internal/module/logger" - "github.com/changba-server/nsqproxy/internal/module/tool" - "github.com/changba-server/nsqproxy/internal/proxy" + "github.com/changba/nsqproxy/config" + "github.com/changba/nsqproxy/internal/backup" + "github.com/changba/nsqproxy/internal/httper" + "github.com/changba/nsqproxy/internal/model" + "github.com/changba/nsqproxy/internal/module/logger" + "github.com/changba/nsqproxy/internal/module/tool" + "github.com/changba/nsqproxy/internal/proxy" "os" "os/signal" "syscall" diff --git a/config/systemconfig.go b/config/systemconfig.go index 4818ac4..b8490ed 100644 --- a/config/systemconfig.go +++ b/config/systemconfig.go @@ -2,8 +2,8 @@ package config import ( "flag" - "github.com/changba-server/nsqproxy/internal/module/logger" - "github.com/changba-server/nsqproxy/internal/module/tool" + "github.com/changba/nsqproxy/internal/module/logger" + "github.com/changba/nsqproxy/internal/module/tool" "strings" "time" ) diff --git a/document/doc/quick_start.md b/document/doc/quick_start.md index f3255cf..b177b0c 100644 --- a/document/doc/quick_start.md +++ b/document/doc/quick_start.md @@ -28,7 +28,7 @@ MySQL中存储着各Topic/Channel的配置信息,因此NSQProxy依赖于MySQL ## 下载安装 下载并启动NSQProxy。 -* 下载最新版本的压缩包 https://github.com/changba-server/nsqproxy/releases +* 下载最新版本的压缩包 https://github.com/changba/nsqproxy/releases * 解压 * 启动(注意替换为自己的MySQL信息) `./nsqproxy -dbHost=127.0.0.1 -dbPort=3306 -dbUsername=root -dbPassword=rootpsd -dbName=nsqproxy -logLevel=debug -nsqlookupdHTTP=127.0.0.1:4161` * 命令行 `curl http://0.0.0.0:19421/status` 输出ok @@ -84,4 +84,4 @@ func main() { 2、查看刚才编写的Golang程序的输出,可以拿到消息的唯一ID和消息的内容 -具体示例 \ No newline at end of file +具体示例 \ No newline at end of file diff --git a/go.mod b/go.mod index 6ea6fb8..4aa8763 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/changba-server/nsqproxy +module github.com/changba/nsqproxy go 1.14 diff --git a/internal/backup/live.go b/internal/backup/live.go index 0ed3e6f..742adec 100644 --- a/internal/backup/live.go +++ b/internal/backup/live.go @@ -2,7 +2,7 @@ package backup import ( "encoding/json" - "github.com/changba-server/nsqproxy/internal/module/logger" + "github.com/changba/nsqproxy/internal/module/logger" "io/ioutil" "net/http" "time" diff --git a/internal/httper/consumeconfig.go b/internal/httper/consumeconfig.go index efaeccb..af890ea 100644 --- a/internal/httper/consumeconfig.go +++ b/internal/httper/consumeconfig.go @@ -1,7 +1,7 @@ package httper import ( - "github.com/changba-server/nsqproxy/internal/model" + "github.com/changba/nsqproxy/internal/model" "net/http" "strconv" "time" diff --git a/internal/httper/consumeservermap.go b/internal/httper/consumeservermap.go index 95d47b2..d212599 100644 --- a/internal/httper/consumeservermap.go +++ b/internal/httper/consumeservermap.go @@ -1,7 +1,7 @@ package httper import ( - "github.com/changba-server/nsqproxy/internal/model" + "github.com/changba/nsqproxy/internal/model" "net/http" "strconv" "strings" diff --git a/internal/httper/http.go b/internal/httper/http.go index 8c1874d..8165d39 100644 --- a/internal/httper/http.go +++ b/internal/httper/http.go @@ -1,7 +1,7 @@ package httper import ( - _ "github.com/changba-server/nsqproxy/internal/statik" + _ "github.com/changba/nsqproxy/internal/statik" "github.com/rakyll/statik/fs" "net/http" _ "net/http/pprof" diff --git a/internal/httper/response.go b/internal/httper/response.go index 6e5d8ec..1f0b7c4 100644 --- a/internal/httper/response.go +++ b/internal/httper/response.go @@ -2,7 +2,7 @@ package httper import ( "encoding/json" - "github.com/changba-server/nsqproxy/internal/module/logger" + "github.com/changba/nsqproxy/internal/module/logger" "net/http" ) diff --git a/internal/httper/router.go b/internal/httper/router.go index 7b69ed1..aaeb6c6 100644 --- a/internal/httper/router.go +++ b/internal/httper/router.go @@ -1,7 +1,7 @@ package httper import ( - "github.com/changba-server/nsqproxy/config" + "github.com/changba/nsqproxy/config" "net/http" ) diff --git a/internal/httper/workserver.go b/internal/httper/workserver.go index b6c595a..b68aede 100644 --- a/internal/httper/workserver.go +++ b/internal/httper/workserver.go @@ -1,7 +1,7 @@ package httper import ( - "github.com/changba-server/nsqproxy/internal/model" + "github.com/changba/nsqproxy/internal/model" "net/http" "strconv" ) diff --git a/internal/module/tool/error.go b/internal/module/tool/error.go index 209ce81..6ba738c 100644 --- a/internal/module/tool/error.go +++ b/internal/module/tool/error.go @@ -1,7 +1,7 @@ package tool import ( - "github.com/changba-server/nsqproxy/internal/module/logger" + "github.com/changba/nsqproxy/internal/module/logger" "runtime/debug" ) diff --git a/internal/proxy/handle.go b/internal/proxy/handle.go index d33c355..ec79e90 100644 --- a/internal/proxy/handle.go +++ b/internal/proxy/handle.go @@ -2,10 +2,10 @@ package proxy import ( "errors" - "github.com/changba-server/nsqproxy/config" - "github.com/changba-server/nsqproxy/internal/model" - "github.com/changba-server/nsqproxy/internal/module/logger" - "github.com/changba-server/nsqproxy/internal/worker" + "github.com/changba/nsqproxy/config" + "github.com/changba/nsqproxy/internal/model" + "github.com/changba/nsqproxy/internal/module/logger" + "github.com/changba/nsqproxy/internal/worker" "github.com/nsqio/go-nsq" "strconv" ) diff --git a/internal/proxy/handle_test.go b/internal/proxy/handle_test.go index 62454b6..8ab4acf 100644 --- a/internal/proxy/handle_test.go +++ b/internal/proxy/handle_test.go @@ -1,7 +1,7 @@ package proxy import ( - "github.com/changba-server/nsqproxy/internal/model" + "github.com/changba/nsqproxy/internal/model" "testing" ) diff --git a/internal/proxy/loadbalance.go b/internal/proxy/loadbalance.go index 9e0ab63..64488c0 100644 --- a/internal/proxy/loadbalance.go +++ b/internal/proxy/loadbalance.go @@ -2,7 +2,7 @@ package proxy import ( "errors" - "github.com/changba-server/nsqproxy/internal/model" + "github.com/changba/nsqproxy/internal/model" ) const LoadBalanceMethodLoop = "loop" diff --git a/internal/proxy/loadbalance_test.go b/internal/proxy/loadbalance_test.go index 31b105c..fdf97bd 100644 --- a/internal/proxy/loadbalance_test.go +++ b/internal/proxy/loadbalance_test.go @@ -1,7 +1,7 @@ package proxy import ( - "github.com/changba-server/nsqproxy/internal/model" + "github.com/changba/nsqproxy/internal/model" "testing" ) diff --git a/internal/proxy/proxy.go b/internal/proxy/proxy.go index e2d03b2..83c4fda 100644 --- a/internal/proxy/proxy.go +++ b/internal/proxy/proxy.go @@ -3,10 +3,10 @@ package proxy import ( "errors" "fmt" - "github.com/changba-server/nsqproxy/config" - "github.com/changba-server/nsqproxy/internal/model" - "github.com/changba-server/nsqproxy/internal/module/logger" - "github.com/changba-server/nsqproxy/internal/module/tool" + "github.com/changba/nsqproxy/config" + "github.com/changba/nsqproxy/internal/model" + "github.com/changba/nsqproxy/internal/module/logger" + "github.com/changba/nsqproxy/internal/module/tool" "github.com/nsqio/go-nsq" "strconv" "time" diff --git a/internal/proxy/proxy_test.go b/internal/proxy/proxy_test.go index a1e1085..f69f31f 100644 --- a/internal/proxy/proxy_test.go +++ b/internal/proxy/proxy_test.go @@ -1,8 +1,8 @@ package proxy import ( - "github.com/changba-server/nsqproxy/config" - "github.com/changba-server/nsqproxy/internal/model" + "github.com/changba/nsqproxy/config" + "github.com/changba/nsqproxy/internal/model" "testing" "time" ) diff --git a/internal/worker/fastcgi.go b/internal/worker/fastcgi.go index a494b4c..a931413 100644 --- a/internal/worker/fastcgi.go +++ b/internal/worker/fastcgi.go @@ -2,8 +2,8 @@ package worker import ( "bytes" - "github.com/changba-server/nsqproxy/config" - "github.com/changba-server/nsqproxy/internal/module/fastcgi" + "github.com/changba/nsqproxy/config" + "github.com/changba/nsqproxy/internal/module/fastcgi" "github.com/nsqio/go-nsq" "io/ioutil" ) diff --git a/internal/worker/http.go b/internal/worker/http.go index 6fed6c3..ac542dd 100644 --- a/internal/worker/http.go +++ b/internal/worker/http.go @@ -2,7 +2,7 @@ package worker import ( "errors" - "github.com/changba-server/nsqproxy/internal/module/tool" + "github.com/changba/nsqproxy/internal/module/tool" "github.com/nsqio/go-nsq" "io/ioutil" "net/http"