diff --git a/.beagle.yml b/.beagle.yml index acc4ad95e46fdc2844f26cc15c41ecf2567302d7..dadd6aacf723e44703db03739a42313bbe8d3b92 100644 --- a/.beagle.yml +++ b/.beagle.yml @@ -1,6 +1,3 @@ -platform: - runner: 10.11.92.34 - kind: pipeline name: dev trigger: @@ -24,9 +21,6 @@ steps: # 定义流水线执行步骤,这些步骤将顺序执行 image: registry.cn-qingdao.aliyuncs.com/wod/devops-s3-cache:1.0 network_mode: host settings: - restore: true - mount: - - ./node_modules endpoint: http://cache.wodcloud.com access_key: from_secret: ACCESS_KEY_MINIO @@ -37,56 +31,56 @@ steps: # 定义流水线执行步骤,这些步骤将顺序执行 image: registry.cn-qingdao.aliyuncs.com/wod/devops-node:16.16.0-slim # 将宿主机中文件夹挂载到容器中,宿主机文件夹中的文件会被容器访问并修改,起到使用缓存的作用,避免每次运行都要重现下载依赖,提高运行速度 commands: - # - yarn + - yarn - export NODE_ENV=production - yarn build - - # - name: s3-cache-build - # image: registry.cn-qingdao.aliyuncs.com/wod/devops-s3-cache:1.0 - # network_mode: host - # settings: - # rebuild: true - # hash: package.json - # mount: - # - node_modules - # endpoint: http://cache.wodcloud.com - # access_key: - # from_secret: ACCESS_KEY_MINIO - # secret_key: - # from_secret: SECRET_KEY_MINIO - - - name: docker + + - name: s3-cache-build + image: registry.cn-qingdao.aliyuncs.com/wod/devops-s3-cache:1.0 + network_mode: host + settings: + rebuild: true + hash: package.json + mount: + - node_modules + endpoint: http://cache.wodcloud.com + access_key: + from_secret: ACCESS_KEY_MINIO + secret_key: + from_secret: SECRET_KEY_MINIO + + - name: docker-amd64 image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker:1.0 # 将宿主机的 docker和配置挂载到运行的 docker 容器中,那么在容器中运行 docker 命令时,等同于在宿主机中运行该docker命令 volumes: - name: docker-sock path: /var/run/docker.sock # 将下载依赖的目录挂载出来,防止重复下载 settings: # 当前设置 - base: registry.cn-qingdao.aliyuncs.com/wod/nginx:1.19.5 # 基础镜像,根据项目需求进行使用,如果第三方登录改成ui-base + base: registry.cn-qingdao.aliyuncs.com/wod/nginx:1.19.5-amd64 # 基础镜像 dockerfile: .beagle/dockerfile - repo: wod/apaas-system-ui # 生成镜像的 分组/名称 - version: "5.0.1" # 版本号 - channel: alpha # 后缀 example: alpha test fix-alpha fix等 + repo: smart-operation/so-manage-ui # 生成镜像的 分组/名称 + version: "v3.0.1" # 版本号 + channel: amd64 # 后缀 args: "TARGETOS=linux,TARGETARCH=amd64" # 不同架构的构建参数 - registry: registry.cn-qingdao.aliyuncs.com # 私有仓库地址 + registry: hub.wodcloud.com # 私有仓库地址 registry_user: # 用户 - from_secret: REGISTRY_USER_ALIYUN + from_secret: REGISTRY_USER registry_password: # 密码 - from_secret: REGISTRY_PASSWORD_ALIYUN - - - name: deploy-cloud + from_secret: REGISTRY_PASSWORD + + - name: deploy-amd64 image: registry.cn-qingdao.aliyuncs.com/wod/devops-kubernetes:1.0 settings: - namespace: apaas-v5 - deployment: apaas-system-ui - container: apaas-system-ui - image: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:5.0.1-alpha + namespace: smart-manage + deployment: so-manage-ui + container: so-manage-ui + image: hub.wodcloud.com/smart-operation/so-manage-ui:v3.0.1-amd64 environment: KUBERNETES_SERVER: from_secret: KUBERNETES_SERVER KUBERNETES_TOKEN: from_secret: KUBERNETES_TOKEN - + - name: docker-arm64 image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker:1.0 volumes: @@ -95,15 +89,62 @@ steps: # 定义流水线执行步骤,这些步骤将顺序执行 settings: base: registry.cn-qingdao.aliyuncs.com/wod/nginx:1.19.5-arm64 dockerfile: .beagle/dockerfile - repo: wod/apaas-system-ui - version: "5.0.1" - channel: alpha-arm64 + repo: smart-operation/so-manage-ui + version: "v3.0.1" + channel: arm64 args: "TARGETOS=linux,TARGETARCH=arm64" - registry: registry.cn-qingdao.aliyuncs.com + registry: hub.wodcloud.com registry_user: - from_secret: REGISTRY_USER_ALIYUN + from_secret: REGISTRY_USER registry_password: - from_secret: REGISTRY_PASSWORD_ALIYUN + from_secret: REGISTRY_PASSWORD + + - name: docker-ppc64le + image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker:1.0 + volumes: + - name: docker-sock + path: /var/run/docker.sock + settings: + base: registry.cn-qingdao.aliyuncs.com/wod/nginx:1.19.5-ppc64le + dockerfile: .beagle/dockerfile + repo: smart-operation/so-manage-ui + version: "v3.0.1" + channel: ppc64le + args: "TARGETOS=linux,TARGETARCH=ppc64le" + registry: hub.wodcloud.com + registry_user: + from_secret: REGISTRY_USER + registry_password: + from_secret: REGISTRY_PASSWORD + + - name: docker-mips64le + image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker:1.0 + volumes: + - name: docker-sock + path: /var/run/docker.sock + settings: + base: registry.cn-qingdao.aliyuncs.com/wod/nginx:1.19.5-mips64le + dockerfile: .beagle/dockerfile + repo: smart-operation/so-manage-ui + version: "v3.0.1" + channel: mips64le + args: "TARGETOS=linux,TARGETARCH=mips64le" + registry: hub.wodcloud.com + registry_user: + from_secret: REGISTRY_USER + registry_password: + from_secret: REGISTRY_PASSWORD + + - name: docker-arch + image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker-manifest:1.0 + settings: + platforms: linux/amd64,linux/arm64,linux/ppc64le,linux/mips64le + template: hub.wodcloud.com/smart-operation/so-manage-ui:v3.0.1-ARCH + target: hub.wodcloud.com/smart-operation/so-manage-ui:v3.0.1 + username: + from_secret: REGISTRY_USER + password: + from_secret: REGISTRY_PASSWORD --- clone: disable: true @@ -112,31 +153,25 @@ trigger: branch: - master -volumes: - - name: docker-sock - host: - path: /var/run/docker.sock kind: pipeline name: master steps: - - name: harbor + - name: harbor-amd64 image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker-tag:1.0 volumes: - name: docker-sock path: /var/run/docker.sock pull: always environment: - http_proxy: http://10.11.92.33:1282 - https_proxy: http://10.11.92.33:1282 REGISTRY_USER: - from_secret: REGISTRY_USER_ALIYUN + from_secret: REGISTRY_USER REGISTRY_PASSWORD: - from_secret: REGISTRY_PASSWORD_ALIYUN + from_secret: REGISTRY_PASSWORD settings: - source: registry.cn-qingdao.aliyuncs.com/wod/apaas-system-ui:5.0.1-alpha - target: registry.cn-qingdao.aliyuncs.com/wod/apaas-system-ui:5.0.1 - registry: registry.cn-qingdao.aliyuncs.com + source: hub.wodcloud.com/smart-operation/so-manage-ui:v3.0.1-amd64 + target: hub.wodcloud.com/smart-operation/so-manage-ui:v3.0-amd64 + registry: hub.wodcloud.com - name: harbor-arm64 image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker-tag:1.0 @@ -145,16 +180,58 @@ steps: path: /var/run/docker.sock pull: always environment: - http_proxy: http://10.11.92.33:1282 - https_proxy: http://10.11.92.33:1282 REGISTRY_USER: - from_secret: REGISTRY_USER_ALIYUN + from_secret: REGISTRY_USER + REGISTRY_PASSWORD: + from_secret: REGISTRY_PASSWORD + settings: + source: hub.wodcloud.com/smart-operation/so-manage-ui:v3.0.1-arm64 + target: hub.wodcloud.com/smart-operation/so-manage-ui:v3.0-arm64 + registry: hub.wodcloud.com + + - name: harbor-ppc64le + image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker-tag:1.0 + volumes: + - name: docker-sock + path: /var/run/docker.sock + pull: always + environment: + REGISTRY_USER: + from_secret: REGISTRY_USER + REGISTRY_PASSWORD: + from_secret: REGISTRY_PASSWORD + settings: + source: hub.wodcloud.com/smart-operation/so-manage-ui:v3.0.1-ppc64le + target: hub.wodcloud.com/smart-operation/so-manage-ui:v3.0-ppc64le + registry: hub.wodcloud.com + + - name: harbor-mips64le + image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker-tag:1.0 + volumes: + - name: docker-sock + path: /var/run/docker.sock + pull: always + environment: + REGISTRY_USER: + from_secret: REGISTRY_USER REGISTRY_PASSWORD: - from_secret: REGISTRY_PASSWORD_ALIYUN + from_secret: REGISTRY_PASSWORD + settings: + source: hub.wodcloud.com/smart-operation/so-manage-ui:v3.0.1-mips64le + target: hub.wodcloud.com/smart-operation/so-manage-ui:v3.0-mips64le + registry: hub.wodcloud.com + + - name: harbor-arch + image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker-manifest:1.0 settings: - source: registry.cn-qingdao.aliyuncs.com/wod/apaas-system-ui:5.0.1-alpha-arm64 - target: registry.cn-qingdao.aliyuncs.com/wod/apaas-system-ui:5.0.1-arm64 - registry: registry.cn-qingdao.aliyuncs.com + platforms: linux/amd64,linux/arm64,linux/ppc64le,linux/mips64le + template: hub.wodcloud.com/smart-operation/so-manage-ui:v3.0-ARCH + target: hub.wodcloud.com/smart-operation/so-manage-ui:v3.0 + username: + from_secret: REGISTRY_USER + password: + from_secret: REGISTRY_PASSWORD + ##--------------对于需要保密的信息隐藏,减少账户信息的泄密⬇-----------------## --- kind: secret @@ -184,25 +261,12 @@ get: kind: secret name: ACCESS_KEY_MINIO get: - name: ACCESS_KEY + name: ACCESS_KEY_MINIO path: devops-secrets --- kind: secret name: SECRET_KEY_MINIO get: - name: SECRET_KEY - path: devops-secrets - ---- -kind: secret -name: REGISTRY_USER_ALIYUN -get: - name: USERNAME - path: devops-registry-aliyun ---- -kind: secret -name: REGISTRY_PASSWORD_ALIYUN -get: - name: PASSWORD - path: devops-registry-aliyun \ No newline at end of file + name: SECRET_KEY_MINIO + path: devops-secrets \ No newline at end of file diff --git a/.beagle/nginx.conf b/.beagle/nginx.conf index a540e85c0226e5812e8e54fe40862dfd48acc996..a00f0a006d93fa5d506a27e2e389a9502bfb7e83 100644 --- a/.beagle/nginx.conf +++ b/.beagle/nginx.conf @@ -28,11 +28,11 @@ http { # redirect server error pages to the static page /50x.html # error_page 500 502 503 504 /50x.html; - location /apaas/ui { + location /so/manage/ui { root /usr/share/nginx/html; index index.html index.htm; - try_files $uri $uri/ /apaas/ui/index.html; + try_files $uri $uri/ /so/manage/ui/index.html; } } diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000000000000000000000000000000000000..e6a67af76ade7b3665bff7b51d7f280c7d133e26 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,8 @@ +root = true +[*] +charset = utf-8 +insert_final_newline = true +end_of_line = lf +indent_style = space +indent_size = 2 +max_line_length = 120 diff --git a/.gitignore b/.gitignore index 29eb55b78b325d365cf6ff30395a34d8824c9678..53f7466aca70031d07116439658b0b8a85af2cfe 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,5 @@ node_modules .DS_Store -.vscode dist dist-ssr *.local \ No newline at end of file diff --git a/.prettierrc.js b/.prettierrc.js new file mode 100644 index 0000000000000000000000000000000000000000..913b45e40d49d2d4c1f13b72a07df7a9dae590bd --- /dev/null +++ b/.prettierrc.js @@ -0,0 +1,27 @@ +/** + * 优先级高于.editorconfig + * https://prettier.io/docs/en/options.html + * 单引号,双引号,末尾是否逗号,是否需要分号根据团队需要配置 + * 但是prettier对vue template的格式化能力有限,建议多观察是否满足需要,最佳实践还是要结合eslint进行风格统一 + */ +module.exports = { + arrowParens: "always", + bracketSameLine: true, // https://prettier.io/docs/en/options.html#bracket-line + bracketSpacing: true, + embeddedLanguageFormatting: "auto", + htmlWhitespaceSensitivity: "css", + insertPragma: false, + jsxSingleQuote: false, + printWidth: 100, // 如果属性过多需要换行,减少该值 + proseWrap: "preserve", + quoteProps: "as-needed", + requirePragma: false, + semi: true, + singleAttributePerLine: false, + singleQuote: false, // 双引号 + tabWidth: 2, // 缩进 + trailingComma: "es5", + useTabs: false, // 不要用tab缩进 + vueIndentScriptAndStyle: false, + endOfLine: "lf", +}; diff --git a/.vscode/extensions.json b/.vscode/extensions.json new file mode 100644 index 0000000000000000000000000000000000000000..c83e26348e1f1ee2df5046c691310c6183b7586e --- /dev/null +++ b/.vscode/extensions.json @@ -0,0 +1,3 @@ +{ + "recommendations": ["esbenp.prettier-vscode"] +} diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000000000000000000000000000000000000..e7678a340de87f1f24a8f0db2f240b35f00c68bf --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,4 @@ +{ + "editor.defaultFormatter": "esbenp.prettier-vscode", + "GitCommitPlugin.ShowEmoji": false +} diff --git a/index.html b/index.html index b97a112d8e3c575803c5b4c4c0068b862183a1ca..4e75c2d7d33a964e839cb17efa86a5daa102dc85 100644 --- a/index.html +++ b/index.html @@ -4,11 +4,12 @@ -