Merge branch 'dvadmin-dev' of https://gitee.com/liqianglog/django-vue-admin into dvadmin-xt12321

docker_env/django/Dockerfile

@@ -12,5 +12,6 @@ WORKDIR /dvadmin-backend
 COPY ./dvadmin-backend/requirements.txt /
 COPY ./dvadmin-backend/conf/env.example.py /dvadmin-backend/conf/env.py
 RUN python3 -m pip install -i https://mirrors.aliyun.com/pypi/simple/ -r /requirements.txt
+RUN python3 -m pip install -i https://mirrors.aliyun.com/pypi/simple/ uwsgi==2.0.19.1
 CMD ["/dvadmin-backend/docker_start.sh"]
 # ENTRYPOINT [ "uwsgi --ini /backend/azcrm/uwsgi.ini" ]

dvadmin-backend/apps/vadmin/monitor/views.py

@@ -58,7 +58,7 @@ class MonitorModelViewSet(CustomModelViewSet):
             "memory": [],
         }
         for ele in queryset:
-            data["cpu"].append(float(ele.get('cpu_sys', 0)))
+            data["cpu"].append(float(ele.get('cpu_sys', 0)) / 100)
             data["memory"].append(float(ele.get('mem_num', 0)) and round(float(ele.get('mem_sys', 0)) /
                                                                          float(ele.get('mem_num', 0)), 4))
         return SuccessResponse(data=data)

dvadmin-backend/apps/vadmin/op_drf/serializers.py

@@ -1,7 +1,10 @@
+from django.utils.functional import cached_property
+
 from rest_framework import serializers
-from rest_framework.serializers import ModelSerializer
 from rest_framework.fields import empty
 from rest_framework.request import Request
+from rest_framework.serializers import ModelSerializer
+from rest_framework.utils.serializer_helpers import BindingDict
 
 
 class CustomModelSerializer(ModelSerializer):
@@ -37,7 +40,7 @@ class CustomModelSerializer(ModelSerializer):
             if self.creator_field_name in self.fields.fields:
                 validated_data[self.creator_field_name] = self.request.user
             if self.dept_belong_id_field_name in self.fields.fields:
-                validated_data[self.dept_belong_id_field_name] = getattr(self.request.user,'dept_id',None)
+                validated_data[self.dept_belong_id_field_name] = getattr(self.request.user, 'dept_id', None)
         return super().create(validated_data)
 
     def update(self, instance, validated_data):
@@ -51,11 +54,11 @@ class CustomModelSerializer(ModelSerializer):
             return getattr(self.request.user, 'username', None)
         return None
 
-
+    @cached_property
-
-    @property
     def fields(self):
-        fields = super().fields
+        fields = BindingDict(self)
+        for key, value in self.get_fields().items():
+            fields[key] = value
 
         if not hasattr(self, '_context'):
             return fields

dvadmin-backend/docker_start.sh

@@ -2,7 +2,6 @@
 
 cd /dvadmin-backend
 cp -rf ./conf/env.example.py ./conf/env.py
-python3 -m pip install -i https://mirrors.aliyun.com/pypi/simple/ uwsgi==2.0.19.1
 python ./manage.py makemigrations
 python ./manage.py migrate
 #python ./manage.py initialization

dvadmin-ui/.env.development

@@ -3,7 +3,7 @@ ENV = 'development'
 
 # 若依管理系统/开发环境
 # VUE_APP_BASE_API = 'https://api.django-vue-admin.com'
-VUE_APP_BASE_API = 'http://127.0.0.1:8888'
+VUE_APP_BASE_API = 'http://127.0.0.1:8000'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true

dvadmin-ui/.env.production

@@ -2,7 +2,7 @@
 ENV = 'production'
 
 # 若依管理系统/生产环境
-VUE_APP_BASE_API = 'https://api.django-vue-admin.com'
+VUE_APP_BASE_API = 'http://api.django-vue-admin.com'
 
 # 前端端口
 PORT=8080