|
@@ -35,6 +35,9 @@ func NewBrowser(httpProxyURL string, loadAdblock bool) (*rod.Browser, error) {
|
|
|
log_helper.GetLogger().Panicln("releaseAdblock", err)
|
|
log_helper.GetLogger().Panicln("releaseAdblock", err)
|
|
|
}
|
|
}
|
|
|
})
|
|
})
|
|
|
|
|
+
|
|
|
|
|
+ // 随机的 rod 子文件夹名称
|
|
|
|
|
+ nowUserData := filepath.Join(global_value.DefRodTmpRootFolder, my_util.RandStringBytesMaskImprSrcSB(20))
|
|
|
var browser *rod.Browser
|
|
var browser *rod.Browser
|
|
|
err = rod.Try(func() {
|
|
err = rod.Try(func() {
|
|
|
purl := ""
|
|
purl := ""
|
|
@@ -44,14 +47,14 @@ func NewBrowser(httpProxyURL string, loadAdblock bool) (*rod.Browser, error) {
|
|
|
Set("load-extension", adblockSavePath).
|
|
Set("load-extension", adblockSavePath).
|
|
|
Proxy(httpProxyURL).
|
|
Proxy(httpProxyURL).
|
|
|
Headless(false). // 插件模式需要设置这个
|
|
Headless(false). // 插件模式需要设置这个
|
|
|
- UserDataDir(global_value.DefRodTmpFolder).
|
|
|
|
|
|
|
+ UserDataDir(nowUserData).
|
|
|
//XVFB("--server-num=5", "--server-args=-screen 0 1600x900x16").
|
|
//XVFB("--server-num=5", "--server-args=-screen 0 1600x900x16").
|
|
|
//XVFB("-ac :99", "-screen 0 1280x1024x16").
|
|
//XVFB("-ac :99", "-screen 0 1280x1024x16").
|
|
|
MustLaunch()
|
|
MustLaunch()
|
|
|
} else {
|
|
} else {
|
|
|
purl = launcher.New().
|
|
purl = launcher.New().
|
|
|
Proxy(httpProxyURL).
|
|
Proxy(httpProxyURL).
|
|
|
- UserDataDir(global_value.DefRodTmpFolder).
|
|
|
|
|
|
|
+ UserDataDir(nowUserData).
|
|
|
MustLaunch()
|
|
MustLaunch()
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -161,13 +164,13 @@ func Clear() {
|
|
|
defer browser.MustClose()
|
|
defer browser.MustClose()
|
|
|
})
|
|
})
|
|
|
|
|
|
|
|
- err := my_util.ClearRodTmpFolder()
|
|
|
|
|
|
|
+ err := my_util.ClearRodTmpRootFolder()
|
|
|
if err != nil {
|
|
if err != nil {
|
|
|
- log_helper.GetLogger().Errorln("ClearRodTmpFolder", err)
|
|
|
|
|
|
|
+ log_helper.GetLogger().Errorln("ClearRodTmpRootFolder", err)
|
|
|
return
|
|
return
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- log_helper.GetLogger().Infoln("ClearRodTmpFolder Done")
|
|
|
|
|
|
|
+ log_helper.GetLogger().Infoln("ClearRodTmpRootFolder Done")
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
func newPage(browser *rod.Browser) (*rod.Page, error) {
|
|
func newPage(browser *rod.Browser) (*rod.Page, error) {
|