From 886136b598be256c12ef7a5a6bf879766ddfc6c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E5=BC=BA?= <1206709430@qq.com>
Date: Sat, 20 Aug 2022 15:41:07 +0800
Subject: [PATCH 1/8] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=8F=98=E5=8C=96:=20?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=90=8D=E7=A7=B0=E5=AD=97=E6=AE=B5=E9=95=BF?=
 =?UTF-8?q?=E5=BA=A6=E6=94=B9=E4=B8=BA200?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/dvadmin/system/models.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/backend/dvadmin/system/models.py b/backend/dvadmin/system/models.py
index 6aee47b..083400a 100644
--- a/backend/dvadmin/system/models.py
+++ b/backend/dvadmin/system/models.py
@@ -259,7 +259,7 @@ def media_file_name(instance, filename):
 
 
 class FileList(CoreModel):
-    name = models.CharField(max_length=50, null=True, blank=True, verbose_name="名称", help_text="名称")
+    name = models.CharField(max_length=200, null=True, blank=True, verbose_name="名称", help_text="名称")
     url = models.FileField(upload_to=media_file_name)
     md5sum = models.CharField(max_length=36, blank=True, verbose_name="文件md5", help_text="文件md5")
 
@@ -427,4 +427,4 @@ class MessageCenter(CoreModel):
         db_table = table_prefix + "message_center"
         verbose_name = "消息中心"
         verbose_name_plural = verbose_name
-        ordering = ("-create_datetime",)
\ No newline at end of file
+        ordering = ("-create_datetime",)

From 8b099542e6b61fc0bc8c2938cfc0bc080278b643 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E5=BC=BA?= <1206709430@qq.com>
Date: Sat, 20 Aug 2022 16:16:57 +0800
Subject: [PATCH 2/8] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=8F=98=E5=8C=96:=20?=
 =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E9=85=8D=E7=BD=AE=E4=BC=98=E5=8C=96=EF=BC=8C?=
 =?UTF-8?q?=E5=8C=BA=E5=88=86=E5=89=8D=E5=8F=B0=E9=85=8D=E7=BD=AE=E5=92=8C?=
 =?UTF-8?q?=E5=90=8E=E5=8F=B0=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/application/dispatch.py                |  2 +-
 backend/dvadmin/system/views/system_config.py  | 17 +++++++++++++++++
 .../system/config/components/formContent.vue   | 18 ++++++++----------
 3 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/backend/application/dispatch.py b/backend/application/dispatch.py
index 3f19225..7c8c9e6 100644
--- a/backend/application/dispatch.py
+++ b/backend/application/dispatch.py
@@ -40,7 +40,7 @@ def _get_all_system_config():
     from dvadmin.system.models import SystemConfig
 
     system_config_obj = (
-        SystemConfig.objects.filter(status=True, parent_id__isnull=False)
+        SystemConfig.objects.filter(parent_id__isnull=False)
         .values("parent__key", "key", "value", "form_item_type")
         .order_by("sort")
     )
diff --git a/backend/dvadmin/system/views/system_config.py b/backend/dvadmin/system/views/system_config.py
index cfe7202..3cdb03b 100644
--- a/backend/dvadmin/system/views/system_config.py
+++ b/backend/dvadmin/system/views/system_config.py
@@ -250,9 +250,26 @@ class InitSettingsViewSet(APIView):
     authentication_classes = []
     permission_classes = []
 
+    def filter_system_config_values(self, data: dict):
+        """
+        过滤系统初始化配置
+        :param data:
+        :return:
+        """
+        for key in self.request.query_params.get('key', '').split('|'):
+            if key:
+                data = dict(filter(lambda x: x[0].startswith(key), data.items()))
+        return data
+
     def get(self, request):
         data = dispatch.get_system_config()
         if not data:
             dispatch.refresh_system_config()
             data = dispatch.get_system_config()
