Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
P
ppt_server
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Li Feifei
ppt_server
Commits
dccfaf2d
Commit
dccfaf2d
authored
Jul 28, 2021
by
Li Feifei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
减少无效日志打印
parent
15597eed
Pipeline
#15690
passed with stages
in 33 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
7 deletions
+8
-7
file_upload.go
packed/file/file_upload.go
+8
-7
No files found.
packed/file/file_upload.go
View file @
dccfaf2d
...
...
@@ -130,8 +130,6 @@ func (f *ObtainFile) taskJob(file *zip.File) ([]interface{}, error) {
info
:=
img
.
Bounds
()
imageInfo
:=
[]
interface
{}{
replaceName
,
info
.
Max
.
X
,
info
.
Max
.
Y
}
g
.
Log
()
.
Async
()
.
Infof
(
"Upload picture file: %s Success"
,
replaceName
)
return
imageInfo
,
oss
.
Upload
(
f
.
parser
.
splitUploadPath
()
+
"images/"
+
replaceName
,
fileReader
)
}
...
...
@@ -159,6 +157,7 @@ func (f *ObtainFile) uploadPicture() error {
defer
reader
.
Close
()
pool
:=
workpool
.
New
(
100
)
for
_
,
file
:=
range
reader
.
File
{
pool
.
DoWait
(
func
()
error
{
return
f
.
task
(
file
)
...
...
@@ -189,9 +188,9 @@ func (f *ObtainFile) Worker(err error) {
if
err
!=
nil
{
g
.
Log
()
.
Async
()
.
Error
(
err
)
f
.
err
<-
err
}
else
{
f
.
ok
<-
true
return
}
f
.
ok
<-
true
}()
if
err
!=
nil
{
return
...
...
@@ -200,23 +199,25 @@ func (f *ObtainFile) Worker(err error) {
if
err
=
f
.
fileInfo
();
err
!=
nil
{
return
}
g
.
Log
()
.
Async
()
.
Infof
(
"file: %s file info complete"
,
f
.
parser
.
name
)
g
.
Log
()
.
Async
()
.
Infof
(
"
[1]
file: %s file info complete"
,
f
.
parser
.
name
)
// 下载ZIP包
if
err
=
http
.
Download
(
f
.
splitDownloadLink
(),
f
.
parser
.
splitTempZipLink
());
err
!=
nil
{
return
}
g
.
Log
()
.
Async
()
.
Infof
(
"file: %s Zip Donwload Complete"
,
f
.
parser
.
filename
())
g
.
Log
()
.
Async
()
.
Infof
(
"
[2]
file: %s Zip Donwload Complete"
,
f
.
parser
.
filename
())
// 解析ZIP包并上传图片到OSS
if
err
=
f
.
uploadPicture
();
err
!=
nil
{
return
}
g
.
Log
()
.
Async
()
.
Infof
(
"[3] picture upload oss success"
)
// 上传packed.json到oss
if
err
=
f
.
uploadPacked
();
err
!=
nil
{
return
}
g
.
Log
()
.
Async
()
.
Infof
(
"filename: %s upload success!"
,
f
.
parser
.
name
)
g
.
Log
()
.
Async
()
.
Infof
(
"
[4]
filename: %s upload success!"
,
f
.
parser
.
name
)
}
func
(
f
*
ObtainFile
)
FileName
()
string
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment