diff --git a/.vuepress/components/InstallDashboardPreview.vue b/.vuepress/components/InstallDashboardPreview.vue index 72b3ead..771ece9 100644 --- a/.vuepress/components/InstallDashboardPreview.vue +++ b/.vuepress/components/InstallDashboardPreview.vue @@ -21,7 +21,7 @@ - + diff --git a/.vuepress/components/KbIframe.vue b/.vuepress/components/KbIframe.vue new file mode 100644 index 0000000..2432be4 --- /dev/null +++ b/.vuepress/components/KbIframe.vue @@ -0,0 +1,104 @@ + + + + + diff --git a/.vuepress/config-sidebar.js b/.vuepress/config-sidebar.js index 7c9dc3f..e284b91 100644 --- a/.vuepress/config-sidebar.js +++ b/.vuepress/config-sidebar.js @@ -52,9 +52,9 @@ module.exports = { title: '配置Kuboard', collapsable: true, children: [ - 'install-dashboard-upgrade', + // 'install-dashboard-upgrade', 'install-kuboard-layout', - 'install-kuboard-env', + 'install-kuboard-env-2', ] }, { @@ -647,6 +647,7 @@ module.exports = { 'change-log/v2.0.x', 'change-log/v1.0.x', 'change-log/upgrade-1-2', + 'change-log/upgrade-2-from-beta', 'known-issue', ] } diff --git a/.vuepress/public/images/preview.png b/.vuepress/public/images/preview.png new file mode 100644 index 0000000..7566b19 Binary files /dev/null and b/.vuepress/public/images/preview.png differ diff --git a/.vuepress/public/install-script/kuboard-arm.yaml b/.vuepress/public/install-script/kuboard-arm.yaml index 61ceed8..6a7ec4a 100644 --- a/.vuepress/public/install-script/kuboard-arm.yaml +++ b/.vuepress/public/install-script/kuboard-arm.yaml @@ -4,24 +4,24 @@ metadata: name: kuboard namespace: kube-system annotations: - k8s.eip.work/displayName: kuboard - k8s.eip.work/ingress: "true" - k8s.eip.work/service: NodePort - k8s.eip.work/workload: kuboard + k8s.kuboard.cn/displayName: kuboard + k8s.kuboard.cn/ingress: "true" + k8s.kuboard.cn/service: NodePort + k8s.kuboard.cn/workload: kuboard labels: - k8s.eip.work/layer: monitor - k8s.eip.work/name: kuboard + k8s.kuboard.cn/layer: monitor + k8s.kuboard.cn/name: kuboard spec: replicas: 1 selector: matchLabels: - k8s.eip.work/layer: monitor - k8s.eip.work/name: kuboard + k8s.kuboard.cn/layer: monitor + k8s.kuboard.cn/name: kuboard template: metadata: labels: - k8s.eip.work/layer: monitor - k8s.eip.work/name: kuboard + k8s.kuboard.cn/layer: monitor + k8s.kuboard.cn/name: kuboard spec: containers: - name: kuboard @@ -45,8 +45,8 @@ spec: targetPort: 80 nodePort: 32567 selector: - k8s.eip.work/layer: monitor - k8s.eip.work/name: kuboard + k8s.kuboard.cn/layer: monitor + k8s.kuboard.cn/name: kuboard --- apiVersion: v1 @@ -97,8 +97,8 @@ metadata: name: kuboard namespace: kube-system annotations: - k8s.eip.work/displayName: kuboard - k8s.eip.work/workload: kuboard + k8s.kuboard.cn/displayName: kuboard + k8s.kuboard.cn/workload: kuboard nginx.org/websocket-services: "kuboard" nginx.com/sticky-cookie-services: "serviceName=kuboard srv_id expires=1h path=/" spec: diff --git a/.vuepress/public/install-script/kuboard-offline.yaml b/.vuepress/public/install-script/kuboard-offline.yaml index 7447ecb..2c6730c 100644 --- a/.vuepress/public/install-script/kuboard-offline.yaml +++ b/.vuepress/public/install-script/kuboard-offline.yaml @@ -4,26 +4,25 @@ metadata: name: kuboard namespace: kube-system annotations: - k8s.eip.work/displayName: kuboard - k8s.eip.work/ingress: "false" - k8s.eip.work/service: NodePort - k8s.eip.work/workload: kuboard + k8s.kuboard.cn/displayName: kuboard + k8s.kuboard.cn/ingress: "true" + k8s.kuboard.cn/service: NodePort + k8s.kuboard.cn/workload: kuboard labels: - k8s.eip.work/layer: monitor - k8s.eip.work/name: kuboard + k8s.kuboard.cn/layer: monitor + k8s.kuboard.cn/name: kuboard spec: replicas: 1 selector: matchLabels: - k8s.eip.work/layer: monitor - k8s.eip.work/name: kuboard + k8s.kuboard.cn/layer: monitor + k8s.kuboard.cn/name: kuboard template: metadata: labels: - k8s.eip.work/layer: monitor - k8s.eip.work/name: kuboard + k8s.kuboard.cn/layer: monitor + k8s.kuboard.cn/name: kuboard spec: - nodeName: your-node-name containers: - name: kuboard image: eipwork/kuboard:latest @@ -46,8 +45,8 @@ spec: targetPort: 80 nodePort: 32567 selector: - k8s.eip.work/layer: monitor - k8s.eip.work/name: kuboard + k8s.kuboard.cn/layer: monitor + k8s.kuboard.cn/name: kuboard --- apiVersion: v1 @@ -92,29 +91,22 @@ subjects: namespace: kube-system --- -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRoleBinding +apiVersion: extensions/v1beta1 +kind: Ingress metadata: - name: kuboard-viewer:kuboard-minimum-role -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: kuboard-minimum-role -subjects: - - kind: ServiceAccount - name: kuboard-viewer - namespace: kube-system - ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRole -metadata: - name: kuboard-minimum-role -rules: - - apiGroups: - - '' - resources: - - 'namespaces' - - 'nodes' - verbs: - - 'list' + name: kuboard + namespace: kube-system + annotations: + k8s.kuboard.cn/displayName: kuboard + k8s.kuboard.cn/workload: kuboard + nginx.org/websocket-services: "kuboard" + nginx.com/sticky-cookie-services: "serviceName=kuboard srv_id expires=1h path=/" +spec: + rules: + - host: kuboard.yourdomain.com + http: + paths: + - path: / + backend: + serviceName: kuboard + servicePort: http diff --git a/.vuepress/public/install-script/kuboard.yaml b/.vuepress/public/install-script/kuboard.yaml index 8a77157..22fa80d 100644 --- a/.vuepress/public/install-script/kuboard.yaml +++ b/.vuepress/public/install-script/kuboard.yaml @@ -4,24 +4,24 @@ metadata: name: kuboard namespace: kube-system annotations: - k8s.eip.work/displayName: kuboard - k8s.eip.work/ingress: "true" - k8s.eip.work/service: NodePort - k8s.eip.work/workload: kuboard + k8s.kuboard.cn/displayName: kuboard + k8s.kuboard.cn/ingress: "true" + k8s.kuboard.cn/service: NodePort + k8s.kuboard.cn/workload: kuboard labels: - k8s.eip.work/layer: monitor - k8s.eip.work/name: kuboard + k8s.kuboard.cn/layer: monitor + k8s.kuboard.cn/name: kuboard spec: replicas: 1 selector: matchLabels: - k8s.eip.work/layer: monitor - k8s.eip.work/name: kuboard + k8s.kuboard.cn/layer: monitor + k8s.kuboard.cn/name: kuboard template: metadata: labels: - k8s.eip.work/layer: monitor - k8s.eip.work/name: kuboard + k8s.kuboard.cn/layer: monitor + k8s.kuboard.cn/name: kuboard spec: containers: - name: kuboard @@ -45,8 +45,8 @@ spec: targetPort: 80 nodePort: 32567 selector: - k8s.eip.work/layer: monitor - k8s.eip.work/name: kuboard + k8s.kuboard.cn/layer: monitor + k8s.kuboard.cn/name: kuboard --- apiVersion: v1 @@ -90,34 +90,6 @@ subjects: name: kuboard-viewer namespace: kube-system ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRoleBinding -metadata: - name: kuboard-viewer:kuboard-minimum-role -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: kuboard-minimum-role -subjects: - - kind: ServiceAccount - name: kuboard-viewer - namespace: kube-system - ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRole -metadata: - name: kuboard-minimum-role -rules: - - apiGroups: - - '' - resources: - - 'namespaces' - - 'nodes' - verbs: - - 'list' - --- apiVersion: extensions/v1beta1 kind: Ingress @@ -125,8 +97,8 @@ metadata: name: kuboard namespace: kube-system annotations: - k8s.eip.work/displayName: kuboard - k8s.eip.work/workload: kuboard + k8s.kuboard.cn/displayName: kuboard + k8s.kuboard.cn/workload: kuboard nginx.org/websocket-services: "kuboard" nginx.com/sticky-cookie-services: "serviceName=kuboard srv_id expires=1h path=/" spec: diff --git a/.vuepress/theme/components/Sidebar.vue b/.vuepress/theme/components/Sidebar.vue index 74fb2c2..dd8669b 100644 --- a/.vuepress/theme/components/Sidebar.vue +++ b/.vuepress/theme/components/Sidebar.vue @@ -48,7 +48,7 @@

- +

diff --git a/guide/example/monitor-v2.assets/image-20200531101355671.png b/guide/example/monitor-v2.assets/image-20200531101355671.png deleted file mode 100644 index 903e9a1..0000000 Binary files a/guide/example/monitor-v2.assets/image-20200531101355671.png and /dev/null differ diff --git a/guide/example/monitor-v2.assets/image-20200531101454954.png b/guide/example/monitor-v2.assets/image-20200531101454954.png deleted file mode 100644 index 7724b92..0000000 Binary files a/guide/example/monitor-v2.assets/image-20200531101454954.png and /dev/null differ diff --git a/guide/example/monitor-v2.assets/image-20200531101800333.png b/guide/example/monitor-v2.assets/image-20200531101800333.png deleted file mode 100644 index 135d4cf..0000000 Binary files a/guide/example/monitor-v2.assets/image-20200531101800333.png and /dev/null differ diff --git a/guide/example/monitor-v2.assets/image-20200531101804604.png b/guide/example/monitor-v2.assets/image-20200531101804604.png deleted file mode 100644 index 135d4cf..0000000 Binary files a/guide/example/monitor-v2.assets/image-20200531101804604.png and /dev/null differ diff --git a/guide/example/monitor-v2.assets/image-20200531102323613.png b/guide/example/monitor-v2.assets/image-20200531102323613.png deleted file mode 100644 index 1eb99f0..0000000 Binary files a/guide/example/monitor-v2.assets/image-20200531102323613.png and /dev/null differ diff --git a/guide/example/monitor-v2.assets/image-20200531102446321.png b/guide/example/monitor-v2.assets/image-20200531102446321.png deleted file mode 100644 index 971380b..0000000 Binary files a/guide/example/monitor-v2.assets/image-20200531102446321.png and /dev/null differ diff --git a/guide/example/monitor-v2.assets/image-20200531102647083.png b/guide/example/monitor-v2.assets/image-20200531102647083.png deleted file mode 100644 index 65e4b2a..0000000 Binary files a/guide/example/monitor-v2.assets/image-20200531102647083.png and /dev/null differ diff --git a/guide/example/monitor-v2.assets/image-20200531102744229.png b/guide/example/monitor-v2.assets/image-20200531102744229.png deleted file mode 100644 index 5873680..0000000 Binary files a/guide/example/monitor-v2.assets/image-20200531102744229.png and /dev/null differ diff --git a/guide/example/monitor-v2.assets/image-20200531103006378.png b/guide/example/monitor-v2.assets/image-20200531103006378.png deleted file mode 100644 index d6a93cf..0000000 Binary files a/guide/example/monitor-v2.assets/image-20200531103006378.png and /dev/null differ diff --git a/guide/example/monitor-v2.assets/image-20200531114349178.png b/guide/example/monitor-v2.assets/image-20200531114349178.png deleted file mode 100644 index f3eb6a0..0000000 Binary files a/guide/example/monitor-v2.assets/image-20200531114349178.png and /dev/null differ diff --git a/guide/example/monitor-v2.assets/image-20200531114628628.png b/guide/example/monitor-v2.assets/image-20200531114628628.png deleted file mode 100644 index 151abe0..0000000 Binary files a/guide/example/monitor-v2.assets/image-20200531114628628.png and /dev/null differ diff --git a/guide/example/monitor-v2.assets/image-20200531114818385.png b/guide/example/monitor-v2.assets/image-20200531114818385.png deleted file mode 100644 index c80a095..0000000 Binary files a/guide/example/monitor-v2.assets/image-20200531114818385.png and /dev/null differ diff --git a/guide/example/monitor-v2.assets/image-20200531115010561.png b/guide/example/monitor-v2.assets/image-20200531115010561.png deleted file mode 100644 index 342b954..0000000 Binary files a/guide/example/monitor-v2.assets/image-20200531115010561.png and /dev/null differ diff --git a/guide/example/monitor-v2.assets/image-20200531115257331.png b/guide/example/monitor-v2.assets/image-20200531115257331.png deleted file mode 100644 index 70b8c76..0000000 Binary files a/guide/example/monitor-v2.assets/image-20200531115257331.png and /dev/null differ diff --git a/guide/example/monitor-v2.assets/image-20200531115308199.png b/guide/example/monitor-v2.assets/image-20200531115308199.png deleted file mode 100644 index bb1049c..0000000 Binary files a/guide/example/monitor-v2.assets/image-20200531115308199.png and /dev/null differ diff --git a/guide/example/monitor-v2.assets/image-20200531115904561.png b/guide/example/monitor-v2.assets/image-20200531115904561.png deleted file mode 100644 index 350f566..0000000 Binary files a/guide/example/monitor-v2.assets/image-20200531115904561.png and /dev/null differ diff --git a/guide/example/monitor-v2.assets/image-20200531120441813.png b/guide/example/monitor-v2.assets/image-20200531120441813.png deleted file mode 100644 index 64d4afa..0000000 Binary files a/guide/example/monitor-v2.assets/image-20200531120441813.png and /dev/null differ diff --git a/guide/example/monitor-v2.assets/image-20200607140056285.png b/guide/example/monitor-v2.assets/image-20200607140056285.png new file mode 100644 index 0000000..da31926 Binary files /dev/null and b/guide/example/monitor-v2.assets/image-20200607140056285.png differ diff --git a/guide/example/monitor-v2.assets/image-20200607140930259.png b/guide/example/monitor-v2.assets/image-20200607140930259.png new file mode 100644 index 0000000..dc6f015 Binary files /dev/null and b/guide/example/monitor-v2.assets/image-20200607140930259.png differ diff --git a/guide/example/monitor-v2.assets/image-20200607142558152.png b/guide/example/monitor-v2.assets/image-20200607142558152.png new file mode 100644 index 0000000..a9856b6 Binary files /dev/null and b/guide/example/monitor-v2.assets/image-20200607142558152.png differ diff --git a/guide/example/monitor-v2.assets/image-20200607142801812.png b/guide/example/monitor-v2.assets/image-20200607142801812.png new file mode 100644 index 0000000..ae19cf8 Binary files /dev/null and b/guide/example/monitor-v2.assets/image-20200607142801812.png differ diff --git a/guide/example/monitor-v2.assets/image-20200607142846847.png b/guide/example/monitor-v2.assets/image-20200607142846847.png new file mode 100644 index 0000000..e5c545f Binary files /dev/null and b/guide/example/monitor-v2.assets/image-20200607142846847.png differ diff --git a/guide/example/monitor-v2.assets/image-20200607142913070.png b/guide/example/monitor-v2.assets/image-20200607142913070.png new file mode 100644 index 0000000..6a975de Binary files /dev/null and b/guide/example/monitor-v2.assets/image-20200607142913070.png differ diff --git a/guide/example/monitor-v2.assets/image-20200607143002942.png b/guide/example/monitor-v2.assets/image-20200607143002942.png new file mode 100644 index 0000000..aa74fe9 Binary files /dev/null and b/guide/example/monitor-v2.assets/image-20200607143002942.png differ diff --git a/guide/example/monitor-v2.assets/image-20200607143223601.png b/guide/example/monitor-v2.assets/image-20200607143223601.png new file mode 100644 index 0000000..fd178df Binary files /dev/null and b/guide/example/monitor-v2.assets/image-20200607143223601.png differ diff --git a/guide/example/monitor-v2.assets/image-20200607143257409.png b/guide/example/monitor-v2.assets/image-20200607143257409.png new file mode 100644 index 0000000..cdaf517 Binary files /dev/null and b/guide/example/monitor-v2.assets/image-20200607143257409.png differ diff --git a/guide/example/monitor-v2.assets/image-20200607143321297.png b/guide/example/monitor-v2.assets/image-20200607143321297.png new file mode 100644 index 0000000..207407d Binary files /dev/null and b/guide/example/monitor-v2.assets/image-20200607143321297.png differ diff --git a/guide/example/monitor-v2.assets/image-20200607143400986.png b/guide/example/monitor-v2.assets/image-20200607143400986.png new file mode 100644 index 0000000..ce0c420 Binary files /dev/null and b/guide/example/monitor-v2.assets/image-20200607143400986.png differ diff --git a/guide/example/monitor-v2.assets/image-20200607143450664.png b/guide/example/monitor-v2.assets/image-20200607143450664.png new file mode 100644 index 0000000..f13b4dc Binary files /dev/null and b/guide/example/monitor-v2.assets/image-20200607143450664.png differ diff --git a/guide/example/monitor-v2.assets/image-20200607143723089.png b/guide/example/monitor-v2.assets/image-20200607143723089.png new file mode 100644 index 0000000..196f1b8 Binary files /dev/null and b/guide/example/monitor-v2.assets/image-20200607143723089.png differ diff --git a/guide/example/monitor-v2.assets/image-20200607143952692.png b/guide/example/monitor-v2.assets/image-20200607143952692.png new file mode 100644 index 0000000..e514886 Binary files /dev/null and b/guide/example/monitor-v2.assets/image-20200607143952692.png differ diff --git a/guide/example/monitor-v2.assets/image-20200607144127342.png b/guide/example/monitor-v2.assets/image-20200607144127342.png new file mode 100644 index 0000000..f92de08 Binary files /dev/null and b/guide/example/monitor-v2.assets/image-20200607144127342.png differ diff --git a/guide/example/monitor-v2.md b/guide/example/monitor-v2.md index 798280b..e06ae95 100644 --- a/guide/example/monitor-v2.md +++ b/guide/example/monitor-v2.md @@ -19,7 +19,7 @@ description: 使用Kuboard在Kubernetes上安装监控套件,并对example微 * 进入 Kuboard 界面后,点击右上角的 **设置** 按钮(圆形图标),然后在左侧菜单中导航到 **Kuboard** --> **套件**,如下图所示: - ![image-20200531101355671](./monitor-v2.assets/image-20200531101355671.png) + ![image-20200607140056285](./monitor-v2.assets/image-20200607140056285.png) * 点击图中的 **查找并安装** 按钮; @@ -27,13 +27,11 @@ description: 使用Kuboard在Kubernetes上安装监控套件,并对example微 > 当前只提供了全局资源层监控套件,后续将逐渐提供更丰富的套件功能。 - ![image-20200531101454954](./monitor-v2.assets/image-20200531101454954.png) + ![image-20200607140930259](./monitor-v2.assets/image-20200607140930259.png) * 点击所选择套件对应的 **安装** 按钮,可将套件所需资源从仓库中加载到您自己的 Kubernetes 集群,并进入该套件的详情页面,如下图所示: - * 点击下图中的 **开始安装之前,请点我,阅读此套件的文档** 可以了解该套件提供的文档描述; - - ![image-20200531101804604](./monitor-v2.assets/image-20200531101804604.png) + ![image-20200607142558152](./monitor-v2.assets/image-20200607142558152.png) * 点击 **套件参数** Tab 页 @@ -43,15 +41,15 @@ description: 使用Kuboard在Kubernetes上安装监控套件,并对example微 如下图所示: - ![image-20200531102323613](./monitor-v2.assets/image-20200531102323613.png) + ![image-20200607142801812](./monitor-v2.assets/image-20200607142801812.png) * 在 **套件参数** 页完成保存后,将自动进入 **安装脚本** 页,如下图所示: - ![image-20200531102446321](./monitor-v2.assets/image-20200531102446321.png) + ![image-20200607142846847](./monitor-v2.assets/image-20200607142846847.png) * 点击 **安装** 按钮,进入 **工作负载导入** 界面,将套件所需的 Deployment/Service/ClusterRole 等对象导入到您的 Kubernetes 集群中,如下图所示: - ![image-20200531102647083](./monitor-v2.assets/image-20200531102647083.png) + ![image-20200607142913070](./monitor-v2.assets/image-20200607142913070.png) * 请按向导提示,完成套件所依赖对象的导入; @@ -60,25 +58,25 @@ description: 使用Kuboard在Kubernetes上安装监控套件,并对example微 > * 建议为 monitor-grafana / monitor-prometheus 分别创建新的存储卷声明,需要您事先已经创建好了 [StorageClass](/guide/cluster/storage.html) ; > * 如果您当前没有合适的存储类,为了测试套件的功能,也可以先选择 **emptyDir**,之后再设置合适的存储卷(此时,容器组被删除后,所有的监控数据将丢失); - ![image-20200531103006378](./monitor-v2.assets/image-20200531103006378.png) + ![image-20200607143002942](./monitor-v2.assets/image-20200607143002942.png) * 完成工作负载导入后,Kuboard 将自动进入套件的 **初始化** 页面,如下图所示: * **初始化** 页面将检测所依赖工作负载的就绪情况,如下图所示: - ![image-20200531114349178](./monitor-v2.assets/image-20200531114349178.png) + ![image-20200607143223601](./monitor-v2.assets/image-20200607143223601.png) * 所有被依赖的工作负载就绪之后,将展示初始化时所引用的资源,如下图所示: - ![image-20200531114628628](./monitor-v2.assets/image-20200531114628628.png) + ![image-20200607143257409](./monitor-v2.assets/image-20200607143257409.png) * 点击 **初始化** 页面中的 **执行初始化** 按钮,Kuboard 将完成对 Grafana 的初始化动作,如下图所示: - ![image-20200531114818385](./monitor-v2.assets/image-20200531114818385.png) + ![image-20200607143321297](./monitor-v2.assets/image-20200607143321297.png) * 点击 **确定** 后,套件详情页将展示该套件支持的 **扩展** 信息,如下图所示: - ![image-20200531115010561](./monitor-v2.assets/image-20200531115010561.png) + ![image-20200607143400986](./monitor-v2.assets/image-20200607143400986.png) ## 查看监控信息 @@ -91,7 +89,7 @@ description: 使用Kuboard在Kubernetes上安装监控套件,并对example微 - 节点资源监控 - 节点监控(含节点上的容器组) - ![image-20200531115257331](./monitor-v2.assets/image-20200531115257331.png) + ![image-20200607143723089](./monitor-v2.assets/image-20200607143723089.png) - 工作负载详情页 @@ -101,13 +99,13 @@ description: 使用Kuboard在Kubernetes上安装监控套件,并对example微 - 所在节点监控 - 所在节点监控(含节点上的容器组) - ![image-20200531115308199](./monitor-v2.assets/image-20200531115308199.png) + ![image-20200607143952692](./monitor-v2.assets/image-20200607143952692.png) ## 直接访问 Grafana 界面 -您可能想要自己定义 Grafana 的规则,比如告警通知、授权管理等,如果需要以管理员用户登录到 Grafana 界面,请以 kuboard-user 身份登录 Kuboard,并导航到名称空间 kube-system 下的 deployment / monitor-grafana 页面,点击其中的 **代理** 按钮,就可以用管理员身份登录 Grafana 界面,如下图所示: +您可能想要自己定义 Grafana 的规则,比如告警通知、授权管理等,如果需要以管理员用户登录到 Grafana 界面,点击下图中的 **Grafana主页** 按钮,即可以当前登录 Kuboard 的用户登录到 Grafana: -![image-20200531115904561](./monitor-v2.assets/image-20200531115904561.png) +![image-20200607143450664](./monitor-v2.assets/image-20200607143450664.png) @@ -121,9 +119,16 @@ description: 使用Kuboard在Kubernetes上安装监控套件,并对example微 * 修改 YAML 安装脚本 * 修改初始化脚本、添加初始化所需资源 * 添加扩展,修改扩展脚本,实现自定义逻辑 +* 修改套件的快速链接 如下图所示: -![image-20200531120441813](./monitor-v2.assets/image-20200531120441813.png) +![image-20200607144127342](./monitor-v2.assets/image-20200607144127342.png) -您还可以将自己的套件提交到套件仓库。 \ No newline at end of file +您还可以将自己的套件提交到套件仓库。 + + + +## 授权用户访问套件 + +请参考具体套件的 **README** 了解如何授权普通用户使用套件。 \ No newline at end of file diff --git a/install/install-dashboard.md b/install/install-dashboard.md index d967919..01ba516 100644 --- a/install/install-dashboard.md +++ b/install/install-dashboard.md @@ -57,10 +57,7 @@ Kuboard 是 Kubernetes 的一款图形化管理界面。 安装 Kuboard。 > 如果您参考 https://kuboard.cn 网站上提供的 Kubernetes 安装文档,可在 master 节点上执行以下命令。 - -> 关于版本选择: -> * 当前,Kuboard 正在从 v1.0.x 向 Kuboard v2.0.0 过渡,v2.0.0-beta.3.c 完成度已经比较高,由于文档尚未更新,latest 版本仍然保持为 v1.0.9.7。新用户可以从 beta 版开始,以获得更好的体验。 -> * 参考此文,[了解如何从 v1.0.x 升级到 Kuboard v2.0.x](/support/change-log/upgrade-1-2.html) +> * 如果您已经安装了 Kuboard v1.0.x,请参考 [了解如何从 v1.0.x 升级到 Kuboard v2.0.x](/support/change-log/upgrade-1-2.html) @@ -97,7 +94,7 @@ kubectl apply -f https://addons.kuboard.cn/metrics-server/0.3.6/metrics-server-a 查看 Kuboard 运行状态: ``` sh -kubectl get pods -l k8s.eip.work/name=kuboard -n kube-system +kubectl get pods -l k8s.kuboard.cn/name=kuboard -n kube-system ``` 输出结果如下所示: @@ -296,7 +293,7 @@ kubectl port-forward service/kuboard 8080:80 -n kube-system * Kuboard 容器中不能访问到您的 API Server,定位问题的方式如下: * 进入 Kuboard 的终端 ```sh - kubectl exec -it $(kubectl get pods -l k8s.eip.work/name=kuboard -n kube-system | grep kuboard | awk '{print $1}') /bin/bash -n kube-system + kubectl exec -it $(kubectl get pods -l k8s.kuboard.cn/name=kuboard -n kube-system | grep kuboard | awk '{print $1}') /bin/bash -n kube-system ``` * 在 Kuboard 终端中执行 ``` sh diff --git a/install/install-k8s.md b/install/install-k8s.md index df6b391..a6f71b0 100644 --- a/install/install-k8s.md +++ b/install/install-k8s.md @@ -15,7 +15,7 @@ meta: ## 文档特点

- +
参考此免费文档,98%以上的概率,您能够顺利完成 K8S 安装,极个别的问题可以到QQ群里免费答疑。 @@ -26,7 +26,7 @@ meta: * 以更加直观易于理解的形式讲解此安装过程 * 介绍K8S学习路径 * 报名学员如碰到安装问题,可获得远程协助 -> 第一次直播课已经于1月18日完成,现在 [报名]((https://ke.qq.com/course/477593?flowToken=1016935)) 可以随时看回看,如需要,还可在2月8日免费再听一次直播。 --> + 第一次直播课已经于1月18日完成,现在 [报名]((https://ke.qq.com/course/477593?flowToken=1016935)) 可以随时看回看,如需要,还可在2月8日免费再听一次直播。 --> ## 配置要求 @@ -179,7 +179,7 @@ default via 172.21.0.1 dev eth0 -**请将脚本最后的 1.18.2 替换成您需要的版本号,** +**请将脚本最后的 1.18.3 替换成您需要的版本号,** 脚本中间的 v1.18.x 不要替换 > docker hub 镜像请根据自己网络的情况任选一个 @@ -189,7 +189,7 @@ default via 172.21.0.1 dev eth0 > * 第十行为阿里云 docker hub 镜像 ``` sh # 在 master 节点和 worker 节点都要执行 -# 最后一个参数 1.18.2 用于指定 kubenetes 版本,支持所有 1.18.x 版本的安装 +# 最后一个参数 1.18.3 用于指定 kubenetes 版本,支持所有 1.18.x 版本的安装 # 腾讯云 docker hub 镜像 # export REGISTRY_MIRROR="https://mirror.ccs.tencentyun.com" # DaoCloud 镜像 @@ -198,13 +198,13 @@ default via 172.21.0.1 dev eth0 # export REGISTRY_MIRROR="https://05f073ad3c0010ea0f4bc00b7105ec20.mirror.swr.myhuaweicloud.com" # 阿里云 docker hub 镜像 export REGISTRY_MIRROR=https://registry.cn-hangzhou.aliyuncs.com -curl -sSL https://kuboard.cn/install-script/v1.18.x/install_kubelet.sh | sh -s 1.18.2 +curl -sSL https://kuboard.cn/install-script/v1.18.x/install_kubelet.sh | sh -s 1.18.3 ``` -手动执行以下代码,结果与快速安装相同。***请将脚本第79行(已高亮)的 ${1} 替换成您需要的版本号,例如 1.18.2*** +手动执行以下代码,结果与快速安装相同。***请将脚本第79行(已高亮)的 ${1} 替换成您需要的版本号,例如 1.18.3*** > docker hub 镜像请根据自己网络的情况任选一个 > * 第四行为腾讯云 docker hub 镜像 @@ -212,7 +212,7 @@ curl -sSL https://kuboard.cn/install-script/v1.18.x/install_kubelet.sh | sh -s 1 > * 第八行为阿里云 docker hub 镜像 ``` sh # 在 master 节点和 worker 节点都要执行 -# 最后一个参数 1.18.2 用于指定 kubenetes 版本,支持所有 1.18.x 版本的安装 +# 最后一个参数 1.18.3 用于指定 kubenetes 版本,支持所有 1.18.x 版本的安装 # 腾讯云 docker hub 镜像 # export REGISTRY_MIRROR="https://mirror.ccs.tencentyun.com" # DaoCloud 镜像 @@ -251,7 +251,7 @@ export REGISTRY_MIRROR=https://registry.cn-hangzhou.aliyuncs.com -**请将脚本最后的 1.18.2 替换成您需要的版本号,** +**请将脚本最后的 1.18.3 替换成您需要的版本号,** 脚本中间的 v1.18.x 不要替换 ``` sh {10} @@ -264,13 +264,13 @@ export APISERVER_NAME=apiserver.demo # Kubernetes 容器组所在的网段,该网段安装完成后,由 kubernetes 创建,事先并不存在于您的物理网络中 export POD_SUBNET=10.100.0.1/16 echo "${MASTER_IP} ${APISERVER_NAME}" >> /etc/hosts -curl -sSL https://kuboard.cn/install-script/v1.18.x/init_master.sh | sh -s 1.18.2 +curl -sSL https://kuboard.cn/install-script/v1.18.x/init_master.sh | sh -s 1.18.3 ``` -手动执行以下代码,结果与快速初始化相同。***请将脚本第21行(已高亮)的 ${1} 替换成您需要的版本号,例如 1.18.2*** +手动执行以下代码,结果与快速初始化相同。***请将脚本第21行(已高亮)的 ${1} 替换成您需要的版本号,例如 1.18.3*** ``` sh # 只在 master 节点执行 diff --git a/install/install-kuboard-env-2.assets/image-20200607204036189.png b/install/install-kuboard-env-2.assets/image-20200607204036189.png new file mode 100644 index 0000000..50a4c04 Binary files /dev/null and b/install/install-kuboard-env-2.assets/image-20200607204036189.png differ diff --git a/install/install-kuboard-env-2.md b/install/install-kuboard-env-2.md new file mode 100644 index 0000000..a3ac460 --- /dev/null +++ b/install/install-kuboard-env-2.md @@ -0,0 +1,76 @@ +--- +vssueId: 126 +description: Kubernetes_Dashboard_是Kubernetes的官方WebUI_本文描述了在K8S集群上安装Kuberentes_Dashboard后_如何修改Kuboard登录页末尾的ICP备案编号_以及其他的一些Kuboard的环境变量 +meta: + - name: keywords + content: Kubernetes Dashboard,配置Kuboard环境变量,K8S Dashboard,K8S管理界面 +--- + +# 配置Kuboard环境变量 + + + +## 环境变量 + +安装 Kuboard 后,有如下几个环境变量值得您关注: + +| 环境变量名 | 描述 | 默认值 | +| ------------------------- | --------------------------------------- | ------------- | +| KUBERNETES_CLUSTER_DOMAIN | Kubernetes Cluster Name | cluster.local | +| KUBOARD_PROXY_COOKIE_TTL | Kuboard Proxy 中 Cookie 的有效时长 | 36000 | +| OIDC_ISSUER | OpenID Connect 对应的 Identity Provider | 空 | + +## 修改Kuboard环境变量 + +* 打开 Kuboard 界面,并导航到 Kuboard 工作负载编辑页: + + kube-system 名称空间 --> Kuboard 工作负载 --> 编辑 + +* 也可以按如下方式直接进入 Kuboard 工作负载编辑页: + + 打开链接 `http://节点IP:32567/namespace/kube-system/workload/edit/Deployment/kuboard` + + + +在 Kuboard 工作负载编辑页,为 `kuboard` 容器添加、修改环境变量,如下图,正在修改 `OIDC_ISSUER` 的取值 + +![image-20200607204036189](./install-kuboard-env-2.assets/image-20200607204036189.png) + +## KUBERNETES_CLUSTER_DOMAIN + +如果您通过 kubeadm 安装 Kubernetes 集群,执行命令 +``` sh +kubeadm config view +``` + +可以查看到输出结果中的 `networking.dnsDomain` 字段,该字段通常取值为 `cluster.local`,如下所示: +``` yaml {19} +apiServer: + extraArgs: + authorization-mode: Node,RBAC + timeoutForControlPlane: 4m0s +apiVersion: kubeadm.k8s.io/v1beta2 +certificatesDir: /etc/kubernetes/pki +clusterName: kubernetes +controlPlaneEndpoint: apiserver.demo:6443 +controllerManager: {} +dns: + type: CoreDNS +etcd: + local: + dataDir: /var/lib/etcd +imageRepository: gcr.azk8s.cn/google-containers +kind: ClusterConfiguration +kubernetesVersion: v1.16.4 +networking: + dnsDomain: cluster.local + serviceSubnet: 10.96.0.0/12 +scheduler: {} +``` + +少数情况下,您安装集群时可能修改了这个字段的取值,此时,请确保您为 Kuboard 设置了 `KUBERNETES_CLUSTER_DOMAIN` 这个环境变量,并将其取值设置与 `networking.dnsDomain` 的取值相同。否则 Kuboard 的一部分功能将无法正常工作。 + +## OIDC_ISSUER + +`OIDC_ISSUER` 这个环境变量与 Kubernetes Authentication 相关,建议您不要手工设置此环境变量,如果您想通过 OpenID Connect 的方式登录 Kuboard / Kubectl 请参考 [Kubernetes Authentication 安装向导](/learning/k8s-advanced/sec/authenticate/install.html),在该向导的引导下,您将能够顺利配置 Kuboard 与 GitHub / GitLab 等的单点登录。 +> 设置 `OIDC_ISSUER` 是该向导自动完成的一个步骤。 diff --git a/install/install-kuboard-layout-2.md b/install/install-kuboard-layout-2.md new file mode 100644 index 0000000..3268b03 --- /dev/null +++ b/install/install-kuboard-layout-2.md @@ -0,0 +1,136 @@ +--- +vssueId: 126 +description: Kuboard 以微服务分层结构的形式展示名称空间中的所有工作负载 +meta: + - name: keywords + content: Kuboard 自定义名称空间布局 +--- + +# 自定义Kuboard名称空间布局 + + + +## 名称空间布局 + +Kuboard 名称空间界面中,以微服务分层架构的形式对工作负载进行分类展示,默认布局模式如下图所示: + +![Kuboard名称空间布局](./install-kuboard-layout.assets/image-20200301165307517.png) + +## 自定义布局 + +自 Kuboard v1.0.7-beta.5 开始,允许用户自定义名称空间的布局。本章节描述了如何配置自定义布局的参数。 + +* 在 Kuboard 界面中,导航到 `kube-system` 名称空间; + +* 创建 ConfigMap + + > 点击名称空间左侧 **配置** 标题后面的 ***创建*** 按钮,可以创建 ConfigMap。 + + 在名称空间 `kube-system` 中创建一个名为 `kuboard-namespace-layout` 的 ConfigMap,并在其中添加一个 Key 为 `kuboard-namespace-layout.yaml` ,Value 为如下 yaml 内容的配置数据条目,如图所示: + + ![Kuboard名称空间布局](./install-kuboard-layout.assets/image-20200301175541579.png) + + yaml 文件内容为: + + ```yaml + version: "0.1" + + layers: + frontend: + name: 前端 + color: "blue" + backend: + name: 后端 + color: "rgba(0,120,246)" + db: + name: 数据库 + color: "#3EAF7C" + midware: + name: 中间件 + color: "#003366" + direction: vertical-right + width: 180 + ``` + + yaml 文件中,各字段的描述如下: + + ::: tip Layer ID + + layers 下每一个字段代表一个分层的 id。例如,此配置文件中定义了 4 个分层:`frontend`、`backend`、`db`、`midware`。对于每个分层,可以配置的参数见下表: + + ::: + + | 字段名 | 字段类型 | 必填 | 字段描述 | + | --------- | -------- | ---- | ------------------------------------------------------------ | + | name | String | 是 | 分层的名称,显示在界面上 | + | color | String | 是 | 分层中工作负载对象的主题色,可以使用 rgba 编码、颜色名称颜色编码等 html 支持的形式; | + | direction | String | 否 | 如果不填写,则该分层按 yaml 中出现的顺序自上而下显示在中间。如果填写,必须从下面两个取值当中选择:
  • `vertical-right`:垂直显示在右侧
  • `vertical-left`: 垂直显示在左侧
| + | width | Number | 条件 | 如果填写了 `direction` 字段,则此字段为必填;
该字段标识了垂直显示时,该区块的宽度,单位为像素 `px`。 | + + + +* 挂载 ConfigMap 到 Kuboard 容器 + + * 在 `kube-system` 名称空间中,导航到 `kuboard` 工作负载页面; + + * 在 `kuboard` 工作负载页面,点击 ***编辑*** 按钮,进入工作负载编辑页面; + + * 在工作负载编辑页面,增加数据卷 + + 为 `kuboard` 增加一个数据卷,字段描述及截图如下: + + | 字段名称 | 字段取值 | 字段描述 | + | ------------- | ------------------------------- | ------------------------------------------------------------ | + | 数据卷名称 | kuboard-namespace-layout-volume | 数据卷名称,在该工作负载内可用 | + | 数据卷类型 | configMap | 选择 configMap 类型的数据卷 | + | ConfigMap名称 | kuboard-namespace-layout | 选择前一个步骤中创建的 kuboard-namespace-layout 这个 ConfigMap | + + ![Kuboard名称空间布局](./install-kuboard-layout.assets/image-20200301180313243.png) + + * 在工作负载编辑页面,挂载配置文件到 `kuboard` 容器 + + 仍然在工作负载编辑页面,将 ConfigMap 中的配置内容挂载到 `kuboard` 容器,字段描述及截图如下: + + | 字段名称 | 字段取值 | 字段描述 | + | ---------------------- | --------------------------------------------------- | --------------------------------------------- | + | 镜像 | eipwork/kuboard:v1.0.7-beta.5 | Kuboard 版本不能低于 v1.0.7-beta.5 | + | 挂载点:容器内路径 | /usr/share/nginx/html/kuboard-namespace-layout.yaml | 替换容器中该路径中的配置文件 | + | 挂载点:数据卷名称 | kuboard-namespace-layout-volume | 选择前一个步骤中添加的数据卷 | + | 挂载点:数据卷内子路径 | kuboard-namespace-layout.yaml | 此字段取值为 configMap 中,对应配置条目的名称 | + + > 上述配置可以将 configMap 中 `kuboard-namspace-layout.yaml` 的内容映射为容器内路径为 `/usr/share/nginx/html/kuboard-namespace-layout.yaml` 的一个文件 + + ![Kuboard名称空间布局](./install-kuboard-layout.assets/image-20200301185053459.png) + + * 保存对 `kuboard` 工作负载的修改 + +* 刷新 Kuboard 界面 + + 刷新 Kuboard 界面后,可以看到,名称空间的布局被调整为如下形式: + + * 省略了左侧的 `监控层`; + * 中间三层被调整为 `前端`、`后端`、`数据库`; + * 右侧名称仍然为 `中间件` ,但是标识已经从 `cloud` 调整为 `midware`,所以原本在此处的 `服务注册` 工作负载现在显示在 `默认` 分层中。 + + ![Kuboard名称空间布局](./install-kuboard-layout.assets/image-20200301192027811.png) + +## 调整工作负载所在分层 + +如果您在使用 Kuboard 之前,就已经创建了许多的工作负载,然后您安装了 Kuboard,此时,所有的工作负载都是显示在 `默认` 这个分层的。 + +Kuboard 通过工作负载(Deployment / StatefulSet / DaemonSet 等)的 `k8s.eip.work/layer` 这个标签来识别工作负载应该显示在哪个分层。 + +如果您想要将工作负载调整到对应的分层,可以按照如下步骤操作: + +* 进入工作负载查看页面,如下图所示: + + ![Kuboard名称空间布局](./install-kuboard-layout.assets/image-20200301193155997.png) + +* 点击上图中 ***调整所在分层*** 按钮,将打开编辑标签的界面: + + 编辑 `k8s.eip.work/layer` ,并选择您想要的分层后,点击 ***确定*** 按钮。 + + ![Kuboard名称空间布局](./install-kuboard-layout.assets/image-20200301193427725.png) + +* 该工作负载将显示到您所期望的分层当中。 + diff --git a/support/change-log/change-log-on-the-way-2.0.md b/support/change-log/change-log-on-the-way-2.0.md index a8a2752..5d9fd2a 100644 --- a/support/change-log/change-log-on-the-way-2.0.md +++ b/support/change-log/change-log-on-the-way-2.0.md @@ -1,14 +1,18 @@ * 安装授权文件 * Port-forward -* Addons * Service: * SessionAffinity +切换主题色 +Prob 设置时,可以使用端口名 * 节点管理操作,驱逐、封禁等 -**BUG 修复** -* 创建 PVC 后,列表未刷新 -* 工作负载编辑页,不创建 Service 时,不应该显示端口列表 +* RoleBinding 可以跨名称空间绑定 + + +**BUG修复** + +* ClusterRoleBinding,被授权主体如果有四个字段时,删除按钮不可用;apiGroup/kind/namespace/name diff --git a/support/change-log/upgrade-2-from-beta.assets/image-20200607131849371.png b/support/change-log/upgrade-2-from-beta.assets/image-20200607131849371.png new file mode 100644 index 0000000..830c38d Binary files /dev/null and b/support/change-log/upgrade-2-from-beta.assets/image-20200607131849371.png differ diff --git a/support/change-log/upgrade-2-from-beta.assets/image-20200607143036738.png b/support/change-log/upgrade-2-from-beta.assets/image-20200607143036738.png new file mode 100644 index 0000000..40605d1 Binary files /dev/null and b/support/change-log/upgrade-2-from-beta.assets/image-20200607143036738.png differ diff --git a/support/change-log/upgrade-2-from-beta.md b/support/change-log/upgrade-2-from-beta.md new file mode 100644 index 0000000..8a3e73c --- /dev/null +++ b/support/change-log/upgrade-2-from-beta.md @@ -0,0 +1,39 @@ +--- +vssueId: 72 +description: 本文描述了Kuboard_v2.0.x版本的升级方法 +--- + +# 从 v2.0.0-beta.3.c 升级到 v2.0.0 + +v2.0.0 中,由于为了给套件增加授权相关的功能,对套件的 CRD 做了修改。如果您之前已经安装过 v2.0.0-beta.3.c 这个版本,请按如下步骤升级: + + + +## 删除 CRD,并升级 + +* 以 **kuboard-user** 这个 ServiceAccount 登录 Kuboard; + + 参考 [获取 **kuboard-user** 的登录 Token](/install/install-dashboard.html#获取token)。 + +* 点击 Kuboard 右上角的 **设置** 按钮,并在左侧菜单中导航到 **Kubernetes --> CRD** 子菜单,如下图所示: + + ![image-20200607131849371](./upgrade-2-from-beta.assets/image-20200607131849371.png) + +* 删除上图中的 ***kuboardaddons.kuboard.cn*** 这个CRD; +* 在左侧菜单中导航到 **版本信息** 子菜单,并在 **版本信息** 子菜单中点击 **Upgrade** 按钮,升级到 v2.0.0 正式版。 + + + +## 重装套件,并使用之前的数据 + +请参考文档 [监控 example](/guide/example/monitor-v2.html),重新完成套件的安装。 + +::: tip 重用原来的数据 + +在安装套件时,第 5 补,设置存储卷声明时,选择与上次安装监控套件时所使用的相同的存储卷声明,即可在监控套件中查看到之前的监控数据。 + +::: + + + +![image-20200607143036738](./upgrade-2-from-beta.assets/image-20200607143036738.png) diff --git a/support/change-log/v2.0.x.md b/support/change-log/v2.0.x.md index f3f8a31..d8aa686 100644 --- a/support/change-log/v2.0.x.md +++ b/support/change-log/v2.0.x.md @@ -13,6 +13,44 @@ Kuboard v2.0.x 的更新说明 了解 [从Kuboard v1.0.x 升级到 Kuboard v2.0.x](./upgrade-1-2.html) +## v2.0.0 + +**发布日期** + +2020年6月8日 + +**新特性** + +* 响应地摊经济,针对增强特性设置付费通道 + +**优化** + +* 套件管理 + * 支持授权配置; + * 套件管理页面增加快捷链接列表; + * 内嵌帮助页显示; + * 将部分操作调整到 ControlBar; +* i18n + * 工作负载查看页; + * 调整容器镜像页; + * 404页; + * Events 通知弹窗; +* 页头 + * 版本号过长时,页头布局出错; + * 当面包屑超长时,占用右侧空间,以保证面包屑可以正常操作; + * 显示更加详细的错误提示; + +* 日志界面 --> 增加清空日志的按钮 +* 终端界面 --> 增加清空终端的按钮 + +**BUG 修复** +* 创建 PVC 后,列表未刷新; +* 工作负载编辑页: + * 不创建 Service 时,不应该显示端口列表; + * 注解为空时,不能保存的问题 +* 当用户没有权限查看名称空间内的事件时,页头显示失败的问题; +* 日志界面 --> 查找功能不工作; + ## v2.0.0-beta.3.c **发布日期** diff --git a/support/index.md b/support/index.md index eb1baec..155bc50 100644 --- a/support/index.md +++ b/support/index.md @@ -21,7 +21,7 @@ export default { } -## 授权声明 + @@ -80,22 +80,12 @@ export default { +## 订阅 + + + ## 已采纳用户 -只要您在此处留下公司名字,您就已经 **取得将 Kuboard 用于生产环境的授权** + +> 如果列表不能显示,请直接到这个链接留言 [Kuboard 授权列表](https://github.com/eip-work/kuboard-press/issues/71) --> diff --git a/yarn.lock b/yarn.lock index 56bb44d..67bd38a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -19,18 +19,18 @@ semver "^5.5.0" "@babel/core@^7.8.4", "@babel/core@^7.9.6": - version "7.10.1" - resolved "https://registry.npm.taobao.org/@babel/core/download/@babel/core-7.10.1.tgz#2a0ad0ea693601820defebad2140206503d89af3" - integrity sha1-KgrQ6mk2AYIN7+utIUAgZQPYmvM= + version "7.10.2" + resolved "https://registry.npm.taobao.org/@babel/core/download/@babel/core-7.10.2.tgz#bd6786046668a925ac2bd2fd95b579b92a23b36a" + integrity sha1-vWeGBGZoqSWsK9L9lbV5uSojs2o= dependencies: "@babel/code-frame" "^7.10.1" - "@babel/generator" "^7.10.1" + "@babel/generator" "^7.10.2" "@babel/helper-module-transforms" "^7.10.1" "@babel/helpers" "^7.10.1" - "@babel/parser" "^7.10.1" + "@babel/parser" "^7.10.2" "@babel/template" "^7.10.1" "@babel/traverse" "^7.10.1" - "@babel/types" "^7.10.1" + "@babel/types" "^7.10.2" convert-source-map "^1.7.0" debug "^4.1.0" gensync "^1.0.0-beta.1" @@ -40,12 +40,12 @@ semver "^5.4.1" source-map "^0.5.0" -"@babel/generator@^7.10.1": - version "7.10.1" - resolved "https://registry.npm.taobao.org/@babel/generator/download/@babel/generator-7.10.1.tgz#4d14458e539bcb04ffe34124143f5c489f2dbca9" - integrity sha1-TRRFjlObywT/40EkFD9cSJ8tvKk= +"@babel/generator@^7.10.1", "@babel/generator@^7.10.2": + version "7.10.2" + resolved "https://registry.npm.taobao.org/@babel/generator/download/@babel/generator-7.10.2.tgz#0fa5b5b2389db8bfdfcc3492b551ee20f5dd69a9" + integrity sha1-D6W1sjiduL/fzDSStVHuIPXdaak= dependencies: - "@babel/types" "^7.10.1" + "@babel/types" "^7.10.2" jsesc "^2.5.1" lodash "^4.17.13" source-map "^0.5.0" @@ -65,10 +65,10 @@ "@babel/helper-explode-assignable-expression" "^7.10.1" "@babel/types" "^7.10.1" -"@babel/helper-compilation-targets@^7.10.1", "@babel/helper-compilation-targets@^7.9.6": - version "7.10.1" - resolved "https://registry.npm.taobao.org/@babel/helper-compilation-targets/download/@babel/helper-compilation-targets-7.10.1.tgz?cache=0&sync_timestamp=1590618310328&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40babel%2Fhelper-compilation-targets%2Fdownload%2F%40babel%2Fhelper-compilation-targets-7.10.1.tgz#ad6f69b4c3bae955081ef914a84e5878ffcaca63" - integrity sha1-rW9ptMO66VUIHvkUqE5YeP/KymM= +"@babel/helper-compilation-targets@^7.10.2", "@babel/helper-compilation-targets@^7.9.6": + version "7.10.2" + resolved "https://registry.npm.taobao.org/@babel/helper-compilation-targets/download/@babel/helper-compilation-targets-7.10.2.tgz#a17d9723b6e2c750299d2a14d4637c76936d8285" + integrity sha1-oX2XI7bix1ApnSoU1GN8dpNtgoU= dependencies: "@babel/compat-data" "^7.10.1" browserslist "^4.12.0" @@ -77,9 +77,9 @@ semver "^5.5.0" "@babel/helper-create-class-features-plugin@^7.10.1": - version "7.10.1" - resolved "https://registry.npm.taobao.org/@babel/helper-create-class-features-plugin/download/@babel/helper-create-class-features-plugin-7.10.1.tgz#6d8a45aafe492378d0e6fc0b33e5dea132eae21c" - integrity sha1-bYpFqv5JI3jQ5vwLM+XeoTLq4hw= + version "7.10.2" + resolved "https://registry.npm.taobao.org/@babel/helper-create-class-features-plugin/download/@babel/helper-create-class-features-plugin-7.10.2.tgz#7474295770f217dbcf288bf7572eb213db46ee67" + integrity sha1-dHQpV3DyF9vPKIv3Vy6yE9tG7mc= dependencies: "@babel/helper-function-name" "^7.10.1" "@babel/helper-member-expression-to-functions" "^7.10.1" @@ -260,10 +260,10 @@ chalk "^2.0.0" js-tokens "^4.0.0" -"@babel/parser@^7.10.1": - version "7.10.1" - resolved "https://registry.npm.taobao.org/@babel/parser/download/@babel/parser-7.10.1.tgz?cache=0&sync_timestamp=1590618310183&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40babel%2Fparser%2Fdownload%2F%40babel%2Fparser-7.10.1.tgz#2e142c27ca58aa2c7b119d09269b702c8bbad28c" - integrity sha1-LhQsJ8pYqix7EZ0JJptwLIu60ow= +"@babel/parser@^7.10.1", "@babel/parser@^7.10.2": + version "7.10.2" + resolved "https://registry.npm.taobao.org/@babel/parser/download/@babel/parser-7.10.2.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40babel%2Fparser%2Fdownload%2F%40babel%2Fparser-7.10.2.tgz#871807f10442b92ff97e4783b9b54f6a0ca812d0" + integrity sha1-hxgH8QRCuS/5fkeDubVPagyoEtA= "@babel/plugin-proposal-async-generator-functions@^7.10.1": version "7.10.1" @@ -387,7 +387,7 @@ "@babel/plugin-syntax-dynamic-import@^7.8.0", "@babel/plugin-syntax-dynamic-import@^7.8.3": version "7.8.3" - resolved "https://registry.npm.taobao.org/@babel/plugin-syntax-dynamic-import/download/@babel/plugin-syntax-dynamic-import-7.8.3.tgz?cache=0&sync_timestamp=1578952227018&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40babel%2Fplugin-syntax-dynamic-import%2Fdownload%2F%40babel%2Fplugin-syntax-dynamic-import-7.8.3.tgz#62bf98b2da3cd21d626154fc96ee5b3cb68eacb3" + resolved "https://registry.npm.taobao.org/@babel/plugin-syntax-dynamic-import/download/@babel/plugin-syntax-dynamic-import-7.8.3.tgz#62bf98b2da3cd21d626154fc96ee5b3cb68eacb3" integrity sha1-Yr+Ysto80h1iYVT8lu5bPLaOrLM= dependencies: "@babel/helper-plugin-utils" "^7.8.0" @@ -710,12 +710,12 @@ "@babel/helper-plugin-utils" "^7.10.1" "@babel/preset-env@^7.9.6": - version "7.10.1" - resolved "https://registry.npm.taobao.org/@babel/preset-env/download/@babel/preset-env-7.10.1.tgz#099e1b76379739bdcbfab3d548dc7e7edb2ac808" - integrity sha1-CZ4bdjeXOb3L+rPVSNx+ftsqyAg= + version "7.10.2" + resolved "https://registry.npm.taobao.org/@babel/preset-env/download/@babel/preset-env-7.10.2.tgz?cache=0&sync_timestamp=1590868884448&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40babel%2Fpreset-env%2Fdownload%2F%40babel%2Fpreset-env-7.10.2.tgz#715930f2cf8573b0928005ee562bed52fb65fdfb" + integrity sha1-cVkw8s+Fc7CSgAXuVivtUvtl/fs= dependencies: "@babel/compat-data" "^7.10.1" - "@babel/helper-compilation-targets" "^7.10.1" + "@babel/helper-compilation-targets" "^7.10.2" "@babel/helper-module-imports" "^7.10.1" "@babel/helper-plugin-utils" "^7.10.1" "@babel/plugin-proposal-async-generator-functions" "^7.10.1" @@ -772,7 +772,7 @@ "@babel/plugin-transform-unicode-escapes" "^7.10.1" "@babel/plugin-transform-unicode-regex" "^7.10.1" "@babel/preset-modules" "^0.1.3" - "@babel/types" "^7.10.1" + "@babel/types" "^7.10.2" browserslist "^4.12.0" core-js-compat "^3.6.2" invariant "^2.2.2" @@ -791,9 +791,9 @@ esutils "^2.0.2" "@babel/runtime@^7.3.4", "@babel/runtime@^7.8.4", "@babel/runtime@^7.9.6": - version "7.10.1" - resolved "https://registry.npm.taobao.org/@babel/runtime/download/@babel/runtime-7.10.1.tgz?cache=0&sync_timestamp=1590618307608&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40babel%2Fruntime%2Fdownload%2F%40babel%2Fruntime-7.10.1.tgz#b6eb75cac279588d3100baecd1b9894ea2840822" - integrity sha1-tut1ysJ5WI0xALrs0bmJTqKECCI= + version "7.10.2" + resolved "https://registry.npm.taobao.org/@babel/runtime/download/@babel/runtime-7.10.2.tgz#d103f21f2602497d38348a32e008637d506db839" + integrity sha1-0QPyHyYCSX04NIoy4AhjfVBtuDk= dependencies: regenerator-runtime "^0.13.4" @@ -823,17 +823,17 @@ "@babel/types@7.0.0-beta.35": version "7.0.0-beta.35" - resolved "https://registry.npm.taobao.org/@babel/types/download/@babel/types-7.0.0-beta.35.tgz?cache=0&sync_timestamp=1590618315798&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40babel%2Ftypes%2Fdownload%2F%40babel%2Ftypes-7.0.0-beta.35.tgz#cf933a9a9a38484ca724b335b88d83726d5ab960" + resolved "https://registry.npm.taobao.org/@babel/types/download/@babel/types-7.0.0-beta.35.tgz#cf933a9a9a38484ca724b335b88d83726d5ab960" integrity sha1-z5M6mpo4SEynJLM1uI2Dcm1auWA= dependencies: esutils "^2.0.2" lodash "^4.2.0" to-fast-properties "^2.0.0" -"@babel/types@^7.10.1", "@babel/types@^7.4.4": - version "7.10.1" - resolved "https://registry.npm.taobao.org/@babel/types/download/@babel/types-7.10.1.tgz?cache=0&sync_timestamp=1590618315798&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40babel%2Ftypes%2Fdownload%2F%40babel%2Ftypes-7.10.1.tgz#6886724d31c8022160a7db895e6731ca33483921" - integrity sha1-aIZyTTHIAiFgp9uJXmcxyjNIOSE= +"@babel/types@^7.10.1", "@babel/types@^7.10.2", "@babel/types@^7.4.4": + version "7.10.2" + resolved "https://registry.npm.taobao.org/@babel/types/download/@babel/types-7.10.2.tgz#30283be31cad0dbf6fb00bd40641ca0ea675172d" + integrity sha1-MCg74xytDb9vsAvUBkHKDqZ1Fy0= dependencies: "@babel/helper-validator-identifier" "^7.10.1" lodash "^4.17.13" @@ -841,7 +841,7 @@ "@hapi/address@2.x.x": version "2.1.4" - resolved "https://registry.npm.taobao.org/@hapi/address/download/@hapi/address-2.1.4.tgz?cache=0&sync_timestamp=1584144992341&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40hapi%2Faddress%2Fdownload%2F%40hapi%2Faddress-2.1.4.tgz#5d67ed43f3fd41a69d4b9ff7b56e7c0d1d0a81e5" + resolved "https://registry.npm.taobao.org/@hapi/address/download/@hapi/address-2.1.4.tgz#5d67ed43f3fd41a69d4b9ff7b56e7c0d1d0a81e5" integrity sha1-XWftQ/P9QaadS5/3tW58DR0KgeU= "@hapi/bourne@1.x.x": @@ -910,17 +910,11 @@ resolved "https://registry.npm.taobao.org/@types/color-name/download/@types/color-name-1.1.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40types%2Fcolor-name%2Fdownload%2F%40types%2Fcolor-name-1.1.1.tgz#1c1261bbeaa10a8055bbc5d8ab84b7b2afc846a0" integrity sha1-HBJhu+qhCoBVu8XYq4S3sq/IRqA= -"@types/events@*": - version "3.0.0" - resolved "https://registry.npm.taobao.org/@types/events/download/@types/events-3.0.0.tgz#2862f3f58a9a7f7c3e78d79f130dd4d71c25c2a7" - integrity sha1-KGLz9Yqaf3w+eNefEw3U1xwlwqc= - "@types/glob@^7.1.1": - version "7.1.1" - resolved "https://registry.npm.taobao.org/@types/glob/download/@types/glob-7.1.1.tgz?cache=0&sync_timestamp=1588201260510&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40types%2Fglob%2Fdownload%2F%40types%2Fglob-7.1.1.tgz#aa59a1c6e3fbc421e07ccd31a944c30eba521575" - integrity sha1-qlmhxuP7xCHgfM0xqUTDDrpSFXU= + version "7.1.2" + resolved "https://registry.npm.taobao.org/@types/glob/download/@types/glob-7.1.2.tgz#06ca26521353a545d94a0adc74f38a59d232c987" + integrity sha1-BsomUhNTpUXZSgrcdPOKWdIyyYc= dependencies: - "@types/events" "*" "@types/minimatch" "*" "@types/node" "*" @@ -935,9 +929,9 @@ integrity sha1-PcoOPzOyAPx9ETnAzZbBJoyt/Z0= "@types/node@*": - version "14.0.6" - resolved "https://registry.npm.taobao.org/@types/node/download/@types/node-14.0.6.tgz#f9e178b2da31a4b0ec60b64649e244c31ce18daf" - integrity sha1-+eF4stoxpLDsYLZGSeJEwxzhja8= + version "14.0.11" + resolved "https://registry.npm.taobao.org/@types/node/download/@types/node-14.0.11.tgz#61d4886e2424da73b7b25547f59fdcb534c165a3" + integrity sha1-YdSIbiQk2nO3slVH9Z/ctTTBZaM= "@types/q@^1.5.1": version "1.5.4" @@ -2062,7 +2056,7 @@ cac@^6.5.6: cacache@^12.0.2, cacache@^12.0.3: version "12.0.4" - resolved "https://registry.npm.taobao.org/cacache/download/cacache-12.0.4.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcacache%2Fdownload%2Fcacache-12.0.4.tgz#668bcbd105aeb5f1d92fe25570ec9525c8faa40c" + resolved "https://registry.npm.taobao.org/cacache/download/cacache-12.0.4.tgz#668bcbd105aeb5f1d92fe25570ec9525c8faa40c" integrity sha1-ZovL0QWutfHZL+JVcOyVJcj6pAw= dependencies: bluebird "^3.5.5" @@ -2169,9 +2163,9 @@ caniuse-api@^3.0.0: lodash.uniq "^4.5.0" caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001043, caniuse-lite@^1.0.30001061: - version "1.0.30001066" - resolved "https://registry.npm.taobao.org/caniuse-lite/download/caniuse-lite-1.0.30001066.tgz#0a8a58a10108f2b9bf38e7b65c237b12fd9c5f04" - integrity sha1-CopYoQEI8rm/OOe2XCN7Ev2cXwQ= + version "1.0.30001078" + resolved "https://registry.npm.taobao.org/caniuse-lite/download/caniuse-lite-1.0.30001078.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcaniuse-lite%2Fdownload%2Fcaniuse-lite-1.0.30001078.tgz#e1b6e2ae327b6a1ec11f65ec7a0dde1e7093074c" + integrity sha1-4bbirjJ7ah7BH2Xseg3eHnCTB0w= caseless@~0.12.0: version "0.12.0" @@ -2538,7 +2532,7 @@ copy-descriptor@^0.1.0: copy-webpack-plugin@^5.0.2: version "5.1.1" - resolved "https://registry.npm.taobao.org/copy-webpack-plugin/download/copy-webpack-plugin-5.1.1.tgz#5481a03dea1123d88a988c6ff8b78247214f0b88" + resolved "https://registry.npm.taobao.org/copy-webpack-plugin/download/copy-webpack-plugin-5.1.1.tgz?cache=0&sync_timestamp=1591198615356&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcopy-webpack-plugin%2Fdownload%2Fcopy-webpack-plugin-5.1.1.tgz#5481a03dea1123d88a988c6ff8b78247214f0b88" integrity sha1-VIGgPeoRI9iKmIxv+LeCRyFPC4g= dependencies: cacache "^12.0.3" @@ -2730,9 +2724,9 @@ css-tree@1.0.0-alpha.39: source-map "^0.6.1" css-unit-converter@^1.1.1: - version "1.1.1" - resolved "https://registry.npm.taobao.org/css-unit-converter/download/css-unit-converter-1.1.1.tgz#d9b9281adcfd8ced935bdbaba83786897f64e996" - integrity sha1-2bkoGtz9jO2TW9urqDeGiX9k6ZY= + version "1.1.2" + resolved "https://registry.npm.taobao.org/css-unit-converter/download/css-unit-converter-1.1.2.tgz#4c77f5a1954e6dbff60695ecb214e3270436ab21" + integrity sha1-THf1oZVObb/2BpXsshTjJwQ2qyE= css-what@2.1: version "2.1.3" @@ -2740,9 +2734,9 @@ css-what@2.1: integrity sha1-ptdgRXM2X+dGhsPzEcVlE9iChfI= css-what@^3.2.1: - version "3.2.1" - resolved "https://registry.npm.taobao.org/css-what/download/css-what-3.2.1.tgz#f4a8f12421064621b456755e34a03a2c22df5da1" - integrity sha1-9KjxJCEGRiG0VnVeNKA6LCLfXaE= + version "3.3.0" + resolved "https://registry.npm.taobao.org/css-what/download/css-what-3.3.0.tgz#10fec696a9ece2e591ac772d759aacabac38cd39" + integrity sha1-EP7Glqns4uWRrHctdZqsq6w4zTk= css@^2.0.0: version "2.2.4" @@ -3159,9 +3153,9 @@ ee-first@1.1.1: integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0= electron-to-chromium@^1.3.413: - version "1.3.455" - resolved "https://registry.npm.taobao.org/electron-to-chromium/download/electron-to-chromium-1.3.455.tgz#fd65a3f5db6ffa83eb7c84f16ea9b1b7396f537d" - integrity sha1-/WWj9dtv+oPrfITxbqmxtzlvU30= + version "1.3.464" + resolved "https://registry.npm.taobao.org/electron-to-chromium/download/electron-to-chromium-1.3.464.tgz?cache=0&sync_timestamp=1591474882235&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Felectron-to-chromium%2Fdownload%2Felectron-to-chromium-1.3.464.tgz#fe13feaa08f6f865d3c89d5d72e54c194f463aa5" + integrity sha1-/hP+qgj2+GXTyJ1dcuVMGU9GOqU= elliptic@^6.0.0, elliptic@^6.5.2: version "6.5.2" @@ -3210,7 +3204,7 @@ end-of-stream@^1.0.0, end-of-stream@^1.1.0: enhanced-resolve@^4.1.0: version "4.1.1" - resolved "https://registry.npm.taobao.org/enhanced-resolve/download/enhanced-resolve-4.1.1.tgz?cache=0&sync_timestamp=1590177813022&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fenhanced-resolve%2Fdownload%2Fenhanced-resolve-4.1.1.tgz#2937e2b8066cd0fe7ce0990a98f0d71a35189f66" + resolved "https://registry.npm.taobao.org/enhanced-resolve/download/enhanced-resolve-4.1.1.tgz#2937e2b8066cd0fe7ce0990a98f0d71a35189f66" integrity sha1-KTfiuAZs0P584JkKmPDXGjUYn2Y= dependencies: graceful-fs "^4.1.2" @@ -3223,9 +3217,9 @@ entities@^1.1.1, entities@~1.1.1: integrity sha1-vfpzUplmTfr9NFKe1PhSKidf6lY= entities@^2.0.0: - version "2.0.2" - resolved "https://registry.npm.taobao.org/entities/download/entities-2.0.2.tgz#ac74db0bba8d33808bbf36809c3a5c3683531436" - integrity sha1-rHTbC7qNM4CLvzaAnDpcNoNTFDY= + version "2.0.3" + resolved "https://registry.npm.taobao.org/entities/download/entities-2.0.3.tgz#5c487e5742ab93c15abb5da22759b8590ec03b7f" + integrity sha1-XEh+V0Krk8Fau12iJ1m4WQ7AO38= envify@^4.0.0: version "4.1.0" @@ -3302,7 +3296,7 @@ escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5: eslint-scope@^4.0.3: version "4.0.3" - resolved "https://registry.npm.taobao.org/eslint-scope/download/eslint-scope-4.0.3.tgz#ca03833310f6889a3264781aa82e63eb9cfe7848" + resolved "https://registry.npm.taobao.org/eslint-scope/download/eslint-scope-4.0.3.tgz?cache=0&sync_timestamp=1591270013616&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Feslint-scope%2Fdownload%2Feslint-scope-4.0.3.tgz#ca03833310f6889a3264781aa82e63eb9cfe7848" integrity sha1-ygODMxD2iJoyZHgaqC5j65z+eEg= dependencies: esrecurse "^4.1.0" @@ -3663,7 +3657,7 @@ from2@^2.1.0: fs-extra@^4.0.2: version "4.0.3" - resolved "https://registry.npm.taobao.org/fs-extra/download/fs-extra-4.0.3.tgz#0d852122e5bc5beb453fb028e9c0c9bf36340c94" + resolved "https://registry.npm.taobao.org/fs-extra/download/fs-extra-4.0.3.tgz?cache=0&sync_timestamp=1591229981021&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ffs-extra%2Fdownload%2Ffs-extra-4.0.3.tgz#0d852122e5bc5beb453fb028e9c0c9bf36340c94" integrity sha1-DYUhIuW8W+tFP7Ao6cDJvzY0DJQ= dependencies: graceful-fs "^4.1.2" @@ -3672,7 +3666,7 @@ fs-extra@^4.0.2: fs-extra@^7.0.1: version "7.0.1" - resolved "https://registry.npm.taobao.org/fs-extra/download/fs-extra-7.0.1.tgz#4f189c44aa123b895f722804f55ea23eadc348e9" + resolved "https://registry.npm.taobao.org/fs-extra/download/fs-extra-7.0.1.tgz?cache=0&sync_timestamp=1591229981021&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ffs-extra%2Fdownload%2Ffs-extra-7.0.1.tgz#4f189c44aa123b895f722804f55ea23eadc348e9" integrity sha1-TxicRKoSO4lfcigE9V6iPq3DSOk= dependencies: graceful-fs "^4.1.2" @@ -3760,7 +3754,7 @@ github-markdown-css@^3.0.1: glob-parent@^3.1.0: version "3.1.0" - resolved "https://registry.npm.taobao.org/glob-parent/download/glob-parent-3.1.0.tgz?cache=0&sync_timestamp=1584836110944&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fglob-parent%2Fdownload%2Fglob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae" + resolved "https://registry.npm.taobao.org/glob-parent/download/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae" integrity sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4= dependencies: is-glob "^3.1.0" @@ -3768,7 +3762,7 @@ glob-parent@^3.1.0: glob-parent@~5.1.0: version "5.1.1" - resolved "https://registry.npm.taobao.org/glob-parent/download/glob-parent-5.1.1.tgz?cache=0&sync_timestamp=1584836110944&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fglob-parent%2Fdownload%2Fglob-parent-5.1.1.tgz#b6c1ef417c4e5663ea498f1c45afac6916bbc229" + resolved "https://registry.npm.taobao.org/glob-parent/download/glob-parent-5.1.1.tgz#b6c1ef417c4e5663ea498f1c45afac6916bbc229" integrity sha1-tsHvQXxOVmPqSY8cRa+saRa7wik= dependencies: is-glob "^4.0.1" @@ -3807,7 +3801,7 @@ global@^4.3.2: globals@^11.1.0: version "11.12.0" - resolved "https://registry.npm.taobao.org/globals/download/globals-11.12.0.tgz?cache=0&sync_timestamp=1586675652043&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fglobals%2Fdownload%2Fglobals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e" + resolved "https://registry.npm.taobao.org/globals/download/globals-11.12.0.tgz?cache=0&sync_timestamp=1591426055144&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fglobals%2Fdownload%2Fglobals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e" integrity sha1-q4eVM4hooLq9hSV1gBjCp+uVxC4= globby@^6.1.0: @@ -3971,7 +3965,7 @@ has@^1.0.0, has@^1.0.3: hash-base@^3.0.0: version "3.1.0" - resolved "https://registry.npm.taobao.org/hash-base/download/hash-base-3.1.0.tgz?cache=0&sync_timestamp=1588318012719&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fhash-base%2Fdownload%2Fhash-base-3.1.0.tgz#55c381d9e06e1d2997a883b4a3fddfe7f0d3af33" + resolved "https://registry.npm.taobao.org/hash-base/download/hash-base-3.1.0.tgz#55c381d9e06e1d2997a883b4a3fddfe7f0d3af33" integrity sha1-VcOB2eBuHSmXqIO0o/3f5/DTrzM= dependencies: inherits "^2.0.4" @@ -4120,10 +4114,10 @@ http-errors@~1.7.2: statuses ">= 1.5.0 < 2" toidentifier "1.0.0" -"http-parser-js@>=0.4.0 <0.4.11": - version "0.4.10" - resolved "https://registry.npm.taobao.org/http-parser-js/download/http-parser-js-0.4.10.tgz?cache=0&sync_timestamp=1572714277347&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fhttp-parser-js%2Fdownload%2Fhttp-parser-js-0.4.10.tgz#92c9c1374c35085f75db359ec56cc257cbb93fa4" - integrity sha1-ksnBN0w1CF912zWexWzCV8u5P6Q= +http-parser-js@>=0.5.1: + version "0.5.2" + resolved "https://registry.npm.taobao.org/http-parser-js/download/http-parser-js-0.5.2.tgz?cache=0&sync_timestamp=1572714277347&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fhttp-parser-js%2Fdownload%2Fhttp-parser-js-0.5.2.tgz#da2e31d237b393aae72ace43882dd7e270a8ff77" + integrity sha1-2i4x0jezk6rnKs5DiC3X4nCo/3c= http-proxy-middleware@0.19.1: version "0.19.1" @@ -4379,9 +4373,9 @@ is-buffer@^2.0.2: integrity sha1-PlcvI8hBGlz9lVfISeNmXgspBiM= is-callable@^1.1.4, is-callable@^1.1.5: - version "1.1.5" - resolved "https://registry.npm.taobao.org/is-callable/download/is-callable-1.1.5.tgz#f7e46b596890456db74e7f6e976cb3273d06faab" - integrity sha1-9+RrWWiQRW23Tn9ul2yzJz0G+qs= + version "1.2.0" + resolved "https://registry.npm.taobao.org/is-callable/download/is-callable-1.2.0.tgz#83336560b54a38e35e3a2df7afd0454d691468bb" + integrity sha1-gzNlYLVKOONeOi33r9BFTWkUaLs= is-ci@^2.0.0: version "2.0.0" @@ -4557,11 +4551,11 @@ is-plain-object@^2.0.3, is-plain-object@^2.0.4: isobject "^3.0.1" is-regex@^1.0.4, is-regex@^1.0.5: - version "1.0.5" - resolved "https://registry.npm.taobao.org/is-regex/download/is-regex-1.0.5.tgz#39d589a358bf18967f726967120b8fc1aed74eae" - integrity sha1-OdWJo1i/GJZ/cmlnEguPwa7XTq4= + version "1.1.0" + resolved "https://registry.npm.taobao.org/is-regex/download/is-regex-1.1.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fis-regex%2Fdownload%2Fis-regex-1.1.0.tgz#ece38e389e490df0dc21caea2bd596f987f767ff" + integrity sha1-7OOOOJ5JDfDcIcrqK9WW+Yf3Z/8= dependencies: - has "^1.0.3" + has-symbols "^1.0.1" is-regexp@^1.0.0: version "1.0.0" @@ -5001,7 +4995,7 @@ markdown-it-chain@^1.3.0: markdown-it-container@^2.0.0: version "2.0.0" - resolved "https://registry.npm.taobao.org/markdown-it-container/download/markdown-it-container-2.0.0.tgz#0019b43fd02eefece2f1960a2895fba81a404695" + resolved "https://registry.npm.taobao.org/markdown-it-container/download/markdown-it-container-2.0.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fmarkdown-it-container%2Fdownload%2Fmarkdown-it-container-2.0.0.tgz#0019b43fd02eefece2f1960a2895fba81a404695" integrity sha1-ABm0P9Au7+zi8ZYKKJX7qBpARpU= markdown-it-emoji@^1.4.0: @@ -5088,9 +5082,9 @@ merge-source-map@^1.1.0: source-map "^0.6.1" merge2@^1.2.3: - version "1.3.0" - resolved "https://registry.npm.taobao.org/merge2/download/merge2-1.3.0.tgz#5b366ee83b2f1582c48f87e47cf1a9352103ca81" - integrity sha1-WzZu6DsvFYLEj4fkfPGpNSEDyoE= + version "1.4.1" + resolved "https://registry.npm.taobao.org/merge2/download/merge2-1.4.1.tgz?cache=0&sync_timestamp=1591170081942&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fmerge2%2Fdownload%2Fmerge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae" + integrity sha1-Q2iJL4hekHRVpv19xVwMnUBJkK4= methods@~1.1.2: version "1.1.2" @@ -5350,9 +5344,9 @@ node-libs-browser@^2.2.1: vm-browserify "^1.0.1" node-releases@^1.1.53: - version "1.1.57" - resolved "https://registry.npm.taobao.org/node-releases/download/node-releases-1.1.57.tgz#f6754ce225fad0611e61228df3e09232e017ea19" - integrity sha1-9nVM4iX60GEeYSKN8+CSMuAX6hk= + version "1.1.58" + resolved "https://registry.npm.taobao.org/node-releases/download/node-releases-1.1.58.tgz#8ee20eef30fa60e52755fcc0942def5a734fe935" + integrity sha1-juIO7zD6YOUnVfzAlC3vWnNP6TU= nodemon@2.0.4: version "2.0.4" @@ -5584,14 +5578,14 @@ p-finally@^1.0.0: p-limit@^1.1.0: version "1.3.0" - resolved "https://registry.npm.taobao.org/p-limit/download/p-limit-1.3.0.tgz?cache=0&sync_timestamp=1586101462762&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fp-limit%2Fdownload%2Fp-limit-1.3.0.tgz#b86bd5f0c25690911c7590fcbfc2010d54b3ccb8" + resolved "https://registry.npm.taobao.org/p-limit/download/p-limit-1.3.0.tgz#b86bd5f0c25690911c7590fcbfc2010d54b3ccb8" integrity sha1-uGvV8MJWkJEcdZD8v8IBDVSzzLg= dependencies: p-try "^1.0.0" p-limit@^2.0.0, p-limit@^2.2.1: version "2.3.0" - resolved "https://registry.npm.taobao.org/p-limit/download/p-limit-2.3.0.tgz?cache=0&sync_timestamp=1586101462762&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fp-limit%2Fdownload%2Fp-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1" + resolved "https://registry.npm.taobao.org/p-limit/download/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1" integrity sha1-PdM8ZHohT9//2DWTPrCG2g3CHbE= dependencies: p-try "^2.0.0" @@ -5741,9 +5735,9 @@ path-type@^3.0.0: pify "^3.0.0" pbkdf2@^3.0.3: - version "3.0.17" - resolved "https://registry.npm.taobao.org/pbkdf2/download/pbkdf2-3.0.17.tgz#976c206530617b14ebb32114239f7b09336e93a6" - integrity sha1-l2wgZTBhexTrsyEUI597CTNuk6Y= + version "3.1.1" + resolved "https://registry.npm.taobao.org/pbkdf2/download/pbkdf2-3.1.1.tgz#cb8724b0fada984596856d1a6ebafd3584654b94" + integrity sha1-y4cksPramEWWhW0abrr9NYRlS5Q= dependencies: create-hash "^1.1.2" create-hmac "^1.1.4" @@ -6159,9 +6153,9 @@ postcss-value-parser@^4.0.2, postcss-value-parser@^4.1.0: integrity sha1-RD9qIM7WSBor2k+oUypuVdeJoss= postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.26, postcss@^7.0.27, postcss@^7.0.30, postcss@^7.0.5, postcss@^7.0.6: - version "7.0.31" - resolved "https://registry.npm.taobao.org/postcss/download/postcss-7.0.31.tgz?cache=0&sync_timestamp=1590459243202&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fpostcss%2Fdownload%2Fpostcss-7.0.31.tgz#332af45cb73e26c0ee2614d7c7fb02dfcc2bd6dd" - integrity sha1-Myr0XLc+JsDuJhTXx/sC38wr1t0= + version "7.0.32" + resolved "https://registry.npm.taobao.org/postcss/download/postcss-7.0.32.tgz?cache=0&sync_timestamp=1591102384019&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fpostcss%2Fdownload%2Fpostcss-7.0.32.tgz#4310d6ee347053da3433db2be492883d62cec59d" + integrity sha1-QxDW7jRwU9o0M9sr5JKIPWLOxZ0= dependencies: chalk "^2.4.2" source-map "^0.6.1" @@ -6331,7 +6325,7 @@ qs@~6.5.2: query-string@^5.0.1: version "5.1.1" - resolved "https://registry.npm.taobao.org/query-string/download/query-string-5.1.1.tgz?cache=0&sync_timestamp=1586713396727&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fquery-string%2Fdownload%2Fquery-string-5.1.1.tgz#a78c012b71c17e05f2e3fa2319dd330682efb3cb" + resolved "https://registry.npm.taobao.org/query-string/download/query-string-5.1.1.tgz?cache=0&sync_timestamp=1591426282140&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fquery-string%2Fdownload%2Fquery-string-5.1.1.tgz#a78c012b71c17e05f2e3fa2319dd330682efb3cb" integrity sha1-p4wBK3HBfgXy4/ojGd0zBoLvs8s= dependencies: decode-uri-component "^0.2.0" @@ -6353,7 +6347,7 @@ querystringify@^2.1.1: resolved "https://registry.npm.taobao.org/querystringify/download/querystringify-2.1.1.tgz#60e5a5fd64a7f8bfa4d2ab2ed6fdf4c85bad154e" integrity sha1-YOWl/WSn+L+k0qsu1v30yFutFU4= -randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5: +randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5, randombytes@^2.1.0: version "2.1.0" resolved "https://registry.npm.taobao.org/randombytes/download/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a" integrity sha1-32+ENy8CcNxlzfYpE0mrekc9Tyo= @@ -6454,9 +6448,9 @@ regenerate-unicode-properties@^8.2.0: regenerate "^1.4.0" regenerate@^1.4.0: - version "1.4.0" - resolved "https://registry.npm.taobao.org/regenerate/download/regenerate-1.4.0.tgz#4a856ec4b56e4077c557589cae85e7a4c8869a11" - integrity sha1-SoVuxLVuQHfFV1icroXnpMiGmhE= + version "1.4.1" + resolved "https://registry.npm.taobao.org/regenerate/download/regenerate-1.4.1.tgz#cad92ad8e6b591773485fbe05a485caf4f457e6f" + integrity sha1-ytkq2Oa1kXc0hfvgWkhcr09Ffm8= regenerator-runtime@^0.11.0: version "0.11.1" @@ -6470,7 +6464,7 @@ regenerator-runtime@^0.13.4: regenerator-transform@^0.14.2: version "0.14.4" - resolved "https://registry.npm.taobao.org/regenerator-transform/download/regenerator-transform-0.14.4.tgz?cache=0&sync_timestamp=1584550807315&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fregenerator-transform%2Fdownload%2Fregenerator-transform-0.14.4.tgz#5266857896518d1616a78a0479337a30ea974cc7" + resolved "https://registry.npm.taobao.org/regenerator-transform/download/regenerator-transform-0.14.4.tgz#5266857896518d1616a78a0479337a30ea974cc7" integrity sha1-UmaFeJZRjRYWp4oEeTN6MOqXTMc= dependencies: "@babel/runtime" "^7.8.4" @@ -6796,6 +6790,13 @@ serialize-javascript@^2.1.2: resolved "https://registry.npm.taobao.org/serialize-javascript/download/serialize-javascript-2.1.2.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fserialize-javascript%2Fdownload%2Fserialize-javascript-2.1.2.tgz#ecec53b0e0317bdc95ef76ab7074b7384785fa61" integrity sha1-7OxTsOAxe9yV73arcHS3OEeF+mE= +serialize-javascript@^3.1.0: + version "3.1.0" + resolved "https://registry.npm.taobao.org/serialize-javascript/download/serialize-javascript-3.1.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fserialize-javascript%2Fdownload%2Fserialize-javascript-3.1.0.tgz#8bf3a9170712664ef2561b44b691eafe399214ea" + integrity sha1-i/OpFwcSZk7yVhtEtpHq/jmSFOo= + dependencies: + randombytes "^2.1.0" + serve-index@^1.9.1: version "1.9.1" resolved "https://registry.npm.taobao.org/serve-index/download/serve-index-1.9.1.tgz#d3768d69b1e7d82e5ce050fff5b453bea12a9239" @@ -7348,15 +7349,15 @@ term-size@^2.1.0: integrity sha1-Hxat7f6b3BiADhd2ghc0CG/MZ1M= terser-webpack-plugin@^1.4.3: - version "1.4.3" - resolved "https://registry.npm.taobao.org/terser-webpack-plugin/download/terser-webpack-plugin-1.4.3.tgz?cache=0&sync_timestamp=1590501116446&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fterser-webpack-plugin%2Fdownload%2Fterser-webpack-plugin-1.4.3.tgz#5ecaf2dbdc5fb99745fd06791f46fc9ddb1c9a7c" - integrity sha1-Xsry29xfuZdF/QZ5H0b8ndscmnw= + version "1.4.4" + resolved "https://registry.npm.taobao.org/terser-webpack-plugin/download/terser-webpack-plugin-1.4.4.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fterser-webpack-plugin%2Fdownload%2Fterser-webpack-plugin-1.4.4.tgz#2c63544347324baafa9a56baaddf1634c8abfc2f" + integrity sha1-LGNUQ0cyS6r6mla6rd8WNMir/C8= dependencies: cacache "^12.0.2" find-cache-dir "^2.1.0" is-wsl "^1.1.0" schema-utils "^1.0.0" - serialize-javascript "^2.1.2" + serialize-javascript "^3.1.0" source-map "^0.6.1" terser "^4.1.2" webpack-sources "^1.4.0" @@ -7855,7 +7856,7 @@ vue-loader@^15.7.1: vue-property-decorator@^8.1.1: version "8.4.2" - resolved "https://registry.npm.taobao.org/vue-property-decorator/download/vue-property-decorator-8.4.2.tgz#016e17f259f73bc547e77a50ce282ba18db4ee41" + resolved "https://registry.npm.taobao.org/vue-property-decorator/download/vue-property-decorator-8.4.2.tgz?cache=0&sync_timestamp=1587763358210&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvue-property-decorator%2Fdownload%2Fvue-property-decorator-8.4.2.tgz#016e17f259f73bc547e77a50ce282ba18db4ee41" integrity sha1-AW4X8ln3O8VH53pQzigroY207kE= dependencies: vue-class-component "^7.1.0" @@ -8095,7 +8096,7 @@ webpack-sources@^1.1.0, webpack-sources@^1.4.0, webpack-sources@^1.4.1: webpack@^4.8.1: version "4.43.0" - resolved "https://registry.npm.taobao.org/webpack/download/webpack-4.43.0.tgz?cache=0&sync_timestamp=1588743927365&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fwebpack%2Fdownload%2Fwebpack-4.43.0.tgz#c48547b11d563224c561dad1172c8aa0b8a678e6" + resolved "https://registry.npm.taobao.org/webpack/download/webpack-4.43.0.tgz?cache=0&sync_timestamp=1591172720955&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fwebpack%2Fdownload%2Fwebpack-4.43.0.tgz#c48547b11d563224c561dad1172c8aa0b8a678e6" integrity sha1-xIVHsR1WMiTFYdrRFyyKoLimeOY= dependencies: "@webassemblyjs/ast" "1.9.0" @@ -8144,18 +8145,18 @@ websocket-driver@0.6.5: websocket-extensions ">=0.1.1" websocket-driver@>=0.5.1: - version "0.7.3" - resolved "https://registry.npm.taobao.org/websocket-driver/download/websocket-driver-0.7.3.tgz#a2d4e0d4f4f116f1e6297eba58b05d430100e9f9" - integrity sha1-otTg1PTxFvHmKX66WLBdQwEA6fk= + version "0.7.4" + resolved "https://registry.npm.taobao.org/websocket-driver/download/websocket-driver-0.7.4.tgz#89ad5295bbf64b480abcba31e4953aca706f5760" + integrity sha1-ia1Slbv2S0gKvLox5JU6ynBvV2A= dependencies: - http-parser-js ">=0.4.0 <0.4.11" + http-parser-js ">=0.5.1" safe-buffer ">=5.1.0" websocket-extensions ">=0.1.1" websocket-extensions@>=0.1.1: - version "0.1.3" - resolved "https://registry.npm.taobao.org/websocket-extensions/download/websocket-extensions-0.1.3.tgz#5d2ff22977003ec687a4b87073dfbbac146ccf29" - integrity sha1-XS/yKXcAPsaHpLhwc9+7rBRszyk= + version "0.1.4" + resolved "https://registry.npm.taobao.org/websocket-extensions/download/websocket-extensions-0.1.4.tgz#7f8473bc839dfd87608adb95d7eb075211578a42" + integrity sha1-f4RzvIOd/YdgituV1+sHUhFXikI= when@~3.6.x: version "3.6.4"