+        # 不返回后端专用配置
+        backend_config = [f"{ele.get('parent__key')}.{ele.get('key')}" for ele in
+                          SystemConfig.objects.filter(status=False, parent_id__isnull=False).values('parent__key',
+                                                                                                    'key')]
+        data = dict(filter(lambda x: x[0] not in backend_config, data.items()))
+        data = self.filter_system_config_values(data=data)
         return DetailResponse(data=data)
diff --git a/web/src/views/system/config/components/formContent.vue b/web/src/views/system/config/components/formContent.vue
index 7dcd28f..e91bc9b 100644
--- a/web/src/views/system/config/components/formContent.vue
+++ b/web/src/views/system/config/components/formContent.vue
@@ -2,10 +2,10 @@
   <div>
     <el-row :gutter="10">
       <el-col :span="4">变量标题</el-col>
-      <el-col :span="8">变量值</el-col>
+      <el-col :span="10">变量值</el-col>
       <el-col :span="4" >变量名</el-col>
-      <el-col :span="4" >状态</el-col>
-      <el-col :span="4" >操作</el-col>
+      <el-col :span="2">是否前端配置</el-col>
+      <el-col :span="3" :offset="1">操作</el-col>
     </el-row>
     <el-form ref="form" :model="form" label-width="240px" label-position="left" style="margin-top: 20px">
       <el-form-item :label="item.title" :prop="['array'].indexOf(item.form_item_type_label) >-1?'':item.key"
@@ -17,7 +17,7 @@
           <el-input v-if="item.edit" v-model="item.title" style="display: inline-block;width: 200px;" placeholder="请输入标题"></el-input>
           <span v-else>{{item.title}}</span>
         </template>
-        <el-col :span="6" >
+        <el-col :span="11" >
           <!--    文本      -->
           <el-input :key="index" v-if="['text','textarea'].indexOf(item.form_item_type_label) >-1"
                     :type="item.form_item_type_label"
@@ -201,7 +201,7 @@
             </div>
           </div>
         </el-col>
-        <el-col :span="6" :offset="2">
+        <el-col :span="4" :offset="1">
           <el-input v-if="item.edit" v-model="item.new_key" style="width: 200px;" placeholder="请输入变量key">
             <template slot="prepend">
               <span style="padding: 0px 5px">{{ editableTabsItem.key }}</span>
@@ -209,16 +209,14 @@
           </el-input>
           <span v-else>{{ editableTabsItem.key }}.{{ item.key }}</span>
           </el-col>
-        <el-col :span="4" >
+        <el-col :span="3" :offset="1">
           <el-switch
           v-model="item.status"
           active-color="#13ce66"
-          inactive-color="#ff4949"
-          active-text="启用"
-          inactive-text="禁用">
+          inactive-color="#ff4949">
         </el-switch>
         </el-col>
-        <el-col :span="4" :offset="1">
+        <el-col :span="2">
           <el-button v-if="item.edit" size="mini" type="primary"  icon="el-icon-success" @click="onEditSave(item)"></el-button>
           <el-button v-else size="mini" type="primary"  icon="el-icon-edit" @click="onEdit(index)"></el-button>
            <el-popconfirm

From 50858d6d7de549079a581d6cec11e646198de154 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E5=BC=BA?= <1206709430@qq.com>
Date: Sat, 20 Aug 2022 17:38:41 +0800
Subject: [PATCH 3/8] =?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=E9=85=8D=E7=BD=AE=E4=B8=BA=E7=A9=BA?=
 =?UTF-8?q?=E6=97=B6=E9=87=8D=E6=96=B0=E8=8E=B7=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/application/dispatch.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/backend/application/dispatch.py b/backend/application/dispatch.py
index 7c8c9e6..6843c75 100644
--- a/backend/application/dispatch.py
+++ b/backend/application/dispatch.py
@@ -131,6 +131,8 @@ def get_dictionary_config(schema_name=None):
     :param schema_name: 对应字典配置的租户schema_name值
     :return:
     """
+    if not settings.DICTIONARY_CONFIG:
+        refresh_dictionary()
     if is_tenants_mode():
         dictionary_config = settings.DICTIONARY_CONFIG[schema_name or connection.tenant.schema_name]
     else:
@@ -175,6 +177,8 @@ def get_system_config(schema_name=None):
     :param schema_name: 对应字典配置的租户schema_name值
     :return:
     """
