版本升级，删除gui项目，修改powershell脚本编译时间为24制

sndnvaps · Feb 11, 2021 · 6a1c368 · 6a1c368
1 parent 81fd264
commit 6a1c368
Show file tree

Hide file tree

Showing 27 changed files with 54 additions and 723 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,5 +1,10 @@
 ## 更新日志文件
-
+
+    2021.02.11 go版本
+          1. 修改xsbiquge.com地址为vbiquge.com(原因为网站改网址)
+          2. 删除gui版本的文件，彻底删除目录
+          3. 修改powershell编译脚本的编译时间定义，改为24小时制
+
     2021.01.01 go版本
           1. 把tpls/ ,fonts/  目录合并到程序里面，使程序独立性更强
           2.  qtgui版本，添加 检测更新 功能

diff --git a/README.md b/README.md
@@ -88,7 +88,8 @@
 
   网站名 | 网址 | 是否支持 | 备注 |
   :-: | :-: | :-: | :-: |
-  笔趣阁 | https://www.xsbiquge.com/ | √ |
+  笔趣阁 | <s>https://www.xsbiquge.com/</s> | × | 网站改名 |
+   笔趣阁 | https://www.vbiquge.com/ | √ |
   笔趣阁 | https://www.biduo.cc/ | √ |
   笔趣阁 | https://www.biquwu.cc/ | √ | 网站的速度比较慢 |
   西西文学网 | http://www.xixiwx.com/ | √ |

diff --git a/cli/build.ps1 b/cli/build.ps1
@@ -1,7 +1,7 @@
 
 # 获取系统时间
 $origin_date=Get-Date
-$build_time=$origin_date.ToString('yyyy-MM-dd hh:mm:ss')
+$build_time=$origin_date.ToString('yyyy-MM-dd HH:mm:ss')
 $commit_id=git rev-parse --short HEAD
 
 $last_tag_commit_id=git rev-list --tags --max-count=1

