Merge branch 'master' of github.com:wallace5303/electron-egg

# Conflicts:
#	app/controller/v1/example.js
#	app/router/example.js
#	app/service/example.js
#	frontend/src/api/main.js
#	frontend/src/config/router.config.js
#	frontend/src/views/Layout.vue
#	frontend/src/views/file/OpenDir.vue
#	frontend/src/views/file/UploadFile.vue