+    if not settings.SYSTEM_CONFIG:
+        refresh_system_config()
     if is_tenants_mode():
         dictionary_config = settings.SYSTEM_CONFIG[schema_name or connection.tenant.schema_name]
     else:

From f22a45af946f7daca9e5b4a54bfe15a3ed6913be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E5=BC=BA?= <1206709430@qq.com>
Date: Sun, 21 Aug 2022 10:10:41 +0800
Subject: [PATCH 4/8] =?UTF-8?q?=E4=BF=AE=E5=A4=8DBUG:=20=E5=AF=86=E7=A0=81?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B6=8A=E6=9D=83bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/dvadmin/system/views/user.py | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/backend/dvadmin/system/views/user.py b/backend/dvadmin/system/views/user.py
index 5ee5fcc..3fb99cb 100644
--- a/backend/dvadmin/system/views/user.py
+++ b/backend/dvadmin/system/views/user.py
@@ -272,22 +272,18 @@ class UserViewSet(CustomModelViewSet):
     @action(methods=["PUT"], detail=True, permission_classes=[IsAuthenticated])
     def change_password(self, request, *args, **kwargs):
         """密码修改"""
-        instance = Users.objects.filter(id=kwargs.get("pk")).first()
         data = request.data
         old_pwd = data.get("oldPassword")
         new_pwd = data.get("newPassword")
         new_pwd2 = data.get("newPassword2")
-        if instance:
-            if new_pwd != new_pwd2:
-                return ErrorResponse(msg="两次密码不匹配")
-            elif instance.check_password(old_pwd):
-                instance.password = make_password(new_pwd)
-                instance.save()
-                return DetailResponse(data=None, msg="修改成功")
-            else:
-                return ErrorResponse(msg="旧密码不正确")
+        if new_pwd != new_pwd2:
+            return ErrorResponse(msg="两次密码不匹配")
+        elif request.user.check_password(old_pwd):
+            request.user.password = make_password(new_pwd)
+            request.user.save()
+            return DetailResponse(data=None, msg="修改成功")
         else:
-            return ErrorResponse(msg="未获取到用户")
+            return ErrorResponse(msg="旧密码不正确")
 
     @action(methods=["PUT"], detail=True, permission_classes=[IsAuthenticated])
     def reset_to_default_password(self, request, *args, **kwargs):

From 408c89c7d31e9959e02789ab341a6169b8a12db4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E5=BC=BA?= <1206709430@qq.com>
Date: Sun, 21 Aug 2022 10:15:28 +0800
Subject: [PATCH 5/8] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=8F=98=E5=8C=96:=20?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=86=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/dvadmin/system/views/user.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/backend/dvadmin/system/views/user.py b/backend/dvadmin/system/views/user.py
index 3fb99cb..933fbe6 100644
--- a/backend/dvadmin/system/views/user.py
+++ b/backend/dvadmin/system/views/user.py
@@ -276,9 +276,14 @@ class UserViewSet(CustomModelViewSet):
         old_pwd = data.get("oldPassword")
         new_pwd = data.get("newPassword")
         new_pwd2 = data.get("newPassword2")
+        if old_pwd or new_pwd or new_pwd2:
+            return ErrorResponse(msg="参数不能为空")
         if new_pwd != new_pwd2:
             return ErrorResponse(msg="两次密码不匹配")
-        elif request.user.check_password(old_pwd):
+        check_password = request.user.check_password(old_pwd)
+        if not check_password:
+            check_password = request.user.check_password(hashlib.md5(old_pwd.encode(encoding='UTF-8')).hexdigest())
+        if check_password:
             request.user.password = make_password(new_pwd)
             request.user.save()
             return DetailResponse(data=None, msg="修改成功")

