From 2b10934e09d04a4c0df35c094676e149af56ca8b Mon Sep 17 00:00:00 2001
From: izory <791736813@qq.com>
Date: Wed, 29 Sep 2021 15:57:56 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8A=A0=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/System/SysConfigController.cs | 162 ++++++++++++++++-
 .../System/SysProfileController.cs            |   4 +-
 ZR.Admin.WebApi/Extensions/EntityExtension.cs |   4 +-
 .../CodeGenTemplate/ControllersTemplate.txt   |  11 +-
 .../CodeGenTemplate/ServiceTemplate.txt       |   7 -
 .../Service/CodeGeneraterService.cs           |   2 +-
 .../src/layout/components/Settings/index.vue  | 167 ++++++++++++++----
 ZR.Vue/src/layout/index.vue                   |   4 +-
 ZR.Vue/src/main.js                            |  10 +-
 ZR.Vue/src/settings.js                        |   6 +-
 ZR.Vue/src/store/modules/settings.js          |  16 +-
 ZR.Vue/src/utils/request.js                   |   4 +-
 ZR.Vue/src/views/system/user/index.vue        |   6 +-
 ZRAdmin.xml                                   |  50 +++++-
 document/admin-sqlserver.sql                  | Bin 100542 -> 104524 bytes
 15 files changed, 378 insertions(+), 75 deletions(-)

diff --git a/ZR.Admin.WebApi/Controllers/System/SysConfigController.cs b/ZR.Admin.WebApi/Controllers/System/SysConfigController.cs
index a29eccd..55425f6 100644
--- a/ZR.Admin.WebApi/Controllers/System/SysConfigController.cs
+++ b/ZR.Admin.WebApi/Controllers/System/SysConfigController.cs
@@ -1,23 +1,169 @@
-using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Threading.Tasks;
+using SqlSugar;
+using Infrastructure;
+using Infrastructure.Attribute;
+using Infrastructure.Enums;
+using Infrastructure.Model;
+using Mapster;
+using ZR.Model.Dto;
+using ZR.Model.Models;
+using ZR.Service.Business;
+using ZR.Admin.WebApi.Extensions;
 using ZR.Admin.WebApi.Filters;
+using ZR.Common;
+using ZR.Service.System;
+using ZR.Model.System;
+using Infrastructure.Extensions;
 
