变更依赖包名称

bitxx · Jul 26, 2023 · 5ad3e10 · 5ad3e10
1 parent 2b89c87
commit 5ad3e10
Show file tree

Hide file tree

Showing 127 changed files with 480 additions and 505 deletions.
diff --git a/app/aid/history/failure.go b/app/aid/history/failure.go
@@ -7,11 +7,11 @@ import (
 	"os"
 	"sync"
 
-	"github.com/jason-wj/pholcus/app/downloader/request"
-	"github.com/jason-wj/pholcus/common/mgo"
-	"github.com/jason-wj/pholcus/common/mysql"
-	"github.com/jason-wj/pholcus/common/pool"
-	"github.com/jason-wj/pholcus/config"
+	"github.com/bitxx/pholcus/app/downloader/request"
+	"github.com/bitxx/pholcus/common/mgo"
+	"github.com/bitxx/pholcus/common/mysql"
+	"github.com/bitxx/pholcus/common/pool"
+	"github.com/bitxx/pholcus/config"
 )
 
 type Failure struct {

diff --git a/app/aid/history/history.go b/app/aid/history/history.go
@@ -8,13 +8,13 @@ import (
 
 	"gopkg.in/mgo.v2/bson"
 
-	"github.com/jason-wj/pholcus/app/downloader/request"
-	"github.com/jason-wj/pholcus/common/mgo"
-	"github.com/jason-wj/pholcus/common/mysql"
-	"github.com/jason-wj/pholcus/common/pool"
-	"github.com/jason-wj/pholcus/common/util"
-	"github.com/jason-wj/pholcus/config"
-	"github.com/jason-wj/pholcus/logs"
+	"github.com/bitxx/pholcus/app/downloader/request"
+	"github.com/bitxx/pholcus/common/mgo"
+	"github.com/bitxx/pholcus/common/mysql"
+	"github.com/bitxx/pholcus/common/pool"
+	"github.com/bitxx/pholcus/common/util"
+	"github.com/bitxx/pholcus/config"
+	"github.com/bitxx/pholcus/logs"
 )
 
 type (

diff --git a/app/aid/history/success.go b/app/aid/history/success.go
@@ -6,9 +6,9 @@ import (
 	"os"
 	"sync"
 
-	"github.com/jason-wj/pholcus/common/mgo"
-	"github.com/jason-wj/pholcus/common/mysql"
-	"github.com/jason-wj/pholcus/config"
+	"github.com/bitxx/pholcus/common/mgo"
+	"github.com/bitxx/pholcus/common/mysql"
+	"github.com/bitxx/pholcus/config"
 )
 
 type Success struct {

diff --git a/app/aid/proxy/proxy.go b/app/aid/proxy/proxy.go
@@ -1,15 +1,15 @@
 package proxy
 
 import (
-	"github.com/jason-wj/pholcus/config"
+	"github.com/bitxx/pholcus/config"
 	"io/ioutil"
 	"log"
 	"os"
 	"regexp"
 	"time"
 )
 
-//author: 代理模块基本重构 wj
+// author: 代理模块基本重构 wj
 type Proxy struct {
 	proxyIPTypeRegexp *regexp.Regexp
 	allProxyIps       []string

diff --git a/app/app.go b/app/app.go
@@ -10,16 +10,16 @@ import (
 	"sync"
 	"time"
 
-	"github.com/jason-wj/pholcus/app/crawler"
-	"github.com/jason-wj/pholcus/app/distribute"
-	"github.com/jason-wj/pholcus/app/pipeline"
-	"github.com/jason-wj/pholcus/app/pipeline/collector"
-	"github.com/jason-wj/pholcus/app/scheduler"
-	"github.com/jason-wj/pholcus/app/spider"
-	"github.com/jason-wj/pholcus/common/teleport"
-	"github.com/jason-wj/pholcus/logs"
-	"github.com/jason-wj/pholcus/runtime/cache"
-	"github.com/jason-wj/pholcus/runtime/status"
+	"github.com/bitxx/pholcus/app/crawler"
+	"github.com/bitxx/pholcus/app/distribute"
+	"github.com/bitxx/pholcus/app/pipeline"
+	"github.com/bitxx/pholcus/app/pipeline/collector"
+	"github.com/bitxx/pholcus/app/scheduler"
+	"github.com/bitxx/pholcus/app/spider"
+	"github.com/bitxx/pholcus/common/teleport"
+	"github.com/bitxx/pholcus/logs"
+	"github.com/bitxx/pholcus/runtime/cache"
+	"github.com/bitxx/pholcus/runtime/status"
 )
 
 type (

diff --git a/app/crawler/crawler.go b/app/crawler/crawler.go
@@ -6,12 +6,12 @@ import (
 	"runtime"
 	"time"
 
-	"github.com/jason-wj/pholcus/app/downloader"
-	"github.com/jason-wj/pholcus/app/downloader/request"
-	"github.com/jason-wj/pholcus/app/pipeline"
-	"github.com/jason-wj/pholcus/app/spider"
-	"github.com/jason-wj/pholcus/logs"
-	"github.com/jason-wj/pholcus/runtime/cache"
+	"github.com/bitxx/pholcus/app/downloader"
+	"github.com/bitxx/pholcus/app/downloader/request"
+	"github.com/bitxx/pholcus/app/pipeline"
+	"github.com/bitxx/pholcus/app/spider"
+	"github.com/bitxx/pholcus/logs"
+	"github.com/bitxx/pholcus/runtime/cache"
 )
 
 // 采集引擎
@@ -52,7 +52,7 @@ func (self *crawler) Init(sp *spider.Spider) Crawler {
 	return self
 }
 
-//用于动态设置暂停时间
+// 用于动态设置暂停时间
 func (self *crawler) setPauseTime() {
 	self.pause[0] = self.Pausetime / 2
 	if self.pause[0] > 0 {
@@ -236,12 +236,12 @@ func (self *crawler) GetOne() *request.Request {
 	return self.Spider.RequestPull()
 }
 
-//从调度使用一个资源空位
+// 从调度使用一个资源空位
 func (self *crawler) UseOne() {
 	self.Spider.RequestUse()
 }
 
-//从调度释放一个资源空位
+// 从调度释放一个资源空位
 func (self *crawler) FreeOne() {
 	self.Spider.RequestFree()
 }

diff --git a/app/crawler/crawlerpool.go b/app/crawler/crawlerpool.go
@@ -4,8 +4,8 @@ import (
 	"sync"
 	"time"
 
-	"github.com/jason-wj/pholcus/config"
-	"github.com/jason-wj/pholcus/runtime/status"
+	"github.com/bitxx/pholcus/config"
+	"github.com/bitxx/pholcus/runtime/status"
 )
 
 // 采集引擎池

diff --git a/app/crawler/spiderqueue.go b/app/crawler/spiderqueue.go
@@ -1,9 +1,8 @@
 package crawler
 
 import (
-	. "github.com/jason-wj/pholcus/app/spider"
-	"github.com/jason-wj/pholcus/common/util"
-	"github.com/jason-wj/pholcus/logs"
+	"github.com/bitxx/pholcus/common/util"
+	"github.com/bitxx/pholcus/logs"
 )
 
 // 采集引擎中规则队列

diff --git a/app/distribute/master_api.go b/app/distribute/master_api.go
@@ -2,8 +2,8 @@ package distribute
 
 import (
 	"encoding/json"
-	"github.com/jason-wj/pholcus/common/teleport"
-	"github.com/jason-wj/pholcus/logs"
+	"github.com/bitxx/pholcus/common/teleport"
+	"github.com/bitxx/pholcus/logs"
 )
 
 // 创建主节点API

diff --git a/app/distribute/slave_api.go b/app/distribute/slave_api.go
@@ -3,8 +3,8 @@ package distribute
 import (
 	"encoding/json"
 
-	"github.com/jason-wj/pholcus/common/teleport"
-	"github.com/jason-wj/pholcus/logs"
+	"github.com/bitxx/pholcus/common/teleport"
+	"github.com/bitxx/pholcus/logs"
 )
 
 // 创建从节点API

diff --git a/app/downloader/downloader.go b/app/downloader/downloader.go
@@ -1,8 +1,8 @@
 package downloader
 
 import (
-	"github.com/jason-wj/pholcus/app/downloader/request"
-	"github.com/jason-wj/pholcus/app/spider"
+	"github.com/bitxx/pholcus/app/downloader/request"
+	"github.com/bitxx/pholcus/app/spider"
 )
 
 // The Downloader interface.

diff --git a/app/downloader/downloader_surfer.go b/app/downloader/downloader_surfer.go
@@ -5,10 +5,10 @@ import (
 	"net/http"
 	"net/http/cookiejar"
 
-	"github.com/jason-wj/pholcus/app/downloader/request"
-	"github.com/jason-wj/pholcus/app/downloader/surfer"
-	"github.com/jason-wj/pholcus/app/spider"
-	"github.com/jason-wj/pholcus/config"
+	"github.com/bitxx/pholcus/app/downloader/request"
+	"github.com/bitxx/pholcus/app/downloader/surfer"
+	"github.com/bitxx/pholcus/app/spider"
+	"github.com/bitxx/pholcus/config"
 )
 
 type Surfer struct {

diff --git a/app/downloader/request/request.go b/app/downloader/request/request.go
@@ -10,7 +10,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/jason-wj/pholcus/common/util"
+	"github.com/bitxx/pholcus/common/util"
 )
 
 // Request represents object waiting for being crawled.

diff --git a/app/downloader/request/temp.go b/app/downloader/request/temp.go
@@ -2,8 +2,8 @@ package request
 
 import (
 	"encoding/json"
-	"github.com/jason-wj/pholcus/common/util"
-	"github.com/jason-wj/pholcus/logs"
+	"github.com/bitxx/pholcus/common/util"
+	"github.com/bitxx/pholcus/logs"
 	"reflect"
 )
 

diff --git a/app/downloader/surfer/example/example.go b/app/downloader/surfer/example/example.go
@@ -1,7 +1,7 @@
 package main
 
 import (
-	"github.com/jason-wj/pholcus/app/downloader/surfer"
+	"github.com/bitxx/pholcus/app/downloader/surfer"
 	"io/ioutil"
 	"log"
 	"time"

diff --git a/app/downloader/surfer/param.go b/app/downloader/surfer/param.go
@@ -25,7 +25,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/jason-wj/pholcus/app/downloader/surfer/agent"
+	"github.com/bitxx/pholcus/app/downloader/surfer/agent"
 )
 
 type Param struct {

diff --git a/app/downloader/surfer/surf.go b/app/downloader/surfer/surf.go
@@ -27,8 +27,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/jason-wj/pholcus/app/downloader/surfer/agent"
-	"github.com/jason-wj/pholcus/common/goutil"
+	"github.com/bitxx/pholcus/app/downloader/surfer/agent"
+	"github.com/bitxx/pholcus/common/goutil"
 )
 
 // Surf is the default Download implementation.

diff --git a/app/pipeline/collector/collector.go b/app/pipeline/collector/collector.go
@@ -7,9 +7,9 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/jason-wj/pholcus/app/pipeline/collector/data"
-	"github.com/jason-wj/pholcus/app/spider"
-	"github.com/jason-wj/pholcus/runtime/cache"
+	"github.com/bitxx/pholcus/app/pipeline/collector/data"
+	"github.com/bitxx/pholcus/app/spider"
+	"github.com/bitxx/pholcus/runtime/cache"
 )
 
 // 结果收集与输出

diff --git a/app/pipeline/collector/output_csv.go b/app/pipeline/collector/output_csv.go
@@ -5,10 +5,10 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/jason-wj/pholcus/common/util"
-	"github.com/jason-wj/pholcus/config"
-	"github.com/jason-wj/pholcus/logs"
-	"github.com/jason-wj/pholcus/runtime/cache"
+	"github.com/bitxx/pholcus/common/util"
+	"github.com/bitxx/pholcus/config"
+	"github.com/bitxx/pholcus/logs"
+	"github.com/bitxx/pholcus/runtime/cache"
 )
 
 /************************ CSV 输出 ***************************/

diff --git a/app/pipeline/collector/output_data.go b/app/pipeline/collector/output_data.go
@@ -1,7 +1,7 @@
 package collector
 
 import (
-	"github.com/jason-wj/pholcus/logs"
+	"github.com/bitxx/pholcus/logs"
 )
 
 var (

diff --git a/app/pipeline/collector/output_excel.go b/app/pipeline/collector/output_excel.go
@@ -4,11 +4,11 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/jason-wj/pholcus/common/util"
-	"github.com/jason-wj/pholcus/common/xlsx"
-	"github.com/jason-wj/pholcus/config"
-	"github.com/jason-wj/pholcus/logs"
-	"github.com/jason-wj/pholcus/runtime/cache"
+	"github.com/bitxx/pholcus/common/util"
+	"github.com/bitxx/pholcus/common/xlsx"
+	"github.com/bitxx/pholcus/config"
+	"github.com/bitxx/pholcus/logs"
+	"github.com/bitxx/pholcus/runtime/cache"
 )
 
 /************************ excel 输出 ***************************/

diff --git a/app/pipeline/collector/output_file.go b/app/pipeline/collector/output_file.go
@@ -7,12 +7,12 @@ import (
 	"path/filepath"
 	"sync/atomic"
 
-	"github.com/jason-wj/pholcus/app/pipeline/collector/data"
-	bytesSize "github.com/jason-wj/pholcus/common/bytes"
-	"github.com/jason-wj/pholcus/common/util"
-	"github.com/jason-wj/pholcus/config"
-	"github.com/jason-wj/pholcus/logs"
-	// "github.com/jason-wj/pholcus/runtime/cache"
+	"github.com/bitxx/pholcus/app/pipeline/collector/data"
+	bytesSize "github.com/bitxx/pholcus/common/bytes"
+	"github.com/bitxx/pholcus/common/util"
+	"github.com/bitxx/pholcus/config"
+	"github.com/bitxx/pholcus/logs"
+	// "github.com/bitxx/pholcus/runtime/cache"
 )
 
 // 文件输出

diff --git a/app/pipeline/collector/output_kafka.go b/app/pipeline/collector/output_kafka.go
@@ -5,9 +5,9 @@ import (
 	"regexp"
 	"sync"
 
-	"github.com/jason-wj/pholcus/common/kafka"
-	"github.com/jason-wj/pholcus/common/util"
-	"github.com/jason-wj/pholcus/logs"
+	"github.com/bitxx/pholcus/common/kafka"
+	"github.com/bitxx/pholcus/common/util"
+	"github.com/bitxx/pholcus/logs"
 )
 
 /************************ Kafka 输出 ***************************/

diff --git a/app/pipeline/collector/output_mgo.go b/app/pipeline/collector/output_mgo.go
@@ -5,11 +5,11 @@ import (
 
 	mgov2 "gopkg.in/mgo.v2"
 
-	"github.com/jason-wj/pholcus/common/mgo"
-	"github.com/jason-wj/pholcus/common/pool"
-	"github.com/jason-wj/pholcus/common/util"
-	"github.com/jason-wj/pholcus/config"
-	"github.com/jason-wj/pholcus/logs"
+	"github.com/bitxx/pholcus/common/mgo"
+	"github.com/bitxx/pholcus/common/pool"
+	"github.com/bitxx/pholcus/common/util"
+	"github.com/bitxx/pholcus/config"
+	"github.com/bitxx/pholcus/logs"
 )
 
 /************************ MongoDB 输出 ***************************/

diff --git a/app/pipeline/collector/output_mysql.go b/app/pipeline/collector/output_mysql.go
@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"sync"
 
-	"github.com/jason-wj/pholcus/common/mysql"
-	"github.com/jason-wj/pholcus/common/util"
-	"github.com/jason-wj/pholcus/logs"
+	"github.com/bitxx/pholcus/common/mysql"
+	"github.com/bitxx/pholcus/common/util"
+	"github.com/bitxx/pholcus/logs"
 )
 
 /************************ Mysql 输出 ***************************/

diff --git a/app/pipeline/collector/output_util.go b/app/pipeline/collector/output_util.go
@@ -1,7 +1,7 @@
 package collector
 
 import (
-	"github.com/jason-wj/pholcus/logs"
+	"github.com/bitxx/pholcus/logs"
 )
 
 // 主命名空间相对于数据库名，不依赖具体数据内容，可选
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,7 +10,7 @@ import ( @@
     	"sync"
     	"time"
-    	"github.com/jason-wj/pholcus/common/util"
+    	"github.com/bitxx/pholcus/common/util"
     )
     // Request represents object waiting for being crawled.
@@ Expand Down @@