Merge pull request 'master' (#69) from master into prod

Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/69
2024-03-29 14:59:14 +00:00
parent 97578316b8 7b500e7ea1
commit 6b81e35db0
4 changed files with 130 additions and 107 deletions
--- a/.drone-mosr.yml
+++ b/.drone-mosr.yml
@@ -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:
-    - prod
-  event:
-    - push
--- 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:
@@ -25,15 +27,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
@@ -65,9 +66,47 @@ steps:
      - sh docker.sh
      # 执行完脚本删除本次制作的docker镜像,避免多次后当前runner空间不足
      - docker rmi -f $(docker images | grep $DRONE_REPO_NAME | awk '{print $3}')
+    when:
+      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
+      - 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
+      - cat docker.sh
+      - sh docker.sh
+      # 执行完脚本删除本次制作的docker镜像,避免多次后当前runner空间不足
+      - docker rmi -f $(docker images | grep $DRONE_REPO_NAME | awk '{print $3}')
+    when:
+      branch:
+        - dm

-  - name: drone-rancher # rancher运行
+  - name: drone-rancher-prod # rancher运行
    image: bitnami/kubectl:1.26.13-debian-11-r1
    volumes: # 将容器内目录挂载到宿主机
      - name: config
@@ -75,6 +114,24 @@ steps:
    commands: # 定义在Docker容器中执行的shell命令
      # 将deployment中定义的变量替换为drone中的内置变量
      - kubectl apply -f deployment.yml -n mosr --kubeconfig=/app/config/base-taishan-kubectl.yml
+    when:
+      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中的内置变量
+      - kubectl apply -f deployment.yml -n mosr-dm --kubeconfig=/app/config/base-taishan-kubectl.yml
+    when:
+      branch:
+        - dm
+
+

 volumes:
  - name: cache
@@ -87,8 +144,10 @@ volumes:
    host:
      path: /var/run/docker.sock

+load:
 trigger:
  branch:
    - prod
+    - dm
  event:
    - push
--- a/src/assets/svg/sso.svg
+++ b/src/assets/svg/sso.svg
--- 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"
    >
-      <h3>科研管理平台</h3>
+      <h2>科研管理平台</h2>
      <el-form-item prop="username" label="账号">
        <el-input v-model="loginForm.username" :prefix-icon="User"></el-input>
      </el-form-item>
      <el-form-item prop="password" label="密码">
-        <el-input v-model="loginForm.password" type="password" :prefix-icon="Lock"></el-input>
+        <el-input v-model="loginForm.password" type="password" :prefix-icon="Lock" :show-password="true"></el-input>
      </el-form-item>
      <el-form-item prop="code" label="验证码">
        <div class="code">
@@ -20,6 +20,12 @@
          <img :src="codeImg" alt="" @click="getCode">
        </div>
      </el-form-item>
+      <div class="sso">
+        <a href="/api/auth/cas/login">
+          <svg-icon name="sso"/>
+          <span>统一身份认证</span>
+        </a>
+      </div>
      <el-form-item>
        <el-button @click="handleLogin(formInstance)" type="primary">登录</el-button>
      </el-form-item>
@@ -98,26 +104,77 @@ onBeforeUnmount(() => {
 <style lang="scss" scoped>
 .login-box {
  height: 100%;
-  background-color: #4158D0;
-  background-image: linear-gradient(43deg, #4158D0 0%, #C850C0 46%, #FFCC70 100%);
+  background-color: #F3F3F3;
+  //background-image: linear-gradient(43deg, #4158D0 0%, #C850C0 46%, #FFCC70 100%);
  display: flex;
  justify-content: center;
  align-items: center;

+  .sso {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    margin-top: -5px;
+    margin-bottom: 10px;
+
+    a {
+      font-size: 16px;
+      color: #BEA266;
+
+      &:hover {
+        text-decoration: underline;
+      }
+    }
+  }
+
  .el-form {
    padding: 12px 15px;
    border-radius: 12px;
-    width: 25%;
+    width: 35%;
    background-color: #fff;

-    h3 {
+    .el-form-item {
+      margin-bottom: 25px;
+
+      :deep(.el-form-item__label) {
+        font-size: 15px;
+      }
+
+      .el-input {
+        height: 40px;
+
+        :deep(.el-input__inner) {
+          font-size: 18px;
+        }
+
+        :deep(.el-input__suffix) {
+          .el-input__password {
+            font-size: 20px;
+          }
+        }
+
+        :deep(.el-input__prefix ) {
+          .el-input__prefix-inner {
+            .el-icon {
+              font-size: 20px;
+            }
+          }
+        }
+      }
+
+    }
+
+    h2 {
      width: 100%;
      text-align: center;
-      margin-bottom: 15px;
+      margin-bottom: 25px;
    }

    .el-button {
      width: 100%;
+      background-color: #BEA266;
+      border-color: #BEA266;
+      font-size: 17px;
    }
  }
 }
@@ -134,7 +191,7 @@ onBeforeUnmount(() => {
  }

  img {
-    height: 32px;
+    height: 40px;
    flex: 1;
  }
 }