gitee
/
django-vue-admin
mirror of https://gitee.com/liqianglog/django-vue-admin
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/v2.x' into v2.x

pull/82/head
猿小天 2022-12-03 21:13:48 +08:00
parent 009b81a31c 7ba939e2f1
commit 256b13bc02
13 changed files with 135 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
backend/dvadmin/system/views/user.py
View File

@ -5,7 +5,7 @@ from django_restql.fields import DynamicSerializerMethodField
from rest_framework import serializers
from rest_framework.decorators import action, permission_classes
from rest_framework.permissions import IsAuthenticated
from django.db import connection
from application import dispatch
from dvadmin.system.models import Users, Role, Dept
from dvadmin.system.views.role import RoleSerializer
@ -26,6 +26,7 @@ def recursion(instance,parent,result):
res += (array)
return res
class UserSerializer(CustomModelSerializer):
"""
用户管理-序列化器
@ -63,6 +64,7 @@ class UsersInitSerializer(CustomModelSerializer):
"""
初始化获取数信息(用于生成初始化json文件)
"""
def save(self, **kwargs):
instance = super().save(**kwargs)
role_key = self.initial_data.get('role_key', [])
@ -162,6 +164,29 @@ class UserUpdateSerializer(CustomModelSerializer):
}
class UserInfoUpdateSerializer(CustomModelSerializer):
"""
用户修改-序列化器
"""
mobile = serializers.CharField(
max_length=50,
validators=[
CustomUniqueValidator(queryset=Users.objects.all(), message="手机号必须唯一")
],
allow_blank=True
)
def update(self, instance, validated_data):
return super().update(instance, validated_data)
class Meta:
model = Users
fields = ['email', 'mobile', 'avatar', 'name', 'gender']
extra_kwargs = {
"post": {"required": False, "read_only": True},
}
class ExportUserProfileSerializer(CustomModelSerializer):
"""
用户导出 序列化器
@ -283,6 +308,7 @@ class UserViewSet(CustomModelViewSet):
user = request.user
result = {
"id": user.id,
"username": user.username,
"name": user.name,
"mobile": user.mobile,
"user_type": user.user_type,
@ -293,6 +319,9 @@ class UserViewSet(CustomModelViewSet):
"is_superuser": user.is_superuser,
"role": user.role.values_list('id', flat=True),
}
if hasattr(connection, 'tenant'):
result['tenant_id'] = connection.tenant and connection.tenant.id
result['tenant_name'] = connection.tenant and connection.tenant.name
dept = getattr(user, 'dept', None)
if dept:
result['dept_info'] = {
@ -307,8 +336,9 @@ class UserViewSet(CustomModelViewSet):
@action(methods=["PUT"], detail=False, permission_classes=[IsAuthenticated])
def update_user_info(self, request):
"""修改当前用户信息"""
user = request.user
Users.objects.filter(id=user.id).update(**request.data)
serializer = UserInfoUpdateSerializer(request.user, data=request.data, request=request)
serializer.is_valid(raise_exception=True)
serializer.save()
return DetailResponse(data=None, msg="修改成功")
@action(methods=["PUT"], detail=True, permission_classes=[IsAuthenticated])

17
docker_env/nginx/my.conf
View File

@ -14,29 +14,20 @@ server {
}
location /api/ {
proxy_http_version 1.1;
proxy_set_header Host $http_host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
set_real_ip_from 0.0.0.0/0;
real_ip_header X-Forwarded-For;
rewrite ^/api/(.*)$ /$1 break; #重写
proxy_pass http://177.8.0.12:8000/; # 设置代理服务器的协议和地址
}
location /api/ws {
proxy_http_version 1.1;
proxy_set_header Host $host;
proxy_set_header X-Real-Ip $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Nginx-Proxy true;
set_real_ip_from 0.0.0.0/0;
proxy_redirect off;
client_max_body_size 10m;
proxy_pass http://177.8.0.12:8000;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade";
proxy_connect_timeout 600s;
proxy_read_timeout 600s;
proxy_send_timeout 600s;
real_ip_header X-Forwarded-For;
rewrite ^/api/(.*)$ /$1 break; #重写
proxy_pass http://177.8.0.12:8000/; # 设置代理服务器的协议和地址
}
}

6
web/package.json
View File

