Merge branch 'dev' into 'master'

小幅度重构

See merge request !8
2 jobs for master
Status Name Job ID Coverage
  Build
failed pages #6886

01:00:00

failed pages #6855

 
Name Stage Failure
failed
pages Build The script exceeded the maximum execution time set for the job
Running with gitlab-runner 13.9.0 (2ebc4dc4)
on linux-docker-1 D4Cxz9Wo
Resolving secrets
Preparing the "docker" executor
Using Docker executor with image ruby ...
WARNING: Container based cache volumes creation is disabled. Will not create volume for "/cache"
Pulling docker image ruby ...
WARNING: Failed to pull image with policy "always": context deadline exceeded (manager.go:205:3599s)
ERROR: Job failed: execution took longer than 1h0m0s seconds