diff --git a/.beagle.yml b/.beagle.yml index 85a0696aaa5ba818086f5ddc7671b7caa8776df1..57fe7d2fc861987cfdd593f6ab0fffc8c5c944ee 100644 --- a/.beagle.yml +++ b/.beagle.yml @@ -51,7 +51,7 @@ pipeline: dockerfile: .beagle/dockerfile repo: wod/apaas-ui version: v3.0.2 - channel: alpha + channel: pure args: "TARGETOS=linux,TARGETARCH=amd64" ## 不同架构的构建参数 registry: registry.cn-qingdao.aliyuncs.com secrets: @@ -61,43 +61,7 @@ pipeline: target: REGISTRY_PASSWORD when: branch: - - dev - - ## 更换dev生成镜像的名称 - harbor: - image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker-tag:1.0 - dns: 223.5.5.5 - volumes: - - /var/run/docker.sock:/var/run/docker.sock - source: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.2-alpha - target: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.2 - registry: registry.cn-qingdao.aliyuncs.com - secrets: - - source: REGISTRY_USER_ALIYUN - target: REGISTRY_USER - - source: REGISTRY_PASSWORD_ALIYUN - target: REGISTRY_PASSWORD - when: - branch: - - master - - # 生成最终amd版本 - latest: - image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker-tag:1.0 - dns: 223.5.5.5 - volumes: - - /var/run/docker.sock:/var/run/docker.sock - source: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.2 - target: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0 - registry: registry.cn-qingdao.aliyuncs.com - secrets: - - source: REGISTRY_USER_ALIYUN - target: REGISTRY_USER - - source: REGISTRY_PASSWORD_ALIYUN - target: REGISTRY_PASSWORD - when: - branch: - - master + - pure # 构建arm64位镜像 docker-arm64: @@ -108,7 +72,7 @@ pipeline: dockerfile: .beagle/dockerfile repo: wod/apaas-ui version: v3.0.2 - channel: alpha-arm64 + channel: pure-arm64 args: "TARGETOS=linux,TARGETARCH=arm64" registry: registry.cn-qingdao.aliyuncs.com secrets: @@ -118,44 +82,8 @@ pipeline: target: REGISTRY_PASSWORD when: branch: - - dev - - ## 更换dev生成arm64镜像的名称 - harbor-arm64: - image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker-tag:1.0 - dns: 223.5.5.5 - volumes: - - /var/run/docker.sock:/var/run/docker.sock - source: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.2-alpha-arm64 - target: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.2-arm64 - registry: registry.cn-qingdao.aliyuncs.com - secrets: - - source: REGISTRY_USER_ALIYUN - target: REGISTRY_USER - - source: REGISTRY_PASSWORD_ALIYUN - target: REGISTRY_PASSWORD - when: - branch: - - master + - pure - # 生成最终arm版本 - latest-arm64: - image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker-tag:1.0 - dns: 223.5.5.5 - volumes: - - /var/run/docker.sock:/var/run/docker.sock - source: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.2-arm64 - target: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0-arm64 - registry: registry.cn-qingdao.aliyuncs.com - secrets: - - source: REGISTRY_USER_ALIYUN - target: REGISTRY_USER - - source: REGISTRY_PASSWORD_ALIYUN - target: REGISTRY_PASSWORD - when: - branch: - - master - docker-ppc64le: image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker:1.0 volumes: @@ -164,7 +92,7 @@ pipeline: dockerfile: .beagle/dockerfile repo: wod/apaas-ui version: v3.0.2 - channel: alpha-ppc64le + channel: pure-ppc64le args: "TARGETOS=linux,TARGETARCH=ppc64le" registry: registry.cn-qingdao.aliyuncs.com secrets: @@ -174,41 +102,7 @@ pipeline: target: REGISTRY_PASSWORD when: branch: - - dev - - harbor-ppc64le: - image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker-tag:1.0 - dns: 223.5.5.5 - volumes: - - /var/run/docker.sock:/var/run/docker.sock - source: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.2-alpha-ppc64le - target: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.2-ppc64le - registry: registry.cn-qingdao.aliyuncs.com - secrets: - - source: REGISTRY_USER_ALIYUN - target: REGISTRY_USER - - source: REGISTRY_PASSWORD_ALIYUN - target: REGISTRY_PASSWORD - when: - branch: - - master - - latest-ppc64le: - image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker-tag:1.0 - dns: 223.5.5.5 - volumes: - - /var/run/docker.sock:/var/run/docker.sock - source: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.2-ppc64le - target: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0-ppc64le - registry: registry.cn-qingdao.aliyuncs.com - secrets: - - source: REGISTRY_USER_ALIYUN - target: REGISTRY_USER - - source: REGISTRY_PASSWORD_ALIYUN - target: REGISTRY_PASSWORD - when: - branch: - - master + - pure docker-mips64le: image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker:1.0 @@ -218,7 +112,7 @@ pipeline: dockerfile: .beagle/dockerfile repo: wod/apaas-ui version: v3.0.2 - channel: alpha-mips64le + channel: pure-mips64le args: "TARGETOS=linux,TARGETARCH=mips64le" registry: registry.cn-qingdao.aliyuncs.com secrets: @@ -228,48 +122,4 @@ pipeline: target: REGISTRY_PASSWORD when: branch: - - dev - - harbor-mips64le: - image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker-tag:1.0 - dns: 223.5.5.5 - volumes: - - /var/run/docker.sock:/var/run/docker.sock - source: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.2-alpha-mips64le - target: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.2-mips64le - registry: registry.cn-qingdao.aliyuncs.com - secrets: - - source: REGISTRY_USER_ALIYUN - target: REGISTRY_USER - - source: REGISTRY_PASSWORD_ALIYUN - target: REGISTRY_PASSWORD - when: - branch: - - master - - latest-mips64le: - image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker-tag:1.0 - dns: 223.5.5.5 - volumes: - - /var/run/docker.sock:/var/run/docker.sock - source: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.2-mips64le - target: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0-mips64le - registry: registry.cn-qingdao.aliyuncs.com - secrets: - - source: REGISTRY_USER_ALIYUN - target: REGISTRY_USER - - source: REGISTRY_PASSWORD_ALIYUN - target: REGISTRY_PASSWORD - when: - branch: - - master - - deploy: - image: registry.cn-qingdao.aliyuncs.com/wod/devops-kubernetes:1.0 - namespace: apaas-v3 - deployment: apaas-ui - container: apaas-ui - registry: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.2-alpha - when: - branch: - - dev + - pure diff --git a/config/index.js b/config/index.js index 3b1177d3715693d946a83f23dcb459c54c5588bf..d82e6e2679856cba9730bae5c6a207f77d35c038 100644 --- a/config/index.js +++ b/config/index.js @@ -11,21 +11,21 @@ module.exports = { assetsPublicPath: "/apaas/ui/", proxyTable: { "/apaas": { - target: "https://apaas3.wodcloud.com/apaas/", + target: "https://apaas.test.wodcloud.com/apaas/", changeOrigin: true, pathRewrite: { "^/apaas": "" } }, "/awecloud": { - target: "https://apaas3.wodcloud.com/awecloud/", + target: "https://apaas.test.wodcloud.com/awecloud/", changeOrigin: true, pathRewrite: { "^/awecloud": "" } }, "/vmap": { - target: "https://apaas3.wodcloud.com/vmap/", + target: "https://apaas.test.wodcloud.com/vmap/", changeOrigin: true, pathRewrite: { "^/vmap": "" diff --git a/src/pages/workbench/fwzc_fwcs.vue b/src/pages/workbench/fwzc_fwcs.vue index 815d66537cc67d441882ccacd0687aa68f2894a8..065df18b13e720b56d8219177f3146c1a535c916 100644 --- a/src/pages/workbench/fwzc_fwcs.vue +++ b/src/pages/workbench/fwzc_fwcs.vue @@ -113,13 +113,13 @@
服务地址:
-
-
- - -