-namespace ZR.Admin.WebApi.Controllers.System
+namespace ZR.Admin.WebApi.Controllers
 {
     /// <summary>
-    /// 配置文件
+    /// 参数配置Controller
+    ///
+    /// @author zhaorui
+    /// @date 2021-09-29
     /// </summary>
     [Verify]
     [Route("system/config")]
     public class SysConfigController : BaseController
     {
-        [HttpGet("list")]
-        public IActionResult Index()
+        /// <summary>
+        /// 参数配置接口
+        /// </summary>
+        private readonly ISysConfigService _SysConfigService;
+
+        public SysConfigController(ISysConfigService SysConfigService)
         {
-            return SUCCESS(1);
+            _SysConfigService = SysConfigService;
+        }
+
+        /// <summary>
+        /// 查询参数配置列表
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet("list")]
+        [ActionPermissionFilter(Permission = "system:config:list")]
+        public IActionResult QuerySysConfig([FromQuery] SysConfigQueryDto parm)
+        {
+            //开始拼装查询条件
+            var predicate = Expressionable.Create<SysConfig>();
+
+            //TODO 搜索条件
+            predicate = predicate.AndIF(!parm.ConfigType.IsEmpty(),m => m.ConfigType == parm.ConfigType);
+            predicate = predicate.AndIF(!parm.ConfigName.IsEmpty(),m => m.ConfigName.Contains(parm.ConfigType));
+            predicate = predicate.AndIF(!parm.ConfigKey.IsEmpty(),m => m.ConfigKey.Contains(parm.ConfigKey));
+            predicate = predicate.AndIF(!parm.BeginTime.IsEmpty(),m => m.Create_time >= parm.BeginTime );
+            predicate = predicate.AndIF(!parm.BeginTime.IsEmpty(),m => m.Create_time <= parm.EndTime);
+
+            var response = _SysConfigService.GetPages(predicate.ToExpression(), parm);
+
+            return SUCCESS(response);
+        }
+
+        /// <summary>
+        /// 查询参数配置详情
+        /// </summary>
+        /// <param name="ConfigId"></param>
+        /// <returns></returns>
+        [HttpGet("{ConfigId}")]
+        [ActionPermissionFilter(Permission = "system:config:query")]
+        public IActionResult GetSysConfig(int ConfigId)
+        {
+            var response = _SysConfigService.GetId(ConfigId);
+
+            return SUCCESS(response);
+        }
+
+        /// <summary>
+        /// 根据参数键名查询参数值
+        /// </summary>
+        /// <param name="configKey"></param>
+        /// <returns></returns>
+        [HttpGet("configKey/{configKey}")]
+        public IActionResult GetConfigKey(string configKey)
+        {
+            //TODO 增加缓存
+            var response = _SysConfigService.Queryable().First(f=> f.ConfigKey == configKey);
+
+            return SUCCESS(response?.ConfigValue);
+        }
+        
+        /// <summary>
+        /// 添加参数配置
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ActionPermissionFilter(Permission = "system:config:add")]
+        [Log(Title = "参数配置添加", BusinessType = BusinessType.INSERT)]
+        public IActionResult AddSysConfig([FromBody] SysConfigDto parm)
+        {
+            if (parm == null)
+            {
+                throw new CustomException("请求参数错误");
+            }
+            //从 Dto 映射到 实体
+            var model = parm.Adapt<SysConfig>().ToCreate();
+
+            return SUCCESS(_SysConfigService.Add(model, it => new
+            {
+                it.ConfigName,
+                it.ConfigKey,
+                it.ConfigValue,
+                it.ConfigType,
+                it.Create_by,
+                it.Create_time,
+                it.Remark,
+            }));
+        }
+
+        /// <summary>
+        /// 更新参数配置
+        /// </summary>
+        /// <returns></returns>
+        [HttpPut]
+        [ActionPermissionFilter(Permission = "system:config:update")]
+        [Log(Title = "参数配置修改", BusinessType = BusinessType.UPDATE)]
+        public IActionResult UpdateSysConfig([FromBody] SysConfigDto parm)
+        {
+            if (parm == null)
+            {
+                throw new CustomException("请求实体不能为空");
+            }
+            //从 Dto 映射到 实体
+            var model = parm.Adapt<SysConfig>().ToUpdate(HttpContext);
+
+            var response = _SysConfigService.Update(w => w.ConfigId == model.ConfigId, it => new SysConfig()
+            {
+                //Update 字段映射
+                ConfigName = model.ConfigName,
+                ConfigKey = model.ConfigKey,
+                ConfigValue = model.ConfigValue,
+                ConfigType = model.ConfigType,
+                Update_by = model.Update_by,
+                Update_time = model.Update_time,
+            });
+
+            return SUCCESS(response);
+        }
+
+        /// <summary>
+        /// 删除参数配置
+        /// </summary>
+        /// <returns></returns>
+        [HttpDelete("{ids}")]
+        [ActionPermissionFilter(Permission = "system:config:remove")]
+        [Log(Title = "参数配置删除", BusinessType = BusinessType.DELETE)]
+        public IActionResult DeleteSysConfig(string ids)
+        {
+            int[] idsArr = Tools.SpitIntArrary(ids);
+            if (idsArr.Length <= 0) { return ToResponse(ApiResult.Error($"删除失败Id 不能为空")); }
+
+            var response = _SysConfigService.Delete(idsArr);
+
+            return SUCCESS(response);
         }
     }
-}
+}
\ No newline at end of file
diff --git a/ZR.Admin.WebApi/Controllers/System/SysProfileController.cs b/ZR.Admin.WebApi/Controllers/System/SysProfileController.cs
index 2ef8337..c846d5a 100644
--- a/ZR.Admin.WebApi/Controllers/System/SysProfileController.cs
+++ b/ZR.Admin.WebApi/Controllers/System/SysProfileController.cs
@@ -79,9 +79,7 @@ namespace ZR.Admin.WebApi.Controllers.System
                 throw new CustomException(ResultCode.PARAM_ERROR, "请求参数错误");
             }
             //从 Dto 映射到 实体
-            var user = userDto.Adapt<SysUser>();
-            user.Update_by = User.Identity.Name;
-            user.Update_time = DateTime.Now;
+            var user = userDto.Adapt<SysUser>().ToUpdate(HttpContext);
 
             int result = UserService.ChangeUser(user);
             return ToResponse(result);
