From 7706d6db84c4db31253f4be205f8439b6531e790 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8C=BF=E5=B0=8F=E5=A4=A9?= <1638245306@qq.com>
Date: Fri, 15 Apr 2022 19:56:28 +0800
Subject: [PATCH 16/25] =?UTF-8?q?=E6=96=B0=E5=8A=9F=E8=83=BD:=20=E5=AF=86?=
=?UTF-8?q?=E7=A0=81=E9=87=8D=E7=BD=AE=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
backend/dvadmin/system/urls.py | 1 +
backend/dvadmin/system/views/user.py | 26 ++-
web/src/views/system/user/api.js | 18 +-
web/src/views/system/user/crud.js | 260 ++++++++++-----------------
web/src/views/system/user/index.vue | 108 +++++++----
5 files changed, 202 insertions(+), 211 deletions(-)
diff --git a/backend/dvadmin/system/urls.py b/backend/dvadmin/system/urls.py
index 2cacc87..8481e1d 100644
--- a/backend/dvadmin/system/urls.py
+++ b/backend/dvadmin/system/urls.py
@@ -41,6 +41,7 @@ urlpatterns = [
path('menu/web_router/', MenuViewSet.as_view({'get': 'web_router'})),
path('user/user_info/', UserViewSet.as_view({'get': 'user_info', 'put': 'update_user_info'})),
path('user/change_password/
/', UserViewSet.as_view({'put': 'change_password'})),
+ path('user/reset_password//', UserViewSet.as_view({'put': 'reset_password'})),
path('user/export/', UserViewSet.as_view({'post': 'export_data', })),
path('user/import/',UserViewSet.as_view({'get': 'import_data', 'post': 'import_data'})),
path('system_config/save_content/', SystemConfigViewSet.as_view({'put': 'save_content'})),
diff --git a/backend/dvadmin/system/views/user.py b/backend/dvadmin/system/views/user.py
index ae13ea0..5144952 100644
--- a/backend/dvadmin/system/views/user.py
+++ b/backend/dvadmin/system/views/user.py
@@ -11,6 +11,7 @@ import hashlib
from django.contrib.auth.hashers import make_password
from rest_framework import serializers
from rest_framework.decorators import action
+from rest_framework.permissions import IsAuthenticated
from dvadmin.system.models import Users
from dvadmin.utils.json_response import ErrorResponse, DetailResponse
@@ -147,7 +148,7 @@ class UserViewSet(CustomModelViewSet):
'gender': '用户性别(男/女/未知)',
'is_active': '帐号状态(启用/禁用)', 'password': '登录密码', 'dept': '部门ID', 'role': '角色ID'}
- @action(methods=['GET'], detail=True, permission_classes=[])
+ @action(methods=['GET'], detail=True, permission_classes=[IsAuthenticated])
def user_info(self, request):
"""获取当前用户信息"""
user = request.user
@@ -159,14 +160,14 @@ class UserViewSet(CustomModelViewSet):
}
return DetailResponse(data=result, msg="获取成功")
- @action(methods=['PUT'], detail=True, permission_classes=[])
+ @action(methods=['PUT'], detail=True, permission_classes=[IsAuthenticated])
def update_user_info(self, request):
"""修改当前用户信息"""
user = request.user
Users.objects.filter(id=user.id).update(**request.data)
return DetailResponse(data=None, msg="修改成功")
- @action(methods=['PUT'], detail=True, permission_classes=[])
+ @action(methods=['PUT'], detail=True, permission_classes=[IsAuthenticated])
def change_password(self, request, *args, **kwargs):
"""密码修改"""
instance = Users.objects.filter(id=kwargs.get('pk')).first()
@@ -185,3 +186,22 @@ class UserViewSet(CustomModelViewSet):
return ErrorResponse(msg="旧密码不正确")
else:
return ErrorResponse(msg="未获取到用户")
+
+ @action(methods=['PUT'], detail=True)
+ def reset_password(self, request, pk):
+ """
+ 密码重置
+ """
+ instance = Users.objects.filter(id=pk).first()
+ data = request.data
+ new_pwd = data.get('newPassword')
+ new_pwd2 = data.get('newPassword2')
+ if instance:
+ if new_pwd != new_pwd2:
+ return ErrorResponse(msg="两次密码不匹配")
+ else:
+ instance.password = make_password(new_pwd)
+ instance.save()
+ return DetailResponse(data=None, msg="修改成功")
+ else:
+ return ErrorResponse(msg="未获取到用户")
diff --git a/web/src/views/system/user/api.js b/web/src/views/system/user/api.js
index 4034b53..9b89613 100644
--- a/web/src/views/system/user/api.js
+++ b/web/src/views/system/user/api.js
@@ -6,7 +6,7 @@
* 联系Qq:1638245306
* @文件介绍: 用户接口
*/
-import { request, downloadFile } from '@/api/service'
+import { request } from '@/api/service'
export const urlPrefix = '/api/system/user/'
@@ -43,13 +43,15 @@ export function DelObj (id) {
}
/**
- * 导出
- * @param params
+ * 重置密码
+ * @param id
+ * @returns {*}
+ * @constructor
*/
-export function exportData (params) {
- return downloadFile({
- url: urlPrefix + 'export/',
- params: params,
- method: 'post'
+export function ResetPwd (obj) {
+ return request({
+ url: urlPrefix + 'reset_password/' + obj.id + '/',
+ method: 'put',
+ data: obj
})
}
diff --git a/web/src/views/system/user/crud.js b/web/src/views/system/user/crud.js
index f28d3ed..f0cd911 100644
--- a/web/src/views/system/user/crud.js
+++ b/web/src/views/system/user/crud.js
@@ -2,7 +2,6 @@ import { request } from '@/api/service'
import { BUTTON_STATUS_BOOL } from '@/config/button'
import { urlPrefix as deptPrefix } from '../dept/api'
import util from '@/libs/util'
-import XEUtils from 'xe-utils'
const uploadUrl = util.baseURL() + 'api/system/img/'
export const crudOptions = (vm) => {
@@ -14,8 +13,7 @@ export const crudOptions = (vm) => {
height: '100%'
},
rowHandle: {
- width: 140,
- fixed: 'right',
+ width: 180,
view: {
thin: true,
text: '',
@@ -36,7 +34,21 @@ export const crudOptions = (vm) => {
disabled () {
return !vm.hasPermissions('Delete')
}
- }
+ },
+ custom: [
+ {
+ thin: true,
+ text: '',
+ size: 'small',
+ type: 'warning',
+ icon: 'el-icon-refresh-left',
+ show () {
+ return vm.hasPermissions('ResetPwd')
+ },
+ emit: 'resetPwd'
+ }
+ ]
+
},
viewOptions: {
componentType: 'form'
@@ -47,7 +59,7 @@ export const crudOptions = (vm) => {
indexRow: { // 或者直接传true,不显示title，不居中
title: '序号',
align: 'center',
- width: 80
+ width: 100
},
columns: [
{
@@ -87,10 +99,7 @@ export const crudOptions = (vm) => {
type: 'input',
form: {
rules: [ // 表单校验规则
- {
- required: true,
- message: '账号必填项'
- }
+ { required: true, message: '账号必填项' }
],
component: {
placeholder: '请输入账号'
@@ -110,16 +119,12 @@ export const crudOptions = (vm) => {
title: '姓名',
key: 'name',
search: {
- key: 'name__icontains',
disabled: false
},
type: 'input',
form: {
rules: [ // 表单校验规则
- {
- required: true,
- message: '姓名必填项'
- }
+ { required: true, message: '姓名必填项' }
],
component: {
span: 12,
@@ -132,7 +137,6 @@ export const crudOptions = (vm) => {
},
{
title: '部门',
- width: 160,
key: 'dept',
search: {
disabled: true
@@ -143,29 +147,18 @@ export const crudOptions = (vm) => {
url: deptPrefix,
value: 'id', // 数据字典中value字段的属性名
label: 'name', // 数据字典中label字段的属性名
- isTree: true,
- getData: (url, dict, {
- _,
- component
- }) => {
- return request({
- url: url,
- params: {
- page: 1,
- limit: 999,
- status: 1
- }
- }).then(ret => {
+ getData: (url, dict, { form, component }) => {
+ return request({ url: url, params: { page: 1, limit: 10, status: 1 } }).then(ret => {
+ component._elProps.page = ret.data.page
+ component._elProps.limit = ret.data.limit
+ component._elProps.total = ret.data.total
return ret.data.data
})
}
},
form: {
rules: [ // 表单校验规则
- {
- required: true,
- message: '必填项'
- }
+ { required: true, message: '必填项' }
],
itemProps: {
class: { yxtInput: true }
@@ -174,20 +167,14 @@ export const crudOptions = (vm) => {
span: 12,
props: { multiple: false },
elProps: {
- treeConfig: {
- transform: true,
- rowField: 'id',
- parentField: 'parent',
- expandAll: true
- },
+ pagination: true,
columns: [
{
field: 'name',
- title: '部门名称',
- treeNode: true
+ title: '部门名称'
},
{
- field: 'status',
+ field: 'status_label',
title: '状态'
},
{
@@ -199,90 +186,21 @@ export const crudOptions = (vm) => {
}
}
},
- {
- title: '角色',
- key: 'role',
- width: 160,
- search: {
- disabled: true
- },
- type: 'table-selector',
- dict: {
- cache: false,
- url: '/api/system/role/',
- value: 'id', // 数据字典中value字段的属性名
- label: 'name', // 数据字典中label字段的属性名
- getData: (url, dict, {
- form,
- component
- }) => {
- return request({
- url: url,
- params: {
- page: 1,
- limit: 10
- }
- }).then(ret => {
- component._elProps.page = ret.data.page
- component._elProps.limit = ret.data.limit
- component._elProps.total = ret.data.total
- return ret.data.data
- })
- }
- },
- form: {
- rules: [ // 表单校验规则
- {
- required: true,
- message: '必填项'
- }
- ],
- itemProps: {
- class: { yxtInput: true }
- },
- component: {
- span: 12,
- props: { multiple: true },
- elProps: {
- pagination: true,
- columns: [
- {
- field: 'name',
- title: '角色名称'
- },
- {
- field: 'key',
- title: '权限标识'
- },
- {
- field: 'status',
- title: '状态'
- }
- ]
- }
- }
- }
- },
{
title: '手机号码',
key: 'mobile',
- width: 120,
search: {
disabled: true
},
type: 'input',
form: {
rules: [
- {
- max: 20,
- message: '请输入正确的手机号码',
- trigger: 'blur'
- },
- {
- pattern: /^1[3|4|5|7|8]\d{9}$/,
- message: '请输入正确的手机号码'
- }
+ { max: 20, message: '请输入正确的手机号码', trigger: 'blur' },
+ { pattern: /^1[3|4|5|7|8]\d{9}$/, message: '请输入正确的手机号码' }
],
+ itemProps: {
+ class: { yxtInput: true }
+ },
component: {
placeholder: '请输入手机号码'
}
@@ -290,14 +208,9 @@ export const crudOptions = (vm) => {
}, {
title: '邮箱',
key: 'email',
- width: 120,
form: {
rules: [
- {
- type: 'email',
- message: '请输入正确的邮箱地址',
- trigger: ['blur', 'change']
- }
+ { type: 'email', message: '请输入正确的邮箱地址', trigger: ['blur', 'change'] }
],
component: {
placeholder: '请输入邮箱'
@@ -307,57 +220,18 @@ export const crudOptions = (vm) => {
{
title: '性别',
key: 'gender',
- type: 'select',
+ type: 'radio',
dict: {
- data: [{
- label: '男',
- value: 1
- }, {
- label: '女',
- value: 0
- }]
+ data: [{ label: '男', value: 1 }, { label: '女', value: 0 }]
},
form: {
value: 1,
- rules: [
- {
- required: true,
- message: '性别必填项'
- }
- ],
component: {
span: 12
- },
- itemProps: {
- class: { yxtInput: true }
}
},
component: { props: { color: 'auto' } } // 自动染色
},
- {
- title: '用户类型',
- key: 'user_type',
- type: 'select',
- width: 120,
- search: {
- key: 'user_type',
- value: 0,
- disabled: false
- },
- dict: {
- data: [{
- label: '前台用户',
- value: 1
- }, {
- label: '后台用户',
- value: 0
- }]
- },
- form: {
- disabled: true
- },
- component: { props: { color: 'auto' } } // 自动染色
- },
{
title: '状态',
key: 'is_active',
@@ -380,7 +254,7 @@ export const crudOptions = (vm) => {
title: '头像',
key: 'avatar',
type: 'avatar-uploader',
- width: 80,
+ width: 100,
align: 'left',
form: {
component: {
@@ -393,13 +267,10 @@ export const crudOptions = (vm) => {
},
type: 'form',
successHandle (ret, option) {
- if (ret.data == null || ret.data === '') {
+ if (ret.data === null || ret.data === '') {
throw new Error('上传失败')
}
- return {
- url: ret.data.data.url,
- key: option.data.key
- }
+ return { url: ret.data.data.url, key: option.data.key }
}
},
elProps: { // 与el-uploader 配置一致
@@ -432,7 +303,58 @@ export const crudOptions = (vm) => {
}
}
}
+ },
+ {
+ title: '角色',
+ key: 'role',
+ search: {
+ disabled: true
+ },
+ type: 'table-selector',
+ dict: {
+ cache: false,
+ url: '/api/system/role/',
+ value: 'id', // 数据字典中value字段的属性名
+ label: 'name', // 数据字典中label字段的属性名
+ getData: (url, dict, { form, component }) => {
+ return request({ url: url, params: { page: 1, limit: 10 } }).then(ret => {
+ component._elProps.page = ret.data.page
+ component._elProps.limit = ret.data.limit
+ component._elProps.total = ret.data.total
+ return ret.data.data
+ })
+ }
+ },
+ form: {
+ rules: [ // 表单校验规则
+ { required: true, message: '必填项' }
+ ],
+ itemProps: {
+ class: { yxtInput: true }
+ },
+ component: {
+ span: 12,
+ props: { multiple: true },
+ elProps: {
+ pagination: true,
+ columns: [
+ {
+ field: 'name',
+ title: '角色名称'
+ },
+ {
+ field: 'key',
+ title: '权限标识'
+ },
+ {
+ field: 'status_label',
+ title: '状态'
+ }
+ ]
+ }
+ }
+ }
}
- ].concat(vm.commonEndColumns({ update_datetime: { showTable: false } }))
+ ].concat(vm.commonEndColumns({ show_create_datetime: false }))
}
}
diff --git a/web/src/views/system/user/index.vue b/web/src/views/system/user/index.vue
index ffc7d04..b8d787f 100644
--- a/web/src/views/system/user/index.vue
+++ b/web/src/views/system/user/index.vue
@@ -1,11 +1,3 @@
-
新增
- 新增
- 导出
-
- 导入
-
+
+
+
+
+
+
+
+
+
+
+
@@ -60,10 +55,42 @@ import { d2CrudPlus } from 'd2-crud-plus'
export default {
name: 'user',
-
mixins: [d2CrudPlus.crud],
data () {
- return {}
+ var validatePass = (rule, value, callback) => {
+ const pwdRegex = new RegExp('(?=.*[0-9])(?=.*[a-zA-Z]).{8,30}')
+ if (value === '') {
+ callback(new Error('请输入密码'))
+ } else if (!pwdRegex.test(value)) {
+ callback(new Error('您的密码复杂度太低(密码中必须包含字母、数字)'))
+ } else {
+ if (this.resetPwdForm.pwd2 !== '') {
+ this.$refs.resetPwdForm.validateField('pwd2')
+ }
+ callback()
+ }
+ }
+ var validatePass2 = (rule, value, callback) => {
+ if (value === '') {
+ callback(new Error('请再次输入密码'))
+ } else if (value !== this.resetPwdForm.pwd) {
+ callback(new Error('两次输入密码不一致!'))
+ } else {
+ callback()
+ }
+ }
+ return {
+ dialogFormVisible: false,
+ resetPwdForm: {
+ id: null,
+ pwd: null,
+ pwd2: null
+ },
+ passwordRules: {
+ pwd: [{ required: true, message: '必填项' }, { validator: validatePass, trigger: 'blur' }],
+ pwd2: [{ required: true, message: '必填项' }, { validator: validatePass2, trigger: 'blur' }]
+ }
+ }
},
methods: {
getCrudOptions () {
@@ -76,19 +103,38 @@ export default {
return api.AddObj(row)
},
updateRequest (row) {
- console.log('----', row)
return api.UpdateObj(row)
},
delRequest (row) {
return api.DelObj(row.id)
},
- onExport () {
- this.$confirm('是否确认导出所有数据项?', '警告', {
- confirmButtonText: '确定',
- cancelButtonText: '取消',
- type: 'warning'
- }).then(function () {
- return api.exportData()
+ // 重置密码弹框
+ resetPwd ({ row }) {
+ this.dialogFormVisible = true
+ this.resetPwdForm.id = row.id
+ },
+ // 重置密码确认
+ resetPwdSubmit () {
+ const that = this
+ that.$refs.resetPwdForm.validate((valid) => {
+ if (valid) {
+ const params = {
+ id: that.resetPwdForm.id,
+ newPassword: that.$md5(that.resetPwdForm.pwd),
+ newPassword2: that.$md5(that.resetPwdForm.pwd2)
+ }
+ api.ResetPwd(params).then(res => {
+ that.dialogFormVisible = false
+ that.resetPwdForm = {
+ id: null,
+ pwd: null,
+ pwd2: null
+ }
+ that.$message.success('修改成功')
+ })
+ } else {
+ that.$message.error('表单校验失败，请检查')
+ }
})
}
}
From 6bf257eb230547b177b58d508e1a97006c518cfd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8C=BF=E5=B0=8F=E5=A4=A9?= <1638245306@qq.com>
Date: Fri, 15 Apr 2022 20:06:42 +0800
Subject: [PATCH 17/25] =?UTF-8?q?=E6=96=B0=E5=8A=9F=E8=83=BD:=20=E5=AF=86?=
=?UTF-8?q?=E7=A0=81=E9=87=8D=E7=BD=AE=E5=8A=9F=E8=83=BD=E5=88=9D=E5=A7=8B?=
=?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
backend/dvadmin/system/initialize.py | 51 +++++++++++++++++++++-------
1 file changed, 38 insertions(+), 13 deletions(-)
diff --git a/backend/dvadmin/system/initialize.py b/backend/dvadmin/system/initialize.py
index 20fa3fa..2a2c463 100644
--- a/backend/dvadmin/system/initialize.py
+++ b/backend/dvadmin/system/initialize.py
@@ -163,6 +163,17 @@ class Initialize(CoreInitialize):
"name": "导出",
"value": "Export",
"creator_id": 1
+ },
+ {
+ "id": 9,
+ "description": None,
+ "modifier": "1",
+ "dept_belong_id": 1,
+ "update_datetime": datetime.datetime.now(),
+ "create_datetime": datetime.datetime.now(),
+ "name": "重置密码",
+ "value": "ResetPwd",
+ "creator_id": 1
}
]
self.save(Button, self.button_data, "权限表标识")
@@ -517,19 +528,19 @@ class Initialize(CoreInitialize):
"""
self.menu_button_data = [
{
- "id": 1,
- "description": None,
- "modifier": "1",
- "dept_belong_id": 1,
- "update_datetime": datetime.datetime.now(),
- "create_datetime": datetime.datetime.now(),
- "name": "查询",
- "value": "Search",
- "api": "/api/system/menu/",
- "method": 0,
- "creator_id": 1,
- "menu_id": 1
- },
+ "id": 1,
+ "description": None,
+ "modifier": "1",
+ "dept_belong_id": 1,
+ "update_datetime": datetime.datetime.now(),
+ "create_datetime": datetime.datetime.now(),
+ "name": "查询",
+ "value": "Search",
+ "api": "/api/system/menu/",
+ "method": 0,
+ "creator_id": 1,
+ "menu_id": 1
+ },
{
"id": 2,
"description": None,
@@ -1243,6 +1254,20 @@ class Initialize(CoreInitialize):
"method": 1,
"creator_id": 1,
"menu_id": 13
+ },
+ {
+ "id": 53,
+ "description": None,
+ "modifier": "1",
+ "dept_belong_id": 1,
+ "update_datetime": datetime.datetime.now(),
+ "create_datetime": datetime.datetime.now(),
+ "name": "重置密码",
+ "value": "ResetPwd",
+ "api": "/api/system/user/reset_password/{id}/",
+ "method": 2,
+ "creator_id": 1,
+ "menu_id": 3
}
]
self.save(MenuButton, self.menu_button_data, "菜单按钮表")
From ad8cf4f0fc8302f97da36bfce5fe7127d4ff5785 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8C=BF=E5=B0=8F=E5=A4=A9?= <1638245306@qq.com>
Date: Fri, 15 Apr 2022 21:26:01 +0800
Subject: [PATCH 18/25] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=8F=98=E5=8C=96:?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
优化用户头像
---
backend/dvadmin/system/models.py | 2 +-
backend/dvadmin/system/views/file_list.py | 3 +-
backend/dvadmin/system/views/login.py | 1 +
backend/dvadmin/system/views/user.py | 3 +-
.../components/header-user/index.vue | 1 +
.../components/header-user/userinfo.vue | 31 ++++++++++
web/src/router/routes.js | 56 +++++++++----------
.../store/modules/d2admin/modules/account.js | 2 +-
web/src/views/system/user/crud.js | 7 +--
9 files changed, 70 insertions(+), 36 deletions(-)
diff --git a/backend/dvadmin/system/models.py b/backend/dvadmin/system/models.py
index 6d0fcda..27dea49 100644
--- a/backend/dvadmin/system/models.py
+++ b/backend/dvadmin/system/models.py
@@ -206,7 +206,7 @@ class OperationLog(CoreModel):
def media_file_name(instance, filename):
h = instance.md5sum
basename, ext = os.path.splitext(filename)
- return os.path.join('media/files', h[0:1], h[1:2], h + ext.lower())
+ return os.path.join('files', h[0:1], h[1:2], h + ext.lower())
class FileList(CoreModel):
diff --git a/backend/dvadmin/system/views/file_list.py b/backend/dvadmin/system/views/file_list.py
index e9f8b07..87c4355 100644
--- a/backend/dvadmin/system/views/file_list.py
+++ b/backend/dvadmin/system/views/file_list.py
@@ -17,7 +17,7 @@ class FileSerializer(CustomModelSerializer):
url = serializers.SerializerMethodField(read_only=True)
def get_url(self, instance):
- return str(instance.url)
+ return 'media/'+str(instance.url)
class Meta:
model = FileList
@@ -41,3 +41,4 @@ class FileViewSet(CustomModelViewSet):
queryset = FileList.objects.all()
serializer_class = FileSerializer
filter_fields = ['name', ]
+ permission_classes = []
diff --git a/backend/dvadmin/system/views/login.py b/backend/dvadmin/system/views/login.py
index 2c3e291..3a85d10 100644
--- a/backend/dvadmin/system/views/login.py
+++ b/backend/dvadmin/system/views/login.py
@@ -88,6 +88,7 @@ class LoginSerializer(TokenObtainPairSerializer):
data = super().validate(attrs)
data['name'] = self.user.name
data['userId'] = self.user.id
+ data['avatar'] = self.user.avatar
return {
"code": 2000,
"msg": "请求成功",
diff --git a/backend/dvadmin/system/views/user.py b/backend/dvadmin/system/views/user.py
index 5144952..36cb938 100644
--- a/backend/dvadmin/system/views/user.py
+++ b/backend/dvadmin/system/views/user.py
@@ -156,7 +156,8 @@ class UserViewSet(CustomModelViewSet):
"name": user.name,
"mobile": user.mobile,
"gender": user.gender,
- "email": user.email
+ "email": user.email,
+ 'avatar':user.avatar
}
return DetailResponse(data=result, msg="获取成功")
diff --git a/web/src/layout/header-aside/components/header-user/index.vue b/web/src/layout/header-aside/components/header-user/index.vue
index fd7a566..d60058d 100644
--- a/web/src/layout/header-aside/components/header-user/index.vue
+++ b/web/src/layout/header-aside/components/header-user/index.vue
@@ -20,6 +20,7 @@
注销
+
diff --git a/web/src/layout/header-aside/components/header-user/userinfo.vue b/web/src/layout/header-aside/components/header-user/userinfo.vue
index e1cf799..67c8dff 100644
--- a/web/src/layout/header-aside/components/header-user/userinfo.vue
+++ b/web/src/layout/header-aside/components/header-user/userinfo.vue
@@ -20,6 +20,21 @@
:label-position="position"
center
>
+
+
+
+
+
+
+
@@ -130,6 +145,11 @@ export default {
return {
position: 'left',
activeName: 'userInfo',
+ action: util.baseURL() + 'api/system/file/',
+ headers: {
+ Authorization: 'JWT ' + util.cookies.get('token')
+ },
+ fileList:[],
userInfo: {
name: '',
gender: '',
@@ -177,6 +197,7 @@ export default {
params: {}
}).then((res) => {
_self.userInfo = res.data
+ _self.fileList = [{name:'avatar.png',url:res.data.avatar}]
})
},
/**
@@ -251,6 +272,16 @@ export default {
this.$message.error('表单校验失败，请检查')
}
})
+ },
+ /**
+ * 头像上传
+ * @param res
+ * @param file
+ */
+ handleAvatarSuccess(res, file) {
+ console.log(11,res)
+ this.fileList =[{ url: util.baseURL() + res.data.url, name:file.name }]
+ this.userInfo.avatar = util.baseURL() + res.data.url;
}
}
}
diff --git a/web/src/router/routes.js b/web/src/router/routes.js
index 51916e0..7d9b192 100644
--- a/web/src/router/routes.js
+++ b/web/src/router/routes.js
@@ -88,25 +88,25 @@ const frameIn = [{
// component: _import('system/user')
// },
// // 系统 按钮配置
- {
- path: 'button',
- name: 'button',
- meta: {
- title: '按钮',
- auth: true
- },
- component: _import('system/button')
- },
- // // 系统 菜单权限
- {
- path: 'menuButton/:id',
- name: 'menuButton',
- meta: {
- title: '菜单按钮',
- auth: true
- },
- component: _import('system/menuButton')
- },
+ // {
+ // path: 'button',
+ // name: 'button',
+ // meta: {
+ // title: '按钮',
+ // auth: true
+ // },
+ // component: _import('system/button')
+ // },
+ // // // 系统 菜单权限
+ // {
+ // path: 'menuButton/:id',
+ // name: 'menuButton',
+ // meta: {
+ // title: '菜单按钮',
+ // auth: true
+ // },
+ // component: _import('system/menuButton')
+ // },
// // 系统 角色管理
// {
// path: 'role',
@@ -149,15 +149,15 @@ const frameIn = [{
// component: _import('system/log/operationLog')
// },
// 系统 前端日志
- {
- path: 'frontendLog',
- name: 'frontendLog',
- meta: {
- title: '前端日志',
- auth: true
- },
- component: _import('system/log/frontendLog')
- },
+ // {
+ // path: 'frontendLog',
+ // name: 'frontendLog',
+ // meta: {
+ // title: '前端日志',
+ // auth: true
+ // },
+ // component: _import('system/log/frontendLog')
+ // },
// 刷新页面 必须保留
{
path: 'refresh',
diff --git a/web/src/store/modules/d2admin/modules/account.js b/web/src/store/modules/d2admin/modules/account.js
index e01badb..ce612c4 100644
--- a/web/src/store/modules/d2admin/modules/account.js
+++ b/web/src/store/modules/d2admin/modules/account.js
@@ -42,7 +42,7 @@ export default {
util.cookies.set('token', res.access)
util.cookies.set('refresh', res.refresh)
// 设置 vuex 用户信息
- await dispatch('d2admin/user/set', { name: res.name, user_id: res.userId }, { root: true })
+ await dispatch('d2admin/user/set', { name: res.name, user_id: res.userId,avatar:res.avatar }, { root: true })
// 用户登录后从持久化数据加载一系列的设置
await dispatch('load')
},
diff --git a/web/src/views/system/user/crud.js b/web/src/views/system/user/crud.js
index f0cd911..e151be8 100644
--- a/web/src/views/system/user/crud.js
+++ b/web/src/views/system/user/crud.js
@@ -3,7 +3,7 @@ import { BUTTON_STATUS_BOOL } from '@/config/button'
import { urlPrefix as deptPrefix } from '../dept/api'
import util from '@/libs/util'
-const uploadUrl = util.baseURL() + 'api/system/img/'
+const uploadUrl = util.baseURL() + 'api/system/file/'
export const crudOptions = (vm) => {
return {
pageOptions: {
@@ -261,7 +261,6 @@ export const crudOptions = (vm) => {
props: {
uploader: {
action: uploadUrl,
- name: 'url',
headers: {
Authorization: 'JWT ' + util.cookies.get('token')
},
@@ -270,7 +269,7 @@ export const crudOptions = (vm) => {
if (ret.data === null || ret.data === '') {
throw new Error('上传失败')
}
- return { url: ret.data.data.url, key: option.data.key }
+ return { url: util.baseURL() + ret.data.url, key: option.data.key }
}
},
elProps: { // 与el-uploader 配置一致
@@ -297,7 +296,7 @@ export const crudOptions = (vm) => {
props: {
buildUrl (value, item) {
if (value && value.indexOf('http') !== 0) {
- return '/api/upload/form/download?key=' + value
+ return util.baseURL() + value
}
return value
}
From cd50adb5565e5907e1f013faacbd7215c6227070 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8C=BF=E5=B0=8F=E5=A4=A9?= <1638245306@qq.com>
Date: Fri, 15 Apr 2022 23:13:09 +0800
Subject: [PATCH 19/25] =?UTF-8?q?=E6=96=B0=E5=8A=9F=E8=83=BD:=20=E5=AF=86?=
=?UTF-8?q?=E7=A0=81=E9=87=8D=E7=BD=AE=E5=8A=9F=E8=83=BD=E5=88=9D=E5=A7=8B?=
=?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
web/src/views/system/log/operationLog/index.vue | 2 --
1 file changed, 2 deletions(-)
diff --git a/web/src/views/system/log/operationLog/index.vue b/web/src/views/system/log/operationLog/index.vue
index 6d88eab..dac12e5 100644
--- a/web/src/views/system/log/operationLog/index.vue
+++ b/web/src/views/system/log/operationLog/index.vue
@@ -57,11 +57,9 @@ export default {
return api.GetList(query)
},
addRequest (row) {
- console.log('api', api)
return api.AddObj(row)
},
updateRequest (row) {
- console.log('----', row)
return api.UpdateObj(row)
},
delRequest (row) {
From 291c78c4113dee0eb37ea9d977888b8aaa803945 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8C=BF=E5=B0=8F=E5=A4=A9?= <1638245306@qq.com>
Date: Sun, 17 Apr 2022 22:28:53 +0800
Subject: [PATCH 20/25] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=8F=98=E5=8C=96:?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
注释CDN文件
---
web/dependencies-cdn.js | 40 ++++++++++++++++++++--------------------
1 file changed, 20 insertions(+), 20 deletions(-)
diff --git a/web/dependencies-cdn.js b/web/dependencies-cdn.js
index 1fc5eb1..427c252 100644
--- a/web/dependencies-cdn.js
+++ b/web/dependencies-cdn.js
@@ -1,22 +1,22 @@
module.exports = [
- { name: 'vue', library: 'Vue', js: 'https://cdn.jsdelivr.net/npm/vue@2.6.10/dist/vue.min.js', css: '' },
- { name: 'vue-i18n', library: 'VueI18n', js: 'https://cdn.jsdelivr.net/npm/vue-i18n@8.15.1/dist/vue-i18n.min.js', css: '' },
- { name: 'vue-router', library: 'VueRouter', js: 'https://cdn.jsdelivr.net/npm/vue-router@3.1.3/dist/vue-router.min.js', css: '' },
- { name: 'vuex', library: 'Vuex', js: 'https://cdn.jsdelivr.net/npm/vuex@3.1.2/dist/vuex.min.js', css: '' },
- { name: 'axios', library: 'axios', js: 'https://cdn.jsdelivr.net/npm/axios@0.19.0/dist/axios.min.js', css: '' },
- { name: 'better-scroll', library: 'BScroll', js: 'https://cdn.jsdelivr.net/npm/better-scroll@1.15.2/dist/bscroll.min.js', css: '' },
- { name: 'axios-mock-adapter', library: 'AxiosMockAdapter', js: 'https://cdn.jsdelivr.net/npm/axios-mock-adapter@1.18.1/dist/axios-mock-adapter.min.js', css: '' },
- { name: 'element-ui', library: 'ELEMENT', js: 'https://cdn.jsdelivr.net/npm/element-ui@2.15.5/lib/index.js', css: 'https://cdn.jsdelivr.net/npm/element-ui@2.15.5/lib/theme-chalk/index.css' },
- { name: 'lodash', library: '_', js: 'https://cdn.jsdelivr.net/npm/lodash@4.17.15/lodash.min.js', css: '' },
- { name: 'ua-parser-js', library: 'UAParser', js: 'https://cdn.jsdelivr.net/npm/ua-parser-js@0.7.20/dist/ua-parser.min.js', css: '' },
- { name: 'js-cookie', library: 'Cookies', js: 'https://cdn.jsdelivr.net/npm/js-cookie@2.2.1/src/js.cookie.min.js', css: '' },
- { name: 'nprogress', library: 'NProgress', js: 'https://cdn.jsdelivr.net/npm/nprogress@0.2.0/nprogress.min.js', css: 'https://cdn.jsdelivr.net/npm/nprogress@0.2.0/nprogress.css' },
- { name: 'dayjs', library: 'dayjs', js: 'https://cdn.jsdelivr.net/npm/dayjs@1.8.17/dayjs.min.js', css: '' },
- { name: 'fuse.js', library: 'Fuse', js: 'https://cdn.jsdelivr.net/npm/fuse.js@5.2.3/dist/fuse.min.js', css: '' },
- { name: 'hotkeys-js', library: 'hotkeys', js: 'https://cdn.jsdelivr.net/npm/hotkeys-js@3.7.3/dist/hotkeys.min.js', css: '' },
- { name: 'qs', library: 'Qs', js: 'https://cdn.jsdelivr.net/npm/qs@6.9.1/dist/qs.js', css: '' },
- { name: 'lowdb', library: 'low', js: 'https://cdn.jsdelivr.net/npm/lowdb@1.0.0/dist/low.min.js', css: '' },
- { name: 'lowdb/adapters/LocalStorage', library: 'LocalStorage', js: 'https://cdn.jsdelivr.net/npm/lowdb@1.0.0/dist/LocalStorage.min.js', css: '' },
- { name: 'screenfull', library: 'screenfull', js: 'https://cdn.jsdelivr.net/npm/screenfull@5.0.2/dist/screenfull.min.js', css: '' },
- { name: 'sortablejs', library: 'Sortable', js: 'https://cdn.jsdelivr.net/npm/sortablejs@1.10.1/Sortable.min.js', css: '' }
+ // { name: 'vue', library: 'Vue', js: 'https://cdn.jsdelivr.net/npm/vue@2.6.10/dist/vue.min.js', css: '' },
+ // { name: 'vue-i18n', library: 'VueI18n', js: 'https://cdn.jsdelivr.net/npm/vue-i18n@8.15.1/dist/vue-i18n.min.js', css: '' },
+ // { name: 'vue-router', library: 'VueRouter', js: 'https://cdn.jsdelivr.net/npm/vue-router@3.1.3/dist/vue-router.min.js', css: '' },
+ // { name: 'vuex', library: 'Vuex', js: 'https://cdn.jsdelivr.net/npm/vuex@3.1.2/dist/vuex.min.js', css: '' },
+ // { name: 'axios', library: 'axios', js: 'https://cdn.jsdelivr.net/npm/axios@0.19.0/dist/axios.min.js', css: '' },
+ // { name: 'better-scroll', library: 'BScroll', js: 'https://cdn.jsdelivr.net/npm/better-scroll@1.15.2/dist/bscroll.min.js', css: '' },
+ // { name: 'axios-mock-adapter', library: 'AxiosMockAdapter', js: 'https://cdn.jsdelivr.net/npm/axios-mock-adapter@1.18.1/dist/axios-mock-adapter.min.js', css: '' },
+ // { name: 'element-ui', library: 'ELEMENT', js: 'https://cdn.jsdelivr.net/npm/element-ui@2.15.5/lib/index.js', css: 'https://cdn.jsdelivr.net/npm/element-ui@2.15.5/lib/theme-chalk/index.css' },
+ // { name: 'lodash', library: '_', js: 'https://cdn.jsdelivr.net/npm/lodash@4.17.15/lodash.min.js', css: '' },
+ // { name: 'ua-parser-js', library: 'UAParser', js: 'https://cdn.jsdelivr.net/npm/ua-parser-js@0.7.20/dist/ua-parser.min.js', css: '' },
+ // { name: 'js-cookie', library: 'Cookies', js: 'https://cdn.jsdelivr.net/npm/js-cookie@2.2.1/src/js.cookie.min.js', css: '' },
+ // { name: 'nprogress', library: 'NProgress', js: 'https://cdn.jsdelivr.net/npm/nprogress@0.2.0/nprogress.min.js', css: 'https://cdn.jsdelivr.net/npm/nprogress@0.2.0/nprogress.css' },
+ // { name: 'dayjs', library: 'dayjs', js: 'https://cdn.jsdelivr.net/npm/dayjs@1.8.17/dayjs.min.js', css: '' },
+ // { name: 'fuse.js', library: 'Fuse', js: 'https://cdn.jsdelivr.net/npm/fuse.js@5.2.3/dist/fuse.min.js', css: '' },
+ // { name: 'hotkeys-js', library: 'hotkeys', js: 'https://cdn.jsdelivr.net/npm/hotkeys-js@3.7.3/dist/hotkeys.min.js', css: '' },
+ // { name: 'qs', library: 'Qs', js: 'https://cdn.jsdelivr.net/npm/qs@6.9.1/dist/qs.js', css: '' },
+ // { name: 'lowdb', library: 'low', js: 'https://cdn.jsdelivr.net/npm/lowdb@1.0.0/dist/low.min.js', css: '' },
+ // { name: 'lowdb/adapters/LocalStorage', library: 'LocalStorage', js: 'https://cdn.jsdelivr.net/npm/lowdb@1.0.0/dist/LocalStorage.min.js', css: '' },
+ // { name: 'screenfull', library: 'screenfull', js: 'https://cdn.jsdelivr.net/npm/screenfull@5.0.2/dist/screenfull.min.js', css: '' },
+ // { name: 'sortablejs', library: 'Sortable', js: 'https://cdn.jsdelivr.net/npm/sortablejs@1.10.1/Sortable.min.js', css: '' }
]
From eb412cfde53ff612845bf3e500805f6339a978c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E5=BC=BA?= <1206709430@qq.com>
Date: Mon, 18 Apr 2022 01:00:24 +0800
Subject: [PATCH 21/25] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=8F=98=E5=8C=96:=20?=
=?UTF-8?q?=E5=90=8E=E7=AB=AF=E6=96=B0=E5=A2=9E=E7=99=BB=E5=BD=95=E6=97=A5?=
=?UTF-8?q?=E5=BF=97=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
backend/conf/env.example.py | 1 +
backend/dvadmin/system/models.py | 31 +++++++++++++++-
backend/dvadmin/system/views/login.py | 8 +++--
backend/dvadmin/utils/request_util.py | 51 +++++++++++++++++++++++++++
4 files changed, 88 insertions(+), 3 deletions(-)
diff --git a/backend/conf/env.example.py b/backend/conf/env.example.py
index 4b1b16d..9c8def9 100644
--- a/backend/conf/env.example.py
+++ b/backend/conf/env.example.py
@@ -35,3 +35,4 @@ DATABASE_PASSWORD = "123456"
DEBUG = True # 线上环境请设置为True
ALLOWED_HOSTS = ["*"]
LOGIN_NO_CAPTCHA_AUTH = True # 登录接口 /api/token/ 是否需要验证码认证，用于测试，正式环境建议取消
+ENABLE_LOGIN_ANALYSIS_LOG = True # 启动登录详细概略获取(通过调用api获取ip详细地址)
diff --git a/backend/dvadmin/system/models.py b/backend/dvadmin/system/models.py
index 27dea49..68ea579 100644
--- a/backend/dvadmin/system/models.py
+++ b/backend/dvadmin/system/models.py
@@ -29,7 +29,7 @@ class Users(AbstractUser, CoreModel):
(1, "前台用户"),
)
user_type = models.IntegerField(choices=USER_TYPE, default=0, verbose_name="用户类型", null=True, blank=True,
- help_text="用户类型")
+ help_text="用户类型")
post = models.ManyToManyField(to='Post', verbose_name='关联岗位', db_constraint=False, help_text="关联岗位")
role = models.ManyToManyField(to='Role', verbose_name='关联角色', db_constraint=False, help_text="关联角色")
dept = models.ForeignKey(to='Dept', verbose_name='所属部门', on_delete=models.PROTECT, db_constraint=False, null=True,
@@ -306,3 +306,32 @@ class SystemConfig(CoreModel):
def __str__(self):
return f"{self.title}"
+
+
+class LoginLog(CoreModel):
+ LOGIN_TYPE_CHOICES = (
+ (1, '普通登录'),
+ )
+ username = models.CharField(max_length=32, verbose_name="登录用户名", null=True, blank=True, help_text="登录ip")
+ ip = models.CharField(max_length=32, verbose_name="登录ip", null=True, blank=True, help_text="登录ip")
+ agent = models.TextField(verbose_name="agent信息", null=True, blank=True, help_text="agent信息")
+ browser = models.CharField(max_length=200, verbose_name="浏览器名", null=True, blank=True, help_text="浏览器名")
+ os = models.CharField(max_length=200, verbose_name="操作系统", null=True, blank=True, help_text="操作系统")
+ continent = models.CharField(max_length=50, verbose_name="州", null=True, blank=True, help_text="州")
+ country = models.CharField(max_length=50, verbose_name="国家", null=True, blank=True, help_text="国家")
+ province = models.CharField(max_length=50, verbose_name="省份", null=True, blank=True, help_text="省份")
+ city = models.CharField(max_length=50, verbose_name="城市", null=True, blank=True, help_text="城市")
+ district = models.CharField(max_length=50, verbose_name="县区", null=True, blank=True, help_text="县区")
+ isp = models.CharField(max_length=50, verbose_name="运营商", null=True, blank=True, help_text="运营商")
+ area_code = models.CharField(max_length=50, verbose_name="区域代码", null=True, blank=True, help_text="区域代码")
+ country_english = models.CharField(max_length=50, verbose_name="英文全称", null=True, blank=True, help_text="英文全称")
+ country_code = models.CharField(max_length=50, verbose_name="简称", null=True, blank=True, help_text="简称")
+ longitude = models.CharField(max_length=50, verbose_name="经度", null=True, blank=True, help_text="经度")
+ latitude = models.CharField(max_length=50, verbose_name="纬度", null=True, blank=True, help_text="纬度")
+ login_type = models.IntegerField(default=1, choices=LOGIN_TYPE_CHOICES, verbose_name="登录类型", help_text="登录类型")
+
+ class Meta:
+ db_table = table_prefix + 'system_login_log'
+ verbose_name = '登录日志'
+ verbose_name_plural = verbose_name
+ ordering = ('-create_datetime',)
diff --git a/backend/dvadmin/system/views/login.py b/backend/dvadmin/system/views/login.py
index 3a85d10..90bf163 100644
--- a/backend/dvadmin/system/views/login.py
+++ b/backend/dvadmin/system/views/login.py
@@ -25,6 +25,7 @@ from rest_framework_simplejwt.views import TokenObtainPairView
from application import settings
from dvadmin.system.models import Users
from dvadmin.utils.json_response import SuccessResponse, ErrorResponse, DetailResponse
+from dvadmin.utils.request_util import save_login_log
from dvadmin.utils.serializers import CustomModelSerializer
from dvadmin.utils.validator import CustomValidationError
@@ -51,7 +52,6 @@ class CaptchaView(APIView):
return SuccessResponse(data=json_data)
-
class LoginSerializer(TokenObtainPairSerializer):
"""
登录的序列化器:
@@ -69,7 +69,7 @@ class LoginSerializer(TokenObtainPairSerializer):
}
def validate(self, attrs):
- captcha = self.initial_data.get('captcha',None)
+ captcha = self.initial_data.get('captcha', None)
if settings.CAPTCHA_STATE:
if captcha is None:
raise CustomValidationError("验证码不能为空")
@@ -89,6 +89,10 @@ class LoginSerializer(TokenObtainPairSerializer):
data['name'] = self.user.name
data['userId'] = self.user.id
data['avatar'] = self.user.avatar
+ request = self.context.get('request')
+ request.user = self.user
+ # 记录登录日志
+ save_login_log(request=request)
return {
"code": 2000,
"msg": "请求成功",
diff --git a/backend/dvadmin/utils/request_util.py b/backend/dvadmin/utils/request_util.py
index 87fa3ff..14414fb 100644
--- a/backend/dvadmin/utils/request_util.py
+++ b/backend/dvadmin/utils/request_util.py
@@ -3,12 +3,16 @@ Request工具类
"""
import json
+import requests
+from django.conf import settings
from django.contrib.auth.models import AbstractBaseUser
from django.contrib.auth.models import AnonymousUser
from django.urls.resolvers import ResolverMatch
from rest_framework_simplejwt.authentication import JWTAuthentication
from user_agents import parse
+from dvadmin.system.models import LoginLog
+
def get_request_user(request):
"""
@@ -163,3 +167,50 @@ def get_verbose_name(queryset=None, view=None, model=None):
except Exception as e:
pass
return model if model else ""
+
+
+def get_ip_analysis(ip):
+ """
+ 获取ip详细概略
+ :param ip: ip地址
+ :return:
+ """
+ data = {
+ "continent": "",
+ "country": "",
+ "province": "",
+ "city": "",
+ "district": "",
+ "isp": "",
+ "area_code": "",
+ "country_english": "",
+ "country_code": "",
+ "longitude": "",
+ "latitude": ""
+ }
+ if ip != 'unknown' and ip:
+ if getattr(settings, 'ENABLE_LOGIN_ANALYSIS_LOG', True):
+ res = requests.post(url='https://ip.django-vue-admin.com/ip/analysis', data=json.dumps({"ip": ip}))
+ if res.status_code == 200:
+ res_data = res.json()
+ if res_data.get('code') == 0:
+ data = res_data.get('data')
+ return data
+ return data
+
+
+def save_login_log(request):
+ """
+ 保存登录日志
+ :return:
+ """
+ ip = get_request_ip(request=request)
+ analysis_data = get_ip_analysis(ip)
+ analysis_data['username'] = request.user.username
+ analysis_data['ip'] = ip
+ analysis_data['agent'] = str(parse(request.META['HTTP_USER_AGENT']))
+ analysis_data['browser'] = get_browser(request)
+ analysis_data['os'] = get_os(request)
+ analysis_data['creator_id'] = request.user.id
+ analysis_data['dept_belong_id'] = getattr(request.user, 'dept_id', '')
+ LoginLog.objects.create(**analysis_data)
From 005cb242c8109e9423d6ade8e01e03c429e1d02a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E5=BC=BA?= <1206709430@qq.com>
Date: Tue, 19 Apr 2022 22:37:26 +0800
Subject: [PATCH 22/25] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=8F=98=E5=8C=96:=20?=
=?UTF-8?q?=E5=90=8E=E7=AB=AF=E6=96=B0=E5=A2=9E=E7=99=BB=E5=BD=95=E6=97=A5?=
=?UTF-8?q?=E5=BF=97=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
backend/dvadmin/system/urls.py | 5 +++-
backend/dvadmin/system/views/login_log.py | 36 +++++++++++++++++++++++
2 files changed, 40 insertions(+), 1 deletion(-)
create mode 100644 backend/dvadmin/system/views/login_log.py
diff --git a/backend/dvadmin/system/urls.py b/backend/dvadmin/system/urls.py
index 8481e1d..5ed359d 100644
--- a/backend/dvadmin/system/urls.py
+++ b/backend/dvadmin/system/urls.py
@@ -15,6 +15,7 @@ from dvadmin.system.views.button import ButtonViewSet
from dvadmin.system.views.dept import DeptViewSet
from dvadmin.system.views.dictionary import DictionaryViewSet
from dvadmin.system.views.file_list import FileViewSet
+from dvadmin.system.views.login_log import LoginLogViewSet
from dvadmin.system.views.menu import MenuViewSet
from dvadmin.system.views.menu_button import MenuButtonViewSet
from dvadmin.system.views.operation_log import OperationLogViewSet
@@ -43,10 +44,12 @@ urlpatterns = [
path('user/change_password//', UserViewSet.as_view({'put': 'change_password'})),
path('user/reset_password//', UserViewSet.as_view({'put': 'reset_password'})),
path('user/export/', UserViewSet.as_view({'post': 'export_data', })),
- path('user/import/',UserViewSet.as_view({'get': 'import_data', 'post': 'import_data'})),
+ path('user/import/', UserViewSet.as_view({'get': 'import_data', 'post': 'import_data'})),
path('system_config/save_content/', SystemConfigViewSet.as_view({'put': 'save_content'})),
path('system_config/get_association_table/', SystemConfigViewSet.as_view({'get': 'get_association_table'})),
path('system_config/get_table_data//', SystemConfigViewSet.as_view({'get': 'get_table_data'})),
path('system_config/get_relation_info/', SystemConfigViewSet.as_view({'get': 'get_relation_info'})),
+ path('login_log/', LoginLogViewSet.as_view({'get': 'list'})),
+ path('login_log//', LoginLogViewSet.as_view({'get': 'retrieve'})),
]
urlpatterns += system_url.urls
diff --git a/backend/dvadmin/system/views/login_log.py b/backend/dvadmin/system/views/login_log.py
new file mode 100644
index 0000000..4dc3617
--- /dev/null
+++ b/backend/dvadmin/system/views/login_log.py
@@ -0,0 +1,36 @@
+# -*- coding: utf-8 -*-
+
+"""
+@author: 猿小天
+@contact: QQ:1638245306
+@Created on: 2021/6/3 003 0:30
+@Remark: 按钮权限管理
+"""
+from dvadmin.system.models import LoginLog
+from dvadmin.utils.serializers import CustomModelSerializer
+from dvadmin.utils.viewset import CustomModelViewSet
+
+
+class LoginLogSerializer(CustomModelSerializer):
+ """
+ 登录日志权限-序列化器
+ """
+
+ class Meta:
+ model = LoginLog
+ fields = "__all__"
+ read_only_fields = ["id"]
+
+
+class LoginLogViewSet(CustomModelViewSet):
+ """
+ 登录日志接口
+ list:查询
+ create:新增
+ update:修改
+ retrieve:单例
+ destroy:删除
+ """
+ queryset = LoginLog.objects.all()
+ serializer_class = LoginLogSerializer
+ extra_filter_backends = []
From 4a3aaba0b58844815dc381e2cdc75b71574508d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E5=BC=BA?= <1206709430@qq.com>
Date: Wed, 20 Apr 2022 00:02:12 +0800
Subject: [PATCH 23/25] =?UTF-8?q?=E9=87=8D=E6=9E=84:=20=E7=99=BB=E5=BD=95?=
=?UTF-8?q?=E6=97=A5=E5=BF=97=E5=89=8D=E7=AB=AF=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
web/src/views/system/log/loginLog/api.js | 19 ++
web/src/views/system/log/loginLog/crud.js | 293 ++++++++++++++++++++
web/src/views/system/log/loginLog/index.vue | 48 ++++
3 files changed, 360 insertions(+)
create mode 100644 web/src/views/system/log/loginLog/api.js
create mode 100644 web/src/views/system/log/loginLog/crud.js
create mode 100644 web/src/views/system/log/loginLog/index.vue
diff --git a/web/src/views/system/log/loginLog/api.js b/web/src/views/system/log/loginLog/api.js
new file mode 100644
index 0000000..337a05f
--- /dev/null
+++ b/web/src/views/system/log/loginLog/api.js
@@ -0,0 +1,19 @@
+/*
+ * @创建文件时间: 2021-06-08 10:40:32
+ * @Auther: 猿小天
+ * @最后修改人: 猿小天
+ * @最后修改时间: 2021-06-09 10:36:20
+ * 联系Qq:1638245306
+ * @文件介绍: 操作日志
+ */
+import { request } from '@/api/service'
+
+export const urlPrefix = '/api/system/login_log/'
+
+export function GetList (query) {
+ return request({
+ url: urlPrefix,
+ method: 'get',
+ params: query
+ })
+}
diff --git a/web/src/views/system/log/loginLog/crud.js b/web/src/views/system/log/loginLog/crud.js
new file mode 100644
index 0000000..d7352c8
--- /dev/null
+++ b/web/src/views/system/log/loginLog/crud.js
@@ -0,0 +1,293 @@
+import { BUTTON_WHETHER_BOOL } from '@/config/button'
+
+export const crudOptions = (vm) => {
+ return {
+ pageOptions: {
+ compact: true
+ },
+ options: {
+ tableType: 'vxe-table',
+ rowKey: true, // 必须设置，true or false
+ rowId: 'id',
+ height: '100%', // 表格高度100%, 使用toolbar必须设置
+ highlightCurrentRow: false
+
+ },
+ rowHandle: {
+ fixed: 'right',
+ view: {
+ thin: true,
+ text: '',
+ disabled () {
+ return !vm.hasPermissions('Retrieve')
+ }
+ },
+ width: 70,
+ edit: {
+ thin: true,
+ text: '',
+ show: false,
+ disabled () {
+ return !vm.hasPermissions('Update')
+ }
+ },
+ remove: {
+ thin: true,
+ text: '删除',
+ show: false,
+ disabled () {
+ return !vm.hasPermissions('Delete')
+ }
+ }
+ },
+ viewOptions: {
+ componentType: 'form'
+ },
+ formOptions: {
+ disabled: true,
+ defaultSpan: 12 // 默认的表单 span
+ },
+ indexRow: { // 或者直接传true,不显示title，不居中
+ title: '序号',
+ align: 'center',
+ width: 70
+ },
+ columns: [
+ {
+ title: '关键词',
+ key: 'search',
+ show: false,
+ disabled: true,
+ search: {
+ disabled: false
+ },
+ form: {
+ show: false,
+ component: {
+ placeholder: '请输入关键词'
+ }
+ }
+ },
+ {
+ title: 'ID',
+ key: 'id',
+ width: 90,
+ disabled: true,
+ form: {
+ disabled: true
+ }
+ },
+ {
+ title: '登录用户名',
+ key: 'username',
+ search: {
+ disabled: false
+ },
+ width: 140,
+ type: 'input',
+ form: {
+ disabled: true,
+ component: {
+ placeholder: '请输入登录用户名'
+ }
+ }
+ },
+ {
+ title: '登录ip',
+ key: 'ip',
+ search: {
+ disabled: false
+ },
+ width: 130,
+ type: 'input',
+ form: {
+ disabled: true,
+ component: {
+ placeholder: '请输入登录ip'
+ }
+ }
+ }, {
+ title: '运营商',
+ key: 'isp',
+ search: {
+ disabled: true
+ },
+ disabled: true,
+ width: 180,
+ type: 'input',
+ form: {
+ component: {
+ placeholder: '请输入操作系统'
+ }
+ }
+ }, {
+ title: '大州',
+ key: 'continent',
+ width: 80,
+ type: 'input',
+ form: {
+ disabled: true,
+ component: {
+ placeholder: '请输入州'
+ }
+ },
+ component: { props: { color: 'auto' } } // 自动染色
+ }, {
+ title: '国家',
+ key: 'country',
+ width: 80,
+ type: 'input',
+ form: {
+ component: {
+ placeholder: '请输入国家'
+ }
+ },
+ component: { props: { color: 'auto' } } // 自动染色
+ }, {
+ title: '省份',
+ key: 'province',
+ width: 80,
+ type: 'input',
+ form: {
+ component: {
+ placeholder: '请输入省份'
+ }
+ },
+ component: { props: { color: 'auto' } } // 自动染色
+ }, {
+ title: '城市',
+ key: 'city',
+ width: 80,
+ type: 'input',
+ form: {
+ component: {
+ placeholder: '请输入城市'
+ }
+ },
+ component: { props: { color: 'auto' } } // 自动染色
+ }, {
+ title: '县区',
+ key: 'district',
+ width: 80,
+ type: 'input',
+ form: {
+ component: {
+ placeholder: '请输入县区'
+ }
+ },
+ component: { props: { color: 'auto' } } // 自动染色
+ }, {
+ title: '区域代码',
+ key: 'area_code',
+ width: 100,
+ type: 'input',
+ form: {
+ component: {
+ placeholder: '请输入区域代码'
+ }
+ },
+ component: { props: { color: 'auto' } } // 自动染色
+ }, {
+ title: '英文全称',
+ key: 'country_english',
+ width: 120,
+ type: 'input',
+ form: {
+ component: {
+ placeholder: '请输入英文全称'
+ }
+ },
+ component: { props: { color: 'auto' } } // 自动染色
+ }, {
+ title: '简称',
+ key: 'country_code',
+ width: 100,
+ type: 'input',
+ form: {
+ component: {
+ placeholder: '请输入简称'
+ }
+ },
+ component: { props: { color: 'auto' } } // 自动染色
+ }, {
+ title: '经度',
+ key: 'longitude',
+ width: 80,
+ type: 'input',
+ disabled: true,
+ form: {
+ component: {
+ placeholder: '请输入经度'
+ }
+ },
+ component: { props: { color: 'auto' } } // 自动染色
+ }, {
+ title: '纬度',
+ key: 'latitude',
+ width: 80,
+ type: 'input',
+ disabled: true,
+ form: {
+ component: {
+ placeholder: '请输入纬度'
+ }
+ },
+ component: { props: { color: 'auto' } } // 自动染色
+ }, {
+ title: '登录类型',
+ key: 'login_type',
+ width: 100,
+ type: 'select',
+ search: {
+ disabled: false
+ },
+ dict: {
+ data: [{ label: '普通登录', value: 1 }]
+ },
+ form: {
+ component: {
+ placeholder: '请选择登录类型'
+ }
+ },
+ component: { props: { color: 'auto' } } // 自动染色
+ }, {
+ title: '操作系统',
+ key: 'os',
+ width: 180,
+ type: 'input',
+ form: {
+ component: {
+ placeholder: '请输入操作系统'
+ }
+ }
+ }, {
+ title: '浏览器名',
+ key: 'browser',
+ width: 180,
+ type: 'input',
+ form: {
+ component: {
+ placeholder: '请输入操作系统'
+ }
+ }
+ }, {
+ title: 'agent信息',
+ key: 'agent',
+ disabled: true,
+ width: 180,
+ type: 'input',
+ form: {
+ component: {
+ placeholder: '请输入操作系统'
+ }
+ }
+ }, {
+ fixed: 'right',
+ title: '登录时间',
+ key: 'create_datetime',
+ width: 160,
+ type: 'datetime'
+ }
+ ]
+ }
+}
diff --git a/web/src/views/system/log/loginLog/index.vue b/web/src/views/system/log/loginLog/index.vue
new file mode 100644
index 0000000..cd6c6a3
--- /dev/null
+++ b/web/src/views/system/log/loginLog/index.vue
@@ -0,0 +1,48 @@
+
+
+
+
+
+
+
+
+
+
+
+
From 7a5d9e5fb0ddb587adbf0ee2be77ffd56b12c20d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E5=BC=BA?= <1206709430@qq.com>
Date: Wed, 20 Apr 2022 00:10:30 +0800
Subject: [PATCH 24/25] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=8F=98=E5=8C=96:=20?=
=?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E7=99=BB=E5=BD=95=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
backend/dvadmin/system/initialize.py | 48 +++++++++++++++++++++
backend/dvadmin/system/models.py | 2 +-
web/src/views/system/log/loginLog/index.vue | 2 +-
3 files changed, 50 insertions(+), 2 deletions(-)
diff --git a/backend/dvadmin/system/initialize.py b/backend/dvadmin/system/initialize.py
index 2a2c463..a6d2198 100644
--- a/backend/dvadmin/system/initialize.py
+++ b/backend/dvadmin/system/initialize.py
@@ -518,6 +518,27 @@ class Initialize(CoreInitialize):
"creator_id": 1,
"parent_id": 15,
"is_catalog": 0
+ },
+ {
+ "id": 20,
+ "description": "",
+ "modifier": "1",
+ "dept_belong_id": 1,
+ "update_datetime": datetime.datetime.now(),
+ "create_datetime": datetime.datetime.now(),
+ "icon": "file-text",
+ "name": "登录日志",
+ "sort": 1,
+ "is_link": 0,
+ "web_path": "/loginLog",
+ "component": "system/log/loginLog/index",
+ "component_name": "loginLog",
+ "status": 1,
+ "cache": 0,
+ "visible": 1,
+ "creator_id": 1,
+ "parent_id": 15,
+ "is_catalog": 0
}
]
self.save(Menu, self.menu_data, "菜单表")
@@ -1268,6 +1289,33 @@ class Initialize(CoreInitialize):
"method": 2,
"creator_id": 1,
"menu_id": 3
+ },{
+ "id": 54,
+ "description": None,
+ "modifier": "1",
+ "dept_belong_id": "1",
+ "update_datetime": datetime.datetime.now(),
+ "create_datetime": datetime.datetime.now(),
+ "name": "查询",
+ "value": "Search",
+ "api": "/api/system/login_log/",
+ "method": 0,
+ "creator_id": 1,
+ "menu_id": 20
+ },
+ {
+ "id": 55,
+ "description": None,
+ "modifier": "1",
+ "dept_belong_id": "1",
+ "update_datetime": datetime.datetime.now(),
+ "create_datetime": datetime.datetime.now(),
+ "name": "详情",
+ "value": "Retrieve",
+ "api": "/api/system/login_log/{id}/",
+ "method": 0,
+ "creator_id": 1,
+ "menu_id": 20
}
]
self.save(MenuButton, self.menu_button_data, "菜单按钮表")
diff --git a/backend/dvadmin/system/models.py b/backend/dvadmin/system/models.py
index 68ea579..798612e 100644
--- a/backend/dvadmin/system/models.py
+++ b/backend/dvadmin/system/models.py
@@ -312,7 +312,7 @@ class LoginLog(CoreModel):
LOGIN_TYPE_CHOICES = (
(1, '普通登录'),
)
- username = models.CharField(max_length=32, verbose_name="登录用户名", null=True, blank=True, help_text="登录ip")
+ username = models.CharField(max_length=32, verbose_name="登录用户名", null=True, blank=True, help_text="登录用户名")
ip = models.CharField(max_length=32, verbose_name="登录ip", null=True, blank=True, help_text="登录ip")
agent = models.TextField(verbose_name="agent信息", null=True, blank=True, help_text="agent信息")
browser = models.CharField(max_length=200, verbose_name="浏览器名", null=True, blank=True, help_text="浏览器名")
diff --git a/web/src/views/system/log/loginLog/index.vue b/web/src/views/system/log/loginLog/index.vue
index cd6c6a3..6610bd2 100644
--- a/web/src/views/system/log/loginLog/index.vue
+++ b/web/src/views/system/log/loginLog/index.vue
@@ -30,7 +30,7 @@ import { crudOptions } from './crud'
import { d2CrudPlus } from 'd2-crud-plus'
export default {
- name: 'operationLog',
+ name: 'loginLog',
mixins: [d2CrudPlus.crud],
data () {
From c3dfb3bed4b901b20d5968052f401e81033109d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E5=BC=BA?= <1206709430@qq.com>
Date: Wed, 20 Apr 2022 00:36:26 +0800
Subject: [PATCH 25/25] =?UTF-8?q?=E9=87=8D=E6=9E=84:=20=E5=89=8D=E7=AB=AF?=
=?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8F=8A=E4=B8=BB=E9=A2=98logo?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
web/public/image/theme/chester/logo/all.png | Bin 3421 -> 7787 bytes
.../image/theme/chester/logo/icon-only.png | Bin 2617 -> 5490 bytes
web/public/image/theme/chester/preview@2x.png | Bin 8710 -> 0 bytes
web/public/image/theme/element/logo/all.png | Bin 3392 -> 7836 bytes
.../image/theme/element/logo/icon-only.png | Bin 2288 -> 5509 bytes
web/public/image/theme/element/preview@2x.png | Bin 14388 -> 0 bytes
web/public/image/theme/line/logo/all.png | Bin 3413 -> 7840 bytes
.../image/theme/line/logo/icon-only.png | Bin 2260 -> 5505 bytes
web/public/image/theme/line/preview@2x.png | Bin 384595 -> 0 bytes
web/public/image/theme/star/logo/all.png | Bin 3290 -> 7501 bytes
.../image/theme/star/logo/icon-only.png | Bin 2225 -> 5036 bytes
web/public/image/theme/star/preview@2x.png | Bin 1978680 -> 0 bytes
.../theme/tomorrow-night-blue/logo/all.png | Bin 3696 -> 8048 bytes
.../tomorrow-night-blue/logo/icon-only.png | Bin 2525 -> 6304 bytes
.../theme/tomorrow-night-blue/preview@2x.png | Bin 10130 -> 0 bytes
web/public/image/theme/violet/logo/all.png | Bin 3290 -> 8030 bytes
.../image/theme/violet/logo/icon-only.png | Bin 2225 -> 5990 bytes
web/public/image/theme/violet/preview@2x.png | Bin 46362 -> 0 bytes
web/src/setting.js | 64 +++++++++---------
web/src/views/system/fileList/crud.js | 8 ++-
web/src/views/system/log/operationLog/crud.js | 27 ++++++--
web/src/views/system/user/crud.js | 14 ++--
web/src/views/system/whiteList/crud.js | 5 +-
23 files changed, 72 insertions(+), 46 deletions(-)
delete mode 100644 web/public/image/theme/chester/preview@2x.png
delete mode 100644 web/public/image/theme/element/preview@2x.png
delete mode 100644 web/public/image/theme/line/preview@2x.png
delete mode 100644 web/public/image/theme/star/preview@2x.png
delete mode 100644 web/public/image/theme/tomorrow-night-blue/preview@2x.png
delete mode 100644 web/public/image/theme/violet/preview@2x.png
diff --git a/web/public/image/theme/chester/logo/all.png b/web/public/image/theme/chester/logo/all.png
index bb858c3f75d5bbf65638b5c66bc81cbae9cb31b1..4d67b0c894ab68f7e7e089c9d8641b31d62d267d 100644
GIT binary patch
delta 7335
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
literal 3421
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
diff --git a/web/public/image/theme/chester/preview@2x.png b/web/public/image/theme/chester/preview@2x.png
deleted file mode 100644
index 7841526d4861cb45ca2e0d17d49afa334f9a8d65..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 8710
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
E2a{T?T>t<8
diff --git a/web/public/image/theme/element/logo/all.png b/web/public/image/theme/element/logo/all.png
index d4c4800282c28b4b601cca8139b643f9ced57787..e046e04863c7ed40308a6daf877d209214578f17 100644
GIT binary patch
delta 7384
zcma)>byO5iyT|E}TtK>6K%{o*WeMp9>5!BT=@wW4>0G)IDFH!5kR=3^TDn0(LOPdp
zNx9s6-}k+L{m!}b*Z0hs&oj?FGjq<&^K{V{NT&k1=zNt-eDysXd;@H}?J?x+JYL$f
zs=cytwAZt@u?zAVu$RKXz~+EUCUT1jfcR}eAR$(9hyYkjL_|V@k5vdH1QG;^3xYxX
zLPC-tF-cKj_+ei94kid&&)y;329r4*f<^j2S`!OMDkLNTVtr!l>~7}~;KP${fz1e$
z5LOUZR#Fg`7gv-3gOwEI#6&?#AZ3UgNKr^c9wf@n8u-dnOG{GG!`APWy}PfPqBQ$M
zkAR)Co#ek*iGO5eSf&0&+j~3v+uJF7d%R-x@qKVj(%Id|*T&t})&AcGo&V3E=sz0#
z7i{;>&WQaZE13Ql_Zh5WXg3uDgMmy=s!W^G)v1=GA
zdzbBVt!?Oc;X9@ouywl<;LzGy<8Jt?^c`#^b2}ZVh@6%GQzJt#QO?|0Di`{YU&8d*GvuV!sBLmX(zu
zP!$cq7FRb!a7%V+#nyN?u1O_3COAx}39Sc5DalY@RU%)o3oAObRi9?g7tCgDi8fNH
z`>yj!Vi_AnroK)%FFzlQH2kc&;S7f=7EuVz(T9^LuinDHez|3O>K&^p3-{Lw{7R-I
zK-FRuYwq~qVK{?|nbQomk~YQsocLWnroNK$qc~YG7DHm!KwR6`TWQM;J{X+e?9!zJ
z05MmU>V60URzD@p_YW)a1sta=xCU0oDQFssPB$E}M(qbT0#Z9)B=`nYJvkXu5(Ai8
zZ8)-%O?~>6sPd5;t2031sF_Eg33vaa*@m(F?;vIC?oRP=-kPi%qPglGxDt|j04+${u;{T!+*6jQXU=W|MIG>Wg4XGv&NqmSPuAkj8a-1
z+|!!P$sJ`{)l-n#q)YCSIM|hs?vFx@*BQq%Qhr7~0^p=k#|{Io@{v~fntQiZ8cJn=
z9ZB^vec|a}5bqJ#!?wj2cV*6uhbgGF|0UEiFStx$r_p9=aB70x%D%8GKrSR9u!zx8
zoTsbxm6G31Hai!HGsZe!lyc_JW*j{QT0TU8iu++P@HG)-I|D4O8ccpkdHQ>iiPjtB
zcD@t!Ha1JFCV7jY$Qkn~tQ{$s|KV?#AlkDK@bkGjj&|+e>Y{51|}Kkk5a@9ww2o_}lTcA(UgxrzI85eiBe}
zS7Em+xJ}d_e`}~J^{bpqCM2`cJK(c}-4o4+Q;;3obR@o$a%%gaZx&tW++Le2j@UW$cwLrW<}XSC#YTalFf#{u^}i?hwC3+tP&DVM#m
z(Veg@y|XBWgp?lq<)^kvDHd+E{I9zV75pt3vel=6cjZmQO4Zep8dw7*GYi`~z6Per3lNM>RJO
z{&z%j+
zYkdCU+1qPOwv%P~-!C@L2(<$1UVYGQz>My)1O%yVsL?P5?vI8FnL=W7bkH69f~Ri7
zVAk6rFwW6HAJGqKwo`lNUj;OmSIm~{9*-KC4%c7Zx3&;4R_p=1mZf5ZI;rWz{bp}v
z1VlOO$H8x;?`ZSxw4&w(G67;{8(&gkEA>B+M?k9g7jwEV$Y@%$>?$U9!~(EwXNj`;kh+7poY1k;g?mt77MA&3E!Xg^1~?
z4!QTr0<>d%HF3BOTRm%fEn7(zE^BZ4oZ^8dN-U(#McaW}dx|cCsZ>5mEWWC+Da{dt
zq{0Ri&d(IRUhsM%Dy3x1X81Q2>PEcEPi~n-A^9epi9n=J_gpl*#^R}lyY{d&TeN4+
z0<*GyJ5PPtn?*8Z7l8`0MDxgPv*@m>H`?2bgE#R>05b2_#!_8Wy{=anmL5IQjzl@R
zqD8s%oA{PG_b6NYBI(2TXKfxZ|6Rbs-IrK7YxV)WM)JSV?|(yo4&YptyS93r$XjC3
zokVFUC6l*&gXkO>4~9Xq0&1OvmWG4sEzQ>oN9GQ5%FYyE7
z+^9-)i_cY?Tz~8@gqvL$Wu+5x*QXPHB+QwJfhr^bF6ST_xRd~0q=E&^Wikwm#Y9%Y
z8J5utW)Ycc(ki{Gja1R)y8ou$&G8%}u?A5dM~AY0?*Q$R{T7~+16`u*m20=cS)xWc
z1EWMUI{g&3QuuyfOPDlz8Y`Feb4zUh0rxsn+JKx|7j^dp+7r|h~v+@^HQ)1raJ)|iVuXt8n9wA
z^U!IUZvK2bC!E;p!gQ1kP^2KPjT
zdBlWi$eLbFnZYso9jWUVg!tv&`sIPqiRFHvRzgtn6IL)j;GBt0$0Xsel*0%cEgE|L
zA$XV>9s6c24hRc+U3AZvRk=>7^LhPt7K)lbpv9(nFFlq7Ps(+Xz3dZj2$hqpSBM~L
ztR;wkaTA4*CrGxSFiyELvucSB&nyuL<~yCmY;y~JWzIH<`3?<9eB4rd?Hs}Q8XtYt
zrjhdFWr(-&Rj4QoHH3erZ>=4cKeiIxVAE?;Z$e>=7=-Nw378i7__$cBkU-2|-E&2B
z2@07|f82w-EhFXN)_V*H?*lDl;LO!?L>iaQ2X@+V$QnAQGpQZ{KlonE8;*HHKNvf8
z%i0knH9I^E(OwrBv(2{Q|QSOMT!~V$7$OL5OFH7*IRSTj;ort7p?z96$
zq-M*hU%(Q7&tRFUms*5wSu*iwE>>BC++yeM7?G`!S$!I~TgQ16S6#9q4Z7dBl9=he
zS8_uADX|Xs0si>#r*IBM^(ZF|#pfm8Oh0348x*r#42DXve%iak)+9qR9PIyy(Gv+C
zXmV357N*=92o-d3!0OzdjCm*Kvo-}SF|4RQ`~|Z(ry4y}&B&+7sqT6r_Em-b_DD!<
z6ey8w){x;R^K+l7a-uq)Mjub){Qk7yy2S=jM}r-tPz49e3n@2ipJ8lB29z)aUFl7d1vA+p8b%upQT0kC2DPo2ql-@ql8COIypLO6KCfp^K>-G{n3T^j};5
zwgcqmM0}ko+Pwx0T+}tQ44X<%{}BkihNa8|urAyqu7`yX*}qOmqN0}%jQc=V+DDdPun!(Tf`wFg
z(Uxe2^r%+!AKa+@xSl}c2duWGhCUnZEXTF(?*E+~Sn%`7RzVE~UJ~|UyHrK@?enX}
zL-XMw67{ob*6o&CVx~f6Sqat?#>a6CY@M~7D>D!Mj-i)Q0oq+mnR#jqQ4US}BIpT7q}I#K)2usUhhcx8W2PARJN
zWXz0~J9^o>yiOX}OMp6<5|fEcWGnlUwpd!#29W&qc~MvQs?=I!QN>_ZkW;~-
zMfc|&Yb=c69tCOPYh8PpZj_`6Qvkz#DV&kP$%f63|E^rZ*Hjot-FZG*!w*}%$MZWE
z*3k%I_;OEK4afqSl!Mc#N74!T(=CEzHd>0023U30FH*ozDA;5@18-DZo#OAT9#3aE
zc+QAoU0;Rjx#8a`noHG)$Hdltqf=UbaVJBO*0VzgyTy8)BnICL=H;iGsluDBZ6A47
zYUtP#bHojij|VkIF<)N`NW)exeQ1hPNc2xgn!YvHu&6Iahxad<`$|?4O?;r;lN&s^
zDAGK}viGd|lW`py8O*3`YkNSR|k
zX@#j$^Gu1308w;WS~|Qvz<)j*9CO*?WwMKV^whvnES~FunE4dG5#ndxfRnz)^ac#Z&t^69@53KH9z`#ryu@SkoPQz@-Zm9g;vpu%&-E<
znm3Q>uD;5mbR{JiH#4E9F|em96cI?qCE<`(Ssv41D-|y=*hV-=i%dS0$y>5gB;bo^
zoAGKx9Gf4Yq_DCXm|$metJU7;Z?heB`^+Hc?`+nyzdQ!dRSZ;mwTGZ6_f`D_$p~6#
zc+Vgh6o)C#7k4n;vyX&tC3zFMzbe_rJ@X}NBKdN$j?*7*kW%xihYl3d%maO+xh1Um
zYYk|TCNVHobm8rWlu_+6efL$EbL8jVm8rx8t&5su8C9ZOSUwCNYmEGKHzrt5b?nw>
z&Qr<lE^8aOt_=DaSY(?UgC*};|Iv*Tqz98;j-
z$~|!DLgvpnW!|uxPMbMyyK#evR!FSRuuQDyYjCcqrC)OpZ1l7j<%;Rddza|n@F~?z
zH!b!cSe}nba}Tx!SO=Deg8zsLye|;mKwEdQ+#Hq-H~f+6XRce@IF&hl5y0m0E(px&
z5rPauwOpeqZxC{Oj!MZFmib*2Ctzhi14Kuug@3Nkr(?t`wP?Lo4J)9;AK;NJ=UR&q
zSlJW9B8Q)LxOHd|CFA1gn*p7C86U58e!llfOwQ3H8&*Fx?AIxYY6i|_RkbTJg*2|1
z8OrF#5|U)vnKBZyDRE-5>V4$s=p;L70f0NSVlSd-Ze#bK`9e}SFD=F2qN}1h0rH&(
z^mWeXXoAjH&Uh;jp4pQ)gN`8b*F3#B5$z4mNrJrL0gi|By>@7+%YN-_0cHCRgh*t`-DUDZd8rOUA`3;X6!
zo5xjoI@d84i!zzb7I#^vM+f`f`*NO2U;dQbYgTab`N-=k0411=HJ^rQa
z&)$=Gm#!Gd)q|ys>j#M*{!)`O`F+-wxMMXw^?>Xl^U<}@PF=Yho5{h_$5{|$Z}4xhM7I;_))=SydZa8%{le$P9hDF8
zVUKP5EdmQ`3_-jYnwOn#pWtXFF_epF7q<3)m2JvCC&ZOlF;u5??b2b|OTW4*?Jp@svS2u>^>;582vt5Q{Jsdt;aQ-I{gSbi0n*<$!nLW4kRYDQUA3BT*
zDzq@b-^xbId@9Mv3+_%O4WhFp<^4H-{?2|K)toW=oCJzw{-^+xT|&Kn%c3YBgT!{
z;PU;(lf>H1Bq05fEHM!QX*xSS
z#i{-=Ya^N96Uf5b5c~}GjO+O1;^*2`F47f5m5rx8*SBsSyzEQT1k!v?-l7GV#>Dcx
znLtOiFdAT07#{KCj7n@tK71%O+pJA662_XExEzs66Xz=}FU&fW+)1j#E|f20X{VKG
zZ`CJ$beHKWD5UU2sJCb$6ToBQkAq+)w)Q|)4|z8lN+^gn?IkShjH1GOj=*p;J*r1_
z^%*swZ!S6G)d`&DJ5b4Jcox^3Exj)H7XT&K#~K`U{nx4Glg?=%bD{;iJ!MuLWH`F7
zwN3cURlYKRiq@%rkQ5pCovL~HrMmHP8PlVB`JziVwR|=e*I;OrI*z<>b@Si0GSB1^|OPmkW$RFE-+I~vpF`!7~Jmt_Vr8kxd~-U1u*-)j3>e>F#>EsjLK?}
zM+zC=Dz`((s&Y;EYAq-W9>cBL<+16Ea>66#>~=V{!M!JTEm>{e((tRU=&aN5{Ftr_
z#XcNY*kzH4GxnKoaj~QwpyH)XreeE?Bbu=mYnUrIoa>}p-dyuoW~F?qZm%q@`GenC
zLk)twLgY`C5EfzyaK^R?U_u^hQeR|{!
zCZk**>z^>66OSUlEq877G7Qq{a33IWbCSk^)rnW7l$rj@Tw$lfapfxKnljE5WQEk9
z6L7_5^YF*3%~>Vrd@~sQK`Sg&csyDhIuE{dWwg=5s*tzj-wcDJ79aANW;EgZaZ5#c
z6dun}Yj^Q}QTJ-$vTbjf+H
z$J5~zEuSYO36VB7n8UGo>^&Cq)7c&m8BeNkB3pk=Lr5^3&K0P%#SHWn3|r3Vs258r
zfp?a$kjT>74(DVXeE=-g;Od|V8O%hE#+4ZOOQDjN1&BI0iPf|Fsi=QA7
z%F*r0*WB+7J<2SIROqPjg6#^v9m12?R$$u>jJ>}QU4yolesENUi1#5C_(~mzrDskV
zZEH?8W1L|UXRbxN9{$QC#09he=45w*3Z^pq}yv9BJcEz&3^_|{6
zCrQ-oFd#laR{YGIvb}+;KIGQl^6eJsa#zfq`)ZRwJ=aSd0Xt%Yi}`s`b9_EkpDB-O
z7A<{BeI{9s2@Qp0*c48bQLX2NAa&bfxge6pEyajQ!xZV~$NCvdIM65iZ$m?edd2Ix
zcAm}^(H>tJLq8xQ`R@T=#3}v@eJ~acy?f%NOyHuFHzLyffNn1bHv}&man1LIbMJD2
zeA4j;mq4ZpGx-^XVRG2WzWk%G7d>Ms)hm&YHG-p;TwgGY!;r%B+*QfdiA+7t)l*Ll
zjbgqNn1dvciC7!9)kkelY59U|?HdWFbCbjDhxIVI?c@469=g*vKMe+*JwlEjV}okx
zXn+Ji-k7-Zzz)9*_Tm%RSZ38kGhcoUZC|fvp~f#zo4Qh-G4Yqs3M_mVuCzbeX-#n{$
z;p0Sa!mcuf0bkXZTJaVg@TR{r$(aaszQ*e~6O_6az6>F_L$(0T@YC#4aOU(z&a~0P
zw`N7nZ#OT>{W~Oe4y*g9qMTP>_C8a}3sb*=*uxq+Mi2ANpAxx1Qk?ezCH&aRK2_gt
zCaDe!qagA7m(kSE7~I!kf}5Y_I1k9vFziDs?BYZTr@DGE6hB6a3_1%)zoN(^AwrLE
zoNRf&Zn&1Fv`!AA`0OzqtQxMioL(3$<6l=pW|@?cSTY8I_ve=a~3Pqccr5q(kWZP#XZ@cdveRe+cT>t;~|NVV`$N%@teChA&sjIzM
z8-YORdV4Vf;Oh{4$hGFd=jy^O%i+rck=F(Z0-_rH~JOr1uUb>#?Lj#3;
zEWi=6A*`G)g3$|a)V;IUJ5Z3sPJWh
zia3zUL9bega+cFz0zM=KP;x#`Afd_W=xJUWe6JqHp;6NiX&fExqBe+H&-6#R3B?eK
zjHO^e0*Q=rpkfIWdlHrU8H$J}IO6b*ID$QfK%tTFG$Ii-^FhPb#GGha0K;R(7W_m<
z$4aFl8V)Cu$*?ketWX?-BT%VS9G-|H5-~6WBS{iS0Xaq>v3}3MfFz)pE0S`B0+gB&
zU<(tZbTq8=oeO-?EUiE?6DBxdI5{A~5wLi*OVdCOIExb{h%D@g?50w9SnK@39f
ziLgv-wKpP~n-~J5LNQAyKsb>g2927HCCyF96N+KOusZt>$GzR${Kdj(E)SlN1bDilyxrX>1S*AsAz}&B
za+yq;w?HBV1R&(iprhdkVYyrmjm!q|_7I+oaf~KLV@Pbk0YkMXkuV^UP2j*2YzmS1
zemz47CaCK`z5d;n;0QsOj=ddwE0t8^#Ac>5j0&FUV4S){zY$}1kAvwNh
z^AmI7T?z0$WL2x;s8xZGJp~WTU=sMpEz7zI4{r_LO|5*P_fWTNl5Cg#t7l&4Rgj2Vscj>|X
zK6BG^AGEReaJV
z_xSeZ8whOJ$sY_E?rmqKnYCw!7Y(rfyUVI9q3zU~t4i}h%{dG7RT^l95`#48LLa#O
zpnQK;N9{g|Q`y^vT9@~iJFWVrgI{Q0p@mSE*wHl+r>#|~>^Y14(-E4x45C&OG(NHM
zNJW-w;lEvkoM-fxlgSq+-I^0xmlZ4CdR8|aX*?htu5tFS7vN|ZR@B6t+idPad`J0l
z_$OP>NKN%dj{~$wd8huZB8SH>t3R`SJ7Q2r*o!cTH42>MpUkqmfU~Ccm}@7kdpx4B
zOu5}WDSPp){&;n#taMv?!;e7#e|Y2lX9<#f;}0yDX4O|QMV{^V(y!ZgKCswusAsM0
zU`ldatZVbhWW{(x@#~Jn$=!|DA{|Wcrl*Ul2zO#r16dJ%_b4v1GM%r2I;kQrIaL8R
zY}655J!pDnEfcAyJ=jy1v%ty3uirgCElo44&gS^{_o5Gl*j?PdF{H*rlQLmE-ktks
zZ|1X|%CyuLq;LE!4BX{B0qZ=93~)k=qXsx_k2J{TqU9
z+e0@uyL{H=l2N4jEE`(fjxE=C^Ki0Mq0_Csaanl&#btP?v(Bu-;fKY($*$Y5TYi@J
z=n0hP^EoPYqIdVS#Tkh1iByG;fCiqy4op
zy$`+CwQdWx7#!PGqO3@qD;bmQ(i{<4mh+5TDlp%4j-~8%%5BZHEz{12<}=x!7E@1Z
z2M*+go(SoQqlC`YqvkD5A4IYT(yU54H!+?uJDaw8Nn#S5mR)_VQ_w*I5K8AaB
zNH6|MZ_ZCk4uySf+n6!(>PX@IrS;8D{(ilgCtCMxndr*vwu^ok%@kBtj1;zJV-rH!
z$6vi7gx{I3va9JgJa<+(^t`p^w07vZb+@!FL3+`Wg?sppzOG9Dbl?7_?c=$T3kRnJ
zhEE!o2cy%5%fE|p*wBMRS|=@e`PgN@5Bp~IzD~0zyl^G&bHy?T>eseU(|)09l&#op
z{AKI;{2OaFZBA}$%@aXQ=YzWpiy~wBPDj`Niyax38hY5svM8>o=8A6oF;wMdWR5=0
ztIBkOtXy$q_#tSJIq-^~*;^SAoK?3YFn@P;8FcW5XU2MS>*gw-%boJXtxj=fm`1P5
zwE=!Tf;ZIACAZ4H*yIq<*ZpI|sf^QWoOkT9raahx&M)7@%_nMYSgmjWl^usw$7$D-
zPc<2_HFozM{5gn1`o7HsX|ZNRC)};>&>WM#g99z}xC4r*&YW!~Oz#(;2HCjI^&uT2u60HPpiN7dML=5SE-LKLg9$bses({i)=el(rb;qdXnCMMG)$VO)R5un~3chsd
zslscgQ)SPk*Dfw6jNxu|Y3rxYC!^^7^Hy}z1`>a{hc$Qx3G8(wD=IgZj-WozbkYIn6vMMWN)zpK7f)_$mPD%9q4GlL#g?|7TX
z15;6sl1|bG=kGgQbKiF&xGWQ4?6?;okKVj$|Hir7SyFZW_#($0HL2R!5&7C2ox$w*
zKr{2zbA97lES5aVQHqaNlGEdy%XD}J%M{N&ZQXLpE9NK(`Jt;YqPy(R`0tvl_03scNMk&&zHz7nsLkUd;QJQo`gn)Dl9fCkW
zMd^xkLK6fOL8{2*zH{%qAMX5j&hE3bGru!uXZO?dlOta4QnIzB2^)(53jhFMGrfqm
zJ*)VCPbP-5Rl`Gdj*gslt>L+?AA+Mb$K5a8(3CU0q&OSxH$*QAte^uB4!>tf{1`iBx&GnV0bms6=b)
z>6PIM1ZQZ_u>arQoJN9OSsA7zDt*N#&?6|~rc8zttq=i@R6;4CjnODIv>F_4WQbBX
zM5`l>R8$Ss)zl2tjl@Oq0l^j)n&=?+@Bq)iFjKUS_}K}}!^cDOKdjL|vbv($|DioY
zeQ=&0#-Tw0qBq0NqG|dB-VAdMbocZ8uc6QX8>0Tv@ISD}KZh~=M^-W8FTFkiXBRmO
z0B{_bq75+k$qgsw$K1UfTX$MYqN{{t(Tns%I&N#aHfx?S=^RE`2E`r-2WtgAatT`L+%8Wqrf*2N7FItOx;gfqzV*B&@4iftK3!9xrfvI0f6J*dab
z-)a%$Sp%K>&aIqt`cWL)UHs0};-q3Ru(>{=7Kmfm^N8FuiBbqDl&|X2r0UZB5)_!f
zWDTjhd(0Uz5F@ZD1x9ISM#E}504DB6Q|AFvde|=r+Ej9Z&fWi8&el=gdDbj
zinHlOJB_kYUs!40hTlv@jKom3$j2W`h&xbKhiV;Q0`4
z#mQSnT6ofN9a^NXued^pEMeUju+6xte;u{C8(DW2xal%4RgY1k`g1+cPTN;jf40Ce
zZ-Me#A|PH4D-{eLk>J^5^0lm=E;4oUg<0?!U~PZ?La{)wfvebc<9Mgu`J(rWK_6Is
zF7n+V80Ip4I~il2;r~|V1LNIDHXaMihnUh#72%m5*cilVeI?Yn$#u1J8e1{M$W0s(
z*p2zKY9U$SJXW;{EX_w5u-JLrzG7GCtmgfuD;MdBst0n@LH=S77PqxW*Nmt@iH~zO
zg09!-)!cRvS$(t6nR`-7L^d8%E6}eXEB+q&YTz1{NurkppnSP^zc3Fm+
zKWfcB09ap^1Q6u4&D@i36S2}&H!WR)r}!wb7ue9a5l(NU>e~w#CF9armCxFPkS44|
z@#g5_QdZpt@=@2OH|gVdVm2G8ZkSHO8C3;7Q+}kjdFQ%qi_3<)h
z!2+{=q}``uu%rqc+wnI4d#~Kadg?W*Z7wf~X4-i7=u-du+tE=j}JNnh_)noKJ536#FQe!bnRKz?$DN9!mL~Zw-
zlEg_MR%t`V(k_~vYij|rhK%s5J{7(N+9Ct&}t)X%L)S^%DA7N
zkWq~u(ocN`>1qz+B;1vK;#UJ8yC!DdcU|kPiK`JXxzZ9h$*jszf{n%Amrf>X|8;xO
z&-yniW9U{hl>=uUCYqXfUn?VyM%|pSN|86)D)&R)E$S~A=90Qq_;GA+EjnVS=eoE*vPJ7=Hbz
zKS_)HGrA|3cKABo;0P-G&aMbeE2vn0^jkq*HPoxx4Aq_eIEzS(f5^yk+kJ(wvx=t7
z2GIHDP62lb8fs8{b-Le|Zjx)AP~w5lhF}Autf+Hy=BF9&HR;j#X}4$M8`lnMOKyhS
z_{eJFVyIYb_o~!H;Kbng?8OF9YP&1E4I~-n?QT8|ezXgFj>>z4ccocv-oy8(aj2;X
z(b~tHCaAv$oxI)*!hedKx=YAk2z{{@f+1y5w1kdJ2H$+|`SH#?XI2$B3!2=$NE6Hb
z=q2ZN$B+gSUGP2HZf%Yi&Yocd7pajfPt5Qg0gQ)Umw#}d^gfLXT0Gq-JZHnV=K=dp
ze7RqNeM)UlU(3fnCjMA(;+$U=1OCzNEY6<4V4dG*Bz66DMI=WEjmQxJR22Kw;P2)B
z&B9~<#oHzy;B}W*)k)Ls_vY*qsCf75k0PaIZZ_T3_B9B9FU6L`-ZI{Ic+tOQoUTd2
zBibR+zu#3MTmX5o$KX-o)bokByrQynXUEPQlr6MJrdR}dC#hGjexNo|75G=0Xsq}Q
z{7Tgb5I4!PN}tj9bzY@{kZ4hT`k~A?0yJpn$jB23nF`t=aaPxd#X|4xxKt2UpINTp
z3J32Lv<|T-QQkj^cw7C-6f64;$B1NpaVy3`v!?OSX?yRa8sO>N-Ca^qAC{~WGg~IR
zb^0uYW5sx7*E>9Rb+aBf#AG^&yQ$BfUPZB3#&SRhppAvU>r-;U(J
z$^NtH-8R?v&$Tk2e#llrVTBh*n)?{)tUo%Ws(-62ln0Nm?xV+#uMIEbT(bbY-2S+4
z&ACj$79yt=WpJHO(4x}Z8!t9;*-j33pOa)IVe7lF-|^kt&DKj6hJ_Ez
zo)q16`wX2Vkm#^mhy!&OrM;xFkrj12b~R*s_p{$ZoY`4m2#X;Mfn9UkOF3uMCw;zR
zQxs!Y0L`z-G6v7m+Z*9~%OG>BOCuDt3b>p#E
zjCWq)e<(*LjM9WgEjcipV1{LV$!uVQ(0t{q6*;7q0}d;l{IRKph+0Z^bID3LPYLFf
zkw!k_(j2$G`!RAm`{*Fr{09!?2yvZ_Ta(h
zr^;{kZXw>7%biG^@6%n|O|;wX7P;lW-Kxy|H2fl$%VRqu;k0%?~;?h>v6~c#|*#Yh;
zricUr*ES@I#y{NZZOWn)BEq)dw6USA*$TPGl1u6T-m$0(e*L+h?t65z|M}Zab@~Qm
z!|}#Fz|XaiEqLtD$wCrc{*K#H#MV5mkYDYwGCR3{c-uDii(@_I{8
zX-o5`z4%rzva{ft;p{pRQIb!zc6BUX-+L?G7ki(WE1+ieio*BV!)xw^Q<+r}1Pz*Eg%+dP
z7?ZwW*X6ESKuV~bsn;DN3k-u7LB(n(qY>_dX}
zT#h|RabZ%0gDP!OUdHb26N|PVRw}xlSw#f5jcAobdd)Td6dWW9_@
zpQ{aOEVUuaJ4^LLK_8#o}U^ntL
zCnJURclrBV4K2W4tS=o*^G@+w>a#j7b$iU#jfRo#vA~#*2;0M?2!Eh~IVZ~3HGM$?
z^?dwWvK&+On$>)sZPmR{;I}Ksg`nrWF3ie~!AyTB&#WGL&7&#@!0a}?ct?=C!p!?T<5p^BzofEqZBsiq$2p^n}jgArQiKM8dcjQS`;<2#%LHd+fXy
z0~zFzN&CX`XR9R~g_9h@_kbm|1xGGC8L-Q^rntDI
zZ&_Z%NeKP$K`GnYE?lHncwW^eHy-Ll7sUCdRNH_ITWu)rPIxw&7N4rkcCDZi=i41%NA5(%e2-w<6dqmQc$O$r;pLQf+2o@My&$n-BI12XRN4&B07Ezv?-$azUh-oXqe`;}s{7b7_g;xqhT0&5bP&6JqW;0W%x{dA0K7QFHfSei~eO8PXm{bM~CsGq9!YpDYV{
z%jgoi*SaSCZJ65J(I)fK4Th$5^_il+cRNJ$C!jG-OQ7i37V1qI?^Q5w=5VGK;0k>k
zkHd)6OXMAShY=U^u668s=U_?4Ln_l#BfqbC6l@yT;Z=U-yerPmFvK!!%|!j9Pc-s>
i_1~V1a`azCGN3q0Ri+-ijy`M80Zff7(KRTS*na`$u}66T
literal 2288
zcmbVO3rrJd9B->YsXD+{P|=*{q8Pp2qt81jSX-nR3y7U!)amu^T5hzxdUrz0Bq}Zl
zYBJ5#Y{n>2iE}ePP-l$OnfaK@oH9+88B{W+hWVKBK{hwUeOF4SPMz5$clX`*{l4G-
z_kVokdtXB5)6bSDq@3Uyc8HK(CFg(8%>af)Z=D@kt8QV1cqBt%!=X$1UFMgj3Njqe!;++$oi;K=hV0@@MVL`
zWjRctXjN5}zRI8%L_dm?B#B}KN)QM@AW}3W(-9;jjp=1@auOr*VVM^~kitlNg~hTB
z2167mIwJ@FB&I@z3nyoV3i@U;-m>1hXKx#e;fCj+pl(=NrvDSnGL%mcgEa7(57K@P4Tt#7+F)WB
zBZ3h=3}G!s67d=_4zV&M>Gd*<)yEop*@{IToJu}GOT)YGl9gUx+ncSlID8NIp3ZiI6IT<#XQA&bi;rKNF
zl6bt4<@o-pat@Hbrb>FOOM*|XqD9W`2eEszQbb?nfkaonUjLirvq#tq`u|qLqZKy9x&iD@U4s%XiQO~9C?+7W-WjE-f-jD=Jw2mYw^_nm^N@m`_$Pwss7yg
z%-bWKd$!oGSEfAb2REo|YVWMdSn6~yg_YD7wzx;S)Md{qt>Wq%>y9{{`Qco_}Hog7Qg<<5lg=Y>t
zzIwml(v8#GS|*N2j&^pp?!9DGHK@zxZN0zbNJn#1y&$@ZkB_QZGvZ0xN7dElXj((p
z7prGgx=gcYw0@TQ_Ip39o=-0y_f{YkIObKKe4D}M`J}F_5P$B*;G6E
zn>`vcRqwyUe;-~`rmR7_0GJ`Gi1Tg!#ZNt$Z5Bs
zeWUURex8z^KELaoPK{{@00k~gn~IC6K}5od{RE_L*-@=sEj
LU*y~~Wnt~#y($vf
diff --git a/web/public/image/theme/element/preview@2x.png b/web/public/image/theme/element/preview@2x.png
deleted file mode 100644
index 301d606a44aa952f10d79f6a55ea6dfb06b5fb04..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 14388
zcmeHuXH-*LxAsO9R1Tn`f*?f{Q4m5Xp*KYk5Ri@(F@)Yi3BBu~NEHGh{(+1d
z1f67uAQJrP6X2I-7iUNCamMb!WAI5q1OFv~;@;6g5E*2lp@Y*=dMJXy+Hj+du|_7`
zt~PdHH3W%Cy4s;JRwg(WBNH5fhU}1-|z}m9F6wyXlC!9Ddkn}GVZ0!CaYwP&8nSj9%u4p?1lA8xs>0b+#l>Y0b
zHa7pPcEsIx23-D@_y0=RQNzv71fgc)h;?$nnA~?ZvBh2g7c*nbKYQ(*9ISt9YK%dc
zSew{@WsX2FN
z8i)S(7GsSqOx^ySrAkU7^0tmRv@OO&UPhc12*qt-VJsqO#D_%lBZaw4P0*%X{AgoA
zE;KI^#U&(&LGhr_#=^WpyualF`(>~gC)kGY{=Z_^7>fZk{xOq?AU{&j1Su@YC4?~+
z;4(GkH{}u%KpS%j^I=SdO-+R`CMN$-Q*p2W>4UcZ&s1TljA5yS(7Y%fun}d<$IAu8
zLvac7VoU)=i~z<6gW*950c#m!L`<;`HfRtm7B*-z6NH_u87s?wNOKQsjdf7M8Uvg2
z{pa81@7;UkfHk$S1`iz7&2F949ZOu#o;38OIjSw(2{pB9S|L(cp&;ApP{cAbE
zM)>PLpbY-;53HNm0@4luv`tJH&p{A!NM1%-!}Z<6&+Sa7sf`8B|
zd?>YGyRSCVp!q@e!-E&PbwarcOJnv~Y8iUd@gLqfqzeTXHH26{HoBvy%z8WC$tllk
z@zxg;#pvc(5>wx=C