refactor: export

2021-02-09 18:05:01 +08:00 · 2021-02-09 18:05:01 +08:00 · c3e374e6e5
parent a9b6e87249
commit c3e374e6e5
8 changed files with 52 additions and 23 deletions
--- a/build/Dockerfile
+++ b/build/Dockerfile
--- a/packages/ui/certd-server/app.js
+++ b/packages/ui/certd-server/app.js
@ -8,6 +8,7 @@ import fs from 'fs'
 import _ from 'lodash-es'
 import './install.js'
 import pathUtil from './utils/util.path.js'
+import compress from 'koa-compress'
 const app = new Koa()

 // error handler
@ -21,10 +22,14 @@ app.use(json())
 app.use(logger())

 const staticPlugin = Static(pathUtil.join('public'), {
-  maxage: 30 * 24 * 60 * 3600
+  maxage: 30 * 24 * 60 * 3600,
+  gzip: true
 })
 app.use(staticPlugin)

+// gzip
+app.use(compress({ threshold: 2048 }))
+
 // logger
 app.use(async (ctx, next) => {
  const start = new Date()
--- a/packages/ui/certd-server/package-lock.json
+++ b/packages/ui/certd-server/package-lock.json
@ -1049,6 +1049,14 @@
      "integrity": "sha1-FuQHD7qK4ptnnyIVhT7hgasuq8A=",
      "dev": true
    },
+    "compressible": {
+      "version": "2.0.18",
+      "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz",
+      "integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==",
+      "requires": {
+        "mime-db": ">= 1.43.0 < 2"
+      }
+    },
    "compressing": {
      "version": "1.5.1",
      "resolved": "https://registry.npmjs.org/compressing/-/compressing-1.5.1.tgz",
@ -1252,7 +1260,7 @@
    },
    "deep-is": {
      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
+      "resolved": "https://registry.npm.taobao.org/deep-is/download/deep-is-0.1.3.tgz",
      "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=",
      "dev": true
    },
@ -2097,7 +2105,7 @@
    },
    "fast-levenshtein": {
      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
+      "resolved": "https://registry.npm.taobao.org/fast-levenshtein/download/fast-levenshtein-2.0.6.tgz",
      "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
      "dev": true
    },
@ -2253,7 +2261,7 @@
    },
    "functional-red-black-tree": {
      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
+      "resolved": "https://registry.npm.taobao.org/functional-red-black-tree/download/functional-red-black-tree-1.0.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ffunctional-red-black-tree%2Fdownload%2Ffunctional-red-black-tree-1.0.1.tgz",
      "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
      "dev": true
    },
@ -2960,7 +2968,7 @@
    },
    "json-stable-stringify-without-jsonify": {
      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
+      "resolved": "https://registry.npm.taobao.org/json-stable-stringify-without-jsonify/download/json-stable-stringify-without-jsonify-1.0.1.tgz",
      "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
      "dev": true
    },
@ -3105,6 +3113,25 @@
      "resolved": "https://registry.npm.taobao.org/koa-compose/download/koa-compose-4.1.0.tgz",
      "integrity": "sha1-UHMGuTcZAdtBEhyBLpI9DWfT6Hc="
    },
+    "koa-compress": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/koa-compress/-/koa-compress-5.0.1.tgz",
+      "integrity": "sha512-uTo7Hcyyt6e9o2X3htRS/SNEKy9vDOUc/r1qs/F0YI2Frv9IEbkjz/9dC6IdJWBQAG34lRuU7jBXeq3DRur9Ng==",
+      "requires": {
+        "bytes": "^3.0.0",
+        "compressible": "^2.0.0",
+        "http-errors": "^1.7.3",
+        "koa-is-json": "^1.0.0",
+        "statuses": "^2.0.0"
+      },
+      "dependencies": {
+        "statuses": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
+          "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ=="
+        }
+      }
+    },
    "koa-convert": {
      "version": "1.2.0",
      "resolved": "https://registry.npm.taobao.org/koa-convert/download/koa-convert-1.2.0.tgz",
@ -3566,7 +3593,7 @@
    },
    "natural-compare": {
      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
+      "resolved": "https://registry.npm.taobao.org/natural-compare/download/natural-compare-1.4.0.tgz",
      "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
      "dev": true
    },
