Skip to content

Commit

Permalink
第三次更新
Browse files Browse the repository at this point in the history
  • Loading branch information
@user1121114685
user1121114685 committed Feb 21, 2021
1 parent 5e174d8 commit 4d0e2b7
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 16 deletions.
Binary file modified 115sha1_64位.zip
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion build.bat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ echo %buildtime%>./version.txt

go build -ldflags "-X main.Version=%buildtime%"


del 115sha1_64λ.zip
zip -q 115sha1_64λ.zip 115sha1.exe
del 115sha1.exe
rmdir /s/q logs
2 changes: 1 addition & 1 deletion go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ require (
github.com/chromedp/cdproto v0.0.0-20210211211551-bf465a41a1f9
github.com/chromedp/chromedp v0.6.5
github.com/flopp/go-findfont v0.0.0-20201114153133-e7393a00c15b
github.com/gawwo/fake115-go v0.0.0-20210216130757-24cd2a1f04c6
github.com/gawwo/fake115-go v0.0.0-20210221044341-088364981dea
github.com/gogf/gf v1.15.3
github.com/mattn/go-runewidth v0.0.10 // indirect
github.com/tidwall/gjson v1.6.8
Expand Down
8 changes: 2 additions & 6 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWo
github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
github.com/fyne-io/mobile v0.1.2 h1:0HaXDtOOwyOTn3Umi0uKVCOgJtfX73c6unC4U8i5VZU=
github.com/fyne-io/mobile v0.1.2/go.mod h1:/kOrWrZB6sasLbEy2JIvr4arEzQTXBTZGb3Y96yWbHY=
github.com/gawwo/fake115-go v0.0.0-20210216130757-24cd2a1f04c6 h1:wjQSMexF5pvf8JGKBYNlL2obiSZPIVptGU+xyJToYPw=
github.com/gawwo/fake115-go v0.0.0-20210216130757-24cd2a1f04c6/go.mod h1:zb17UeGBBv+kB3ukJxrRwIagRekz2q1YuJHTxXhj9dA=
github.com/gawwo/fake115-go v0.0.0-20210221044341-088364981dea h1:2Als4YLImA11oMDj0DKAGcEzJTqd/s7ftGWJ7lD3Gsk=
github.com/gawwo/fake115-go v0.0.0-20210221044341-088364981dea/go.mod h1:zb17UeGBBv+kB3ukJxrRwIagRekz2q1YuJHTxXhj9dA=
github.com/go-gl/gl v0.0.0-20190320180904-bf2b1f2f34d7 h1:SCYMcCJ89LjRGwEa0tRluNRiMjZHalQZrVrvTbPh+qw=
github.com/go-gl/gl v0.0.0-20190320180904-bf2b1f2f34d7/go.mod h1:482civXOzJJCPzJ4ZOX/pwvXBWSnzD4OKMdH4ClKGbk=
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200625191551-73d3c3675aa3 h1:q521PfSp5/z6/sD9FZZOWj4d1MLmfQW8PkRnI9M6PCE=
Expand Down Expand Up @@ -91,7 +91,6 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+
github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4=
github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0=
github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
Expand Down Expand Up @@ -130,7 +129,6 @@ golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e h1:3G+cUijn7XD+S4eJFddp53Pv7+slrESplyjG25HgL+k=
golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
golang.org/x/net v0.0.0-20201031054903-ff519b6c9102 h1:42cLlJJdEh+ySyeUUbEQ5bsTiq8voBeTuweGVkY6Puw=
golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
Expand All @@ -140,13 +138,11 @@ golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5h
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200720211630-cb9d2d5c5666 h1:gVCS+QOncANNPlmlO1AhlU3oxs4V9z+gTtPwIk3p2N8=
golang.org/x/sys v0.0.0-20200720211630-cb9d2d5c5666/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210122093101-04d7465088b8 h1:de2yTH1xuxjmGB7i6Z5o2z3RCHVa0XlpSZzjd8Fe6bE=
golang.org/x/sys v0.0.0-20210122093101-04d7465088b8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.3.4 h1:0YWbFKbhXG/wIiuHDSKpS0Iy7FSA+u45VtBMfQcFTTc=
Expand Down
15 changes: 8 additions & 7 deletions main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ func inputBoxChoose() {
widget.NewLabel("选择导入目录请在Chrome浏览器上进行\r\n按f5刷新，确认导入目录"),

//content := fdw.SetContent(container.NewVBox(
widget.NewButton("选择需要导入的Json文件", func() {
widget.NewButton("选择需要导入的Json文件或者TXT文件", func() {

fd := dialog.NewFileOpen(func(reader fyne.URIReadCloser, err error) {
if err == nil && reader == nil {
Expand All @@ -215,14 +215,15 @@ func inputBoxChoose() {
fd.Show()

}),

widget.NewLabel("导入1次后崩溃，请重新打开软件，下版本修复"),
widget.NewLabel("导入1次后崩溃，请重新打开软件，下版本修复"),
//开始导入
widget.NewButton("开始导入", func() {
if JsonData == "" {
err := errors.New("请先选择 需要导入的Json文件")
dialog.ShowError(err, fdw)
} else if MyFolderChoose == "" {
err := errors.New("请先选择 需要导入到115的目录")
err := errors.New("请在Chrome 中选择导入到115的目录，按刷新(F5)")
dialog.ShowError(err, fdw)
} else {

Expand Down Expand Up @@ -322,7 +323,7 @@ func outputBoxChoose() {
//开始导入
widget.NewButton("开始导出", func() {
if MyFolderChoose == "" {
err := errors.New("请先选择 需要导出的115目录")
err := errors.New("请在Chrome 中选择导出到115的目录，按刷新(F5)")
dialog.ShowError(err, fdw)
} else {
//dir, _ := os.Getwd()
Expand Down Expand Up @@ -430,12 +431,12 @@ func main() {
// 窗口大小
w.Resize(fyne.NewSize(200, 600))

hello := widget.NewLabel("这是我的第一个GUI程序，运行本程序需要安装Chrome")
hello := widget.NewLabel(" 这是我的第一个GUI程序\r\n 运行本程序需要安装Chrome")

// 第一个按钮
w.SetContent(container.NewVBox(
hello,
widget.NewLabel(""),

// widget.NewLabel("版本号 2021年2月6日16:04:35"),
// widget.NewLabel(""),
widget.NewButton("1.登陆", func() {
Expand All @@ -457,7 +458,7 @@ func main() {
}

}),
widget.NewLabel("导入1次后崩溃，请重新打开软件，下版本修复"),

widget.NewButton("3.导入", func() {
if CooKie_115 == "" {
err := errors.New("你还没登陆，我猜你不知道需要先登陆")
Expand Down
2 changes: 1 addition & 1 deletion version.txt
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
20210219215450
20210221133511

0 comments on commit 4d0e2b7

Please sign in to comment.