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

backend/docker_start.sh

@@ -1,4 +1,5 @@
+#!/bin/bash
 # python manage.py makemigrations
 # python manage.py migrate
 # python manage.py init -y
-daphne -b 0.0.0.0 -p 8000 application.asgi:application
+daphne -b 0.0.0.0 -p 8000 application.asgi:application

backend/dvadmin/system/views/user.py

@@ -289,7 +289,7 @@ class UserViewSet(CustomModelViewSet):
             "gender": user.gender,
             "email": user.email,
             "avatar": user.avatar,
-            "dept": user.dept.id,
+            "dept": user.dept_id,
             "is_superuser": user.is_superuser,
             "role": user.role.values_list('id', flat=True),
         }

docker-compose.yml

@@ -91,6 +91,27 @@ services:
 #      network:
 #        ipv4_address: 177.8.0.14
 
+
+# dvadmin-redis:
+#   image: redis:6.2.6-alpine # 指定服务镜像，最好是与之前下载的redis配置文件保持一致
+#   container_name: dvadmin-redis # 容器名称
+#   restart: on-failure # 重启方式
+#   environment:
+#     - TZ=Asia/Shanghai # 设置时区
+#   volumes: # 配置数据卷
+#     - ./docker_env/redis/data:/data
+#     - ./docker_env/redis/redis.conf:/etc/redis/redis.conf
+#   ports: # 映射端口
+#     - "6379:6379"
+#   sysctls: # 设置容器中的内核参数
+#     - net.core.somaxconn=1024
+#   command: /bin/sh -c "echo 'vm.overcommit_memory = 1' >> /etc/sysctl.conf && redis-server /etc/redis/redis.conf --appendonly yes" # 指定配置文件并开启持久化
+#   privileged: true # 使用该参数，container内的root拥有真正的root权限。否则，container内的root只是外部的一个普通用户权限
+#   networks:
+#     network:
+#       ipv4_address: 177.8.0.15
+
+
 networks:
   network:
     ipam:

web/src/views/system/dept/api.js

@@ -13,6 +13,14 @@ export function GetList (query) {
   })
 }
 
+export function GetListAll (query) {
+  return request({
+    url: urlPrefix + 'all_dept/',
+    method: 'get',
+    params: query
+  })
+}
+
 /**
  * 新增
  */

web/src/views/system/log/loginLog/crud.js

@@ -240,7 +240,7 @@ export const crudOptions = (vm) => {
           disabled: false
         },
         dict: {
-          data: [{ label: '普通登录', value: 1 }]
+          data: [{ label: '普通登录', value: 1 }, { label: '微信扫码登录', value: 2 }]
         },
         form: {
           component: {

web/src/views/system/rolePermission/index.vue

@@ -163,7 +163,7 @@ export default {
         },
         {
           value: 4,
-          label: '自定数据权限'
+          label: '自定义数据权限'
         }
       ],
       dataAuthorizationTips: '授权用户可操作的数据范围',
@@ -212,8 +212,8 @@ export default {
     },
     // 获取部门数据
     getDeptData () {
-      deptApi.GetList({ status: 1 }).then(ret => {
+      deptApi.GetListAll().then(ret => {
-        this.deptOptions = ret.data.data
+        this.deptOptions = XEUtils.toArrayTree(ret.data, { parentKey: 'parent', strict: false })
       })
     },
     // 获取菜单数据