mxs 7 miesięcy temu
rodzic
commit
52e4ff6ccb
4 zmienionych plików z 10 dodań i 8 usunięć
  1. 1 1
      backend/browser.go
  2. 1 1
      bind4spider.go
  3. 2 2
      frontend/src/components/spider/EditSpider.vue
  4. 6 4
      main.go

+ 1 - 1
backend/browser.go

@@ -159,7 +159,7 @@ func NewBrowser(headless bool, showImage bool, proxyServe bool, baseUrl string,
 
 func GetProxyAddr() string {
 	proxyAddr := "http://cc.spdata.jianyu360.com/crawl/proxy/socks5/fetch"
-	proxyAuthor := "http://cc.spdata.jianyu360.com/crawl/proxy/socks5/fetch"
+	proxyAuthor := "Basic amlhbnl1MDAxOjEyM3F3ZSFB"
 	//获取代理
 	req, err := http.NewRequest(http.MethodGet, proxyAddr, nil)
 	if err != nil {

+ 1 - 1
bind4spider.go

@@ -26,7 +26,7 @@ func (a *App) DebugSpider(url string, proxyServe bool, maxPages int, listDealy i
 // VerifySpiderConfig 验证
 func (a *App) VerifySpiderConfig(cssMark map[string]interface{}) map[string]interface{} {
 	var errtype int
-	qu.Debug(cssMark)
+	qu.Debug("cssMark---", cssMark)
 	sc, err := be.NewSpiderConfig(cssMark)
 	if err != nil {
 		qu.Debug("CssMark Marshal Error:", err)

+ 2 - 2
frontend/src/components/spider/EditSpider.vue

@@ -55,8 +55,8 @@
       </el-row>
       <el-row>
         <el-col :span="24">
-          <el-form-item label="filterResource">
-            <el-input v-model="formData.filterResource" placeholder="多个以英文逗号隔开"></el-input>
+          <el-form-item label="页面资源过滤">
+            <el-input v-model="formData.filterResource" placeholder="多个以英文分号隔开(例:ws://;wss://;.tof;.woff;.ico;.mp4;.zip;.rar;.exe;)"></el-input>
           </el-form-item>
         </el-col>
       </el-row>

+ 6 - 4
main.go

@@ -34,8 +34,8 @@ var (
 	//重点网站和正式环境
 	isOnly4MainSite             = "false"
 	browserDisableLoadResources = "ws://;wss://;.tof;.woff;.ico;.mp4;.zip;.rar;.exe;"
-	//serverAddress               = "http://visualizeld.spdata.jianyu360.com/%s" //正式环境
-	serverAddress = "http://127.0.0.1:8091/%s" //正式环境
+	serverAddress               = "http://visualizeld.spdata.jianyu360.com/%s" //正式环境
+	//serverAddress = "http://127.0.0.1:8091/%s" //正式环境
 
 	//验证码服务
 	serverCodeTimeOut               int64 = 15
@@ -50,7 +50,7 @@ var (
 // wails build -ldflags="-X 'main.isOnly4MainSite=false'" -o="剑鱼可视化爬虫开发工具_正式.exe"
 
 func init() {
-	//be.LoadConfig("./config.yaml")
+	//be.LoadConfig("config.yaml")
 	//从配置文件外,编译时设定浏览器排除加载资源。比配置文件优先级低
 	if browserDisableLoadResources != "" {
 		be.Cfg.DisableLoadResource = browserDisableLoadResources
@@ -62,6 +62,9 @@ func init() {
 	if serverCodeTimeOut > 0 {
 		be.Cfg.ServerCodeTimeOut = serverCodeTimeOut
 	}
+	if serverCodeAddress != "" {
+		be.Cfg.ServerCodeAddress = serverCodeAddress
+	}
 	if serverCodeFreeAddressOcr != "" {
 		be.Cfg.ServerCodeFreeAddressOcr = serverCodeFreeAddressOcr
 	}
@@ -80,7 +83,6 @@ func init() {
 	if be.Cfg.IsOnly4MainSite {
 		serverAddress = "http://visualize.spdata.jianyu360.com/%s" //重点网站
 	}
-
 	qu.Debug("重点网站:", be.Cfg.IsOnly4MainSite, serverAddress)
 }