From 13d3428d7ae92b185393078a78ab5663e429af1a Mon Sep 17 00:00:00 2001 From: clay <20932067@zju.edu.cn> Date: Fri, 29 Mar 2024 18:22:23 +0800 Subject: [PATCH 1/6] =?UTF-8?q?build=20:=20=E7=8E=AF=E5=A2=83=E5=8C=BA?= =?UTF-8?q?=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone-mosr.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.drone-mosr.yml b/.drone-mosr.yml index 012fa81..01defce 100644 --- a/.drone-mosr.yml +++ b/.drone-mosr.yml @@ -25,7 +25,7 @@ steps: - export NODE_MODULES_PATH=`pwd`/node_modules #- npm config set registry https://registry.npm.taobao.org #- set NODE_OPTIONS=--openssl-legacy-provider -# - npm install + - npm install - npm run build - ls /app/build/$DRONE_REPO_NAME/ - echo $NODE_MODULES_PATH @@ -89,6 +89,6 @@ volumes: trigger: branch: - - prod + - dm event: - push From fcff8c9cc407c31f2f1e02c58f691c9a26552f37 Mon Sep 17 00:00:00 2001 From: clay <20932067@zju.edu.cn> Date: Fri, 29 Mar 2024 20:44:33 +0800 Subject: [PATCH 2/6] =?UTF-8?q?build=20:=20=E4=BF=AE=E6=94=B9dm=E5=8F=91?= =?UTF-8?q?=E5=B8=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone-mosr.yml | 94 ------------------------------------------------- .drone.yml | 62 +++++++++++++++++++++++++++++--- 2 files changed, 57 insertions(+), 99 deletions(-) delete mode 100644 .drone-mosr.yml diff --git a/.drone-mosr.yml b/.drone-mosr.yml deleted file mode 100644 index 01defce..0000000 --- a/.drone-mosr.yml +++ /dev/null @@ -1,94 +0,0 @@ -kind: pipeline -type: docker -name: mosr-web -platform: - os: linux - arch: arm64 -steps: - - name: build-package - image: node:16.20.0 - volumes: - - name: cache - path: /drone/src/node_modules - commands: - - export CI=false - - mkdir -p /app/build/$DRONE_REPO_NAME - - rm -rf /app/build/$DRONE_REPO_NAME/* - - cp deployment.yml /app/build/$DRONE_REPO_NAME/ - - cp Dockerfile /app/build/$DRONE_REPO_NAME/ - - cp .dockerignore /app/build/$DRONE_REPO_NAME/ - - cp default.conf /app/build/$DRONE_REPO_NAME/ - - cp docker.sh /app/build/$DRONE_REPO_NAME/ - - cp nginx.conf /app/build/$DRONE_REPO_NAME/ - - npm -v - - mkdir -p ./node_modules - - export NODE_MODULES_PATH=`pwd`/node_modules - #- npm config set registry https://registry.npm.taobao.org - #- set NODE_OPTIONS=--openssl-legacy-provider - - npm install - - npm run build - - ls /app/build/$DRONE_REPO_NAME/ - - echo $NODE_MODULES_PATH - - 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命令 - - cat Dockerfile - - sed -i 's/$REGISTRY/'"$REGISTRY"'/' deployment.yml - - sed -i 's/$REGISTRY_NAMESPACE/'"$REGISTRY_NAMESPACE"'/' deployment.yml - - sed -i 's/$PROFILES/'"mosr-dm"'/' nginx.conf - - sed -i 's/$DRONE_REPO_NAME/'"$DRONE_REPO_NAME"'/' deployment.yml - - sed -i 's/$DRONE_COMMIT/'"$DRONE_COMMIT"'/' deployment.yml - - sed -i 's/$PORTS_NAME/'"dasdafas"'/' deployment.yml - - sed -i 's/$PORTS_PORT/'"8082"'/' 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}') - - - - 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 mosr-dm --kubeconfig=/app/config/base-taishan-kubectl.yml - -volumes: - - name: cache - host: - path: /home/npm/mosr-web - - name: config # k8s对接的配置文件 - host: - path: /home/kubect - - name: docker # 宿主机中的docker - host: - path: /var/run/docker.sock - -trigger: - branch: - - dm - event: - - push diff --git a/.drone.yml b/.drone.yml index 10bd29e..9b74b4a 100644 --- a/.drone.yml +++ b/.drone.yml @@ -25,15 +25,14 @@ steps: - export NODE_MODULES_PATH=`pwd`/node_modules #- npm config set registry https://registry.npm.taobao.org #- set NODE_OPTIONS=--openssl-legacy-provider -# - npm install + # - npm install - npm run build - ls /app/build/$DRONE_REPO_NAME/ - echo $NODE_MODULES_PATH - cp -r dist /app/build/$DRONE_REPO_NAME - - - name: build-docker # 制作docker镜像 + - name: build-docker-prod # 制作docker镜像 image: docker # 使用官方docker镜像 volumes: # 将容器内目录挂载到宿主机 - name: docker @@ -57,7 +56,6 @@ steps: - sed -i 's/$DRONE_COMMIT/'"$DRONE_COMMIT"'/' deployment.yml - sed -i 's/$PORTS_NAME/'"dasdafas"'/' deployment.yml - sed -i 's/$PORTS_PORT/'"8081"'/' deployment.yml - - sed -i 's/$PROFILES/'"mosr"'/' nginx.conf # docker登录,不能在脚本中登录,并且不能使用docker login -u -p - echo $DOCKER_PASSWORD | docker login $REGISTRY --username $DOCKER_USERNAME --password-stdin - chmod +x docker.sh @@ -65,16 +63,69 @@ steps: - sh docker.sh # 执行完脚本删除本次制作的docker镜像,避免多次后当前runner空间不足 - docker rmi -f $(docker images | grep $DRONE_REPO_NAME | awk '{print $3}') + branch: + - prod + - name: build-docker-dm # 制作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命令 + - 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 + - sed -i 's/$PORTS_NAME/'"dasdafas"'/' deployment.yml + - sed -i 's/$PORTS_PORT/'"8082"'/' 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}') + branch: + - dm - - name: drone-rancher # rancher运行 + - name: drone-rancher-prod # rancher运行 image: bitnami/kubectl:1.26.13-debian-11-r1 volumes: # 将容器内目录挂载到宿主机 - name: config path: /app/config # 将kubectl 配置文件挂载出来 commands: # 定义在Docker容器中执行的shell命令 # 将deployment中定义的变量替换为drone中的内置变量 + - sed -i 's/$PROFILES/'"mosr"'/' nginx.conf - kubectl apply -f deployment.yml -n mosr --kubeconfig=/app/config/base-taishan-kubectl.yml + branch: + - prod + + + - name: drone-rancher-dm # rancher运行 + image: bitnami/kubectl:1.26.13-debian-11-r1 + volumes: # 将容器内目录挂载到宿主机 + - name: config + path: /app/config # 将kubectl 配置文件挂载出来 + commands: # 定义在Docker容器中执行的shell命令 + # 将deployment中定义的变量替换为drone中的内置变量 + - sed -i 's/$PROFILES/'"mosr-dm"'/' nginx.conf + - kubectl apply -f deployment.yml -n mosr-dm --kubeconfig=/app/config/base-taishan-kubectl.yml + branch: + - dm + + volumes: - name: cache @@ -90,5 +141,6 @@ volumes: trigger: branch: - prod + - dm event: - push From bba369abaa3511f0b24152e432d46258d95c8571 Mon Sep 17 00:00:00 2001 From: clay <20932067@zju.edu.cn> Date: Fri, 29 Mar 2024 20:47:49 +0800 Subject: [PATCH 3/6] =?UTF-8?q?build=20:=20=E4=BF=AE=E6=94=B9dm=E5=8F=91?= =?UTF-8?q?=E5=B8=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone.yml | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/.drone.yml b/.drone.yml index 9b74b4a..bf1d771 100644 --- a/.drone.yml +++ b/.drone.yml @@ -5,6 +5,8 @@ platform: os: linux arch: arm64 steps: + + - name: build-package image: node:16.20.0 volumes: @@ -63,8 +65,9 @@ steps: - sh docker.sh # 执行完脚本删除本次制作的docker镜像,避免多次后当前runner空间不足 - docker rmi -f $(docker images | grep $DRONE_REPO_NAME | awk '{print $3}') - branch: - - prod + where: + branch: + - prod - name: build-docker-dm # 制作docker镜像 image: docker # 使用官方docker镜像 @@ -97,8 +100,9 @@ steps: - sh docker.sh # 执行完脚本删除本次制作的docker镜像,避免多次后当前runner空间不足 - docker rmi -f $(docker images | grep $DRONE_REPO_NAME | awk '{print $3}') - branch: - - dm + where: + branch: + - dm - name: drone-rancher-prod # rancher运行 image: bitnami/kubectl:1.26.13-debian-11-r1 @@ -109,8 +113,9 @@ steps: # 将deployment中定义的变量替换为drone中的内置变量 - sed -i 's/$PROFILES/'"mosr"'/' nginx.conf - kubectl apply -f deployment.yml -n mosr --kubeconfig=/app/config/base-taishan-kubectl.yml - branch: - - prod + where: + branch: + - prod - name: drone-rancher-dm # rancher运行 @@ -122,8 +127,9 @@ steps: # 将deployment中定义的变量替换为drone中的内置变量 - sed -i 's/$PROFILES/'"mosr-dm"'/' nginx.conf - kubectl apply -f deployment.yml -n mosr-dm --kubeconfig=/app/config/base-taishan-kubectl.yml - branch: - - dm + where: + branch: + - dm From 0c56e6a1615c6eeb77823c2c6fe931be1b81152b Mon Sep 17 00:00:00 2001 From: clay <20932067@zju.edu.cn> Date: Fri, 29 Mar 2024 20:50:06 +0800 Subject: [PATCH 4/6] =?UTF-8?q?build=20:=20=E4=BF=AE=E6=94=B9dm=E5=8F=91?= =?UTF-8?q?=E5=B8=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.drone.yml b/.drone.yml index bf1d771..1876555 100644 --- a/.drone.yml +++ b/.drone.yml @@ -65,7 +65,7 @@ steps: - sh docker.sh # 执行完脚本删除本次制作的docker镜像,避免多次后当前runner空间不足 - docker rmi -f $(docker images | grep $DRONE_REPO_NAME | awk '{print $3}') - where: + when: branch: - prod @@ -100,7 +100,7 @@ steps: - sh docker.sh # 执行完脚本删除本次制作的docker镜像,避免多次后当前runner空间不足 - docker rmi -f $(docker images | grep $DRONE_REPO_NAME | awk '{print $3}') - where: + when: branch: - dm @@ -113,7 +113,7 @@ steps: # 将deployment中定义的变量替换为drone中的内置变量 - sed -i 's/$PROFILES/'"mosr"'/' nginx.conf - kubectl apply -f deployment.yml -n mosr --kubeconfig=/app/config/base-taishan-kubectl.yml - where: + when: branch: - prod @@ -127,7 +127,7 @@ steps: # 将deployment中定义的变量替换为drone中的内置变量 - sed -i 's/$PROFILES/'"mosr-dm"'/' nginx.conf - kubectl apply -f deployment.yml -n mosr-dm --kubeconfig=/app/config/base-taishan-kubectl.yml - where: + when: branch: - dm @@ -144,6 +144,7 @@ volumes: host: path: /var/run/docker.sock +load: trigger: branch: - prod From dd659cf1356bbce766a4df378860b565a17ea09a Mon Sep 17 00:00:00 2001 From: clay <20932067@zju.edu.cn> Date: Fri, 29 Mar 2024 20:53:46 +0800 Subject: [PATCH 5/6] =?UTF-8?q?build=20:=20=E4=BF=AE=E6=94=B9dm=E5=8F=91?= =?UTF-8?q?=E5=B8=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index 1876555..4d7a73c 100644 --- a/.drone.yml +++ b/.drone.yml @@ -58,6 +58,7 @@ steps: - sed -i 's/$DRONE_COMMIT/'"$DRONE_COMMIT"'/' deployment.yml - sed -i 's/$PORTS_NAME/'"dasdafas"'/' deployment.yml - sed -i 's/$PORTS_PORT/'"8081"'/' deployment.yml + - sed -i 's/$PROFILES/'"mosr"'/' nginx.conf # docker登录,不能在脚本中登录,并且不能使用docker login -u -p - echo $DOCKER_PASSWORD | docker login $REGISTRY --username $DOCKER_USERNAME --password-stdin - chmod +x docker.sh @@ -93,6 +94,7 @@ steps: - sed -i 's/$DRONE_COMMIT/'"$DRONE_COMMIT"'/' deployment.yml - sed -i 's/$PORTS_NAME/'"dasdafas"'/' deployment.yml - sed -i 's/$PORTS_PORT/'"8082"'/' deployment.yml + - sed -i 's/$PROFILES/'"mosr-dm"'/' nginx.conf # docker登录,不能在脚本中登录,并且不能使用docker login -u -p - echo $DOCKER_PASSWORD | docker login $REGISTRY --username $DOCKER_USERNAME --password-stdin - chmod +x docker.sh @@ -111,7 +113,6 @@ steps: path: /app/config # 将kubectl 配置文件挂载出来 commands: # 定义在Docker容器中执行的shell命令 # 将deployment中定义的变量替换为drone中的内置变量 - - sed -i 's/$PROFILES/'"mosr"'/' nginx.conf - kubectl apply -f deployment.yml -n mosr --kubeconfig=/app/config/base-taishan-kubectl.yml when: branch: @@ -125,7 +126,6 @@ steps: path: /app/config # 将kubectl 配置文件挂载出来 commands: # 定义在Docker容器中执行的shell命令 # 将deployment中定义的变量替换为drone中的内置变量 - - sed -i 's/$PROFILES/'"mosr-dm"'/' nginx.conf - kubectl apply -f deployment.yml -n mosr-dm --kubeconfig=/app/config/base-taishan-kubectl.yml when: branch: From e9acf99ccb7b7c3545d08e62638c5f281950d315 Mon Sep 17 00:00:00 2001 From: odjbin <1042039504@qq.com> Date: Fri, 29 Mar 2024 22:58:00 +0800 Subject: [PATCH 6/6] =?UTF-8?q?fix=20:=20=E4=BF=AE=E6=94=B9=E7=99=BB?= =?UTF-8?q?=E5=BD=95=E7=95=8C=E9=9D=A2=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/svg/sso.svg | 1 + src/views/login/index.vue | 75 ++++++++++++++++++++++++++++++++++----- 2 files changed, 67 insertions(+), 9 deletions(-) create mode 100644 src/assets/svg/sso.svg diff --git a/src/assets/svg/sso.svg b/src/assets/svg/sso.svg new file mode 100644 index 0000000..df0fdcc --- /dev/null +++ b/src/assets/svg/sso.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/views/login/index.vue b/src/views/login/index.vue index 519ac4b..0f9669a 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -4,14 +4,14 @@ :model="loginForm" ref="formInstance" :rules="rules" - label-width="65px" + label-width="70px" > -

科研管理平台

+

科研管理平台

- +
@@ -20,6 +20,12 @@
+
+ + + 统一身份认证 + +
登录 @@ -98,26 +104,77 @@ onBeforeUnmount(() => {