Skip to content

Commit

Permalink
组织名改为changba-server -> changba
Browse files Browse the repository at this point in the history
  • Loading branch information
lixuancn committed Jan 6, 2021
1 parent 163d282 commit 721912c
Show file tree
Hide file tree
Showing 22 changed files with 44 additions and 44 deletions.
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -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
Expand Down
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
@@ -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)

## 解决的问题

Expand Down Expand Up @@ -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
Expand All @@ -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`
Expand Down Expand Up @@ -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)
Released under the [MIT License](https://github.com/changba/nsqproxy/blob/main/LICENSE)
14 changes: 7 additions & 7 deletions cmd/nsqproxy.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions config/systemconfig.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
4 changes: 2 additions & 2 deletions document/doc/quick_start.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -84,4 +84,4 @@ func main() {

2、查看刚才编写的Golang程序的输出,可以拿到消息的唯一ID和消息的内容

<img src="https://raw.githubusercontent.com/changba-server/nsqproxy/main/assets/images/quick_start_demo.png" alt="具体示例">
<img src="https://raw.githubusercontent.com/changba/nsqproxy/main/assets/images/quick_start_demo.png" alt="具体示例">
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/changba-server/nsqproxy
module github.com/changba/nsqproxy

go 1.14

Expand Down
2 changes: 1 addition & 1 deletion internal/backup/live.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion internal/httper/consumeconfig.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package httper

import (
"github.com/changba-server/nsqproxy/internal/model"
"github.com/changba/nsqproxy/internal/model"
"net/http"
"strconv"
"time"
Expand Down
2 changes: 1 addition & 1 deletion internal/httper/consumeservermap.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package httper

import (
"github.com/changba-server/nsqproxy/internal/model"
"github.com/changba/nsqproxy/internal/model"
"net/http"
"strconv"
"strings"
Expand Down
2 changes: 1 addition & 1 deletion internal/httper/http.go
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
2 changes: 1 addition & 1 deletion internal/httper/response.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion internal/httper/router.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package httper

import (
"github.com/changba-server/nsqproxy/config"
"github.com/changba/nsqproxy/config"
"net/http"
)

Expand Down
2 changes: 1 addition & 1 deletion internal/httper/workserver.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package httper

import (
"github.com/changba-server/nsqproxy/internal/model"
"github.com/changba/nsqproxy/internal/model"
"net/http"
"strconv"
)
Expand Down
2 changes: 1 addition & 1 deletion internal/module/tool/error.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package tool

import (
"github.com/changba-server/nsqproxy/internal/module/logger"
"github.com/changba/nsqproxy/internal/module/logger"
"runtime/debug"
)

Expand Down
8 changes: 4 additions & 4 deletions internal/proxy/handle.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion internal/proxy/handle_test.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package proxy

import (
"github.com/changba-server/nsqproxy/internal/model"
"github.com/changba/nsqproxy/internal/model"
"testing"
)

Expand Down
2 changes: 1 addition & 1 deletion internal/proxy/loadbalance.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package proxy

import (
"errors"
"github.com/changba-server/nsqproxy/internal/model"
"github.com/changba/nsqproxy/internal/model"
)

const LoadBalanceMethodLoop = "loop"
Expand Down
2 changes: 1 addition & 1 deletion internal/proxy/loadbalance_test.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package proxy

import (
"github.com/changba-server/nsqproxy/internal/model"
"github.com/changba/nsqproxy/internal/model"
"testing"
)

Expand Down
8 changes: 4 additions & 4 deletions internal/proxy/proxy.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions internal/proxy/proxy_test.go
Original file line number Diff line number Diff line change
@@ -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"
)
Expand Down
4 changes: 2 additions & 2 deletions internal/worker/fastcgi.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion internal/worker/http.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit 721912c

Please sign in to comment.