diff --git a/cli/ebookdl_cli.go b/cli/ebookdl_cli.go
@@ -71,7 +71,7 @@ func EbookDownloader(c *cli.Context) error {
 		(isTxt && isEpub) ||
 		isPV || isJSON {
 
-		if ebhost == "xsbiquge.com" {
+		if ebhost == "vbiquge.com" {
 			xsbiquge := ebook.NewXSBiquge()
 			EBDLInterface = xsbiquge //实例化接口
 		} else if ebhost == "biduo.cc" {
@@ -102,6 +102,7 @@ func EbookDownloader(c *cli.Context) error {
 			return nil
 		}
 		bookinfo = EBDLInterface.GetBookInfo(bookid, proxy)
+		//fmt.Println(bookinfo.Chapters) //只用于测试
 
 		//打印分卷信息，只用于调试
 		if isPV {
@@ -325,19 +326,19 @@ func main() {
 	app.Name = "golang EBookDownloader"
 	app.Version = Version + "-" + Commit + "-" + BuildTime
 	app.Authors = []cli.Author{
-		cli.Author{
+		{
 			Name:  "Jimes Yang",
 			Email: "sndnvaps@gmail.com",
 		},
 	}
-	app.Copyright = "© 2019 - 2020 Jimes Yang<sndnvaps@gmail.com>"
-	app.Usage = "用于下载 笔趣阁(https://www.xsbiquge.com, https://www.biduo.cc, https://www.biquwu.cc/),999小说网(https://www.999xs.com/) ,顶点小说网(https://www.23us.la , https://www.booktxt.net) 上面的电子书，并保存为txt格式或者(mobi格式,awz3格式)的电子书"
+	app.Copyright = "© 2019 - 2021 Jimes Yang<sndnvaps@gmail.com>"
+	app.Usage = "用于下载 笔趣阁(https://www.vbiquge.com,https://www.biduo.cc, https://www.biquwu.cc/),999小说网(https://www.999xs.com/) ,顶点小说网(https://www.23us.la , https://www.booktxt.net) 上面的电子书，并保存为txt格式或者(mobi格式,awz3格式)的电子书"
 	app.Action = EbookDownloader
 	app.Flags = []cli.Flag{
 		cli.StringFlag{
 			Name:  "ebhost",
-			Value: "xsbiquge.com",
-			Usage: "定义下载ebook的网站地址(可选择xsbiquge.com,biduo.cc,xixiwx.com,biquwu.cc,999xs.com,23us.la,booktxt.net)",
+			Value: "vbiquge.com",
+			Usage: "定义下载ebook的网站地址(可选择vbiquge.com,biduo.cc,xixiwx.com,biquwu.cc,999xs.com,23us.la,booktxt.net)",
 		},
 		cli.StringFlag{
 			Name:  "bookid,id",

diff --git a/ebook-sources/xsbiquge.go b/ebook-sources/xsbiquge.go
@@ -22,7 +22,7 @@ type XSBiquge struct {
 // NewXSBiquge 初始化
 func NewXSBiquge() XSBiquge {
 	return XSBiquge{
-		URL:  "https://www.xsbiquge.com",
+		URL:  "https://www.vbiquge.com/",
 		Lock: new(sync.Mutex),
 	}
 }

diff --git a/go.mod b/go.mod
@@ -6,6 +6,7 @@ require (
 	github.com/Aiicy/htmlquery v0.0.0-20191217151354-e656ce3100dc
 	github.com/AllenDang/giu v0.0.0-20200122082656-c72804e6577a
 	github.com/Chain-Zhang/pinyin v0.1.3
+	github.com/PuerkitoBio/goquery v1.6.1
 	github.com/ajvb/kala v0.3.2
 	github.com/akavel/rsrc v0.8.0 // indirect
 	github.com/antchfx/xpath v1.1.4 // indirect
@@ -16,6 +17,7 @@ require (
 	github.com/chromedp/cdproto v0.0.0-20201204063249-be40c824ad18
 	github.com/chromedp/chromedp v0.5.4
 	github.com/dgrijalva/jwt-go v3.2.0+incompatible
+	github.com/djimenez/iconv-go v0.0.0-20160305225143-8960e66bd3da
 	github.com/gin-gonic/gin v1.5.0
 	github.com/goki/freetype v0.0.0-20181231101311-fa8a33aabaff
 	github.com/hidapple/isbn-gen v1.0.0
@@ -29,7 +31,6 @@ require (
 	github.com/visualfc/goqt v0.0.0-20160901223124-8c774d799233
 	go.etcd.io/bbolt v1.3.4
 	golang.org/x/image v0.0.0-20200119044424-58c23975cae1 // indirect
-	golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa // indirect
 	gopkg.in/dgrijalva/jwt-go.v3 v3.2.0 // indirect
 	gopkg.in/ini.v1 v1.51.1
 	gopkg.in/urfave/cli.v1 v1.20.0

diff --git a/go.sum b/go.sum
@@ -7,11 +7,15 @@ github.com/Chain-Zhang/pinyin v0.1.3 h1:RzErNyNwVa8z2sOLCuXSOtVdY/AsARb8mBzI2p2q
 github.com/Chain-Zhang/pinyin v0.1.3/go.mod h1:5iHpt9p4znrnaP59/hfPMnAojajkDxQaP9io+tRMPho=
 github.com/DATA-DOG/go-sqlmock v1.3.0/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM=
 github.com/DataDog/zstd v1.4.1/go.mod h1:1jcaCB/ufaK+sKp1NBhlGmpz41jOoPQ35bpF36t7BBo=
+github.com/PuerkitoBio/goquery v1.6.1 h1:FgjbQZKl5HTmcn4sKBgvx8vv63nhyhIpv7lJpFGCWpk=
+github.com/PuerkitoBio/goquery v1.6.1/go.mod h1:GsLWisAFVj4WgDibEWF4pvYnkVQBpKBKeU+7zCJoLcc=
 github.com/Sereal/Sereal v0.0.0-20190618215532-0b8ac451a863/go.mod h1:D0JMgToj/WdxCgd30Kc1UcA9E+WdZoJqeVOuYW7iTBM=
 github.com/ajvb/kala v0.3.2 h1:ziBQLI9l8EUD3gE29xtv+qCEAIPsAgdd9EVP2u57QU4=
 github.com/ajvb/kala v0.3.2/go.mod h1:soqYR/d34mwKEI585kNB2rukRQnkPyU7dAmjGCfxZMc=
 github.com/akavel/rsrc v0.8.0 h1:zjWn7ukO9Kc5Q62DOJCcxGpXC18RawVtYAGdz2aLlfw=
 github.com/akavel/rsrc v0.8.0/go.mod h1:uLoCtb9J+EyAqh+26kdrTgmzRBFPGOolLWKpdxkKq+c=
+github.com/andybalholm/cascadia v1.1.0 h1:BuuO6sSfQNFRu1LppgbD25Hr2vLYW25JvxHs5zzsLTo=
+github.com/andybalholm/cascadia v1.1.0/go.mod h1:GsXiBklL0woXo1j/WYWtSYYC4ouU9PqHO0sqidkEA4Y=
 github.com/antchfx/xpath v1.1.4 h1:naPIpjBGeT3eX0Vw7E8iyHsY8FGt6EbGdkcd8EZCo+g=
 github.com/antchfx/xpath v1.1.4/go.mod h1:Yee4kTMuNiPYJ7nSNorELQMr1J33uOpXDMByNYhvtNk=
 github.com/appleboy/gin-jwt v2.5.0+incompatible h1:oLQTP1fiGDoDKoC2UDqXD9iqCP44ABIZMMenfH/xCqw=
@@ -47,6 +51,8 @@ github.com/dchest/siphash v1.1.0 h1:1Rs9eTUlZLPBEvV+2sTaM8O0NWn0ppbgqS7p11aWawI=
 github.com/dchest/siphash v1.1.0/go.mod h1:q+IRvb2gOSrUnYoPqHiyHXS0FOBBOdl6tONBlVnOnt4=
 github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM=
 github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
+github.com/djimenez/iconv-go v0.0.0-20160305225143-8960e66bd3da h1:0qwwqQCLOOXPl58ljnq3sTJR7yRuMolM02vjxDh4ZVE=
+github.com/djimenez/iconv-go v0.0.0-20160305225143-8960e66bd3da/go.mod h1:ns+zIWBBchgfRdxNgIJWn2x6U95LQchxeqiN5Cgdgts=
 github.com/garyburd/redigo v1.0.1-0.20170208211623-48545177e92a/go.mod h1:NR3MbYisc3/PwhQ00EMzDiPmrwpPxAn5GI05/YaO1SY=
 github.com/gin-contrib/sse v0.0.0-20190301062529-5545eab6dad3/go.mod h1:VJ0WA2NBN22VlZ2dKZQPAPnyWw5XTlK1KymzLKsr59s=
 github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE=
@@ -181,13 +187,16 @@ go.etcd.io/bbolt v1.3.4/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/image v0.0.0-20200119044424-58c23975cae1 h1:5h3ngYt7+vXCDZCup/HkCQgW5XwmSvR/nA2JmJ0RErg=
 golang.org/x/image v0.0.0-20200119044424-58c23975cae1/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
+golang.org/x/net v0.0.0-20180218175443-cbe0f9307d01/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181011144130-49bb7cea24b1/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20191105084925-a882066a44e0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa h1:F+8P+gmewFQYRk6JoLQLwjBCTu3mcIURZfNkVweuRKA=
 golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200202094626-16171245cfb2 h1:CCH4IOTTfewWjGOlSp+zGcjutRKlBEZQ6wTn8ozI/nI=
+golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/sys v0.0.0-20161023150541-c200b10b5d5e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=

diff --git a/gui/README.md b/gui/README.md
diff --git a/gui/bindata.go b/gui/bindata.go
diff --git a/gui/build.sh b/gui/build.sh
diff --git a/gui/build_x32.cmd b/gui/build_x32.cmd
diff --git a/gui/build_x32.ps1 b/gui/build_x32.ps1
diff --git a/gui/build_x64.cmd b/gui/build_x64.cmd
diff --git a/gui/build_x64.ps1 b/gui/build_x64.ps1
diff --git a/gui/config.go b/gui/config.go
diff --git a/gui/ebd.png b/gui/ebd.png
diff --git a/gui/ebd_gui.png b/gui/ebd_gui.png