From ea28be2f5f65afd8406540c27cfc48425e020e4e Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Wed, 23 Sep 2020 08:40:13 +0800
Subject: [PATCH] msg

---
 client/src/App.vue                            |  15 +
 client/src/api/msg.js                         |   9 +
 client/src/api/user.js                        |   9 +
 client/src/components/Pagination/index.vue    |   4 +-
 client/src/store/modules/user.js              |  18 +-
 client/src/styles/index.scss                  |  40 ++-
 client/src/utils/request.js                   |  28 +-
 client/src/views/login/index.vue              | 316 +++++++++++++-----
 server/apps/system/migrations/0004_message.py |  28 ++
 server/apps/system/models.py                  |   6 +-
 server/apps/system/serializers.py             |   1 +
 server/apps/system/urls.py                    |   3 +-
 server/apps/system/views.py                   |  69 +++-
 server/db.sqlite3                             | Bin 44654592 -> 44654592 bytes
 server/server/urls.py                         |   3 +-
 15 files changed, 444 insertions(+), 105 deletions(-)
 create mode 100644 client/src/api/msg.js
 create mode 100644 server/apps/system/migrations/0004_message.py

diff --git a/client/src/App.vue b/client/src/App.vue
index ec9032c..2d9191c 100644
--- a/client/src/App.vue
+++ b/client/src/App.vue
@@ -9,3 +9,18 @@ export default {
   name: 'App'
 }
 </script>
+<style >
+  .el-table--medium td,   .el-table--medium th {
+    padding: 2px 0;
+  }
+  .el-form-item {
+    margin-bottom: 16px;
+}
+ 
+.el-card__body {
+    padding: 10px;
+}
+.el-card__header {
+    padding: 10px;
+}
+</style>
\ No newline at end of file
diff --git a/client/src/api/msg.js b/client/src/api/msg.js
new file mode 100644
index 0000000..bc20ece
--- /dev/null
+++ b/client/src/api/msg.js
@@ -0,0 +1,9 @@
+import request from '@/utils/request'
+
+export function sendMsg(data) {
+    return request({
+      url: '/system/sendmsg/',
+      method: 'post',
+      data
+    })
+  }
\ No newline at end of file
diff --git a/client/src/api/user.js b/client/src/api/user.js
index 2712ba4..3bf3700 100644
--- a/client/src/api/user.js
+++ b/client/src/api/user.js
@@ -8,6 +8,15 @@ export function login(data) {
   })
 }
 
+export function login2(data) {
+  //验证码登陆
+  return request({
+    url: '/token2/',
+    method: 'post',
+    data
+  })
+}
+
 export function logout() {
   return request({
     url: '/token/black/',
diff --git a/client/src/components/Pagination/index.vue b/client/src/components/Pagination/index.vue
index c815e13..c5ace71 100644
--- a/client/src/components/Pagination/index.vue
+++ b/client/src/components/Pagination/index.vue
@@ -90,10 +90,10 @@ export default {
 }
 </script>
 
-<style scoped>
+<style>
 .pagination-container {
   background: #fff;
-  padding: 32px 16px;
+  padding: 0px 2px;
 }
 .pagination-container.hidden {
   display: none;
diff --git a/client/src/store/modules/user.js b/client/src/store/modules/user.js
index 3dba2c2..70d9281 100644
--- a/client/src/store/modules/user.js
+++ b/client/src/store/modules/user.js
@@ -1,4 +1,4 @@
-import { login, logout, getInfo } from '@/api/user'
+import { login, logout, getInfo, login2 } from '@/api/user'
 import { getToken, setToken, removeToken } from '@/utils/auth'
 import { resetRouter } from '@/router'
 
@@ -47,7 +47,21 @@ const actions = {
       })
     })
   },
