多处修改

增加 pcs_ua 和 pan_ua 的设置, 替代了原先的 user-agent 优化代码结构修改获取公网ip源
liuzhuoling2011 · Oct 30, 2019 · 353b83d · 353b83d
1 parent 28fec36
commit 353b83d
Show file tree

Hide file tree

Showing 18 changed files with 360 additions and 541 deletions.
diff --git a/baidupcs/baidupcs.go b/baidupcs/baidupcs.go
@@ -119,21 +119,20 @@ var (
 		Scheme: "http",
 		Host:   "baidupcs.com",
 	}
-
-	netdiskUAHeader = map[string]string{
-		"User-Agent": NetdiskUA,
-	}
 )
 
 type (
 	// BaiduPCS 百度 PCS API 详情
 	BaiduPCS struct {
-		appID    int                   // app_id
-		isHTTPS  bool                  // 是否启用https
-		uid      uint64                // 百度uid
-		client   *requester.HTTPClient // http 客户端
-		ph       *panhome.PanHome
-		cacheMap cachemap.CacheMap
+		appID      int                   // app_id
+		isHTTPS    bool                  // 是否启用https
+		uid        uint64                // 百度uid
+		client     *requester.HTTPClient // http 客户端
+		pcsUA      string
+		panUA      string
+		isSetPanUA bool
+		ph         *panhome.PanHome
+		cacheMap   cachemap.CacheMap
 	}
 
 	userInfoJSON struct {
@@ -197,6 +196,9 @@ func (pcs *BaiduPCS) lazyInit() {
 	if pcs.ph == nil {
 		pcs.ph = panhome.NewPanHome(pcs.client)
 	}
+	if !pcs.isSetPanUA {
+		pcs.panUA = NetdiskUA
+	}
 }
 
 // GetClient 获取当前的http client
@@ -246,9 +248,15 @@ func (pcs *BaiduPCS) SetStoken(stoken string) {
 	})
 }
 
-// SetUserAgent 设置 User-Agent
-func (pcs *BaiduPCS) SetUserAgent(ua string) {
-	pcs.client.SetUserAgent(ua)
+// SetPCSUserAgent 设置 PCS User-Agent
+func (pcs *BaiduPCS) SetPCSUserAgent(ua string) {
+	pcs.pcsUA = ua
+}
+
+// SetPanUserAgent 设置 Pan User-Agent
+func (pcs *BaiduPCS) SetPanUserAgent(ua string) {
+	pcs.panUA = ua
+	pcs.isSetPanUA = true
 }
 
 // SetHTTPS 是否启用https连接
@@ -264,6 +272,12 @@ func (pcs *BaiduPCS) URL() *url.URL {
 	}
 }
 
+func (pcs *BaiduPCS) getPanUAHeader() (header map[string]string) {
+	return map[string]string{
+		"User-Agent": pcs.panUA,
+	}
+}
+
 func (pcs *BaiduPCS) generatePCSURL(subPath, method string, param ...map[string]string) *url.URL {
 	pcsURL := pcs.URL()
 	pcsURL.Path = "/rest/2.0/pcs/" + subPath

diff --git a/baidupcs/download.go b/baidupcs/download.go
@@ -116,9 +116,9 @@ func (pcs *BaiduPCS) DownloadStreamFile(path string, downloadFunc DownloadFunc)
 	return downloadFunc(pcsURL.String(), pcs.client.Jar)
 }
 
-// LocateDownloadWithUserAgent 获取下载链接, 可指定User-Agent
-func (pcs *BaiduPCS) LocateDownloadWithUserAgent(pcspath, ua string) (info *URLInfo, pcsError pcserror.Error) {
-	dataReadCloser, pcsError := pcs.prepareLocateDownload(pcspath, ua)
+// LocateDownloadWithUserAgent 获取下载链接
+func (pcs *BaiduPCS) LocateDownload(pcspath string) (info *URLInfo, pcsError pcserror.Error) {
+	dataReadCloser, pcsError := pcs.PrepareLocateDownload(pcspath)
 	if dataReadCloser != nil {
 		defer dataReadCloser.Close()
 	}
@@ -139,11 +139,6 @@ func (pcs *BaiduPCS) LocateDownloadWithUserAgent(pcspath, ua string) (info *URLI
 	return &jsonData.URLInfo, nil
 }
 
-// LocateDownload 获取下载链接
-func (pcs *BaiduPCS) LocateDownload(pcspath string) (info *URLInfo, pcsError pcserror.Error) {
-	return pcs.LocateDownloadWithUserAgent(pcspath, "")
-}
-
 // LocatePanAPIDownload 从百度网盘首页获取下载链接
 func (pcs *BaiduPCS) LocatePanAPIDownload(fidList ...int64) (dlinkInfoList APIDownloadDlinkInfoList, pcsError pcserror.Error) {
 	dataReadCloser, pcsError := pcs.PrepareLocatePanAPIDownload(fidList...)

diff --git a/baidupcs/extends.go b/baidupcs/extends.go
@@ -44,7 +44,7 @@ var (
 )
 
 func (pcs *BaiduPCS) getLocateDownloadLink(pcspath string) (link string, pcsError pcserror.Error) {
-	info, pcsError := pcs.LocateDownloadWithUserAgent(pcspath, NetdiskUA)
+	info, pcsError := pcs.LocateDownload(pcspath)
 	if pcsError != nil {
 		return
 	}
@@ -112,9 +112,7 @@ func (pcs *BaiduPCS) GetRapidUploadInfoByLink(link string, compareRInfo *RapidUp
 	errInfo.ErrType = pcserror.ErrTypeOthers
 
 	var (
-		header = map[string]string{
-			"User-Agent": NetdiskUA,
-		}
+		header     = pcs.getPanUAHeader()
 		isSetRange = compareRInfo != nil && compareRInfo.ContentLength > SliceMD5Size // 是否设置Range
 	)
 	if isSetRange {

diff --git a/baidupcs/netdisksign/locatedownloadsign.go b/baidupcs/netdisksign/locatedownloadsign.go
@@ -45,3 +45,7 @@ func (s *LocateDownloadSign) Sign(uid uint64, bduss string) {
 	hex.Encode(sha1ResHex, randSha1.Sum(nil))
 	s.Rand = converter.ToString(sha1ResHex)
 }
+
+func (s *LocateDownloadSign) URLParam() string {
+	return "time=" + strconv.FormatInt(s.Time, 10) + "&rand=" + s.Rand + "&devuid=" + s.DevUID
+}