From 0259e4ffe5d1620981a42e587dba73e2b3c373da Mon Sep 17 00:00:00 2001
From: shiyidong <syidong@aliyun.com>
Date: Thu, 13 May 2021 02:47:11 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B2=A1=E6=9C=89=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E7=9A=84=E6=97=B6=E5=80=99=E6=8F=92=E5=85=A5=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../config/InfConfigController.java           | 11 ++-
 .../convert/config/InfConfigConvert.java      |  3 +
 .../dal/dataobject/config/InfConfigDO.java    |  3 +-
 .../config/impl/InfConfigServiceImpl.java     | 31 ++++++---
 .../service/config/InfConfigServiceTest.java  |  6 +-
 .../errorcode/SysErrorCodeServiceTest.java    |  8 +--
 .../src/components/LogSwitch/index.vue        | 68 +++++++++++++++++++
 yudao-admin-ui/src/main.js                    |  4 ++
 yudao-admin-ui/src/utils/constants.js         |  4 +-
 .../src/views/infra/apiAccessLog/index.vue    | 14 ++--
 .../src/views/infra/apiErrorLog/index.vue     |  4 ++
 .../src/views/system/operatelog/index.vue     |  4 ++
 yudao-framework/yudao-common/pom.xml          |  5 ++
 .../config/enums/ConfigGroupConstants.java    | 13 ++++
 .../common/config/enums/InfConfigEnum.java    | 50 ++++++++++++++
 .../config/enums}/InfConfigTypeEnum.java      |  2 +-
 .../common/config/util/InfConfigUtil.java     | 45 ++++++++++++
 .../operatelog/core/aop/OperateLogAspect.java | 17 ++---
 .../apollo/internals/DBConfigRepository.java  |  3 +-
 .../core/filter/ApiAccessLogFilter.java       | 10 +--
 20 files changed, 251 insertions(+), 54 deletions(-)
 create mode 100644 yudao-admin-ui/src/components/LogSwitch/index.vue
 create mode 100644 yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/config/enums/ConfigGroupConstants.java
 create mode 100644 yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/config/enums/InfConfigEnum.java
 rename {yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/enums/config => yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/config/enums}/InfConfigTypeEnum.java (80%)
 create mode 100644 yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/config/util/InfConfigUtil.java

diff --git a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/controller/config/InfConfigController.java b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/controller/config/InfConfigController.java
index d23a64c6e8..fe2a22aded 100644
--- a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/controller/config/InfConfigController.java
+++ b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/controller/config/InfConfigController.java
@@ -1,10 +1,11 @@
 package cn.iocoder.yudao.adminserver.modules.infra.controller.config;
 
-import cn.hutool.core.util.StrUtil;
 import cn.iocoder.yudao.adminserver.modules.infra.controller.config.vo.*;
 import cn.iocoder.yudao.adminserver.modules.infra.convert.config.InfConfigConvert;
 import cn.iocoder.yudao.adminserver.modules.infra.dal.dataobject.config.InfConfigDO;
 import cn.iocoder.yudao.adminserver.modules.infra.service.config.InfConfigService;
