功能变化: 更新后端系统配置获取方法及前端插件校验方法

backend/dvadmin/system/views/login.py

@@ -15,6 +15,8 @@ from rest_framework_simplejwt.serializers import TokenObtainPairSerializer
 from rest_framework_simplejwt.views import TokenObtainPairView
 
 from django.conf import settings
+
+from application import dispatch
 from dvadmin.system.models import Users
 from dvadmin.utils.json_response import ErrorResponse, DetailResponse
 from dvadmin.utils.request_util import save_login_log
@@ -34,7 +36,7 @@ class CaptchaView(APIView):
     )
     def get(self, request):
         data = {}
-        if settings.SYSTEM_CONFIG.get("base.captcha_state"):
+        if dispatch.get_system_config_values("base.captcha_state"):
             hashkey = CaptchaStore.generate_key()
             id = CaptchaStore.objects.filter(hashkey=hashkey).first().id
             imgage = captcha_image(request, hashkey)
@@ -66,7 +68,7 @@ class LoginSerializer(TokenObtainPairSerializer):
 
     def validate(self, attrs):
         captcha = self.initial_data.get("captcha", None)
-        if settings.SYSTEM_CONFIG.get("base.captcha_state"):
+        if dispatch.get_system_config_values("base.captcha_state"):
             if captcha is None:
                 raise CustomValidationError("验证码不能为空")
             self.image_code = CaptchaStore.objects.filter(

backend/dvadmin/system/views/user.py

@@ -1,6 +1,6 @@
 import hashlib
 
-from application import settings
+from application import settings, dispatch
 from django.contrib.auth.hashers import make_password
 from rest_framework import serializers
 from rest_framework.decorators import action
@@ -252,7 +252,7 @@ class UserViewSet(CustomModelViewSet):
         """恢复默认密码"""
         instance = Users.objects.filter(id=kwargs.get("pk")).first()
         if instance:
-            instance.set_password(settings.SYSTEM_CONFIG.get("base.default_password"))
+            instance.set_password(dispatch.get_system_config_values("base.default_password"))
             instance.save()
             return DetailResponse(data=None, msg="密码重置成功")
         else:

web/src/install.js

@@ -18,6 +18,7 @@ import XEUtils from 'xe-utils'
 import store from '@/store/index'
 import { urlPrefix as deptPrefix } from '@/views/system/dept/api'
 import types from '@/config/d2p-extends/types'
+import { checkPlugins } from '@/views/plugins'
 const uploadUrl = util.baseURL() + 'api/system/file/'
 
 /**
@@ -34,7 +35,11 @@ Vue.use(d2CrudX, { name: 'd2-crud-x' })
 
 // // 官方版【此处为演示与官方版共存而引入，全新项目中可以用d2-crud-x完全替代官方版】
 // Vue.use(d2Crud)
-
+/**
+ * @description 校验插件是否安装
+ * @param {String} pluginName 插件名称
+ */
+Vue.prototype.checkPlugins = checkPlugins
 // 引入d2CrudPlus
 Vue.use(d2CrudPlus, {
   starTip: false,

web/src/libs/util.js

@@ -34,7 +34,7 @@ util.open = function (url) {
  */
 util.baseURL = function () {
   var baseURL = process.env.VUE_APP_API
-  if (window.pluginsAll && window.pluginsAll.indexOf('dvadmin-tenant') !== -1) {
+  if (window.pluginsAll && window.pluginsAll.indexOf('dvadmin-tenant-web') !== -1) {
     // document.domain
     var host = baseURL.split('/')[2]
     var prot = host.split(':')[1] || 80