From 64a58be53d10e1ef6427dce190ff87b0dde8d1bd Mon Sep 17 00:00:00 2001
From: Lxxyx <Lxxyxzj@gmail.com>
Date: Fri, 16 Mar 2018 21:23:15 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E9=98=B2=E6=AD=A2=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 gulpfile.js             |  77 ++++++++++++++++++++++++----------------
 src/pdf/LxxyxResume.pdf | Bin 943207 -> 943207 bytes
 2 files changed, 47 insertions(+), 30 deletions(-)

diff --git a/gulpfile.js b/gulpfile.js
index 20b8053..6c7fd3e 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -9,46 +9,55 @@ const fs = require('fs')
 const connect = require('gulp-connect')
 const generatePdf = require('./generate_pdf')
 
-gulp.task('resume-sass', function () {
-  gulp.src('src/scss/resume.scss')
+gulp.task('resume-sass', () => {
+  gulp
+    .src('src/scss/resume.scss')
     .pipe(sass().on('error', sass.logError))
-    .pipe(autoprefixer({
-      browsers: ['last 4 versions'],
-      cascade: false
-    }))
+    .pipe(
+      autoprefixer({
+        browsers: ['last 4 versions'],
+        cascade: false
+      })
+    )
     .pipe(gulp.dest('dist/css/'))
     .pipe(connect.reload())
 })
 
-gulp.task('icon-sass', function () {
-  gulp.src('src/scss/iconfont.scss')
+gulp.task('icon-sass', () => {
+  gulp
+    .src('src/scss/iconfont.scss')
     .pipe(sass().on('error', sass.logError))
-    .pipe(autoprefixer({
-      browsers: ['last 4 versions'],
-      cascade: false
-    }))
+    .pipe(
+      autoprefixer({
+        browsers: ['last 4 versions'],
+        cascade: false
+      })
+    )
     .pipe(gulp.dest('dist/iconfont/'))
     .pipe(connect.reload())
 })
 
-gulp.task('sass:watch', function () {
+gulp.task('sass:watch', () => {
   gulp.watch('./src/scss/resume.scss', ['resume-sass'])
   gulp.watch('./src/scss/iconfont.scss', ['icon-sass'])
   gulp.watch('./src/scss/components/*.scss', ['resume-sass'])
 })
 
-gulp.task('json2jade', function () {
-  var info = JSON.parse(fs.readFileSync('./info.json', 'utf-8'))
-  var locals = highlight(info)
-  gulp.src('./src/jade/index.jade')
-    .pipe(jade({
-      locals: locals
-    }))
+gulp.task('json2jade', () => {
+  const info = JSON.parse(fs.readFileSync('./info.json', 'utf-8'))
+  const locals = highlight(info)
+  gulp
+    .src('./src/jade/index.jade')
+    .pipe(
+      jade({
+        locals
+      })
+    )
     .pipe(gulp.dest('./dist/'))
     .pipe(connect.reload())
 })
 
-gulp.task('json2jade:watch', function () {
+gulp.task('json2jade:watch', () => {
   gulp.watch('./info.json', ['json2jade'])
 })
 
@@ -58,7 +67,7 @@ function src2dist(dir) {
 
 function highlight(locals) {
   var locals = JSON.stringify(locals)
-  var re = /`(.+?)`/g
+  const re = /`(.+?)`/g
   locals = locals.replace(re, '<strong>$1</strong>')
   return JSON.parse(locals)
 }
@@ -74,19 +83,27 @@ gulp.task('clean', () => {
   rimrafPromise('./dist/')
 })
 
-gulp.task('deploy', function () {
-  return gulp.src('./dist/**/*')
-    .pipe(ghPages({
+gulp.task('deploy', () =>
+  gulp.src('./dist/**/*').pipe(
+    ghPages({
       remoteUrl: 'git@github.com:Lxxyx/lxxyx.github.io.git',
       branch: 'master'
-    }))
+    })
+  )
+)
+
+let port = 9000
+
+// 避免打印时，同时运行开发服务报错
+gulp.task('set-pdf-port', () => {
+  port = 9001
 })
 
-gulp.task('webserver', function () {
+gulp.task('webserver', () => {
   connect.server({
     root: './dist',
     livereload: true,
-    port: 9000
+    port
   })
 })
 
@@ -94,8 +111,8 @@ gulp.task('dev', ['default', 'json2jade:watch', 'sass:watch', 'webserver'])
 
 gulp.task('default', ['icon-sass', 'resume-sass', 'json2jade', 'copy'])
 
-gulp.task('pdf', ['default', 'webserver'], async () => {
-  await generatePdf('http://localhost:9000')
+gulp.task('pdf', ['set-pdf-port', 'default', 'webserver'], async () => {
+  await generatePdf('http://localhost:9001')
   connect.serverClose()
   process.exit(0)
 })
diff --git a/src/pdf/LxxyxResume.pdf b/src/pdf/LxxyxResume.pdf
index 3ad5b58b19cfb8a7917efaaf675993824ee475e8..ca6e55f182ae24167d4aed39a331c58fdb5412e4 100644
GIT binary patch
delta 96
zcmaEU!t(hE%L(zChQ>xlM&{ZE2I@eh$))d`pW>2OlB%HLVr67tXklP%Xa-Tz*wNa-
u*xJF=+QHn~!P45n+S<X^+QHu1!O_~m+1kO?+QHr0!PDBoyS0Pwelh^J?;m*p

delta 96
zcmaEU!t(hE%L(zC2Ihulh8Efe2I@eh$))d`pW>2OlB%HLVr67tXklP%Xa-Tz*wNa-
u*xJF=+QHn~!P45n+S<X^+QHu1!O_~m+1kO?+QHr0!PDBoyS0Pwelh^N6CZ^D

-- 
GitLab