产品名称:

- -
- -

产品简介:

- -
- -

产品领域:

- - - -
- -

产品版本:

- -
- -

产品封面:

- -
- -

产品标签:

-
-
- {{ item }} - -
- - 增加 -
-
- -

产品介绍文档:

-
- 产品介绍文档模版.md - 下载文件 -
- -
- -

开放程度:

- - 共享 - 受限 - 敏感 - -
- - 产品注册 - -
-
-
{ if (request.data.success == 1) { this.form.origin = request.data.data.department; - this.form_cp.origin = request.data.data.department; this.oid = request.data.data.department_id; } else { console.log(response.data.errMsg); @@ -1681,43 +1511,6 @@ export default { this.registePt(); } }, - registeCp() { - this.$refs.form_cp.validate((valid) => { - if (valid) { - if (this.form_cp.bq.length < 1 && this.form_cp.bq.length > 3) { - this.$message.error("产品标签至少1个,至多3个"); - } else { - this.cpR = true; - let query = { - name: this.form_cp.name, - sectors: this.form_cp.area, - organization: this.form_cp.origin, - cover: this.cover_cp[0], - openness: this.form_cp.resource, - descript: this.form_cp.desc, - data_service_type1: this.btnList[this.activeBtn].id, - data_service_type2: 0, - portal_id: "", - encode_method: "自动生成", - doc_file: this.wd_cp.length != 0 ? this.wd_cp[0].url : "", - version: this.form_cp.bb, - tags: this.form_cp.bq, - urls: [], - }; - this.$api.workbench.serviceAdd(query).then((response) => { - this.cpR = false; - if (response.data.success == 1) { - this.$message.success("产品注册成功"); - this.$router.push("/fwgl/" + this.$store.getters.level); - } else { - console.log(response.data.errMsg); - this.$message.error(response.data.errMsg); - } - }); - } - } - }); - }, registePt() { this.$refs.form.validate((valid) => { if (valid) { @@ -1949,13 +1742,6 @@ export default { break; } }); - let cp_index = arr.findIndex((item) => { - return item.id == 36; - }); - let cp = arr[cp_index]; - arr.splice(cp_index, 1); - arr.push(cp); - console.log(arr); this.btnList = arr; let skfwRadios = this.btnList[1].childDomains; skfwRadios.splice(2, 1); @@ -2332,48 +2118,12 @@ export default { } } }, - delIp(index, type) { - if (type == "white") { - this.form_cp.bq.splice(index, 1); - } else if (type == "black") { - this.form_cp.bq.splice(index, 1); - } - }, - addIp(type) { - if (type == "white") { - this.whiteAddShow - ? this.$message({ - message: "请按回车完善本次标签填写", - type: "error", - }) - : (this.whiteAddShow = true); - } - }, - watchKeyboardWhite() { - let self = this; - if (self.newIpWhite == "") { - this.$message({ - message: "无法添加空标签", - type: "error", - }); - } else if (self.newIpWhite.length > 7) { - this.$message({ - message: "添加的标签请小于七个字", - type: "error", - }); - } else { - self.form_cp.bq.push(self.newIpWhite); - self.whiteAddShow = false; - self.newIpWhite = ""; - } - }, }, mounted() { let self = this; window.addEventListener("message", self.listeners, false); self.judgeMap(); self.getArea(); - self.getOrganization(); }, created() { let _self = this;