+import cn.iocoder.yudao.framework.common.config.enums.InfConfigEnum;
+import cn.iocoder.yudao.framework.common.config.util.InfConfigUtil;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
@@ -22,6 +23,7 @@ import javax.validation.Valid;
 import javax.validation.constraints.NotBlank;
 import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 import static cn.iocoder.yudao.adminserver.modules.infra.enums.InfErrorCodeConstants.CONFIG_GET_VALUE_ERROR_IF_SENSITIVE;
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
@@ -85,7 +87,12 @@ public class InfConfigController {
     public CommonResult<String> getConfigKey(@RequestParam("key") String key) {
         InfConfigDO config = configService.getConfigByKey(key);
         if (config == null) {
-            return null;
+            InfConfigEnum initConfigEnum = InfConfigUtil.getInitConfigEnum(key);
+            if(Objects.nonNull(initConfigEnum)){
+                config = InfConfigConvert.INSTANCE.convert(initConfigEnum);
+            }else{
+                return null;
+            }
         }
         if (config.getSensitive()) {
             throw exception(CONFIG_GET_VALUE_ERROR_IF_SENSITIVE);
diff --git a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/convert/config/InfConfigConvert.java b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/convert/config/InfConfigConvert.java
index 0b076b6e0e..2002afe27f 100644
--- a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/convert/config/InfConfigConvert.java
+++ b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/convert/config/InfConfigConvert.java
@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.adminserver.modules.infra.convert.config;
 
+import cn.iocoder.yudao.framework.common.config.enums.InfConfigEnum;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.adminserver.modules.infra.controller.config.vo.InfConfigCreateReqVO;
 import cn.iocoder.yudao.adminserver.modules.infra.controller.config.vo.InfConfigExcelVO;
@@ -24,6 +25,8 @@ public interface InfConfigConvert {
 
     InfConfigDO convert(InfConfigUpdateReqVO bean);
 
+    InfConfigDO convert(InfConfigEnum bean);
+
     List<InfConfigExcelVO> convertList(List<InfConfigDO> list);
 
 }
diff --git a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/dal/dataobject/config/InfConfigDO.java b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/dal/dataobject/config/InfConfigDO.java
index 119d069d95..3bdc9d9039 100644
--- a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/dal/dataobject/config/InfConfigDO.java
+++ b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/dal/dataobject/config/InfConfigDO.java
@@ -1,7 +1,6 @@
 package cn.iocoder.yudao.adminserver.modules.infra.dal.dataobject.config;
 
 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
-import cn.iocoder.yudao.adminserver.modules.infra.enums.config.InfConfigTypeEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -46,7 +45,7 @@ public class InfConfigDO extends BaseDO {
     /**
      * 参数类型
      *
-     * 枚举 {@link InfConfigTypeEnum}
+     * 枚举 {@link cn.iocoder.yudao.framework.common.config.enums.InfConfigTypeEnum}
      */
     @TableField("`type`")
     private Integer type;
diff --git a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/service/config/impl/InfConfigServiceImpl.java b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/service/config/impl/InfConfigServiceImpl.java
index 7578e8d529..acd9d9a663 100644
--- a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/service/config/impl/InfConfigServiceImpl.java
+++ b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/service/config/impl/InfConfigServiceImpl.java
@@ -1,24 +1,25 @@
 package cn.iocoder.yudao.adminserver.modules.infra.service.config.impl;
 
-import cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.adminserver.modules.infra.controller.config.vo.InfConfigCreateReqVO;
 import cn.iocoder.yudao.adminserver.modules.infra.controller.config.vo.InfConfigExportReqVO;
 import cn.iocoder.yudao.adminserver.modules.infra.controller.config.vo.InfConfigPageReqVO;
 import cn.iocoder.yudao.adminserver.modules.infra.controller.config.vo.InfConfigUpdateReqVO;
 import cn.iocoder.yudao.adminserver.modules.infra.convert.config.InfConfigConvert;
-import cn.iocoder.yudao.adminserver.modules.infra.dal.mysql.config.InfConfigMapper;
 import cn.iocoder.yudao.adminserver.modules.infra.dal.dataobject.config.InfConfigDO;
-import cn.iocoder.yudao.adminserver.modules.infra.enums.config.InfConfigTypeEnum;
+import cn.iocoder.yudao.adminserver.modules.infra.dal.mysql.config.InfConfigMapper;
 import cn.iocoder.yudao.adminserver.modules.infra.mq.producer.config.InfConfigProducer;
 import cn.iocoder.yudao.adminserver.modules.infra.service.config.InfConfigService;
+import cn.iocoder.yudao.framework.common.config.enums.InfConfigEnum;
+import cn.iocoder.yudao.framework.common.config.enums.InfConfigTypeEnum;
+import cn.iocoder.yudao.framework.common.config.util.InfConfigUtil;
+import cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import com.google.common.annotations.VisibleForTesting;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
-
 import java.util.List;
 import java.util.Objects;
 
@@ -66,12 +67,22 @@ public class InfConfigServiceImpl implements InfConfigService {
     public void updateValueByKey(String key, String value) {
         InfConfigDO config = configMapper.selectByKey(key);
         if (Objects.isNull(config)) {
-            throw ServiceExceptionUtil.exception(CONFIG_NOT_EXISTS);
+            InfConfigEnum initConfigEnum = InfConfigUtil.getInitConfigEnum(key);
+            if(Objects.isNull(initConfigEnum)){
+                throw ServiceExceptionUtil.exception(CONFIG_NOT_EXISTS);
+            }else{
+                //初始化配置
+                InfConfigDO convert = InfConfigConvert.INSTANCE.convert(initConfigEnum);
+                convert.setValue(value);
+                configMapper.insert(convert);
+            }
+        }else {
+            InfConfigDO updateDo = new InfConfigDO();
+            updateDo.setId(config.getId());
+            updateDo.setValue(value);
+            configMapper.updateById(updateDo);
         }
-        InfConfigDO updateDo = new InfConfigDO();
-        updateDo.setId(config.getId());
-        updateDo.setValue(value);
-        configMapper.updateById(updateDo);
+
         // 发送刷新消息
         configProducer.sendConfigRefreshMessage();
     }
diff --git a/yudao-admin-server/src/test/java/cn/iocoder/yudao/adminserver/modules/infra/service/config/InfConfigServiceTest.java b/yudao-admin-server/src/test/java/cn/iocoder/yudao/adminserver/modules/infra/service/config/InfConfigServiceTest.java
index 4ef105df3f..9c35b24bc8 100644
--- a/yudao-admin-server/src/test/java/cn/iocoder/yudao/adminserver/modules/infra/service/config/InfConfigServiceTest.java
+++ b/yudao-admin-server/src/test/java/cn/iocoder/yudao/adminserver/modules/infra/service/config/InfConfigServiceTest.java
@@ -1,16 +1,16 @@
 package cn.iocoder.yudao.adminserver.modules.infra.service.config;
 
 import cn.iocoder.yudao.adminserver.BaseDbUnitTest;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.adminserver.modules.infra.controller.config.vo.InfConfigCreateReqVO;
 import cn.iocoder.yudao.adminserver.modules.infra.controller.config.vo.InfConfigExportReqVO;
 import cn.iocoder.yudao.adminserver.modules.infra.controller.config.vo.InfConfigPageReqVO;
 import cn.iocoder.yudao.adminserver.modules.infra.controller.config.vo.InfConfigUpdateReqVO;
 import cn.iocoder.yudao.adminserver.modules.infra.dal.dataobject.config.InfConfigDO;
 import cn.iocoder.yudao.adminserver.modules.infra.dal.mysql.config.InfConfigMapper;
-import cn.iocoder.yudao.adminserver.modules.infra.enums.config.InfConfigTypeEnum;
 import cn.iocoder.yudao.adminserver.modules.infra.mq.producer.config.InfConfigProducer;
 import cn.iocoder.yudao.adminserver.modules.infra.service.config.impl.InfConfigServiceImpl;
+import cn.iocoder.yudao.framework.common.config.enums.InfConfigTypeEnum;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.collection.ArrayUtils;
 import cn.iocoder.yudao.framework.common.util.object.ObjectUtils;
 import org.junit.jupiter.api.Test;
@@ -23,9 +23,9 @@ import java.util.function.Consumer;
 
 import static cn.hutool.core.util.RandomUtil.randomEle;
 import static cn.iocoder.yudao.adminserver.modules.infra.enums.InfErrorCodeConstants.*;
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.buildTime;
 import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals;
 import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException;
-import static cn.iocoder.yudao.framework.common.util.date.DateUtils.buildTime;
 import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*;
 import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.Mockito.times;
diff --git a/yudao-admin-server/src/test/java/cn/iocoder/yudao/adminserver/modules/system/service/errorcode/SysErrorCodeServiceTest.java b/yudao-admin-server/src/test/java/cn/iocoder/yudao/adminserver/modules/system/service/errorcode/SysErrorCodeServiceTest.java
index f5dbc71089..9fb8880e5b 100644
--- a/yudao-admin-server/src/test/java/cn/iocoder/yudao/adminserver/modules/system/service/errorcode/SysErrorCodeServiceTest.java
+++ b/yudao-admin-server/src/test/java/cn/iocoder/yudao/adminserver/modules/system/service/errorcode/SysErrorCodeServiceTest.java
@@ -1,9 +1,6 @@
 package cn.iocoder.yudao.adminserver.modules.system.service.errorcode;
 
 import cn.iocoder.yudao.adminserver.BaseDbUnitTest;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.adminserver.modules.tool.framework.errorcode.core.dto.ErrorCodeAutoGenerateReqDTO;
-import cn.iocoder.yudao.adminserver.modules.infra.enums.config.InfConfigTypeEnum;
 import cn.iocoder.yudao.adminserver.modules.system.controller.errorcode.vo.SysErrorCodeCreateReqVO;
 import cn.iocoder.yudao.adminserver.modules.system.controller.errorcode.vo.SysErrorCodeExportReqVO;
 import cn.iocoder.yudao.adminserver.modules.system.controller.errorcode.vo.SysErrorCodePageReqVO;
@@ -12,6 +9,9 @@ import cn.iocoder.yudao.adminserver.modules.system.dal.dataobject.errorcode.SysE
 import cn.iocoder.yudao.adminserver.modules.system.dal.mysql.errorcode.SysErrorCodeMapper;
 import cn.iocoder.yudao.adminserver.modules.system.enums.errorcode.SysErrorCodeTypeEnum;
 import cn.iocoder.yudao.adminserver.modules.system.service.errorcode.impl.SysErrorCodeServiceImpl;
+import cn.iocoder.yudao.adminserver.modules.tool.framework.errorcode.core.dto.ErrorCodeAutoGenerateReqDTO;
+import cn.iocoder.yudao.framework.common.config.enums.InfConfigTypeEnum;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.collection.ArrayUtils;
 import cn.iocoder.yudao.framework.common.util.object.ObjectUtils;
 import org.assertj.core.util.Lists;
@@ -27,9 +27,9 @@ import java.util.function.Consumer;
 import static cn.hutool.core.util.RandomUtil.randomEle;
 import static cn.iocoder.yudao.adminserver.modules.system.enums.SysErrorCodeConstants.ERROR_CODE_DUPLICATE;
 import static cn.iocoder.yudao.adminserver.modules.system.enums.SysErrorCodeConstants.ERROR_CODE_NOT_EXISTS;
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.buildTime;
 import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals;
 import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException;
-import static cn.iocoder.yudao.framework.common.util.date.DateUtils.buildTime;
 import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*;
 import static org.junit.jupiter.api.Assertions.*;
 
diff --git a/yudao-admin-ui/src/components/LogSwitch/index.vue b/yudao-admin-ui/src/components/LogSwitch/index.vue
new file mode 100644
index 0000000000..5d5836185d
--- /dev/null
+++ b/yudao-admin-ui/src/components/LogSwitch/index.vue
@@ -0,0 +1,68 @@
+<template>
+  <el-button :type="type" plain :icon="icon" size="mini" @click="enableHandler" v-show="finish"
+                   v-hasPermi="permissions">{{content}}</el-button>
+</template>
+
+<script>
+import { updateValueByKey } from "@/api/infra/config";
+
+export default {
+  name: 'LogSwitch',
+  data() {
+      return {
+         enable: false,
+         finish: false,  
+      }
+  },
+  props: {
+    configKey: {
+      required: true,
+      type: String
+    },
+    closeText: {
+      type: String,
+      default: '关闭'
+    },
+    openText: {
+      type: String,
+      default: '开启'
+    },
+    permissions: {
+      type: Array,
+      default: []
+    }
+  },
+  computed: {
+    type() {
+      return this.enable?'info':'primary'
+    },
+    icon() {
+      return this.enable?'el-icon-close':'el-icon-check'
+    },
+    content() {
+      return this.enable?this.closeText:this.openText
+    },
+  },
+  created() {
+      this.getEnableConfig();
+  },
+  methods: {
+    //开启关闭日志
+    enableHandler(){
+        let data = new FormData();
+        data.append("key",this.configKey);
+        data.append("value",this.enable?false:true);
+        updateValueByKey(data).then(response => {
+           this.msgSuccess(this.content+"成功");
+           this.getEnableConfig();
+        })
+    },
+    getEnableConfig(){
+        this.getConfigKey(this.configKey).then(response => {
+          this.enable = (response.data == "true");
+          this.finish = true
+        })
+    },
+  }
+}
+</script>
diff --git a/yudao-admin-ui/src/main.js b/yudao-admin-ui/src/main.js
index 78ab14f775..eaf5307013 100644
--- a/yudao-admin-ui/src/main.js
+++ b/yudao-admin-ui/src/main.js
@@ -33,6 +33,9 @@ import {
 import Pagination from "@/components/Pagination";
 // 自定义表格工具扩展
 import RightToolbar from "@/components/RightToolbar"
+
+import LogSwitch from "@/components/LogSwitch";
+
 // 代码高亮插件
 // import hljs from 'highlight.js'
 // import 'highlight.js/styles/github-gist.css'
@@ -73,6 +76,7 @@ Vue.prototype.msgInfo = function (msg) {
 // 全局组件挂载
 Vue.component('Pagination', Pagination)
 Vue.component('RightToolbar', RightToolbar)
+Vue.component('LogSwitch', LogSwitch)
 
 Vue.use(permission)
 // Vue.use(hljs.vuePlugin);
diff --git a/yudao-admin-ui/src/utils/constants.js b/yudao-admin-ui/src/utils/constants.js
index 36f24907b2..4c9ed5bdaa 100644
--- a/yudao-admin-ui/src/utils/constants.js
+++ b/yudao-admin-ui/src/utils/constants.js
@@ -72,6 +72,6 @@ export const InfApiErrorLogProcessStatusEnum = {
  */
 export const InfConfigKeyEnum = {
   API_LOG_KEY: 'yudao.web.api.log.enable', 
-  DONE: 1, 
-  IGNORE: 2, 
+  API_ERROR_LOG_KEY: 'yudao.web.api.error.log.enable', 
+  OPERATE_LOG_KEY: 'yudao.operate.log.enable', 
 }
\ No newline at end of file
diff --git a/yudao-admin-ui/src/views/infra/apiAccessLog/index.vue b/yudao-admin-ui/src/views/infra/apiAccessLog/index.vue
index 8fee22d00d..d620e321b9 100644
--- a/yudao-admin-ui/src/views/infra/apiAccessLog/index.vue
+++ b/yudao-admin-ui/src/views/infra/apiAccessLog/index.vue
@@ -36,16 +36,14 @@
 
     <!-- 操作工具栏 -->
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <log-switch :ckey="InfConfigKeyEnum.API_LOG_KEY" 
-        :permissions="['infra:api-access-log:export','infra:api-access-log:asd']"/>
-        <!-- <el-button :type="enable?'info':'primary'" plain :icon="enable?'el-icon-close':'el-icon-check'" size="mini" @click="enableHandler"
-                   v-hasPermi="['infra:api-access-log:export']">{{enable?'关闭日志':'开启日志'}}</el-button> -->
-      </el-col>
       <el-col :span="1.5">
         <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
                    v-hasPermi="['infra:api-access-log:export']">导出</el-button>
       </el-col>
+      <el-col :span="1.5">
+        <log-switch :config-key="InfConfigKeyEnum.API_LOG_KEY" 
+        :permissions="['infra:api-access-log:export']" open-text="开启日志" close-text="关闭日志"/>
+      </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
@@ -120,12 +118,8 @@
 
 <script>
 import { getApiAccessLogPage, exportApiAccessLogExcel } from "@/api/infra/apiAccessLog";
-import LogSwitch from "@/components/LogSwitch";
 export default {
   name: "ApiAccessLog",
-  components: {
-    LogSwitch
-  },
   data() {
     return {
       // 遮罩层
diff --git a/yudao-admin-ui/src/views/infra/apiErrorLog/index.vue b/yudao-admin-ui/src/views/infra/apiErrorLog/index.vue
index 97d6148219..f3f43afed6 100644
--- a/yudao-admin-ui/src/views/infra/apiErrorLog/index.vue
+++ b/yudao-admin-ui/src/views/infra/apiErrorLog/index.vue
@@ -40,6 +40,10 @@
         <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
                    v-hasPermi="['infra:api-error-log:export']">导出</el-button>
       </el-col>
+      <el-col :span="1.5">
+        <log-switch :config-key="InfConfigKeyEnum.API_ERROR_LOG_KEY" 
+        :permissions="['infra:api-access-log:export']" open-text="开启异常日志" close-text="关闭异常日志"/>
+      </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
diff --git a/yudao-admin-ui/src/views/system/operatelog/index.vue b/yudao-admin-ui/src/views/system/operatelog/index.vue
index 7131654bf5..739b3c4c16 100644
--- a/yudao-admin-ui/src/views/system/operatelog/index.vue
+++ b/yudao-admin-ui/src/views/system/operatelog/index.vue
@@ -36,6 +36,10 @@
         <el-button type="warning" icon="el-icon-download" size="mini" @click="handleExport"
                    v-hasPermi="['system:operate-log:export']">导出</el-button>
       </el-col>
+      <el-col :span="1.5">
+        <log-switch :config-key="InfConfigKeyEnum.OPERATE_LOG_KEY"  open-text="开启操作日志" close-text="关闭操作日志"
+        :permissions="['infra:api-access-log:export']"/>
+      </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
diff --git a/yudao-framework/yudao-common/pom.xml b/yudao-framework/yudao-common/pom.xml
index ad84d6a24e..b335bfe970 100644
--- a/yudao-framework/yudao-common/pom.xml
+++ b/yudao-framework/yudao-common/pom.xml
@@ -32,6 +32,11 @@
             <artifactId>spring-aop</artifactId>
             <scope>provided</scope> <!-- 设置为 provided，只有工具类需要使用到 -->
         </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+            <scope>provided</scope> <!-- 设置为 provided，只有工具类需要使用到 -->
+        </dependency>
         <dependency>
             <groupId>org.aspectj</groupId>
             <artifactId>aspectjweaver</artifactId>
diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/config/enums/ConfigGroupConstants.java b/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/config/enums/ConfigGroupConstants.java
new file mode 100644
index 0000000000..6b9cfdf910
--- /dev/null
+++ b/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/config/enums/ConfigGroupConstants.java
@@ -0,0 +1,13 @@
+package cn.iocoder.yudao.framework.common.config.enums;
+
+/**
+ * @author syidong@aliyun.com
+ * @date 2021/5/12 23:07
+ */
+public interface ConfigGroupConstants {
+    /**
+     * log 开关组名
+     */
+    String CONFIG_LOG_SWITCH_KEY_GROUP = "config.log.switch.key.group";
+
+}
diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/config/enums/InfConfigEnum.java b/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/config/enums/InfConfigEnum.java
new file mode 100644
index 0000000000..a0d7e87769
--- /dev/null
+++ b/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/config/enums/InfConfigEnum.java
@@ -0,0 +1,50 @@
+package cn.iocoder.yudao.framework.common.config.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+
+/**
+ * @author syidong@aliyun.com
+ * @date 2021/5/12 22:57
+ */
+@AllArgsConstructor
+@Getter
+public enum InfConfigEnum {
+
+    YUDAO_WEB_API_LOG_ENABLE_CONFIG("是否开启apiLog key"
+            ,"yudao.web.api.log.enable"
+            ,Boolean.TRUE.toString()
+            ,ConfigGroupConstants.CONFIG_LOG_SWITCH_KEY_GROUP
+            ,InfConfigTypeEnum.SYSTEM.getType()
+            ,Boolean.FALSE
+            ,"api log 是否开启配置")
+    ,YUDAO_WEB_API_ERROR_LOG_ENABLE_CONFIG("是否开启api error log  日志 key"
+            ,"yudao.web.api.error.log.enable"
+            ,Boolean.TRUE.toString()
+            ,ConfigGroupConstants.CONFIG_LOG_SWITCH_KEY_GROUP
+            ,InfConfigTypeEnum.SYSTEM.getType()
+            ,Boolean.FALSE
+            ,"api error log 是否开启配置")
+    ,YUDAO_OPERATE_LOG_ENABLE_CONFIG("是否开启operateLog key"
+            ,"yudao.operate.log.enable"
+            ,Boolean.TRUE.toString()
+            ,ConfigGroupConstants.CONFIG_LOG_SWITCH_KEY_GROUP
+            ,InfConfigTypeEnum.SYSTEM.getType()
+            ,Boolean.FALSE
+            ,"api error log 是否开启配置");
+
+    private final String name;
+
+    private final String key;
+
+    private final String value;
+
+    private final String group;
+
+    private Integer type;
+
+    private Boolean sensitive;
+
+    private String remark;
+}
diff --git a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/enums/config/InfConfigTypeEnum.java b/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/config/enums/InfConfigTypeEnum.java
similarity index 80%
rename from yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/enums/config/InfConfigTypeEnum.java
rename to yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/config/enums/InfConfigTypeEnum.java
index 6e9fd4d35d..86c01bcc87 100644
--- a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/enums/config/InfConfigTypeEnum.java
+++ b/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/config/enums/InfConfigTypeEnum.java
@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.adminserver.modules.infra.enums.config;
+package cn.iocoder.yudao.framework.common.config.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/config/util/InfConfigUtil.java b/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/config/util/InfConfigUtil.java
new file mode 100644
index 0000000000..4d6f25fbbb
--- /dev/null
+++ b/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/config/util/InfConfigUtil.java
@@ -0,0 +1,45 @@
+package cn.iocoder.yudao.framework.common.config.util;
+
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.extra.spring.SpringUtil;
+import cn.iocoder.yudao.framework.common.config.enums.InfConfigEnum;
+
+import java.util.HashMap;
+
+import static cn.iocoder.yudao.framework.common.config.enums.InfConfigEnum.*;
+
+/**
+ * @author syidong@aliyun.com
+ * @date 2021/5/13 0:26
+ */
+public class InfConfigUtil {
+
+    private static final HashMap<String, InfConfigEnum> INIT_CONFIG = new HashMap<>();
+
+    static {
+        INIT_CONFIG.put(YUDAO_WEB_API_LOG_ENABLE_CONFIG.getKey(),YUDAO_WEB_API_LOG_ENABLE_CONFIG);
+        INIT_CONFIG.put(YUDAO_WEB_API_ERROR_LOG_ENABLE_CONFIG.getKey(),YUDAO_WEB_API_ERROR_LOG_ENABLE_CONFIG);
+        INIT_CONFIG.put(YUDAO_OPERATE_LOG_ENABLE_CONFIG.getKey(),YUDAO_OPERATE_LOG_ENABLE_CONFIG);
+    }
+
+    public static InfConfigEnum getInitConfigEnum(String key) {
+        return INIT_CONFIG.get(key);
+    }
+
+    public static boolean isEnable(String key) {
+        String enable = SpringUtil.getProperty(key);
+        return Boolean.parseBoolean(StrUtil.isBlank(enable)?Boolean.TRUE.toString():enable);
+    }
+
+    public static boolean apiLogEnable() {
+        return isEnable(YUDAO_WEB_API_LOG_ENABLE_CONFIG.getKey());
+    }
+
+    public static boolean apiErrorLogEnable() {
+        return isEnable(YUDAO_WEB_API_ERROR_LOG_ENABLE_CONFIG.getKey());
+    }
+
+    public static boolean operateLogEnable() {
+        return isEnable(YUDAO_OPERATE_LOG_ENABLE_CONFIG.getKey());
+    }
+}
diff --git a/yudao-framework/yudao-spring-boot-starter-biz-operatelog/src/main/java/cn/iocoder/yudao/framework/operatelog/core/aop/OperateLogAspect.java b/yudao-framework/yudao-spring-boot-starter-biz-operatelog/src/main/java/cn/iocoder/yudao/framework/operatelog/core/aop/OperateLogAspect.java
index 412efe5feb..7d9bf50bf3 100644
--- a/yudao-framework/yudao-spring-boot-starter-biz-operatelog/src/main/java/cn/iocoder/yudao/framework/operatelog/core/aop/OperateLogAspect.java
+++ b/yudao-framework/yudao-spring-boot-starter-biz-operatelog/src/main/java/cn/iocoder/yudao/framework/operatelog/core/aop/OperateLogAspect.java
@@ -4,6 +4,7 @@ import cn.hutool.core.exceptions.ExceptionUtil;
 import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.extra.servlet.ServletUtil;
+import cn.iocoder.yudao.framework.common.config.util.InfConfigUtil;
 import cn.iocoder.yudao.framework.common.enums.ConfigKeyConstants;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog;
@@ -67,30 +68,18 @@ public class OperateLogAspect {
      */
     private static final ThreadLocal<Map<String, Object>> EXTS = new ThreadLocal<>();
 
-    /**
-     * operateLog 开关
-     */
-    @Value(ConfigKeyConstants.SPRING_YUDAO_OPERATE_LOG_KEY)
-    private Boolean isEnable;
-
     @Resource
     private OperateLogFrameworkService operateLogFrameworkService;
 
     @Around("@annotation(apiOperation)")
     public Object around(ProceedingJoinPoint joinPoint, ApiOperation apiOperation) throws Throwable {
         // 可能也添加了 @ApiOperation 注解
-        if(!isEnable){
-            return null;
-        }
         OperateLog operateLog = getMethodAnnotation(joinPoint, OperateLog.class);
         return around0(joinPoint, operateLog, apiOperation);
     }
 
     @Around("!@annotation(io.swagger.annotations.ApiOperation) && @annotation(operateLog)") // 兼容处理，只添加 @OperateLog 注解的情况
     public Object around(ProceedingJoinPoint joinPoint, OperateLog operateLog) throws Throwable {
-        if(!isEnable){
-            return null;
-        }
         return around0(joinPoint, operateLog, null);
     }
 
@@ -100,6 +89,10 @@ public class OperateLogAspect {
         try {
             // 执行原有方法
             Object result = joinPoint.proceed();
+            // 是否记录操作日志
+            if(!InfConfigUtil.operateLogEnable()){
+                return result;
+            }
             // 记录正常执行时的操作日志
             this.log(joinPoint, operateLog, apiOperation, startTime, result, null);
             return result;
diff --git a/yudao-framework/yudao-spring-boot-starter-config/src/main/java/cn/iocoder/yudao/framework/apollo/internals/DBConfigRepository.java b/yudao-framework/yudao-spring-boot-starter-config/src/main/java/cn/iocoder/yudao/framework/apollo/internals/DBConfigRepository.java
index 095ebb26f3..03bc18a8dd 100644
--- a/yudao-framework/yudao-spring-boot-starter-config/src/main/java/cn/iocoder/yudao/framework/apollo/internals/DBConfigRepository.java
+++ b/yudao-framework/yudao-spring-boot-starter-config/src/main/java/cn/iocoder/yudao/framework/apollo/internals/DBConfigRepository.java
@@ -135,7 +135,8 @@ public class DBConfigRepository extends AbstractConfigRepository {
 
     private Properties buildProperties(List<ConfigRespDTO> configs) {
         Properties properties = propertiesFactory.getPropertiesInstance();
-        configs.stream().filter(item -> !item.getDeleted()) // 过滤掉被删除的配置
+        // 过滤掉被删除的配置
+        configs.stream().filter(item -> !item.getDeleted())
                 .forEach(config -> properties.put(config.getKey(), config.getValue()));
         return properties;
     }
diff --git a/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/apilog/core/filter/ApiAccessLogFilter.java b/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/apilog/core/filter/ApiAccessLogFilter.java
index 1cab39a1db..f8796a31b1 100644
--- a/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/apilog/core/filter/ApiAccessLogFilter.java
+++ b/yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/apilog/core/filter/ApiAccessLogFilter.java
@@ -7,6 +7,7 @@ import cn.hutool.extra.servlet.ServletUtil;
 import cn.hutool.extra.spring.SpringUtil;
 import cn.iocoder.yudao.framework.apilog.core.service.ApiAccessLogFrameworkService;
 import cn.iocoder.yudao.framework.apilog.core.service.dto.ApiAccessLogCreateDTO;
+import cn.iocoder.yudao.framework.common.config.util.InfConfigUtil;
 import cn.iocoder.yudao.framework.common.enums.ConfigKeyConstants;
 import cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
@@ -62,13 +63,13 @@ public class ApiAccessLogFilter extends OncePerRequestFilter {
             // 继续过滤器
             filterChain.doFilter(request, response);
             // api log 开关
-            if(isEnable(ConfigKeyConstants.YUDAO_WEB_API_LOG_ENABLE_KEY)){
+            if(InfConfigUtil.apiLogEnable()){
                 // 正常执行，记录日志
                 createApiAccessLog(request, beginTim, queryString, requestBody, null);
             }
         } catch (Exception ex) {
             // api log异常日志开关
-            if(isEnable(ConfigKeyConstants.YUDAO_WEB_API_ERROR_LOG_ENABLE_KEY)){
+            if(InfConfigUtil.apiErrorLogEnable()){
                 // 异常执行，记录日志
                 createApiAccessLog(request, beginTim, queryString, requestBody, ex);
             }
@@ -76,11 +77,6 @@ public class ApiAccessLogFilter extends OncePerRequestFilter {
         }
     }
 
-    private boolean isEnable(String key){
-        String enable = SpringUtil.getProperty(key);
-        return Boolean.parseBoolean(StrUtil.isBlank(enable)?Boolean.TRUE.toString():enable);
-    }
-
     private void createApiAccessLog(HttpServletRequest request, Date beginTime,
                                     Map<String, String> queryString, String requestBody, Exception ex) {
         ApiAccessLogCreateDTO accessLog = new ApiAccessLogCreateDTO();