diff --git a/ZR.Admin.WebApi/Extensions/EntityExtension.cs b/ZR.Admin.WebApi/Extensions/EntityExtension.cs
index 879a258..1ec762a 100644
--- a/ZR.Admin.WebApi/Extensions/EntityExtension.cs
+++ b/ZR.Admin.WebApi/Extensions/EntityExtension.cs
@@ -57,9 +57,9 @@ namespace ZR.Admin.WebApi.Extensions
             {
                 types.GetProperty("UpdateTime").SetValue(source, DateTime.Now, null);
             }
-            if (types.GetProperty("Update_Time") != null)
+            if (types.GetProperty("Update_time") != null)
             {
-                types.GetProperty("Update_Time").SetValue(source, DateTime.Now, null);
+                types.GetProperty("Update_time").SetValue(source, DateTime.Now, null);
             }
             //if (types.GetProperty("UpdateID") != null)
             //{
diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/ControllersTemplate.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/ControllersTemplate.txt
index 3a5d41c..e4ac42d 100644
--- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/ControllersTemplate.txt
+++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/ControllersTemplate.txt
@@ -14,6 +14,7 @@ using {ServicesNamespace}.Business;
 using {ApiControllerNamespace}.Extensions;
 using {ApiControllerNamespace}.Filters;
 using ZR.Common;