@ -5186,7 +5213,7 @@
    },
    "text-table": {
      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
+      "resolved": "https://registry.npm.taobao.org/text-table/download/text-table-0.2.0.tgz",
      "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
      "dev": true
    },
--- a/packages/ui/certd-server/package.json
+++ b/packages/ui/certd-server/package.json
@ -20,6 +20,7 @@
    "fs-extra": "^9.1.0",
    "koa": "^2.7.0",
    "koa-bodyparser": "^4.2.1",
+    "koa-compress": "^5.0.1",
    "koa-convert": "^1.2.0",
    "koa-json": "^2.0.2",
    "koa-logger": "^3.2.0",
--- a/packages/ui/certd-server/service/exports-service.js
+++ b/packages/ui/certd-server/service/exports-service.js
@ -27,11 +27,12 @@ export default {
    fs.writeJsonSync(optionsFilePath, options)

    // 依赖版本
-    const exePkgJson = fs.readFileSync('node_modules/@certd/executor/package.json')
+    const exePkgJson = fs.readFileSync(pathUtil.join('node_modules/@certd/executor/package.json'))
    const executorPkg = JSON.parse(exePkgJson)
    const currentVersion = executorPkg.version

-    const templatePkg = require('../templates/certd-run/package.json')
+    const templatePkgJson = fs.readFileSync(pathUtil.join('templates/certd-run/package.json'))
+    const templatePkg = JSON.parse(templatePkgJson)
    templatePkg.dependencies['@certd/executor'] = '^' + currentVersion
    templatePkg.dependencies['@certd/plugin-aliyun'] = '^' + currentVersion
    templatePkg.dependencies['@certd/plugin-host'] = '^' + currentVersion
--- a/packages/ui/certd-server/utils/util.path.js
+++ b/packages/ui/certd-server/utils/util.path.js
@ -2,7 +2,6 @@ import os from 'os'
 export default {
  join (...dirs) {
    const url = new URL('../' + dirs.join('/'), import.meta.url)
-    console.log('url', url)
    let path = url.pathname
    if (os.type() === 'Windows_NT') {
      path = path.substring(1)
--- a/packages/ui/certd-ui/src/antdv.js
+++ b/packages/ui/certd-ui/src/antdv.js
@ -22,7 +22,6 @@ import {
  LocaleProvider,
  Modal,
  Radio,
-  Rate,
  Row,
  Select,
  Switch,
@ -61,7 +60,6 @@ const list = {
  TimePicker,
  Modal,
  Radio,
-  Rate,
  Row,
  Select,
  Switch,
@ -77,14 +75,14 @@ const list = {
 export default function (app) {
  _.forEach(list, item => {
    app.use(item)
-
+    //
    // app.config.globalProperties.$message = message
    // app.config.globalProperties.$notification = notification
-    app.config.globalProperties.$info = Modal.info
-    app.config.globalProperties.$success = Modal.success
-    app.config.globalProperties.$error = Modal.error
-    app.config.globalProperties.$warning = Modal.warning
-    app.config.globalProperties.$confirm = Modal.confirm
-    app.config.globalProperties.$destroyAll = Modal.destroyAll
+    // app.config.globalProperties.$info = Modal.info
+    // app.config.globalProperties.$success = Modal.success
+    // app.config.globalProperties.$error = Modal.error
+    // app.config.globalProperties.$warning = Modal.warning
+    // app.config.globalProperties.$confirm = Modal.confirm
+    // app.config.globalProperties.$destroyAll = Modal.destroyAll
  })
 }
--- a/packages/ui/certd-ui/src/api/tools.js
+++ b/packages/ui/certd-ui/src/api/tools.js
@ -55,10 +55,8 @@ export function errorLog (error) {
  // 打印到控制台
  console.log(error)
  // 显示提示
-  notification({
-    message: error.message,
-    type: 'error',
-    duration: 5 * 1000
+  notification.error({
+    message: error.message
  })
 }