-
+// user code login
+  login2({ commit }, msginfo) {
+    const { mail, msg } = msginfo
+    return new Promise((resolve, reject) => {
+      login2({ mail: mail.trim(), msg: msg }).then(response => {
+        const { data } = response
+        commit('SET_TOKEN', data.access)
+        setToken(data.access)
+        resolve()
+    
+      }).catch(error => {
+        reject(error)
+      })
+    })
+  },
   // get user info
   getInfo({ commit, state }) {
     return new Promise((resolve, reject) => {
diff --git a/client/src/styles/index.scss b/client/src/styles/index.scss
index 3b4da51..3136ad5 100644
--- a/client/src/styles/index.scss
+++ b/client/src/styles/index.scss
@@ -61,5 +61,43 @@ div:focus {
 
 // main-container global css
 .app-container {
-  padding: 20px;
+  padding: 10px;
+}
+
+.el-table--medium td,   .el-table--medium th {
+  padding: 2px 0;
+}
+.el-form-item {
+  margin-bottom: 16px;
+}
+.el-card, .el-message {
+  border-radius: 0px;
+  overflow: hidden;
+}
+.el-card__body {
+  padding: 6px;
+}
+.el-card__header {
+  padding: 6px;
+}
+.el-tabs--border-card>.el-tabs__content {
+  padding: 6px;
+}
+.el-dialog__header {
+  padding: 10px 10px 6px;
+}
+.el-dialog__body {
+  padding: 8px 12px;
+}
+// .el-form-item--medium .el-form-item__label {
+//   line-height: 16px;
+// }
+.el-form--label-top .el-form-item__label {
+  line-height: 16px;
+}
+.el-button+.el-button {
+  margin-left: 1px;
+}
+.el-button {
+  border-radius: 0px;
 }
diff --git a/client/src/utils/request.js b/client/src/utils/request.js
index f485832..7c2c571 100644
--- a/client/src/utils/request.js
+++ b/client/src/utils/request.js
@@ -45,22 +45,30 @@ service.interceptors.response.use(
     const res = response.data
     // 50008: Illegal token; 50012: Other clients logged in; 50014: Token expired;
     if (res.code === 401) {
-      MessageBox.confirm('您已退出,您可以停留在本页或者重新登陆.', '确认退出', {
-        confirmButtonText: '重新登陆',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        store.dispatch('user/resetToken').then(() => {
-          location.reload()
+      if(res.msg.indexOf('No active account')!=-1){
+        Message({
+          message: '用户名或密码错误',
+          type: 'error',
+          duration: 3 * 1000
         })
-      })
+      }else{
+        MessageBox.confirm('认证失败,请重新登陆.', '确认退出', {
+          confirmButtonText: '重新登陆',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          store.dispatch('user/resetToken').then(() => {
+            location.reload()
+          })
+        })
+      }
+      
     } else if (res.code >= 400) {
       Message({
         message: res.msg || '请求出错',
         type: 'error',
-        duration: 5 * 1000
+        duration: 3 * 1000
       })
-
       return Promise.reject(new Error(res.msg || '请求出错'))
     } else {
       return res
diff --git a/client/src/views/login/index.vue b/client/src/views/login/index.vue
index b680fab..5250b56 100644
--- a/client/src/views/login/index.vue
+++ b/client/src/views/login/index.vue
@@ -1,62 +1,125 @@
 <template>
   <div class="login-container">
-    <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form" auto-complete="on" label-position="left">
-
+    <div class="login-form">
       <div class="title-container">
-        <h3 class="title">CTC能力检索</h3>
+        <h3 class="title">ctc能力检索</h3>
       </div>
+      <el-tabs v-model="activeName" :stretch="true">
+        <el-tab-pane label="验证码登陆" name="msg">
+          <el-form
+            ref="loginForm2"
+            :model="loginForm2"
+            :rules="loginRules2"
+            auto-complete="on"
+            label-position="left"
+          >
+            <el-form-item prop="mail">
+              <span class="svg-container">
+                <svg-icon icon-class="email" />
+              </span>
+              <el-input
+                ref="mail"
+                v-model="loginForm2.mail"
+                placeholder="邮箱号"
+                name="mail"
+                type="text"
+                tabindex="1"
+                auto-complete="on"
+              />
+            </el-form-item>
 
-      <el-form-item prop="username">
-        <span class="svg-container">
-          <svg-icon icon-class="user" />
-        </span>
-        <el-input
-          ref="username"
-          v-model="loginForm.username"
-          placeholder="账号"
-          name="username"
-          type="text"
-          tabindex="1"
-          auto-complete="on"
-        />
-      </el-form-item>
+            <el-form-item prop="msg">
+              <span class="svg-container">
+                <svg-icon icon-class="message" />
+              </span>
+              <el-input
+                ref="msg"
+                v-model="loginForm2.msg"
+                type="text"
+                placeholder="验证码"
+                name="msg"
+                tabindex="2"
+                auto-complete="on"
+                @keyup.enter.native="handleLogin"
+              />
+              <span class="show-pwd" @click="sendMsg">
+                <el-button :disabled="disabled" plain type="primary">
+                  <template>{{buttonmsg}}</template>
+                </el-button>
+                <!-- <svg-icon :icon-class="passwordType === 'password' ? 'eye' : 'eye-open'" /> -->
+              </span>
+            </el-form-item>
+            <el-button
+              :loading="loading2"
+              type="primary"
+              style="width:100%;margin-bottom:30px;"
+              @click.native.prevent="handleLogin2"
+            >验证登陆</el-button>
+          </el-form>
 
-      <el-form-item prop="password">
-        <span class="svg-container">
-          <svg-icon icon-class="password" />
-        </span>
-        <el-input
-          :key="passwordType"
-          ref="password"
-          v-model="loginForm.password"
-          :type="passwordType"
-          placeholder="密码"
-          name="password"
-          tabindex="2"
-          auto-complete="on"
-          @keyup.enter.native="handleLogin"
-        />
-        <span class="show-pwd" @click="showPwd">
-          <svg-icon :icon-class="passwordType === 'password' ? 'eye' : 'eye-open'" />
-        </span>
-      </el-form-item>
 
-      <el-button :loading="loading" type="primary" style="width:100%;margin-bottom:30px;" @click.native.prevent="handleLogin">登陆</el-button>
+        </el-tab-pane>
+        <el-tab-pane label="账户密码登陆" name="pwd">
+          <el-form
+            ref="loginForm"
+            :model="loginForm"
+            :rules="loginRules"
+            auto-complete="on"
+            label-position="left"
+          >
+            <el-form-item prop="username">
+              <span class="svg-container">
+                <svg-icon icon-class="user" />
+              </span>
+              <el-input
+                ref="username"
+                v-model="loginForm.username"
+                placeholder="账号"
+                name="username"
+                type="text"
+                tabindex="1"
+                auto-complete="on"
+              />
+            </el-form-item>
 
-      <!-- <div class="tips">
-        <span style="margin-right:20px;">username: admin</span>
-        <span> password: any</span>
-      </div> -->
-
-    </el-form>
+            <el-form-item prop="password">
+              <span class="svg-container">
+                <svg-icon icon-class="password" />
+              </span>
+              <el-input
+                :key="passwordType"
+                ref="password"
+                v-model="loginForm.password"
+                :type="passwordType"
+                placeholder="密码"
+                name="password"
+                tabindex="2"
+                auto-complete="on"
+                @keyup.enter.native="handleLogin"
+              />
+              <span class="show-pwd" @click="showPwd">
+                <svg-icon :icon-class="passwordType === 'password' ? 'eye' : 'eye-open'" />
+              </span>
+            </el-form-item>
+            <el-button
+              :loading="loading"
+              type="primary"
+              style="width:100%;margin-bottom:30px;"
+              @click.native.prevent="handleLogin"
+            >登陆</el-button>
+          </el-form>
+        </el-tab-pane>
+      </el-tabs>
+    </div>
   </div>
 </template>
 
 <script>
 // import { validUsername } from '@/utils/validate'
-
+import { sendMsg } from '@/api/msg'
+import { login2 } from "@/api/user"
 export default {
-  name: 'Login',
+  name: "Login",
   data() {
     // const validateUsername = (rule, value, callback) => {
     //   if (!validUsername(value)) {
@@ -67,70 +130,147 @@ export default {
     // }
     const validatePassword = (rule, value, callback) => {
       if (value.length < 4) {
-        callback(new Error('密码长度小于4位!'))
+        callback(new Error("密码长度小于4位!"));
       } else {
-        callback()
+        callback();
       }
-    }
+    };
     return {
+      timer:null,
+      disabled:false,
+      buttonmsg:'发送验证码',
+      count:20,
+      activeName: "pwd",
       loginForm: {
-        username: '',
-        password: ''
+        username: "",
+        password: "",
+      },
+      loginForm2: {
+        mail: "",
+        msg: "",
       },
       loginRules: {
-        username: [{ required: true, trigger: 'blur', message: "请输入账户" }],
-        password: [{ required: true, trigger: 'blur', validator: validatePassword, message: "请输入密码" }]
+        username: [{ required: true, trigger: "blur", message: "请输入账户" }],
+        password: [
+          {
+            required: true,
+            trigger: "blur",
+            validator: validatePassword,
+            message: "请输入密码",
+          },
+        ],
       },
+      loginRules2: {
+        mail: [{ required: true, trigger: "blur", message: "请输入邮箱号" }],
+        msg: [
+          {
+            required: true,
+            trigger: "blur",
+            message: "请输入验证码",
+          },
+        ],
+      },
+      loading2:false,
       loading: false,
-      passwordType: 'password',
-      redirect: undefined
-    }
+      passwordType: "password",
+      redirect: undefined,
+    };
   },
   watch: {
     $route: {
-      handler: function(route) {
-        this.redirect = route.query && route.query.redirect
+      handler: function (route) {
+        this.redirect = route.query && route.query.redirect;
       },
-      immediate: true
-    }
+      immediate: true,
+    },
   },
   methods: {
     showPwd() {
-      if (this.passwordType === 'password') {
-        this.passwordType = ''
+      if (this.passwordType === "password") {
+        this.passwordType = "";
       } else {
-        this.passwordType = 'password'
+        this.passwordType = "password";
       }
       this.$nextTick(() => {
-        this.$refs.password.focus()
-      })
+        this.$refs.password.focus();
+      });
     },
-    handleLogin() {
-      this.$refs.loginForm.validate(valid => {
-        if (valid) {
-          this.loading = true
-          this.$store.dispatch('user/login', this.loginForm).then(() => {
-            this.$router.push({ path: this.redirect || '/' })
-            this.loading = false
-          }).catch(() => {
-            this.loading = false
-          })
+    sendMsg(){
+      if(this.loginForm2.mail.length){
+        this.getTimer()
+        sendMsg({'mail':this.loginForm2.mail}).then(res=>{
+          this.$message.success('验证码已发送至该邮箱,请注意查收')
+        }).catch(e=>{})
+      }else{
+        this.$message.warning('请输入邮箱号')
+      }
+    },
+    getTimer(){
+     const TIME_COUNT = 20;
+     if (!this.timer) {
+       this.count = TIME_COUNT;
+       this.disabled = true;
+       this.timer = setInterval(() => {
+       if (this.count > 0 && this.count <= TIME_COUNT) {
+         this.count--;
+         this.buttonmsg = this.count
         } else {
-          console.log('error submit!!')
-          return false
+         this.disabled = false;
+         clearInterval(this.timer);
+         this.timer = null;
+         this.buttonmsg = '发送验证码'
         }
-      })
-    }
-  }
-}
+       }, 1000)
+      }
+   },
+    handleLogin() {
+      this.$refs.loginForm.validate((valid) => {
+        if (valid) {
+          this.loading = true;
+          this.$store
+            .dispatch("user/login", this.loginForm)
+            .then(() => {
+              this.$router.push({ path: this.redirect || "/" });
+              this.loading = false;
+            })
+            .catch(() => {
+              this.loading = false;
+            });
+        } else {
+          console.log("error submit!!");
+          return false;
+        }
+      });
+    },
+        handleLogin2() {
+      this.$refs.loginForm2.validate((valid) => {
+        if (valid) {
+          this.loading2 = true;
+          this.$store
+            .dispatch("user/login2", this.loginForm2)
+            .then(() => {
+              this.$router.push({ path: this.redirect || "/" });
+              this.loading2 = false;
+            })
+            .catch(() => {
+              this.loading2 = false;
+            });
+        } else {
+          console.log("error submit!!");
+          return false;
+        }
+      });
+    },
+  },
+};
 </script>
 
 <style lang="scss">
 /* 修复input 背景不协调 和光标变色 */
 /* Detail see https://github.com/PanJiaChen/vue-element-admin/pull/927 */
 
-$bg:#283443;
-$light_gray:#fff;
+$bg: #283443;
+$light_gray: #fff;
 $cursor: #fff;
 
 @supports (-webkit-mask: none) and (not (cater-color: $cursor)) {
@@ -169,13 +309,19 @@ $cursor: #fff;
     border-radius: 5px;
     color: #454545;
   }
+  .el-tabs__item {
+    color: #fff;
+  }
+  .el-tabs__item.is-active {
+    color: #409eff;
+  }
 }
 </style>
 
 <style lang="scss" scoped>
-$bg:#2d3a4b;
-$dark_gray:#889aa4;
-$light_gray:#eee;
+$bg: #2d3a4b;
+$dark_gray: #889aa4;
+$light_gray: #eee;
 
 .login-container {
   min-height: 100%;
diff --git a/server/apps/system/migrations/0004_message.py b/server/apps/system/migrations/0004_message.py
new file mode 100644
index 0000000..4ba9a91
--- /dev/null
+++ b/server/apps/system/migrations/0004_message.py
@@ -0,0 +1,28 @@
+# Generated by Django 3.0.7 on 2020-09-22 08:52
+
+from django.db import migrations, models
+import django.utils.timezone
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('system', '0003_auto_20200528_1716'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Message',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('create_time', models.DateTimeField(default=django.utils.timezone.now, help_text='创建时间', verbose_name='创建时间')),
+                ('update_time', models.DateTimeField(auto_now=True, help_text='修改时间', verbose_name='修改时间')),
+                ('is_deleted', models.BooleanField(default=False, help_text='删除标记', verbose_name='删除标记')),
+                ('mail', models.CharField(max_length=200, verbose_name='发送邮箱')),
+                ('msg', models.CharField(max_length=200, verbose_name='验证码')),
+            ],
+            options={
+                'abstract': False,
+            },
+        ),
+    ]
diff --git a/server/apps/system/models.py b/server/apps/system/models.py
index e96adc5..accc014 100644
--- a/server/apps/system/models.py
+++ b/server/apps/system/models.py
@@ -215,4 +215,8 @@ class File(CommonAModel):
         verbose_name_plural = verbose_name
 
     def __str__(self):
-        return self.name
\ No newline at end of file
+        return self.name
+
+class Message(BaseModel):
+    mail = models.CharField('发送邮箱', max_length=200)
+    msg = models.CharField('验证码', max_length=200)
diff --git a/server/apps/system/serializers.py b/server/apps/system/serializers.py
index 7901e48..89867a7 100644
--- a/server/apps/system/serializers.py
+++ b/server/apps/system/serializers.py
@@ -4,6 +4,7 @@ from rest_framework import serializers
 
 from .models import Organization, Permission, Role, User, Position, DictType, Dict, File
 
+
 class FileSerializer(serializers.ModelSerializer):
     class Meta:
         model = File
diff --git a/server/apps/system/urls.py b/server/apps/system/urls.py
index 49aea89..225b722 100644
--- a/server/apps/system/urls.py
+++ b/server/apps/system/urls.py
@@ -1,5 +1,5 @@
 from django.urls import path, include
-from .views import UserViewSet, OrganizationViewSet, PermissionViewSet, RoleViewSet, PositionViewSet, TestView, DictTypeViewSet, DictViewSet
+from .views import UserViewSet, OrganizationViewSet, PermissionViewSet, RoleViewSet, PositionViewSet, TestView, DictTypeViewSet, DictViewSet, sendMsg
 from rest_framework import routers
 
 
@@ -13,5 +13,6 @@ router.register('dicttype', DictTypeViewSet, basename="dicttype")
 router.register('dict', DictViewSet, basename="dict")
 urlpatterns = [
     path('', include(router.urls)),
+    path('sendmsg/', sendMsg.as_view()),
     path('test/', TestView.as_view())
 ]
diff --git a/server/apps/system/views.py b/server/apps/system/views.py
index f0b153a..79ec0fc 100644
--- a/server/apps/system/views.py
+++ b/server/apps/system/views.py
@@ -1,10 +1,12 @@
 import logging
 
 from django.contrib.auth.hashers import check_password, make_password
+from django.contrib.auth.models import UserManager
 from django.core.cache import cache
+from django.http import request
 from django_filters.rest_framework import DjangoFilterBackend
 from rest_framework import status
-from rest_framework.decorators import action
+from rest_framework.decorators import action, authentication_classes, permission_classes
 from rest_framework.filters import OrderingFilter, SearchFilter
 from rest_framework.mixins import (CreateModelMixin, DestroyModelMixin,
                                    ListModelMixin, RetrieveModelMixin,
@@ -20,7 +22,7 @@ from utils.queryset import get_child_queryset2
 
 from .filters import UserFilter
 from .models import (Dict, DictType, Organization, Permission, Position, Role,
-                     User, File)
+                     User, File, Message)
 from .permission import RbacPermission, get_permission_list
 from .permission_data import RbacFilterSet
 from .serializers import (DictSerializer, DictTypeSerializer,
@@ -40,6 +42,69 @@ class LogoutView(APIView):
     def get(self, request, *args, **kwargs):  # 可将token加入黑名单
         return Response(status=status.HTTP_200_OK)
 
+import smtplib
+from email.mime.text import MIMEText
+from email.utils import formataddr
+from email.header import Header
+import random
+
+from rest_framework_simplejwt.tokens import RefreshToken
+
+def get_tokens_for_user(user):
+    refresh = RefreshToken.for_user(user)
+    return {
+        'refresh': str(refresh),
+        'access': str(refresh.access_token),
+    }
+
+class Login2View(APIView):
+    authentication_classes = []
+    permission_classes = []
+    def post(self, request):
+        mail = request.data['mail']
+        msg = request.data['msg']
+        if not User.objects.filter(username=mail).exists():
+            return Response('账户不存在', status=status.HTTP_400_BAD_REQUEST)
+        if Message.objects.filter(mail=mail).last().msg == msg:
+            user = User.objects.get(username=mail)
+            return Response(get_tokens_for_user(user), status=status.HTTP_200_OK)
+        return Response('验证码错误', status=status.HTTP_400_BAD_REQUEST)
+
+class sendMsg(APIView):
+    authentication_classes = []
+    permission_classes = []
+
+    def post(self, request):
+        code = random.randint(1000,9999)
+        my_sender = 'caoqianming@ctc.ac.cn'
+        my_user = request.data['mail']
+        my_pass = '9093QQww'
+        if not User.objects.filter(username=my_user).exists():
+            return Response('该账户不存在', status=status.HTTP_400_BAD_REQUEST)
+        try:
+            # 邮件内容
+            msg=MIMEText('ctc能力检索本次验证码为' + str(code),'plain','utf-8')
+            # 括号里的对应发件人邮箱昵称、发件人邮箱账号
+            msg['From']=formataddr(["国检集团能力检索",my_sender])  
+            # 括号里的对应收件人邮箱昵称、收件人邮箱账号
+            msg['To']=formataddr(["国检集团",my_user])   
+            # 邮件的主题           
+            msg['Subject'] = Header(str(code), 'utf-8').encode()               
+    
+            # SMTP服务器，腾讯企业邮箱端口是465，腾讯邮箱支持SSL(不强制)， 不支持TLS
+            # qq邮箱smtp服务器地址:smtp.qq.com,端口号：456
+            # 163邮箱smtp服务器地址：smtp.163.com，端口号：25
+            server=smtplib.SMTP_SSL("smtp.exmail.qq.com", 465)  
+            # 登录服务器，括号中对应的是发件人邮箱账号、邮箱密码
+            server.login(my_sender, my_pass)  
+            # 发送邮件，括号中对应的是发件人邮箱账号、收件人邮箱账号、发送邮件
+            server.sendmail(my_sender,[my_user,],msg.as_string())  
+            # 关闭连接
+            server.quit()
+            Message.objects.create(mail=my_user, msg=code)
+        except:
+            return Response('验证码发送失败', status=status.HTTP_400_BAD_REQUEST)
+        return Response(status=status.HTTP_200_OK)
 
 class DictTypeViewSet(ModelViewSet):
     """
diff --git a/server/db.sqlite3 b/server/db.sqlite3
index 59fb375c2994c182c119be1d3689be24c436e198..6641a69354ff9fc6bc2e6842395077ae2e032faf 100644
GIT binary patch
delta 4735
zcmbW%2~<>N9|rJynSlY685vi!VgNN!fnih7RNT>2+;`KFMNn`9*EF|!TvLn`cOOl&
z#RVgyRc+tPY}GbxFU`zsG3)EQkBF&tzEj^Eo*y&!{?Gf~_kZtu=N{Z%d#;t@2BB`l
zXu8@kLiZR(%@V^f%2zf|G~IhgZFAYe180{wYP2x}OCvlV4X^MPw>fWK?Fln6KHT33
zYt+7QMqyEQf!FIz8d;ECSm+y*o#0LI#&}a>5)wS#lvc?JtrEPksfqC^-WKI$_4+$(
zZs)8Lho|A@h#Hg4VOJ0Q*Qu(GtV#>6RnNKKsAmg}u|)?}&RaES$%@!KGoa*L?8Z9j
zuEU1i6=;hxFP2Ox%%1Eh*%{Z!3@<qx7Zc?Uw$|%*t~Z=VoG&<cyH2@Yb{%!?cCB?q
zxe}dUJI^`SmwUW3oHgC{um%?gxwtfU`R=v@O=|_~N*rlXrgL+Icb+-pU#%gmW~ke4
zgf*zVxQpYK@9H(kw511UlsI}Xb_6dAo)$bhxHQz;yzT!Qd%2n6wwsMi_td=XX;qy_
zuVpu*O?Osyes)oI)xoZn2Qzbh<HuY&*d^3%MwxD3R#sJ6=kiTMbCPZ8&H*Kk;>8Z<
z7^lxU%y}TxGuZ6(mq(!LzFdBVrD>yTt*Pg4Gfj8;1-o9b%LO}^7i=nRZ%eoDEO8uL
z?C|&4f3Y93Z;mKVHkbZ6$O>~#WV*j$Hj24oSsi`jJzA#cV#gYHwQ8c{uUe<7Dp!7~
zu1jUzl}lG$<&mm7PiLzxs+qb`x2hegvVK>Uly~_2siQ%*kTZs>opVdbfzYy1=J9{j
z7VFWCoHMVv!)?rqHUeWpLP7$A+J_tMf{cly$7SUtj4aIcB_y|KXzdZ})3DE^?40<X
zzDb$g<Ht6f*nft%V{)$!@y#+@Ovvv&Fl&6bE_vhnb?jS^F>^}K?3}#3oKA5wbCZVT
zj%$<ZO-)Qr_QofrO_~&&IicY4ooH>vq|{c)Ev>DX&@wgUQfXX4c2=G*E-O37HzmI)
z&NtOp<eMBjar~HyEw7oGW{}Nw#Bd#P{p>1@Nb|h<=Y9IS+kfTRLy3`Q?OL`N^U_=w
zFUwJS>SMD`h286S+7)7$4!g}T18g=UD5Tsx{YUufgQkCg%j)tu*T3j-<=j@MqaFSM
zcEb#ERGbU<t9D4!oN)zPlLS>x@{rf>tgHIv({3&ET7Rog`vv&_|Feb#*v%l*5pdyO
zfWO``ey+2I>sPCB#Xr7zWo!QKm3nzYQ_Z^CGL8UQHP}yv>%41o#OdjNZ~xoTf-kII
z_&-o)_wKMCvK<R|8k-E)iy@t=MFcMnIuX=7aFOG<qhG+Y{v-T+#wL4dsK=gPv7*c#
zZu2uXl$Mp-*Tl?s&vDd^j`mwHqR2NoKl{pe@Rh%eC8c}cvDJ25+^?na9nF%&0$*N!
zq-UycvbFgpH%ah%qdmPc`g?i}=+UFOC$gY$%wJC~9JJ4F#otOm#h`tTT}S;**B--F
z5s~)Z@_)4ZE<G8o`(&67qka3pnA(@`jMP?%sja-pu}KN3$t{!q_DrHTIi<zbk8z4O
zsU;W)27$p~HLyAu0y;q#SOW|N-C#|y7FZjs1J(uWfni{MumN}tcrADx7!G>C2rv?i
z0vm#jz{cS9U=uJJYzj65n}ac6EEorR!FVtMOazm_WUvKjT~7*_3bq1UgExR}z_wsJ
zFb!-Eb^tqqoxsju7qBas4t4{(gExXbz@A_)Fazuj_5u5X{lNa<0B|5U2pkL!0f&Oa
zz~SHs@Fs91I12QEqrprt3(N*{z%gJhm<Nsp$AS4^0XQC<08Ruafs?^Pun3$2P6eld
z)4>_wOz>uK7C0Nc1)KxU1?PeD!3E&0;B6qlh2SD^F}MU=3N8b02bY5@z+!MEcn4Sl
z-U+S(SA(VC8gMPR4qOjz05^i0z|A1RE#Ox0E^r&T9lRUd0p0`N3*HCb5AFnafxE#y
zU>Ud<d;ly59|ZS-4}lfn!{8&}qu^uU<KPqEe((Tz5PTAR3Va%T27DHL4tySb0elgB
z349rR1$-5J4SXFu1ik?t2HynV0^bJT0pA7R1CM}5!S}%rzz@NXz>mRW;BoL1@Kf+J
z@N@7B@JsM3@N4iJ@C0}g{1!X~eg~cgzX#8NKY(Y!AHko%pTS?ibKtMwdGI&zckn;p
zA4_O1r)kB{ip`4MiocZrD-J7xR)VYqTd8KHx|I+sPAe`eHLQeMaa*ZrrIwZ2R_a)(
zYo(r*Fmpfan~pSd_kqA;_08qg{p?t==45@-qJg+ZTq~{<;ld*#M5Krk4Mii-SX?if
zh-lGNG!xB5jEEI+!YkrMf=CoeB3ZN$Ek%k*6|F>Taf4_h+KP4}O|%ysL`Ts{bQWDi
zSCKBdiSFV?(L?kUy+nrSE&7PQqMzt528e-TkQgk6h@oPb7%oPLo5V;lO8CTRktwo7
zw#X4<M6SpaW5qa;FABtXF+ofelf-0ED2l`sF;z?x)5Q!iQ`{_OiP_>7F-Oc5^Td3y
zK-?;B6A%l<BC%L35lh7~al2S9R)}J;Qrsa*#GPW5SS?D$8nITa6YIqWu~BRin+3%d
zu~pn9wu$ZHZm~n$BkmRViTlM)u}kb0dqkPoD;^N#;z6-bJR~Z_!{QO~sCY~~E}jtk
z#Q||pJSm<MPm5>7v*J1Nym&#pC|(jTi&w;};x+NQI3(T>hsB%XE%CN^N4zWE6Gy~R
z@xJ&#d?-E=AB$t+xcEeTDn1jRi!a2N;w$mB_(q%%C&jnol=x1Z7T=3A;s<e7{3w1B
zKZ{?)Iq|DFFMbohi~oo}%%y8i`dMF0;U{duF8oD+aEL$=B!WdXQC)-xr*MfHB2>6V
zO;JnK7Ij2jQBQ=4`l5ljMqDed6XC)mB1EK!5)DNo(O6tBnuuu8R5TOKMU03Qal$L&
zMS@5aNg`Ra5G_TDNENL_YjJ~UBif2~B2Bax9YjabNpu!nL|2h6x{2=MM$tp`6um@-
z=q>t)zM`M#F9wK#VvrathKQkJm>4cbh?~SnF-rKvXpt$hM7GEgV??gV6Jy0VkuM6w
zcrigt6qCecQ7DSU6fspy6Vt^EF;m<uW{KJ27BNT674yV=u|V7^ZW9m-#Uim-ED=k^
zGI6_DE>?(Qu~OV2O2nOFl~^rG#Tv0ztP|_S2C-3W5}O6Z7O_>_CANv};%>3S?|}9C
I^UE##FYwqA%m4rY

delta 4576
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
B)HDD9

diff --git a/server/server/urls.py b/server/server/urls.py
index 58bf69f..fb84319 100644
--- a/server/server/urls.py
+++ b/server/server/urls.py
@@ -22,13 +22,14 @@ from rest_framework.documentation import include_docs_urls
 from rest_framework_simplejwt.views import (TokenObtainPairView,
                                             TokenRefreshView)
 
-from apps.system.views import FileViewSet, LogoutView
+from apps.system.views import FileViewSet, LogoutView, Login2View
 router = routers.DefaultRouter()
 router.register('file', FileViewSet, basename="file")
 
 urlpatterns = [
     path('admin/', admin.site.urls),
     path('token/', TokenObtainPairView.as_view(), name='token_obtain_pair'),
+    path('token2/', Login2View.as_view(), name='token_obtain_2'),
     path('token/refresh/', TokenRefreshView.as_view(), name='token_refresh'),
     path('token/black/', LogoutView.as_view(), name='token_black'),
     path('system/', include('apps.system.urls')),