From bf6bc71b95a67eb488887c710d47abe89d12da6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E5=BC=BA?= <1206709430@qq.com>
Date: Sun, 21 Aug 2022 15:56:16 +0800
Subject: [PATCH 6/8] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=8F=98=E5=8C=96:=20?=
 =?UTF-8?q?=E8=BF=87=E6=BB=A4=E7=B3=BB=E7=BB=9F=E5=88=9D=E5=A7=8B=E5=8C=96?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/dvadmin/system/views/system_config.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/backend/dvadmin/system/views/system_config.py b/backend/dvadmin/system/views/system_config.py
index 3cdb03b..043a54e 100644
--- a/backend/dvadmin/system/views/system_config.py
+++ b/backend/dvadmin/system/views/system_config.py
@@ -256,10 +256,11 @@ class InitSettingsViewSet(APIView):
         :param data:
         :return:
         """
+        new_data = {}
         for key in self.request.query_params.get('key', '').split('|'):
             if key:
-                data = dict(filter(lambda x: x[0].startswith(key), data.items()))
-        return data
+                new_data.update(**dict(filter(lambda x: x[0].startswith(key), data.items())))
+        return new_data
 
     def get(self, request):
         data = dispatch.get_system_config()

From cf6c7814b632aca010ddbcbfd4cc465cc3b16fd4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E5=BC=BA?= <1206709430@qq.com>
Date: Sun, 21 Aug 2022 16:38:40 +0800
Subject: [PATCH 7/8] =?UTF-8?q?=E4=BF=AE=E5=A4=8DBUG:=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E9=85=8D=E7=BD=AE=E5=8F=AA=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?10=E4=B8=AAbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/src/views/system/config/components/formContent.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/src/views/system/config/components/formContent.vue b/web/src/views/system/config/components/formContent.vue
index e91bc9b..53a9b1f 100644
--- a/web/src/views/system/config/components/formContent.vue
+++ b/web/src/views/system/config/components/formContent.vue
@@ -303,7 +303,7 @@ export default {
     // 获取数据
     getInit () {
       const that = this
-      api.GetList({ parent: this.options.id }).then(res => {
+      api.GetList({ parent: this.options.id, limit: 999 }).then(res => {
         const { data } = res.data
         this.formList = data
         const form = {}

From e1ee69da94a7057f262891d468845b0996b7dc8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E5=BC=BA?= <1206709430@qq.com>
Date: Sun, 21 Aug 2022 19:33:14 +0800
Subject: [PATCH 8/8] =?UTF-8?q?=E4=BF=AE=E5=A4=8DBUG:=20=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E4=B8=AD=EF=BC=8Cradio=E4=BF=9D=E5=AD=98?=
 =?UTF-8?q?=E7=9A=84=E5=80=BC=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/dvadmin/system/views/system_config.py          | 2 ++
 web/src/views/system/config/components/formContent.vue | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/backend/dvadmin/system/views/system_config.py b/backend/dvadmin/system/views/system_config.py
index 043a54e..aa97091 100644
--- a/backend/dvadmin/system/views/system_config.py
+++ b/backend/dvadmin/system/views/system_config.py
@@ -256,6 +256,8 @@ class InitSettingsViewSet(APIView):
         :param data:
         :return:
         """
+        if not self.request.query_params.get('key', ''):
+            return data
         new_data = {}
         for key in self.request.query_params.get('key', '').split('|'):
             if key:
diff --git a/web/src/views/system/config/components/formContent.vue b/web/src/views/system/config/components/formContent.vue
index 53a9b1f..191ec85 100644
--- a/web/src/views/system/config/components/formContent.vue
+++ b/web/src/views/system/config/components/formContent.vue
@@ -74,7 +74,7 @@
             <el-radio
               v-for="item in dictionary(item.setting)  || []"
               :key="item.value"
-              :label="item.label"
+              :label="item.value"
               :value="item.value">
               {{ item.label }}
             </el-radio>