merge

client/.config.dev.js

 module.exports = {
   domain: 'dev.ezijing.com',
-  url: 'http://dev.ezijing.com:4002/api',
-  // apiBaseURL: '//demo-login.ezijing.com/'
+  url: 'https://kelley-learning2.ezijing.com/api',
+  apiBaseURL: '/',
   others: {
-    url: '/app/learn/course'
+    url: '/app/learn/course',
+    loginUrl: 'https://login2.ezijing.com/kelley/login/index'
   },
   webpack: {
     externals: {
-      'CKEDITOR': 'window.CKEDITOR',
-      'VideoJs': 'window.swfobject',
-      'Base64': 'window.Base64',
-      'md5': 'window.md5',
-      'regeneratorRuntime': 'window.regeneratorRuntime',
-      '$': 'window.$',
-      'Aliplayer': 'window.Aliplayer',
-      'AliPlayerComponent': 'window.AliPlayerComponent'
+      CKEDITOR: 'window.CKEDITOR',
+      VideoJs: 'window.swfobject',
+      Base64: 'window.Base64',
+      md5: 'window.md5',
+      regeneratorRuntime: 'window.regeneratorRuntime',
+      $: 'window.$',
+      Aliplayer: 'window.Aliplayer',
+      AliPlayerComponent: 'window.AliPlayerComponent'
       // 'sentNotify': 'window.sentNotify',
     }
   },
-  ProvidePlugin: {
-
-  }
+  ProvidePlugin: {}
 }

client/.config.pro.js

 module.exports = {
-  url: '//api.ezijing.com',
+  url: '/',
   DesDir: '../client-dist',
-  apiBaseURL: '/api',
+  apiBaseURL: '/',
   others: {
-    url: '/app/learn/course'
+    url: '/app/learn/course',
+    loginUrl: 'https://login.ezijing.com/kelley/login/index'
   },
   webpack: {
     externals: {
-      'CKEDITOR': 'window.CKEDITOR',
-      'VideoJs': 'window.swfobject',
-      'Base64': 'window.Base64',
-      'md5': 'window.md5',
-      'regeneratorRuntime': 'window.regeneratorRuntime',
-      '$': 'window.$',
-      'Aliplayer': 'window.Aliplayer',
-      'AliPlayerComponent': 'window.AliPlayerComponent'
+      CKEDITOR: 'window.CKEDITOR',
+      VideoJs: 'window.swfobject',
+      Base64: 'window.Base64',
+      md5: 'window.md5',
+      regeneratorRuntime: 'window.regeneratorRuntime',
+      $: 'window.$',
+      Aliplayer: 'window.Aliplayer',
+      AliPlayerComponent: 'window.AliPlayerComponent'
       // 'sentNotify': 'window.sentNotify',
     }
   },
-  ProvidePlugin: {
-
-  }
+  ProvidePlugin: {}
 }

client/.config.test.js

 module.exports = {
-  url: '//api.ezijing.com',
+  url: '/',
   DesDir: '../client-dist',
-  apiBaseURL: '/api',
+  apiBaseURL: '/',
   others: {
-    url: '/app/learn/course'
+    url: '/app/learn/course',
+    loginUrl: 'https://login2.ezijing.com/kelley/login/index'
   },
   isUploadStatic: false,
   webpack: {
     externals: {
-      'CKEDITOR': 'window.CKEDITOR',
-      'VideoJs': 'window.swfobject',
-      'Base64': 'window.Base64',
-      'md5': 'window.md5',
-      'regeneratorRuntime': 'window.regeneratorRuntime',
-      '$': 'window.$',
-      'Aliplayer': 'window.Aliplayer',
-      'AliPlayerComponent': 'window.AliPlayerComponent'
+      CKEDITOR: 'window.CKEDITOR',
+      VideoJs: 'window.swfobject',
+      Base64: 'window.Base64',
+      md5: 'window.md5',
+      regeneratorRuntime: 'window.regeneratorRuntime',
+      $: 'window.$',
+      Aliplayer: 'window.Aliplayer',
+      AliPlayerComponent: 'window.AliPlayerComponent'
       // 'sentNotify': 'window.sentNotify',
     }
   },
-  ProvidePlugin: {
-
-  }
+  ProvidePlugin: {}
 }

