maxjhandsome
/
ruoyi-vue-pro
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

添加没有配置的时候插入默认配置

This commit is contained in:
shiyidong 2021-05-13 02:47:11 +08:00
parent 102cafa9a6
commit 0259e4ffe5
20 changed files with 251 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/controller/config/InfConfigController.java
View File

@ -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);

3
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/convert/config/InfConfigConvert.java
View File

@ -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);
}

3
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/dal/dataobject/config/InfConfigDO.java
View File

@ -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;

31
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/service/config/impl/InfConfigServiceImpl.java
View File

@ -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();
}

6
yudao-admin-server/src/test/java/cn/iocoder/yudao/adminserver/modules/infra/service/config/InfConfigServiceTest.java
View File

@ -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;

8
yudao-admin-server/src/test/java/cn/iocoder/yudao/adminserver/modules/system/service/errorcode/SysErrorCodeServiceTest.java
View File

@ -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.*;

68
yudao-admin-ui/src/components/LogSwitch/index.vue Normal file
View File

@ -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>

4
yudao-admin-ui/src/main.js
View File

@ -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);

4
yudao-admin-ui/src/utils/constants.js
View File

@ -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',
}

14
yudao-admin-ui/src/views/infra/apiAccessLog/index.vue
View File

@ -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 {
// 遮罩层

4
yudao-admin-ui/src/views/infra/apiErrorLog/index.vue
View File

@ -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>

4
yudao-admin-ui/src/views/system/operatelog/index.vue
View File

@ -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>

5
yudao-framework/yudao-common/pom.xml
View File

@ -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>

13
yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/config/enums/ConfigGroupConstants.java Normal file
View File

@ -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";
}

50
yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/config/enums/InfConfigEnum.java Normal file
View File

@ -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;
}

2
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/enums/config/InfConfigTypeEnum.java → yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/config/enums/InfConfigTypeEnum.java
View File

@ -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;

45
yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/config/util/InfConfigUtil.java Normal file
View File

@ -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());
}
}

17
yudao-framework/yudao-spring-boot-starter-biz-operatelog/src/main/java/cn/iocoder/yudao/framework/operatelog/core/aop/OperateLogAspect.java
View File

@ -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;

3
yudao-framework/yudao-spring-boot-starter-config/src/main/java/cn/iocoder/yudao/framework/apollo/internals/DBConfigRepository.java
View File

@ -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;
}

10
yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/apilog/core/filter/ApiAccessLogFilter.java
View File

@ -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();