@ -1,6 +1,6 @@
{
"name": "django-vue-admin",
"version": "2.0.6",
"version": "2.0.7",
"scripts": {
"serve": "vue-cli-service serve --open",
"start": "npm run serve",
@ -13,7 +13,7 @@
},
"dependencies": {
"@great-dream/template": "^1.0.2",
"@vue/composition-api": "^1.0.4",
"@vue/composition-api": "1.0.4",
"axios": "^0.19.0",
"axios-mock-adapter": "^1.18.1",
"better-scroll": "^1.15.2",
@ -41,7 +41,7 @@
"screenfull": "^5.0.2",
"sortablejs": "^1.10.1",
"ua-parser-js": "^0.7.20",
"vue": "^2.6.11",
"vue": "2.7.14",
"vue-i18n": "^8.15.1",
"vue-infinite-scroll": "^2.0.2",
"vue-router": "^3.6.5",

BIN
web/public/image/avatar.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 708 B

4
web/src/layout/header-aside/components/header-color/index.vue
View File

@ -1,10 +1,12 @@
<template>
<el-tooltip effect="dark" :content="'颜色'" placement="bottom">
<el-color-picker
class="btn-text can-hover"
class="can-hover"
:value="value"
:predefine="predefine"
size="mini"
@change="set"/>
</el-tooltip>
</template>
<script>

20
web/src/layout/header-aside/components/header-user/index.vue
View File

@ -8,9 +8,22 @@
-->
<template>
<el-dropdown size="small" class="d2-mr">
<el-link
type="primary"
:underline="false"
style="margin-bottom: 2px;margin-left: 10px"
v-if="isTenants"
>
<span>
当前租户：{{info.tenant_name}}
</span>
<span class="btn-text">{{
info.name ? `你好 ${info.name}` : "未登录"
}}</span>
</el-link>
<span class="btn-text" v-else>{{
info.name ? `你好 ${info.name}` : "未登录"
}}</span>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item @click.native="userInfo">
<d2-icon name="cog" class="d2-mr-5" />个人信息
@ -20,7 +33,7 @@
注销
</el-dropdown-item>
</el-dropdown-menu>
<el-image v-if="info.avatar" :src="info.avatar" :preview-src-list="[info.avatar]" style="width: 20px;height: 20px" alt="头像"></el-image>
<el-image v-if="info.avatar" :src="info.avatar" :preview-src-list="[info.avatar]" style="width: 20px;height: 20px;border-radius: 20%;top: 5px;" alt="头像"></el-image>
</el-dropdown>
</template>
@ -30,6 +43,11 @@ export default {
computed: {
...mapState('d2admin/user', ['info'])
},
data () {
return {
isTenants: window.pluginsAll && window.pluginsAll.indexOf('dvadmin-tenants-web') !== -1
}
},
methods: {
...mapActions('d2admin/account', ['logout']),
/**

66
web/src/layout/header-aside/components/header-user/userinfo.vue
View File

@ -1,11 +1,3 @@
<!--
* @创建文件时间: 2021-07-26 23:08:16
* @Auther: 猿小天
* @最后修改人: 猿小天
* @最后修改时间: 2021-08-12 11:32:30
* 联系Qq:1638245306
* @文件介绍: 用户信息
-->
<template>
<d2-container class="page">
<el-tabs v-model="activeName" @tab-click="handleClick">
@ -14,42 +6,20 @@
<el-col :span="10" :offset="6">
<el-form
ref="userInfoForm"
label-width="100px"
:model="userInfo"
required-asterisk
:rules="userInforules"
:label-position="position"
center
>
<el-form-item prop="avatar" required label="头像">
<el-upload
class="avatar-uploader"
list-type="picture-card"
:file-list="fileList"
:action="action"
:headers="headers"
:limit="1"
:disabled="fileList.length === 1"
:on-success="handleAvatarSuccess"
>
<!-- <el-image
v-if="userInfo.avatar"
:src="userInfo.avatar"
:preview-src-list="[userInfo.avatar]"
style="width: 100px; height: 100px"
alt="头像"
></el-image>
<i
v-else
class="el-icon-plus avatar-uploader-icon"
style="width: 100px; height: 100px"
></i> -->
<i class="el-icon-plus"></i>
</el-upload>
<el-form-item prop="avatar" label="头像">
<d2p-cropper-uploader :value="userInfo.avatar || '/image/avatar.png'" @input="handleAvatarSuccess"/>
</el-form-item>
<el-form-item prop="name" required label="昵称">
<el-input v-model="userInfo.name" clearable></el-input>
</el-form-item>
<el-form-item label="电话号码" prop="mobile">
<el-form-item label="电话号码" required prop="mobile">
<el-input v-model="userInfo.mobile" clearable></el-input>
</el-form-item>
<el-form-item label="邮箱" prop="email">
@ -62,6 +32,22 @@
<el-radio :label="-1">未知</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="用户名" prop="dept">
<el-input :value="userInfo.username" clearable disabled></el-input>
</el-form-item>
<el-form-item label="所属部门" prop="dept">
<el-input :value="userInfo.dept_info && userInfo.dept_info.dept_name" clearable disabled></el-input>
</el-form-item>
<el-form-item label="当前角色" prop="role">
<el-select :value="userInfo.role" multiple placeholder="请选择" disabled style="width: 100%;">
<el-option
v-for="item in userInfo.role_info"
:key="item.id"
:label="item.name"
:value="item.id">
</el-option>
</el-select>
</el-form-item>
<el-form-item>
<el-button @click="updateInfo" type="primary">
<i class="fa fa-check"></i>
@ -83,6 +69,7 @@
ref="userPasswordForm"
:model="userPasswordInfo"
required-asterisk
label-width="100px"
:label-position="position"
:rules="passwordRules"
center
@ -90,6 +77,7 @@
<el-form-item label="原密码" required prop="oldPassword">
<el-input
v-model="userPasswordInfo.oldPassword"
placeholder="请输入原始密码"
clearable
></el-input>
</el-form-item>
@ -97,6 +85,7 @@
<el-input
type="password"
v-model="userPasswordInfo.newPassword"
placeholder="请输入新密码"
clearable
></el-input>
</el-form-item>
@ -104,6 +93,7 @@
<el-input
type="password"
v-model="userPasswordInfo.newPassword2"
placeholder="请再次输入新密码"
clearable
></el-input>
</el-form-item>
@ -206,7 +196,6 @@ export default {
params: {}
}).then((res) => {
_self.userInfo = res.data
_self.fileList = [{ name: 'avatar.png', url: res.data.avatar }]
})
},
/**
@ -217,10 +206,12 @@ export default {
_self.$refs.userInfoForm.validate((valid) => {
if (valid) {
const userInfo = _self.userInfo
delete userInfo.role
request({
url: '/api/system/user/update_user_info/',
method: 'put',
data: _self.userInfo
data: userInfo
}).then((res) => {
_self.$message.success('修改成功')
_self.getCurrentUserInfo()
@ -289,8 +280,7 @@ export default {
*/
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
this.userInfo.avatar = res
}
}
}

4
web/src/libs/util.js
View File

@ -39,7 +39,7 @@ util.open = function (url) {
util.baseURL = function () {
var baseURL = process.env.VUE_APP_API
var param = baseURL.split('/')[3] || ''
if (window.pluginsAll && window.pluginsAll.indexOf('dvadmin-tenant-web') !== -1 && (!param || baseURL.startsWith('/'))) {
if (window.pluginsAll && window.pluginsAll.indexOf('dvadmin-tenants-web') !== -1 && (!param || baseURL.startsWith('/'))) {
// 1.把127.0.0.1 替换成和前端一样域名
// 2.把 ip 地址替换成和前端一样域名
// 3.把 /api 或其他类似的替换成和前端一样域名
@ -66,7 +66,7 @@ util.baseURL = function () {
util.wsBaseURL = function () {
var baseURL = process.env.VUE_APP_API
var param = baseURL.split('/')[3] || ''
if (window.pluginsAll && window.pluginsAll.indexOf('dvadmin-tenant-web') !== -1 && (!param || baseURL.startsWith('/'))) {
if (window.pluginsAll && window.pluginsAll.indexOf('dvadmin-tenants-web') !== -1 && (!param || baseURL.startsWith('/'))) {
// 1.把127.0.0.1 替换成和前端一样域名
// 2.把 ip 地址替换成和前端一样域名
// 3.把 /api 或其他类似的替换成和前端一样域名

9
web/src/router/index.js
View File

@ -62,14 +62,7 @@ router.beforeEach(async (to, from, next) => {
method: 'get',
params: {}
})
await store.dispatch('d2admin/user/set', {
name: res.data.name,
user_id: res.data.id,
avatar: res.data.avatar,
role_info: res.data.role_info,
dept_info: res.data.dept_info,
is_superuser: res.data.is_superuser
}, { root: true })
await store.dispatch('d2admin/user/set', res.data, { root: true })
await store.dispatch('d2admin/account/load')
store.dispatch('d2admin/dept/load')
store.dispatch('d2admin/settings/init')

21
web/src/store/modules/d2admin/modules/account.js
View File

@ -11,6 +11,7 @@ import util from '@/libs/util.js'
import router from '@/router'
import store from '@/store/index'
import { SYS_USER_LOGIN, SYS_USER_LOGOUT } from '@/views/system/login/api'
import { request } from '@/api/service'
export default {
namespaced: true,
@ -44,13 +45,19 @@ 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,
avatar: res.avatar,
role_info: res.role_info,
dept_info: res.dept_info
}, { root: true })
// await dispatch('d2admin/user/set', {
// name: res.name,
// user_id: res.userId,
// avatar: res.avatar,
// role_info: res.role_info,
// dept_info: res.dept_info
// }, { root: true })
var userInfoRes = await request({
url: '/api/system/user/user_info/',
method: 'get',
params: {}
})
await store.dispatch('d2admin/user/set', userInfoRes.data, { root: true })
// 用户登录后从持久化数据加载一系列的设置
await dispatch('load')
},

2
web/src/views/system/messageCenter/api.js
View File

@ -52,5 +52,3 @@ export function DelObj (id) {
data: { id }
})
}