client/build/checkNodeVersion.js

+
+var semver = require('semver')
+
+var requiredVersion = require('../package.json').engines.node
+function checkNodeVersion (wanted, id) {
+  if (!semver.satisfies(process.version, wanted)) {
+    console.log('\x1b[91m%s\x1B[0m',
+      'You are using Node ' + process.version + ', but this version of ' + id +
+      ' requires Node ' + wanted + '.\nPlease upgrade your Node version.'
+    )
+    process.exit(1)
+  }
+}
+
+checkNodeVersion(requiredVersion, '`node uploadAliyunCDN.js`')

client/build/config.js

 const isDev = process.env.NODE_ENV
+const RegStrs = require('./regExpStr.js')
 
 let config = {
   isDev: isDev,
@@ -12,6 +13,8 @@ let config = {
 
   isHttps: true,
 
+  isEnableToIphoneDebugger: false,
+
   CDN_BASE: 'https://zws-imgs-pub.ezijing.com/',
   CDN_DIR: 'static/build/learn-kelley/',
   isUploadStatic: false,
@@ -19,10 +22,12 @@ let config = {
   webpack: {}
 }
 
+config.RegStrs = RegStrs
+
 let vueClientConfig = {}
-config.domain = 'dev.ezijing.com'
+config.domain = ''
 if (config.isDev === 'development') {
-  config.url = 'http://dev.ezijing.com:12002'
+  config.url = 'http://' + config.domain + ':12002'
   try {
     vueClientConfig = require('../.config.dev.js')
   } catch (error) {

client/build/dev.ezijing.com.key

+-----BEGIN RSA PRIVATE KEY-----
+MIIEowIBAAKCAQEAgddAmdjWL+4JUXvmiR/lr9cbdoctEGLwdLpnIrRlL/oVKubZ
+TrASed5pA2kHKUbbV9i64iNIzn668ziytivudRiuGL4wBTPdtlpkSty9ij0ZHZXe
+23oWQ73fV3FNROp3ekLmIYHqo2ep5hhfq1A4Sey7IM1Z0A9OF6MV7Tgqm+8a6Fy4
+eNbgx99f0n7nquGjYZ3RcnU0j6xzfQhOqOYmhk4flQqSx6Mb6sSmWM7V4/h/554L
+QyJNV3ngNfT3ZFmAmhIZt7n+o3svzIqwghiZSj0K9jyE7zbSZjVUBEQztFUcfYgP
+ZQfZFFsdgIkFSvR3cXIpIiN8oPf8xK6naApOXwIDAQABAoIBAHKlKKJvZvgdO1ca
+ir1rT7jKu7IVu4GritvWtzhahrotHEGsYhZru3SmIJ1lQHB+4zAW6zS/qQrDtbkK
+yCm4cq4sI5UvYWFGoa7g84tyi12jgyiva37ptv0Li0g/f9WpHePzbBYMC61K3CaS
+QO8YPwtvHu/gwjvHN9IBK1wxatYRriAfR6CF2+pfZXhlq3nprc0z9YypExLg2Swa
+ML1uQGLObDHAFKheVFYOgWOncMbG5eXNV9mdfzoUuc+mkENDtynQUTzI2ZM4OZFr
+uMjto7y4RLFu463Rg0ijg2MXL4FbygzclaePNL7YBS6wed0Z8cE26FvbG5vM//Qc
+qYK+WBECgYEA0FdJ7tPzgBvn4VsvBBdA8gmmFmmD/TJxehrxAwn/x0QkcZa6ngxJ
+ScgcicJ2OSM049zId35KA4OV7aGUC6QKdG6JbL00Wqg9xWbsHiiB9XzV1iDghTug
+35cDWhRN8SnMgBhQ85l5ps8NJuLS/fqLBK0/yeE54mkWKqvD4JS39KcCgYEAn4rl
+Uc4PQ/xkgCKCTOCIYmzvDUuZcS0pA0MU/uJ/aQIwaJFanIehczs6Wg/Gb0YhKx0h
+cMDuvZYY2XjbCic8eDNE7ED0hUHBAa8VAQZwS22ds/qNoooCO5UcHPRevenb/dIk
+oKQTrI+4e5izQtuV3YLJMeH5Ba9bUP45iaZDt4kCgYEAnBGnmrc/46oD7HdoIwJg
+bm/38TYd3+CXzUa9YO9uohFT05t8NMUzaYf0iOYZtfe/uSo9KfZ672L1P0wZIRdD
+lbDwVXru6zK5A1V0b6scn49iiMOcLXJbsuLnaeVn9c7AGP0eNz2zOdhFG+oy8Htt
+BJXcARktSYQ7TL/bPjNqEmUCgYB54o8XVCltcyEEk1igitkm+LoYmiz7vdibWWBs
+6XUVMErzWDi1ZRj/A7ysmWisEhO88GBf18WMqWMKob4Vn6we2GxLYcRtGbLuKmgN
+hHG97lyQ51XVW0IhauUzaa4HwOYEn8rDvxYYuyPhqOMqrL9tn0E+DrlEkpdc5Rvo
+AVGyoQKBgGYvAeoKrdkfLUUnvRBIju9/bg5H6t1MY8lYi4WEnL+aPn056LV43LU9
++gF7+S7f8Er6WiJCCb7laYeDyC5adqnF/fI//4iNsarid86blirXfJMSfTG+GkZM
+OEBHd/sX0IbRUt6MCxiG3Znmdpny3/MG4CegPMtdohQktQEAS2yJ
+-----END RSA PRIVATE KEY-----

client/build/dev.ezijing.com.pem

+-----BEGIN CERTIFICATE-----
+MIIFiDCCBHCgAwIBAgIQAepAKb4wAxmrtof7BwPQSDANBgkqhkiG9w0BAQsFADBu
+MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
+d3cuZGlnaWNlcnQuY29tMS0wKwYDVQQDEyRFbmNyeXB0aW9uIEV2ZXJ5d2hlcmUg
+RFYgVExTIENBIC0gRzEwHhcNMTkxMTA4MDAwMDAwWhcNMjAxMTA3MTIwMDAwWjAa
+MRgwFgYDVQQDEw9kZXYuZXppamluZy5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IB
+DwAwggEKAoIBAQCB10CZ2NYv7glRe+aJH+Wv1xt2hy0QYvB0umcitGUv+hUq5tlO
+sBJ53mkDaQcpRttX2LriI0jOfrrzOLK2K+51GK4YvjAFM922WmRK3L2KPRkdld7b
+ehZDvd9XcU1E6nd6QuYhgeqjZ6nmGF+rUDhJ7LsgzVnQD04XoxXtOCqb7xroXLh4
+1uDH31/Sfueq4aNhndFydTSPrHN9CE6o5iaGTh+VCpLHoxvqxKZYztXj+H/nngtD
+Ik1XeeA19PdkWYCaEhm3uf6jey/MirCCGJlKPQr2PITvNtJmNVQERDO0VRx9iA9l
+B9kUWx2AiQVK9HdxcikiI3yg9/zErqdoCk5fAgMBAAGjggJ0MIICcDAfBgNVHSME
+GDAWgBRVdE+yck/1YLpQ0dfmUVyaAYca1zAdBgNVHQ4EFgQU28ndXe6qIDlhPWX5
++gzJoRhaQQowGgYDVR0RBBMwEYIPZGV2LmV6aWppbmcuY29tMA4GA1UdDwEB/wQE
+AwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwTAYDVR0gBEUwQzA3
+BglghkgBhv1sAQIwKjAoBggrBgEFBQcCARYcaHR0cHM6Ly93d3cuZGlnaWNlcnQu
+Y29tL0NQUzAIBgZngQwBAgEwgYAGCCsGAQUFBwEBBHQwcjAkBggrBgEFBQcwAYYY
+aHR0cDovL29jc3AuZGlnaWNlcnQuY29tMEoGCCsGAQUFBzAChj5odHRwOi8vY2Fj
+ZXJ0cy5kaWdpY2VydC5jb20vRW5jcnlwdGlvbkV2ZXJ5d2hlcmVEVlRMU0NBLUcx
+LmNydDAJBgNVHRMEAjAAMIIBBQYKKwYBBAHWeQIEAgSB9gSB8wDxAHYApLkJkLQY
+WBSHuxOizGdwCjw1mAT5G9+443fNDsgN3BAAAAFuSnTaJgAABAMARzBFAiEAtYCW
+PLYE6pylBOsB1MmETgxGpYrG64Osn/XXyJlh+/UCIEnttMCBvNif4hpJfAQibP/Q
+bJ9w0VYC59hi8Tmcf/mfAHcAXqdz+d9WwOe1Nkh90EngMnqRmgyEoRIShBh1loFx
+RVgAAAFuSnTZSQAABAMASDBGAiEAsMgDWdSJ5d2jiXoNyxJ5FY7+3PET59vgvxi9
+Eev9MwECIQC3sfR8sRWxJg82xH7lIA9sN87p7fLmr+KyhnuAK+2bcjANBgkqhkiG
+9w0BAQsFAAOCAQEAOXMhz5dapVgYoLe23i+rEbBeO648c3cAO11qubqE0b5ie2bY
+4DuatptwiLA47xfSVbFF0Y44cPL1b0zHe+Ki9TpcFP+TQ/+cPD2bPrqovI2uh8Qi
+1RU7baLoYO9t7NxaPXh9RtRLUufJHas7HcWtLw/nPvVi+SuhgiiPytWdVM64dIPz
++nP9YY6wZhp4S/vNw5T7LARaw28xrEPzgCzWoXBUDyLB1slU3A2Uu+vl4lilcVeF
+B/hl/75PWIdlxeRsD2V4TGCg796eL1BTVYEh7+mjvvaft+1/jwofKtGxg34YZHfl
+6M22MuuP1pLviPZEE4ZlPXvltUV/Qq47LvZkTg==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIEqjCCA5KgAwIBAgIQAnmsRYvBskWr+YBTzSybsTANBgkqhkiG9w0BAQsFADBh
+MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
+d3cuZGlnaWNlcnQuY29tMSAwHgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBD
+QTAeFw0xNzExMjcxMjQ2MTBaFw0yNzExMjcxMjQ2MTBaMG4xCzAJBgNVBAYTAlVT
+MRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5j
+b20xLTArBgNVBAMTJEVuY3J5cHRpb24gRXZlcnl3aGVyZSBEViBUTFMgQ0EgLSBH
+MTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALPeP6wkab41dyQh6mKc
+oHqt3jRIxW5MDvf9QyiOR7VfFwK656es0UFiIb74N9pRntzF1UgYzDGu3ppZVMdo
+lbxhm6dWS9OK/lFehKNT0OYI9aqk6F+U7cA6jxSC+iDBPXwdF4rs3KRyp3aQn6pj
+pp1yr7IB6Y4zv72Ee/PlZ/6rK6InC6WpK0nPVOYR7n9iDuPe1E4IxUMBH/T33+3h
+yuH3dvfgiWUOUkjdpMbyxX+XNle5uEIiyBsi4IvbcTCh8ruifCIi5mDXkZrnMT8n
+wfYCV6v6kDdXkbgGRLKsR4pucbJtbKqIkUGxuZI2t7pfewKRc5nWecvDBZf3+p1M
+pA8CAwEAAaOCAU8wggFLMB0GA1UdDgQWBBRVdE+yck/1YLpQ0dfmUVyaAYca1zAf
+BgNVHSMEGDAWgBQD3lA1VtFMu2bwo+IbG8OXsj3RVTAOBgNVHQ8BAf8EBAMCAYYw
+HQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBIGA1UdEwEB/wQIMAYBAf8C
+AQAwNAYIKwYBBQUHAQEEKDAmMCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5kaWdp
+Y2VydC5jb20wQgYDVR0fBDswOTA3oDWgM4YxaHR0cDovL2NybDMuZGlnaWNlcnQu
+Y29tL0RpZ2lDZXJ0R2xvYmFsUm9vdENBLmNybDBMBgNVHSAERTBDMDcGCWCGSAGG
+/WwBAjAqMCgGCCsGAQUFBwIBFhxodHRwczovL3d3dy5kaWdpY2VydC5jb20vQ1BT
+MAgGBmeBDAECATANBgkqhkiG9w0BAQsFAAOCAQEAK3Gp6/aGq7aBZsxf/oQ+TD/B
+SwW3AU4ETK+GQf2kFzYZkby5SFrHdPomunx2HBzViUchGoofGgg7gHW0W3MlQAXW
+M0r5LUvStcr82QDWYNPaUy4taCQmyaJ+VB+6wxHstSigOlSNF2a6vg4rgexixeiV
+4YSB03Yqp2t3TeZHM9ESfkus74nQyW7pRGezj+TC44xCagCQQOzzNmzEAP2SnCrJ
+sNE2DpRVMnL8J6xBRdjmOsC3N6cQuKuRXbzByVBjCqAA8t1L0I+9wXJerLPyErjy
+rMKWaBFLmfK/AHNF4ZihwPGOc7w6UHczBZXH5RFzJNnww+WnKuTPI0HfnVH8lg==
+-----END CERTIFICATE-----

client/build/getSSL.js

+
+const fs = require('fs')
+const path = require('path')
+const request = require('request')
+
+const _conf = require('./config')
+fs.writeFileSync(path.join(__dirname, _conf.domain + '.key'), '', { encoding: 'utf8', mode: 0o755 })
+fs.writeFileSync(path.join(__dirname, _conf.domain + '.pem'), '', { encoding: 'utf8', mode: 0o755 })
+request('https://ssl.godzyx.com/' + _conf.domain + '/' + _conf.domain + '.key?get=allow').pipe(fs.createWriteStream(path.join(__dirname, _conf.domain + '.key')))
+request('https://ssl.godzyx.com/' + _conf.domain + '/' + _conf.domain + '.pem?get=allow').pipe(fs.createWriteStream(path.join(__dirname, _conf.domain + '.pem')))

client/build/regExpStr.js

+/* 由于正则表达式，不能进行跟 gulpfile 中 去注释 在一起 */
+module.exports = {
+  regExp_static: /('|"|`)[\.|\/]*?static\/(.*?\.(png|jpe?g|gif|svg|ico)(\?.*)?)\1/g
+}

client/build/stringReplaceLoader.js

+const _conf = require('./config')
+
+module.exports = function (source) {
+  if (_conf.isDev !== 'development') {
+    return source
+            .replace(_conf.RegStrs.regExp_static, '$1' + _conf.CDN_BASE + _conf.CDN_DIR + 'static/$2$1')
+  } else {
+    return source
+  }
+}

client/build/uploadAliyunCDN.js

-/**
- * 本文件执行，需要 node -v >= v8.11.3
- * 原因：其中使用很多es6新特性，需要高版本才能直接识别并运行
- * 放服务器上 上传慢，而且经常报错（没找到原因），最后改为打包完成后自动上传不在服务器上deploy时再上传了
- */
+
 const fs = require('fs')
 const path = require('path')
 
-// 这个包本身也是用es6语法写的，低版本node编译解析不了
 const OSS = require('ali-oss')
 
 const conf = require('./config')
@@ -18,23 +13,22 @@ const client = new OSS({
   bucket: 'zws-imgs-pub'
 })
 
-/* 定位到对应 public目录下 */
+const headers = {
+  'x-oss-traffic-limit': 8 * 1024 * 100 * 100
+}
+
 const DIR_PATH = path.join(__dirname, '../' + conf.DesDir)
-/* 上传对应目录 */
 const PREFIX_PATH = conf.CDN_DIR
-/* 是否上传static目录 */
 const isUploadStatic = conf.isUploadStatic
 
 let fileCount = 1
-/**
- * 调用接口，单个文件上传
- * @param {string} dirPath 传入对应需要遍历的路径
- * @param {function} callback 加入一个回调方法，执行文件上传
- */
 async function uploadFile (prefixPath, dirFileName) {
   try {
     const upFilePath = prefixPath.replace(new RegExp(DIR_PATH, 'gi'), '') + path.basename(dirFileName)
-    let result = await client.put(prefixPath + path.basename(dirFileName), dirFileName)
+    const result = await client.put(prefixPath + path.basename(dirFileName), dirFileName, {
+      headers,
+      timeout: 600000
+    })
     if (result.res.status === 200) {
       console.log('第' + fileCount++ + '个文件，已上传：' + conf.CDN_BASE + upFilePath)
       return { status: 200 }
@@ -45,24 +39,14 @@ async function uploadFile (prefixPath, dirFileName) {
   }
 }
 
-/**
- * 循环遍历文件，准备上传文件
- * 原生js 遍历方法
- * @param {string} dirPath 传入对应需要遍历的路径
- * @param {function} callback 加入一个回调方法，执行文件上传
- */
 function uploadfiles (dirPath, callback) {
-  /* 根据文件路径读取文件 */
   const files = fs.readdirSync(dirPath)
   files.forEach(function (filename, i) {
     const filedir = path.join(dirPath, filename)
     const info = fs.statSync(filedir)
     if (info.isDirectory()) {
-      /* 确定是否上传 */
       if (!(isUploadStatic ? true : filename !== 'static')) { return }
-      /* 得到对应目录结构 */
       const morePath = filedir.replace(new RegExp(DIR_PATH, 'gi'), '') + '/'
-      /* 递归，如果是文件夹，就继续遍历该文件夹下面的文件 */
       uploadfiles(filedir, function (filedir) {
         uploadFile(path.join(PREFIX_PATH, morePath), filedir)
       })
@@ -77,5 +61,4 @@ function uploadfiles (dirPath, callback) {
   return true
 }
 
-/* 批量上传文件 */
 uploadfiles(DIR_PATH, null)

client/build/webpack.base.conf.js

@@ -7,6 +7,7 @@ const _conf = require('./config')
 const $GLOBAL = {
   isDev: _conf.isDev,
   ResDir: _conf.ResDir,
+  'isEnableToIphoneDebugger': _conf.isEnableToIphoneDebugger,
 
   templatePath: path.resolve(__dirname, '../' + _conf.HtmlPath),
   icoPath: _conf.IcoPath,
@@ -21,9 +22,12 @@ const $GLOBAL = {
   EntryStaticPath: path.resolve(__dirname, '../' + 'static'),
   OutputStaticPath: path.resolve(__dirname, '../' + _conf.DesDir + '/static'),
 
+  RegStrs: _conf.RegStrs,
+
   webConf: {
     'isDev': _conf.isDev,
     'serverPort': process.env.SERVER_PORT || 8000,
+    'isEnableToIphoneDebugger': _conf.isEnableToIphoneDebugger,
     'domain': _conf.domain,
     'url': _conf.url,
     'isHttps': _conf.isHttps,
@@ -50,7 +54,8 @@ $GLOBAL.BaseConfig = {
       '@api': path.resolve(__dirname, '../' + $GLOBAL.ResDir + '/api'),
       '@action': path.resolve(__dirname, '../' + $GLOBAL.ResDir + '/action'),
       '@tool': path.resolve(__dirname, '../' + $GLOBAL.ResDir + '/tool')
-    }
+    },
+    extensions: ['.js', '.json', '.jsx', '.vue']
   },
   module: {
     rules: [
@@ -60,6 +65,12 @@ $GLOBAL.BaseConfig = {
         exclude: /node_modules/,
         enforce: 'pre'
       },
+      {
+        test: /\.(vue|js|jsx)|((sa|sc|c)ss)$/,
+        loader: './build/stringReplaceLoader.js',
+        exclude: /node_modules/,
+        enforce: 'pre'
+      },
       {
         test: /\.vue$/,
         loader: 'vue-loader'
@@ -69,10 +80,32 @@ $GLOBAL.BaseConfig = {
         exclude: /(node_modules)|(dist)/,
         loader: 'babel-loader',
         options: {
-          presets: ['env', 'stage-2'],
+          presets: [[
+            '@babel/preset-env',
+            {
+              "targets": {
+                "browsers": [
+                  "last 2 versions",
+                  "ie >= 11"
+                ],
+              },
+              corejs: '3.6.5',
+              useBuiltIns: 'usage'
+            }
+          ]],
           plugins: [
-            'transform-vue-jsx',
-            'syntax-dynamic-import'
+            '@babel/plugin-syntax-jsx',
+            '@babel/plugin-proposal-class-properties',
+            '@babel/plugin-syntax-dynamic-import',
+            [
+              '@babel/plugin-transform-runtime',
+              {
+                corejs: 3,
+                helpers: true,
+                regenerator: true,
+                useESModules: false
+              }
+            ]
           ]
         }
       },

client/build/webpack.client.conf.js

@@ -9,7 +9,9 @@ const VueLoaderPlugin = require('vue-loader/lib/plugin')
 const AutoPrefixer = require('autoprefixer')
 const MiniCssExtractPlugin = require('mini-css-extract-plugin')
 const HtmlWebpackPlugin = require('html-webpack-plugin')
+const HtmlReplaceWebpackPlugin = require('html-replace-webpack-plugin')
 const CopyWebpackPlugin = require('copy-webpack-plugin')
+const VconsoleWebpackPlugin = require('vconsole-webpack-plugin')
 const $GLOBAL = require('./webpack.base.conf')
 
 
@@ -26,9 +28,10 @@ if ($GLOBAL.isDev === 'development') {
       port: $GLOBAL.webConf.serverPort,
       disableHostCheck: false,
       host: $GLOBAL.webConf.domain || 'localhost',
+      http2: false,
       https: $GLOBAL.webConf.isHttps && {
-        key: fs.readFileSync(path.join(__dirname, '../static/cert/dev.ezijing.com.key')),
-        cert: fs.readFileSync(path.join(__dirname, '../static/cert/dev.ezijing.com.pem'))
+        key: fs.readFileSync(path.join(__dirname, $GLOBAL.webConf.domain + '.key')),
+        cert: fs.readFileSync(path.join(__dirname, $GLOBAL.webConf.domain + '.pem'))
       },
       overlay: {
         errors: true
@@ -77,7 +80,7 @@ if ($GLOBAL.isDev === 'development') {
             }
           },
           {
-            loader: 'sass-loader', // 不再使用本身默认 node-sass，部分mac安装有问题。
+            loader: 'sass-loader',
             options: {
               implementation: require('dart-sass')
             }
@@ -92,6 +95,10 @@ if ($GLOBAL.isDev === 'development') {
         template: $GLOBAL.templatePath,
         inject: true,
         favicon: $GLOBAL.icoPath
+      }),
+      new VconsoleWebpackPlugin({
+        filter: [],
+        enable: $GLOBAL.isEnableToIphoneDebugger
       })
     ]
   })
@@ -100,7 +107,7 @@ if ($GLOBAL.isDev === 'development') {
     mode: 'production',
     entry: {
       app: $GLOBAL.EntryPath,
-      vendor: ['vue', 'vue-router']
+      vendor: ['vue', 'vue-router', 'vue-i18n']
     },
     module: {
       rules: [{
@@ -128,7 +135,7 @@ if ($GLOBAL.isDev === 'development') {
             }
           },
           {
-            loader: 'sass-loader', // 不再使用本身默认 node-sass，部分mac安装有问题。
+            loader: 'sass-loader',
             options: {
               implementation: require('dart-sass')
             }
@@ -152,6 +159,12 @@ if ($GLOBAL.isDev === 'development') {
           collapseWhitespace: true
         }
       }),
+      new HtmlReplaceWebpackPlugin([
+        {
+          pattern: $GLOBAL.RegStrs.regExp_static,
+          replacement: '$1' + $GLOBAL.webConf.CDN_PATH + 'static/$2$1'
+        }
+      ]),
       new CopyWebpackPlugin([
         {
           from: $GLOBAL.EntryStaticPath,
@@ -161,7 +174,11 @@ if ($GLOBAL.isDev === 'development') {
             return content
           }
         }
-      ])
+      ]),
+      new VconsoleWebpackPlugin({
+        filter: [],
+        enable: $GLOBAL.isEnableToIphoneDebugger
+      })
     ],
     optimization: {
       runtimeChunk: {
@@ -170,27 +187,19 @@ if ($GLOBAL.isDev === 'development') {
       splitChunks: {
         chunks: 'async',
         minSize: 30000,
-        maxSize: 400000, // 大于400kb 会再进行拆分，可以进行优化时，添加
+        maxSize: 400000,
         minChunks: 1,
-        maxAsyncRequests: 5, // 按需加载块时并行请求的最大数量
-        maxInitialRequests: 3, // 初始页面加载时并行请求的最大数量
+        maxAsyncRequests: 5,
+        maxInitialRequests: 3,
         name: false,
         cacheGroups: {
-          vendor: { // 将所有node_modules中模块 js打包到一起，并拆分
+          vendor: {
             name: 'vendor',
             chunks: 'initial',
             priority: -10,
             reuseExistingChunk: false,
             test: /node_modules\/(.*)\.js/
           },
-          // styles: { // 将所有node_modules中模块 css、scss打包到一起，并拆分，暂时没用，还在研究
-          //   name: 'styles',
-          //   test: /node_modules\/\.(sa|sc|c)ss$/,
-          //   chunks: 'all',
-          //   minChunks: 1,
-          //   reuseExistingChunk: true,
-          //   enforce: true
-          // }
         }
       }
     }

client/client/components/player/exam/exam.vue

@@ -272,7 +272,7 @@ export default {
         //       attrs: {
         //         multiple: true,
         //         headers: {
-        //           'tenant': 'sofia'
+        //           'tenant': 'kelley'
         //         }
         //       },
         //       html: `

client/client/project/actions/ExamAction.js

@@ -37,7 +37,7 @@ export default class ExamAction {
           attrs: {
             multiple: true,
             headers: {
-              'tenant': 'sofia'
+              'tenant': 'kelley'
             }
           },
           html: `
@@ -92,7 +92,7 @@ export default class ExamAction {
           attrs: {
             multiple: true,
             headers: {
-              'tenant': 'sofia'
+              'tenant': 'kelley'
             }
           },
           html: `