update api url and signature

Author: 雷科伟

.gitignore

@@ -1 +1,3 @@
-.idea/
+.idea/
+*.md
+*.html

README.md

@@ -1,16 +1,22 @@
 # 批量导出CSDN博客
 > 批量导出`csnd`博客，并转化为`hexo`博客样式，如果你是用富文本编辑器写的则会导出`html`样式
 
-注：有些文章可能获取不到造成进度条无法达到100%，如果走到90%多，走不动了，直接取消即可
+注：有些文章可能获取不到造成进度条无法达到100%，如果走到99%，走不动了，直接取消即可
 
 # Quick start
+
+**安装**
 ```bash
-go run main.go -username 你的csdn用户名 -cookie 你csdn的cookie -page 1
+go get github.com/pibigstar/csdn-hexo
 ```
-> page不写，默认为下载全部页
 
-# Demo
+**使用**
+```bash
+csdn-hexo -username 你的csdn用户名 -cookie 你csdn的cookie -page 1
+```
+> page不写，默认为下载全部页
 
+**完整示例**
 ```bash
 go run main.go -username "junmoxi" -cookie "UserName=junmoxi; UserToken=c3c29cca48be43c4884fe36d052d5851"
 ```
@@ -21,13 +27,6 @@ go run main.go -username "junmoxi" -cookie "UserName=junmoxi; UserToken=c3c29cca
 
 [点击下载](https://github.com/pibigstar/csdn-hexo/releases/tag/v1.1)
 
-**使用**
-> 以Windows用户为例
-
-```bash
-main.exe -username 你的csdn用户名 -cookie 你csdn的cookie
-```
-
 
 # cookie获取
 ![](cookie.png)

go.mod

@@ -1,4 +1,4 @@
-module csdn-hexo
+module github.com/pibigstar/csdn-hexo
 
 go 1.12
 

main.go

@@ -1,12 +1,16 @@
 package main
 
 import (
+	"crypto/hmac"
+	"crypto/sha256"
+	"encoding/base64"
 	"encoding/json"
 	"flag"
 	"fmt"
 	"io/ioutil"
 	"math/rand"
 	"net/http"
+	"net/url"
 	"os"
 	"regexp"
 	"strings"
@@ -21,7 +25,7 @@ import (
 
 const (
 	ListPostURL   = "https://blog.csdn.net/%s/article/list/%d?"
-	PostDetailURL = "https://mp.csdn.net/mdeditor/getArticle?id=%s"
+	PostDetailURL = "https://bizapi.csdn.net/blog-console-api/v3/editor/getArticle?id=%s&model_type="
 	HexoHeader    = `
 ---
 title: %s
@@ -40,7 +44,6 @@ categories: %s
 </html>`
 )
 
-var postTime = time.Now()
 
 type DetailData struct {
 	Data PostDetail `json:"data"`
@@ -63,39 +66,45 @@ var (
 	count       int
 	wg          sync.WaitGroup
 	bar         *pgbar.Bar
+ 	postTime = time.Now()
+)
+
+const (
+	appSecret = "9znpamsyl2c7cdrr9sas0le9vbc3r6ba"
+	appCaKey = "203803574"
+	signHeaders = "x-ca-key,x-ca-nonce"
 )
 
 func init() {
 	flag.StringVar(&username, "username", "junmoxi", "your csdn username")
-	flag.StringVar(&cookie, "cookie", "UserName=junmoxi; UserToken=c3c29cca48be43c4884fe36d052d5851;", "your csdn cookie")
+	flag.StringVar(&cookie, "cookie", "UserName=junmoxi;UserToken=b9023fb39b534543a5e65f7cae7cb3c4;", "your csdn cookie")
 	flag.IntVar(&page, "page", -1, "download pages")
 	flag.Parse()
+	rand.Seed(time.Now().Unix())
 }
 
 func main() {
 	urls, err := crawlPosts(username)
 	if err != nil {
 		panic(err)
 	}
-
 	bar = pgbar.NewBar(0, "下载进度", len(urls))
-	for _, url := range urls {
+
+	for _, ul := range urls {
 		wg.Add(1)
-		go crawlPostMarkdown(url)
+		go crawlPostMarkdown(ul)
 	}
-
 	wg.Wait()
 }
 
 // Crawl posts by username
 func crawlPosts(username string) ([]string, error) {
-	client := http.Client{}
-	var (
-		urls []string
-	)
+	defer fmt.Println("地址抓取完成,开始下载...")
 
+	var urls []string
 	for {
-		resp, err := client.Get(fmt.Sprintf(ListPostURL, username, currentPage))
+		fmt.Printf("正在抓取第%d页文章地址... \n", currentPage)
+		resp, err := http.DefaultClient.Get(fmt.Sprintf(ListPostURL, username, currentPage))
 		if err != nil {
 			return nil, err
 		}
@@ -124,34 +133,50 @@ func crawlPosts(username string) ([]string, error) {
 }
 
 func crawlPostMarkdown(url string) {
+	defer wg.Done()
+	defer bar.Add()
+	defer func() {
+		if err := recover(); err != nil {
+			fmt.Println(err)
+		}
+	}()
+
 	index := strings.LastIndex(url, "/")
 	id := url[index+1:]
+	apiUrl := fmt.Sprintf(PostDetailURL, id)
 
-	client := http.Client{}
+	uuid := createUUID()
+	sign := createSignature(uuid, apiUrl)
 
-	req, _ := http.NewRequest("GET", fmt.Sprintf(PostDetailURL, id), nil)
+	req, _ := http.NewRequest("GET",apiUrl, nil)
 	req.Header.Set("cookie", cookie)
+	req.Header.Set("x-ca-key", appCaKey)
+	req.Header.Set("x-ca-nonce", uuid)
+	req.Header.Set("x-ca-signature", sign)
+	req.Header.Set("x-ca-signature-headers", signHeaders)
+	req.Header.Set("Accept", "*/*")
 
-	resp, err := client.Do(req)
+	resp, err := http.DefaultClient.Do(req)
 	if err != nil {
 		return
 	}
-
+	if resp.StatusCode != http.StatusOK {
+		return
+	}
 	data, err := ioutil.ReadAll(resp.Body)
 	if err != nil {
 		return
 	}
-
-	post := new(DetailData)
-	err = json.Unmarshal(data, post)
+	var post DetailData
+	err = json.Unmarshal(data, &post)
 	if err != nil {
 		return
 	}
 
 	if post.Data.Markdowncontent != "" {
-		go buildMarkdownPost(post.Data)
+		 buildMarkdownPost(post.Data)
 	} else if post.Data.Content != "" {
-		go buildHtmlPost(post.Data)
+		 buildHtmlPost(post.Data)
 	}
 }
 
@@ -171,15 +196,10 @@ func buildMarkdownPost(post PostDetail) {
 	rand.Seed(time.Now().UnixNano())
 	d := rand.Intn(3) + 1
 	postTime = postTime.AddDate(0, 0, -d).Add(time.Hour)
-
 	count++
-
-	defer wg.Done()
-	defer bar.Add()
 }
 
 func buildHtmlPost(post PostDetail) {
-
 	html := fmt.Sprintf(HtmlBody, post.Title, post.Content)
 	err := ioutil.WriteFile(
 		fmt.Sprintf("%s.html", post.Title),
@@ -188,7 +208,42 @@ func buildHtmlPost(post PostDetail) {
 	if err != nil {
 		return
 	}
+}
 
-	defer wg.Done()
-	defer bar.Add()
+func createSignature(uuid, apiUrl string) string {
+	u, err := url.Parse(apiUrl)
+	if err != nil {
+		panic(err)
+	}
+	query := u.Query().Encode()
+	query = query[:len(query)-1]
+	message := fmt.Sprintf("GET\n*/*\n\n\n\nx-ca-key:%s\nx-ca-nonce:%s\n%s?%s", appCaKey, uuid, u.Path, query)
+	hc := hmac.New(sha256.New, []byte(appSecret))
+	hc.Write([]byte(message))
+	res := hc.Sum(nil)
+
+	result := base64.StdEncoding.EncodeToString(res)
+	return result
 }
+
+func createUUID() string {
+	s := strings.Builder{}
+	chars := make([]string, 0, 10)
+	for i := 97; i < 103; i++ {
+		chars = append(chars, string(i))
+	}
+	for i := 49; i < 58; i++ {
+		chars = append(chars, string(i))
+	}
+	xs := "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx"
+	for _, k := range xs {
+		x := string(k)
+		if x == "4" || x == "-" {
+			s.WriteString(x)
+		} else {
+			i := rand.Intn(len(chars))
+			s.WriteString(chars[i])
+		}
+	}
+	return s.String()
+}