From e25627cda98f019eefa2a990ed33e7ec1519d1b7 Mon Sep 17 00:00:00 2001 From: odjbin <1042039504@qq.com> Date: Wed, 21 Aug 2024 11:03:31 +0800 Subject: [PATCH] ci/cd --- .drone.yml | 36 +++-------------- README.md | 7 +++- index.html | 2 +- package-lock.json | 5 ++- package.json | 2 +- src/api/auth/auth.js | 4 +- src/api/cache.js | 6 +-- src/api/custom-query/portal.js | 9 +++++ src/api/dept/dept.js | 14 +++---- src/api/ipblacklist/index.js | 12 +++--- src/api/login.js | 6 +-- src/api/online/online.js | 4 +- src/api/post/post.js | 12 +++--- src/api/role/role.js | 22 +++++------ src/api/system/config.js | 10 ++--- src/api/system/dict-data.js | 10 ++--- src/api/system/dict-type.js | 12 +++--- src/api/system/mapping-switch.js | 4 +- src/api/system/menu.js | 4 +- src/api/system/menuman.js | 16 ++++---- src/api/user/user.js | 30 +++++++------- src/api/workflow/process-user.js | 2 +- src/layout/siderbar/index.vue | 2 +- src/utils/publicvoid.js | 38 +++++++++--------- src/views/custom-query/data-adapter/index.vue | 29 +++++++++----- src/views/custom-query/portal/index.vue | 39 ++++++++++++++++--- src/views/home/index.vue | 2 +- src/views/login/index.vue | 2 +- src/views/system/config/index.vue | 2 +- src/views/tool/componentdemo/index.vue | 10 ++--- src/views/tool/dict/index.vue | 2 +- src/views/tool/ipblacklist/index.vue | 2 +- vite.config.js | 23 ++++++----- 33 files changed, 204 insertions(+), 176 deletions(-) diff --git a/.drone.yml b/.drone.yml index ae42048..245d6f7 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,9 +1,6 @@ kind: pipeline type: docker -name: fateverse-vue -platform: - os: linux - arch: arm64 +name: SmartOpsWeb steps: - name: build-package image: node:16.20.0 @@ -32,60 +29,37 @@ steps: - cp -r dist /app/build/$DRONE_REPO_NAME - - name: build-docker # 制作docker镜像 image: docker # 使用官方docker镜像 volumes: # 将容器内目录挂载到宿主机 - name: docker path: /var/run/docker.sock # 挂载宿主机的docker - - name: config - path: /config - environment: # 获取到密文的docker用户名和密码 - DOCKER_USERNAME: - from_secret: docker_username - DOCKER_PASSWORD: - from_secret: docker_password - REGISTRY: - from_secret: registry - REGISTRY_NAMESPACE: - from_secret: registry_namespace commands: # 定义在Docker容器中执行的shell命令 + - docker rmi -f $(docker images | grep $DRONE_REPO_NAME | awk '{print $3}') - cat Dockerfile - sed -i 's/$REGISTRY/'"$REGISTRY"'/' deployment.yml - sed -i 's/$REGISTRY_NAMESPACE/'"$REGISTRY_NAMESPACE"'/' deployment.yml - sed -i 's/$DRONE_REPO_NAME/'"$DRONE_REPO_NAME"'/' deployment.yml - sed -i 's/$DRONE_COMMIT/'"$DRONE_COMMIT"'/' deployment.yml # docker登录,不能在脚本中登录,并且不能使用docker login -u -p - - echo $DOCKER_PASSWORD | docker login $REGISTRY --username $DOCKER_USERNAME --password-stdin - chmod +x docker.sh - cat docker.sh - sh docker.sh # 执行完脚本删除本次制作的docker镜像,避免多次后当前runner空间不足 - - docker rmi -f $(docker images | grep $DRONE_REPO_NAME | awk '{print $3}') +# - docker rmi -f $(docker imag.es | grep $DRONE_REPO_NAME | awk '{print $3}') - - name: drone-rancher # rancher运行 - image: bitnami/kubectl:1.26.13-debian-11-r1 - volumes: # 将容器内目录挂载到宿主机 - - name: config - path: /app/config # 将kubectl 配置文件挂载出来 - commands: # 定义在Docker容器中执行的shell命令 - # 将deployment中定义的变量替换为drone中的内置变量 - - kubectl apply -f deployment.yml -n fateverse --kubeconfig=/app/config/base-taishan-kubectl.yml - volumes: - name: cache host: - path: /home/npm/cache + path: /home/SmartOpsWeb/cache - name: config # k8s对接的配置文件 - host: - path: /home/kubect - name: docker # 宿主机中的docker host: path: /var/run/docker.sock trigger: branch: - - prod +# - prod event: - push diff --git a/README.md b/README.md index 937a35f..0911363 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,9 @@ -# SmartOpsWeb +# Ե/FateVerse + +Ե̨ϵͳһڽɫȨϵͳ, ûõĹ; ڿ߶, һٿ + +ջ[vue@3](https://cn.vuejs.org/);[vue-router@4](https://router.vuejs.org/zh/); +[pinia@2](https://pinia.vuejs.org/zh/);[element-plus](https://element-plus.org/zh-CN/);[vite@4](https://cn.vitejs.dev/) ## Ŀ¼ ```sh diff --git a/index.html b/index.html index 691191c..7ad5194 100644 --- a/index.html +++ b/index.html @@ -4,7 +4,7 @@ -