+using Infrastructure.Extensions;
 
 namespace {ApiControllerNamespace}.Controllers
 {
@@ -76,7 +77,7 @@ namespace {ApiControllerNamespace}.Controllers
         /// <returns></returns>
         [HttpPost]
         [ActionPermissionFilter(Permission = "{Permission}:add")]
-        [Log(Title = "{TableDesc}添加", BusinessType = BusinessType.INSERT)]
+        [Log(Title = "{FunctionName}添加", BusinessType = BusinessType.INSERT)]
         public IActionResult Add{ModelName}([FromBody] {ModelName}Dto parm)
         {
             if (parm == null)
@@ -84,7 +85,7 @@ namespace {ApiControllerNamespace}.Controllers
                 throw new CustomException("请求参数错误");
             }
             //从 Dto 映射到 实体
-            var model = parm.Adapt<{ModelName}>().ToCreate();
+            var model = parm.Adapt<{ModelName}>().ToCreate(HttpContext);
 
             return SUCCESS(_{ModelName}Service.Add(model, it => new
             {
@@ -98,7 +99,7 @@ namespace {ApiControllerNamespace}.Controllers
         /// <returns></returns>
         [HttpPut]
         [ActionPermissionFilter(Permission = "{Permission}:update")]
-        [Log(Title = "{TableDesc}修改", BusinessType = BusinessType.UPDATE)]
+        [Log(Title = "{FunctionName}修改", BusinessType = BusinessType.UPDATE)]
         public IActionResult Update{ModelName}([FromBody] {ModelName}Dto parm)
         {
             if (parm == null)
@@ -106,7 +107,7 @@ namespace {ApiControllerNamespace}.Controllers
                 throw new CustomException("请求实体不能为空");
             }
             //从 Dto 映射到 实体
-            var model = parm.Adapt<{ModelName}>().ToUpdate();
+            var model = parm.Adapt<{ModelName}>().ToUpdate(HttpContext);
 
             var response = _{ModelName}Service.Update(w => w.{PrimaryKey} == model.{PrimaryKey}, it => new {ModelName}()
             {
@@ -123,7 +124,7 @@ namespace {ApiControllerNamespace}.Controllers
         /// <returns></returns>
         [HttpDelete("{ids}")]
         [ActionPermissionFilter(Permission = "{Permission}:delete")]
-        [Log(Title = "{TableDesc}删除", BusinessType = BusinessType.DELETE)]
+        [Log(Title = "{FunctionName}删除", BusinessType = BusinessType.DELETE)]
         public IActionResult Delete{ModelName}(string ids)
         {
             int[] idsArr = Tools.SpitIntArrary(ids);
diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/ServiceTemplate.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/ServiceTemplate.txt
index 1892b2f..fe7121a 100644
--- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/ServiceTemplate.txt
+++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/ServiceTemplate.txt
@@ -1,12 +1,5 @@
 using Infrastructure;
 using Infrastructure.Attribute;
-using Infrastructure.Extensions;
-using SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using ZR.Common;
 using {ModelsNamespace}.Models;
 using {IRepositoriesNamespace};
 
diff --git a/ZR.CodeGenerator/Service/CodeGeneraterService.cs b/ZR.CodeGenerator/Service/CodeGeneraterService.cs
index 1e5612d..b0fcbe7 100644
--- a/ZR.CodeGenerator/Service/CodeGeneraterService.cs
+++ b/ZR.CodeGenerator/Service/CodeGeneraterService.cs
@@ -33,7 +33,7 @@ namespace ZR.CodeGenerator.Service
             {
                 tableList = tableList.Where(f => f.Name.ToLower().Contains(tableName.ToLower())).ToList();
             }
-            tableList = tableList.Where(f => !new string[] { "gen", "sys_" }.Contains(f.Name)).ToList();
+            //tableList = tableList.Where(f => !new string[] { "gen", "sys_" }.Contains(f.Name)).ToList();
             pager.TotalNum = tableList.Count;
             return tableList.Skip(pager.PageSize * (pager.PageNum - 1)).Take(pager.PageSize).OrderBy(f => f.Name).ToList();
         }
diff --git a/ZR.Vue/src/layout/components/Settings/index.vue b/ZR.Vue/src/layout/components/Settings/index.vue
index 90d99df..5079b8e 100644
--- a/ZR.Vue/src/layout/components/Settings/index.vue
+++ b/ZR.Vue/src/layout/components/Settings/index.vue
@@ -1,13 +1,38 @@
 <template>
   <div class="drawer-container">
-    <div>
-      <h3 class="drawer-title">系统布局配置</h3>
+    <div class="setting-drawer-content">
+      <div class="setting-drawer-title">
+        <h3 class="drawer-title">主题风格设置</h3>
+      </div>
+      <div class="setting-drawer-block-checbox">
+        <div class="setting-drawer-block-checbox-item" @click="handleTheme('theme-dark')">
+          <img src="@/assets/image/dark.svg" alt="dark">
+          <div v-if="sideTheme === 'theme-dark'" class="setting-drawer-block-checbox-selectIcon" style="display: block;">
+            <i aria-label="图标: check" class="anticon anticon-check">
+              <svg viewBox="64 64 896 896" data-icon="check" width="1em" height="1em" :fill="theme" aria-hidden="true" focusable="false" class="">
+                <path d="M912 190h-69.9c-9.8 0-19.1 4.5-25.1 12.2L404.7 724.5 207 474a32 32 0 0 0-25.1-12.2H112c-6.7 0-10.4 7.7-6.3 12.9l273.9 347c12.8 16.2 37.4 16.2 50.3 0l488.4-618.9c4.1-5.1.4-12.8-6.3-12.8z" />
+              </svg>
+            </i>
+          </div>
+        </div>
+        <div class="setting-drawer-block-checbox-item" @click="handleTheme('theme-light')">
+          <img src="@/assets/image/light.svg" alt="light">
+          <div v-if="sideTheme === 'theme-light'" class="setting-drawer-block-checbox-selectIcon" style="display: block;">
+            <i aria-label="图标: check" class="anticon anticon-check">
+              <svg viewBox="64 64 896 896" data-icon="check" width="1em" height="1em" :fill="theme" aria-hidden="true" focusable="false" class="">
+                <path d="M912 190h-69.9c-9.8 0-19.1 4.5-25.1 12.2L404.7 724.5 207 474a32 32 0 0 0-25.1-12.2H112c-6.7 0-10.4 7.7-6.3 12.9l273.9 347c12.8 16.2 37.4 16.2 50.3 0l488.4-618.9c4.1-5.1.4-12.8-6.3-12.8z" />
+              </svg>
+            </i>
+          </div>
+        </div>
+      </div>
 
       <div class="drawer-item">
         <span>主题颜色</span>
         <theme-picker style="float: right;height: 26px;margin: -3px 8px 0 0;" @change="themeChange" />
       </div>
 
+      <el-divider/>
       <div class="drawer-item">
         <span>开启 Tags-Views</span>
         <el-switch v-model="tagsView" class="drawer-switch" />
@@ -22,66 +47,143 @@
         <span>显示 Logo</span>
         <el-switch v-model="sidebarLogo" class="drawer-switch" />
       </div>
+      <el-divider />
 
+      <el-button size="small" type="primary" plain icon="el-icon-document-add" @click="saveSetting">保存配置</el-button>
+      <el-button size="small" plain icon="el-icon-refresh" @click="resetSetting">重置配置</el-button>
     </div>
   </div>
 </template>
 
 <script>
-import ThemePicker from '@/components/ThemePicker'
+import ThemePicker from "@/components/ThemePicker";
 
 export default {
   components: { ThemePicker },
   data() {
-    return {}
+    return {
+      theme: this.$store.state.settings.theme,
+      sideTheme: this.$store.state.settings.sideTheme,
+    };
   },
   computed: {
     fixedHeader: {
       get() {
-        return this.$store.state.settings.fixedHeader
+        return this.$store.state.settings.fixedHeader;
       },
       set(val) {
-        this.$store.dispatch('settings/changeSetting', {
-          key: 'fixedHeader',
-          value: val
-        })
-      }
+        this.$store.dispatch("settings/changeSetting", {
+          key: "fixedHeader",
+          value: val,
+        });
+      },
     },
     tagsView: {
       get() {
-        return this.$store.state.settings.tagsView
+        return this.$store.state.settings.tagsView;
       },
       set(val) {
-        this.$store.dispatch('settings/changeSetting', {
-          key: 'tagsView',
-          value: val
-        })
-      }
+        this.$store.dispatch("settings/changeSetting", {
+          key: "tagsView",
+          value: val,
+        });
+      },
     },
     sidebarLogo: {
       get() {
-        return this.$store.state.settings.sidebarLogo
+        return this.$store.state.settings.sidebarLogo;
       },
       set(val) {
-        this.$store.dispatch('settings/changeSetting', {
-          key: 'sidebarLogo',
-          value: val
-        })
-      }
+        this.$store.dispatch("settings/changeSetting", {
+          key: "sidebarLogo",
+          value: val,
+        });
+      },
     },
   },
   methods: {
     themeChange(val) {
-      this.$store.dispatch('settings/changeSetting', {
-        key: 'theme',
-        value: val
-      })
-    }
-  }
-}
+      this.$store.dispatch("settings/changeSetting", {
+        key: "theme",
+        value: val,
+      });
+    },
+    handleTheme(val) {
+      this.$store.dispatch("settings/changeSetting", {
+        key: "sideTheme",
+        value: val,
+      });
+      this.sideTheme = val;
+    },
+    // 保存配置好
+    saveSetting() {
+      // this.$modal.loading("正在保存到本地，请稍后...");
+      localStorage.setItem(
+        "layout-setting",
+        `{
+            "tagsView":${this.tagsView},
+            "fixedHeader":${this.fixedHeader},
+            "sidebarLogo":${this.sidebarLogo},
+            "sideTheme":"${this.sideTheme}",
+            "theme":"${this.theme}"
+          }`
+      );
+      this.msgSuccess("保存成功");
+      // setTimeout(this.$modal.closeLoading(), 1000);
+    },
+    resetSetting() {
+      // this.$modal.loading("正在清除设置缓存并刷新，请稍后...");
+      localStorage.removeItem("layout-setting");
+      setTimeout("window.location.reload()", 1000);
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
+.setting-drawer-content {
+  .setting-drawer-title {
+    margin-bottom: 12px;
+    color: rgba(0, 0, 0, 0.85);
+    font-size: 14px;
+    line-height: 22px;
+    font-weight: bold;
+  }
+
+  .setting-drawer-block-checbox {
+    display: flex;
+    justify-content: flex-start;
+    align-items: center;
+    margin-top: 10px;
+    margin-bottom: 20px;
+
+    .setting-drawer-block-checbox-item {
+      position: relative;
+      margin-right: 16px;
+      border-radius: 2px;
+      cursor: pointer;
+
+      img {
+        width: 48px;
+        height: 48px;
+      }
+
+      .setting-drawer-block-checbox-selectIcon {
+        position: absolute;
+        top: 0;
+        right: 0;
+        width: 100%;
+        height: 100%;
+        padding-top: 15px;
+        padding-left: 24px;
+        color: #1890ff;
+        font-weight: 700;
+        font-size: 14px;
+      }
+    }
+  }
+}
+
 .drawer-container {
   padding: 24px;
   font-size: 14px;
@@ -90,19 +192,20 @@ export default {
 
   .drawer-title {
     margin-bottom: 12px;
-    color: rgba(0, 0, 0, .85);
+    color: rgba(0, 0, 0, 0.85);
     font-size: 14px;
     line-height: 22px;
   }
 
   .drawer-item {
-    color: rgba(0, 0, 0, .65);
+    color: rgba(0, 0, 0, 0.65);
     font-size: 14px;
     padding: 12px 0;
   }
 
   .drawer-switch {
-    float: right
+    float: right;
   }
 }
 </style>
+
diff --git a/ZR.Vue/src/layout/index.vue b/ZR.Vue/src/layout/index.vue
index 889b7dc..97c78ef 100644
--- a/ZR.Vue/src/layout/index.vue
+++ b/ZR.Vue/src/layout/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div :class="classObj" class="app-wrapper">
+  <div :class="classObj" class="app-wrapper" :style="{'--current-color': theme}">
     <div v-if="device==='mobile'&&sidebar.opened" class="drawer-bg" @click="handleClickOutside" />
     <sidebar class="sidebar-container" />
     <div :class="{hasTagsView:needTagsView}" class="main-container">
@@ -34,6 +34,8 @@ export default {
   mixins: [ResizeMixin],
   computed: {
     ...mapState({
+      theme: state => state.settings.theme,
+      sideTheme: state => state.settings.sideTheme,
       sidebar: state => state.app.sidebar,
       device: state => state.app.device,
       showSettings: state => state.settings.showSettings,
diff --git a/ZR.Vue/src/main.js b/ZR.Vue/src/main.js
index 94685d3..2333caf 100644
--- a/ZR.Vue/src/main.js
+++ b/ZR.Vue/src/main.js
@@ -15,15 +15,20 @@ import permission from './directive/permission'
 import './assets/icons' // icon
 import './permission' // permission control
 import { getDicts } from "@/api/system/dict/data";
-// import { getConfigKey } from "@/api/system/config";
+import { getConfigKey } from "@/api/system/config";
 import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels, download, handleTree } from "@/utils/ruoyi";
+//分页组件
 import Pagination from "@/components/Pagination";
 //自定义表格工具扩展
 import RightToolbar from "@/components/RightToolbar"
+// 字典标签组件
+import DictTag from '@/components/DictTag'
+// 字典数据组件
+// import DictData from '@/components/DictData'
 
 // 全局方法挂载
 Vue.prototype.getDicts = getDicts
-// Vue.prototype.getConfigKey = getConfigKey
+Vue.prototype.getConfigKey = getConfigKey
 Vue.prototype.parseTime = parseTime
 Vue.prototype.resetForm = resetForm
 Vue.prototype.addDateRange = addDateRange
@@ -47,6 +52,7 @@ Vue.prototype.msgInfo = function (msg) {
 // 全局组件挂载
 Vue.component('Pagination', Pagination)
 Vue.component('RightToolbar', RightToolbar)
+Vue.component('DictTag', DictTag)
 
 Vue.use(permission)
 
diff --git a/ZR.Vue/src/settings.js b/ZR.Vue/src/settings.js
index da84f4d..7223b32 100644
--- a/ZR.Vue/src/settings.js
+++ b/ZR.Vue/src/settings.js
@@ -1,8 +1,12 @@
 module.exports = {
   title: 'ZrAdmin.NET',
+  /**
+   * 侧边栏主题 深色主题theme-dark，浅色主题theme-light
+   */
+   sideTheme: 'theme-dark',
 
   /**
-   * 是否系统布局配置
+   * 显示是否系统布局配置
    */
   showSettings: false,
 
diff --git a/ZR.Vue/src/store/modules/settings.js b/ZR.Vue/src/store/modules/settings.js
index a1152a9..8e90e89 100644
--- a/ZR.Vue/src/store/modules/settings.js
+++ b/ZR.Vue/src/store/modules/settings.js
@@ -1,14 +1,17 @@
-import variables from '@/assets/styles/element-variables.scss'
 import defaultSettings from '@/settings'
 
-const { showSettings, tagsView, fixedHeader, sidebarLogo } = defaultSettings
+const { sideTheme, showSettings, tagsView, fixedHeader, sidebarLogo } = defaultSettings
 
+const storageSetting = JSON.parse(localStorage.getItem('layout-setting')) || ''
 const state = {
-  theme: variables.theme,
+  theme: storageSetting.theme || '#409EFF',
+  sideTheme: storageSetting.sideTheme || sideTheme,
   showSettings: showSettings,
-  tagsView: tagsView,
-  fixedHeader: fixedHeader,
-  sidebarLogo: sidebarLogo
+  tagsView: storageSetting.tagsView === undefined ? tagsView : storageSetting.tagsView,
+  fixedHeader: storageSetting.fixedHeader === undefined ? fixedHeader : storageSetting.fixedHeader,
+  sidebarLogo: storageSetting.sidebarLogo === undefined ? sidebarLogo : storageSetting.sidebarLogo,
+  // topNav:  storageSetting.topNav === undefined ? topNav : storageSetting.topNav,
+  // dynamicTitle: storageSetting.dynamicTitle === undefined ? dynamicTitle : storageSetting.dynamicTitle
 }
 
 const mutations = {
@@ -20,6 +23,7 @@ const mutations = {
 }
 
 const actions = {
+  //修改布局设置
   changeSetting({ commit }, data) {
     commit('CHANGE_SETTING', data)
   }
diff --git a/ZR.Vue/src/utils/request.js b/ZR.Vue/src/utils/request.js
index 1a883eb..b832f95 100644
--- a/ZR.Vue/src/utils/request.js
+++ b/ZR.Vue/src/utils/request.js
@@ -57,6 +57,8 @@ service.interceptors.response.use(res => {
         location.href = '/index';
       })
     })
+
+    return Promise.reject()
   }
   else if (code == 0 || code == 110 || code == 101 || code == 403 || code == 500) {
     Message({
@@ -91,8 +93,6 @@ service.interceptors.response.use(res => {
   }
 )
 
-
-
 /**
  * get方法，对应get请求
  * @param {String} url [请求的url地址]
diff --git a/ZR.Vue/src/views/system/user/index.vue b/ZR.Vue/src/views/system/user/index.vue
index 1490266..ad0bf10 100644
--- a/ZR.Vue/src/views/system/user/index.vue
+++ b/ZR.Vue/src/views/system/user/index.vue
@@ -346,9 +346,9 @@ export default {
     this.getDicts("sys_user_sex").then((response) => {
       this.sexOptions = response.data;
     });
-    // this.getConfigKey("sys.user.initPassword").then(response => {
-    //   this.initPassword = response.msg;
-    // });
+    this.getConfigKey("sys.user.initPassword").then(response => {
+      this.initPassword = response.data;
+    });
   },
   methods: {
     /** 查询用户列表 */
diff --git a/ZRAdmin.xml b/ZRAdmin.xml
index e88b1f5..6eb99c0 100644
--- a/ZRAdmin.xml
+++ b/ZRAdmin.xml
@@ -281,11 +281,57 @@
             </summary>
             <returns></returns>
         </member>
-        <member name="T:ZR.Admin.WebApi.Controllers.System.SysConfigController">
+        <member name="T:ZR.Admin.WebApi.Controllers.SysConfigController">
+             <summary>
+             参数配置Controller
+            
+             @author zhaorui
+             @date 2021-09-29
+             </summary>
+        </member>
+        <member name="F:ZR.Admin.WebApi.Controllers.SysConfigController._SysConfigService">
             <summary>
-            配置文件
+            参数配置接口
             </summary>
         </member>
+        <member name="M:ZR.Admin.WebApi.Controllers.SysConfigController.QuerySysConfig(ZR.Model.Dto.SysConfigQueryDto)">
+            <summary>
+            查询参数配置列表
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:ZR.Admin.WebApi.Controllers.SysConfigController.GetSysConfig(System.Int32)">
+            <summary>
+            查询参数配置详情
+            </summary>
+            <param name="ConfigId"></param>
+            <returns></returns>
+        </member>
+        <member name="M:ZR.Admin.WebApi.Controllers.SysConfigController.GetConfigKey(System.String)">
+            <summary>
+            根据参数键名查询参数值
+            </summary>
+            <param name="configKey"></param>
+            <returns></returns>
+        </member>
+        <member name="M:ZR.Admin.WebApi.Controllers.SysConfigController.AddSysConfig(ZR.Model.Dto.SysConfigDto)">
+            <summary>
+            添加参数配置
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:ZR.Admin.WebApi.Controllers.SysConfigController.UpdateSysConfig(ZR.Model.Dto.SysConfigDto)">
+            <summary>
+            更新参数配置
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:ZR.Admin.WebApi.Controllers.SysConfigController.DeleteSysConfig(System.String)">
+            <summary>
+            删除参数配置
+            </summary>
+            <returns></returns>
+        </member>
         <member name="T:ZR.Admin.WebApi.Controllers.System.SysDeptController">
             <summary>
             部门
diff --git a/document/admin-sqlserver.sql b/document/admin-sqlserver.sql
index 10ea56efb1c3a6901ac4a8f6c8b821196e7d13e7..3c48712c9bd7cb6311164b3ce418834aa1788b1f 100644
GIT binary patch
delta 2010
zcmb_dU1*zS6h5a5F_}r*S=Z3HL8h$fY<{=dc6NhSm|KzMrwu|;?7HT!Yn$e`X?0uL
zxXz4Lq`uU*h|C`*>djUuIJ_Bdh&S%S3ok?+f>$bt6ED0NGoF(#Uw&qait^Fs{oeDQ
z^FHS}&pF?<746M+?fM_5O)jv487z>7Bm^NrD=X+hztM8W*06;a{n`D>BE4`>SzLLs
zWV*F@7sZVW&f>Y>F0?gZmoP4WBVy^s`^F&(DVW}fXIwbkL07oI3Eid3ZVbhO*OsDL
zzKkvWU$u?FG`WUg9KtFX`c1+d{iO)v6gZ%KMmXN+7v`IdmhujHJr0xP&8IoOg?s|^
zUVPi|<>M&6erYH6h?P4J3GbCgVb1%-TkmS5SA&|3+smOJuRc42?M?E;Q9Pz&q{mmH
zS-Bp;kmw8O^yQo6FGd`=zx)be>B*o)+K-^F296mzzzAC@MRNr>!5n~q{O}aE$k`n3
zkl$v|ZLxuk4q1S2?RDE%8GjvDd3_R1(iz7G#EHXOr8kP2*K*int9Cc~Z_jPw4o?v!
zb8>eQcZ=r^8_NE!YJdBx(Z8Ah(=bXDry(fgr*N0}#9)y22|QE--@batyNSQ-d>;1-
zZ>v@wi=!Fca$61`F<U8jCHp(4zdO6=i)M9&VQ_@Z;D&a;z97D^?-28Lt#qfbnUimR
z)u5B!bJ!=o?As@QNMXRp5vJ$~viQV;$yVoZS4=r99(>|aIg`ey{N9QWXIZaG2c)P3
zCH2xu5#C5m<;*anGC=kYDp;@k$;e0H^qLL6x_D{n^30|A?nu*!S_7`U@~A?#7jFm<
z&{?okjEUyrhMU4NdLoXc(YA-rPZUiyIH_>X#&SFs%dqI**(To)V=MKOVvJI8Ch1XH
z`_{QcjuW{z5IPHIYb{|K0Kp=A=<GaGYl~6L1jHz65YYL~J)Z0r$dcjHi?wcZWMC-M
zkRfnp*bBWyN&h##JJQ`J-+n=xvO)XHzYpyi{CxPcXK;2)iMJL<g=clHDU9<N@Dj;M
zdNPD5L8C!+BC=hu5B9?WcnrEqOsa)b%lEfrGnUpNM#F=xI^6%2dr51}B)0cFAHUKR
z>2<HIm69-ZRx)RXD+(JguKf_9dQ?fwL|LcGn>IQ$N~BEGWd9E&_Ulw4$1v)JG8B%~
zvGRxx)5ScN{{=G#s=f|?Z9^8rPYWLm+F<$h>q|HbBT1jijHklPD0MT>?KF=G>c25c
zI!3E8!ZQjU+V#)}C{#lN3xKIg@Z4hyH|Ta!TtyKB_1n)8YWKs4!>>SkbMWrGuAs)@
zeM2Ecw@#8GgOK$7ys9r)gm2q+;f!mpo?pbv4KlZg)|RRdO|gNFf=4do@u19Suu*z5
KsFCOM*z+gvkIfSR

delta 142
zcmX@Jfo<PJwhjMkChOI6OrBCJFxl%b-)6O18K%i@e}yI|ba8BstCs?EHup4YKo}>Q
zA<~<Fw7y}SJgHBH(Q@+ozS_+KoBS9jKWR4rY2B>R!NJ66JlU}8_VfvCj2x3|ss%Q?
l^oPA<Gi0!2U^Li1tAbIDf3iU#%l11{7}qgPKQx`O3jq6lItTy&