Merge branch 'test'

Conflicts:
	conf/app.conf
	upload/upload.go
3 jobs from master in 11 seconds (queued for 32 seconds)
Status Job ID Name Coverage
  Build
failed #35728
ppt-server-shell
docker-build

00:11

failed #35726
ppt-server-shell
docker-build

00:15

 
  Deploy
skipped #35727
ppt-server-shell
k8s-deploy
 
Build docker-build
go: finding github.com/streadway/amqp v1.0.0
go: finding github.com/xxjwxc/public v0.0.0-20210518123934-6cc0965f0bc5
go: finding gopkg.in/eapache/queue.v1 v1.1.0
# ppt_server/upload
upload/upload.go:43:2: undefined: once
upload/upload.go:45:3: undefined: syncPool
upload/upload.go:46:3: undefined: syncPool
The command '/bin/sh -c cd /tmp/develop && go build -o /tmp/ppt-server main.go' returned a non-zero code: 2
ERROR: Job failed: exit status 1