Merge remote-tracking branch 'origin/master'

master
bynt 1 year ago
commit a3e0166e2a

@ -1,36 +1,36 @@
package com.baiye.aspect;
import com.baiye.common.CommonLog;
import lombok.extern.slf4j.Slf4j;
import org.aspectj.lang.JoinPoint;
import org.aspectj.lang.annotation.*;
import org.springframework.stereotype.Component;
import java.util.Arrays;
/**
* @Author YQY
* @Date 2023/5/24
*/
@Component
@Aspect
@Slf4j
public class BadRequestExceptionAspect {
/**
*
*/
@Pointcut("execution(* com.baiye.exception.handler.GlobalExceptionHandler.badRequestException(..))")
public void badRequestExceptionPointcut() {
}
@Before("badRequestExceptionPointcut()")
public void bb(JoinPoint joinPoint) {
Object[] args = joinPoint.getArgs();
if (args.length > 0) {
String str = Arrays.toString(args);
int index = str.indexOf(':');
if (index != -1) CommonLog.error(str.substring(index + 1, str.length() - 1));
}
}
}
//package com.baiye.aspect;
//
//import com.baiye.common.CommonLog;
//import lombok.extern.slf4j.Slf4j;
//import org.aspectj.lang.JoinPoint;
//import org.aspectj.lang.annotation.*;
//import org.springframework.stereotype.Component;
//
//import java.util.Arrays;
//
///**
// * @Author YQY
// * @Date 2023/5/24
// */
//@Component
//@Aspect
//@Slf4j
//public class BadRequestExceptionAspect {
//
// /**
// * 配置切入点
// */
// @Pointcut("execution(* com.baiye.exception.handler.GlobalExceptionHandler.badRequestException(..))")
// public void badRequestExceptionPointcut() {
// }
//
// @Before("badRequestExceptionPointcut()")
// public void badRequestExceptionBefore(JoinPoint joinPoint) {
// Object[] args = joinPoint.getArgs();
// if (args.length > 0) {
// String str = Arrays.toString(args);
// int index = str.indexOf(':');
// if (index != -1) CommonLog.error(str.substring(index + 1, str.length() - 1));
// }
// }
//}

@ -38,6 +38,7 @@ public class LogAspect {
private final SystemClient systemClient;
ThreadLocal<Long> currentTime = new ThreadLocal<>();
private final String SYSTEM_TYPE = "systemType";
public LogAspect(SystemClient systemClient) {
this.systemClient = systemClient;
@ -86,8 +87,8 @@ public class LogAspect {
String ip = RequestUtils.getIp(request);
// 插入数据库的日志
LogReqDTO logReqDTO = this.install(joinPoint, controllerLog, ip, e);
if (controllerLog.isSaveMySQL()) {
LogReqDTO logReqDTO = this.install(joinPoint, null, ip, e);
logReqDTO.setLogType(LogType.ERROR);
logReqDTO.setTime(System.currentTimeMillis() - currentTime.get());
logReqDTO.setBrowser(RequestUtils.getBrowser(request));
@ -107,13 +108,9 @@ public class LogAspect {
Object[] args = joinPoint.getArgs();
// 方法路径
String methodName = joinPoint.getTarget().getClass().getName() + "." + signature.getName() + "()";
String reqParam = argsArrayToString(args);
String reqParams = StringUtils.substring(reqParam, 0, 2000);
String reqMethod = ServletUtil.getRequest().getMethod();
if (e == null) {
MDC.put("userId", this.getUserId());
MDC.put("userName", this.getUsername());
MDC.put("reqIp", ip);
@ -121,11 +118,12 @@ public class LogAspect {
MDC.put("params", reqParams);
MDC.put("reqMethod", reqMethod);
MDC.put("reqUrl", Objects.requireNonNull(ServletUtil.getRequest()).getRequestURI());
MDC.put(SYSTEM_TYPE, String.valueOf(DefaultNumberConstants.ONE_NUMBER));
if (controllerLog != null) {
MDC.put("businessPartyType", controllerLog.BusinessPartyType());
logReqDTO.setDescription(controllerLog.value());
}
}
StringBuilder params = new StringBuilder("{");
//参数值
List<Object> argValues = new ArrayList<>(Arrays.asList(args));
@ -143,10 +141,12 @@ public class LogAspect {
logReqDTO.setUsername(getUsername());
if (e == null) {
MDC.put("systemType", String.valueOf(DefaultNumberConstants.ONE_NUMBER));
log.info("{}", controllerLog.value());
MDC.remove("systemType");
if (controllerLog != null) log.info("{}", controllerLog.value());
}else {
// if (controllerLog != null) log.error("{}", controllerLog.value() + "失败\n错误信息" + ThrowableUtil.getStackTrace(e).substring(0, 2000));
if (controllerLog != null) log.error("{}", controllerLog.value() + "失败;\n错误信息" + e.getMessage());
}
MDC.remove(SYSTEM_TYPE);
return logReqDTO;
}

@ -75,7 +75,7 @@ public class LogServiceImpl implements LogService {
return PageUtil.toPage(page.map(logSmallMapper::toDto));
}
// @Override
// @Override
// @Transactional(rollbackFor = Exception.class)
// public void save(String username, String browser, String ip, ProceedingJoinPoint joinPoint, LogEntity logEntity) {
//
@ -211,7 +211,7 @@ public class LogServiceImpl implements LogService {
filter.must(QueryBuilders.termQuery("businessPartyType", query.getBusinessPartyType()));
}
if (StringUtils.isNotBlank(query.getUserName())) {
filter.must(QueryBuilders.matchQuery("userName", query.getUserName()));
filter.must(QueryBuilders.matchPhraseQuery("userName", query.getUserName()));
}
if (StringUtils.isNotBlank(query.getSystemType())) {
filter.must(QueryBuilders.termQuery("systemType", query.getSystemType()));

@ -144,7 +144,7 @@ public class TelephoneCallController {
}
telephoneCallService.rollCallBack(rollCallBackDTO);
} catch (Exception e) {
CommonLog.error("点呼回调话单错误:" + json);
CommonLog.error("点呼回调,处理错误:" + json);
return CommonResponse.createByError();
}
return CommonResponse.createBySuccess();

@ -7,6 +7,7 @@ import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.stereotype.Repository;
import java.util.Date;
import java.util.List;
/**
@ -35,10 +36,11 @@ public interface AllCallInfoRepository extends JpaRepository<AllCallInfo, Long>,
* @param recordFlag
* @param recordFileDownloadUrl
* @param id
* @param createTime
*/
@Modifying
@Query(value = "update AllCallInfo d set d.recordFlag =?1 , d.recordFileDownloadUrl = ?2 where d.id =?3")
void updateByRecord(Integer recordFlag, String recordFileDownloadUrl, Long id);
@Query(value = "update AllCallInfo d set d.recordFlag =?1 , d.recordFileDownloadUrl = ?2 ,d.createTime=?4 where d.id =?3")
void updateByRecord(Integer recordFlag, String recordFileDownloadUrl, Long id, Date createTime);
/**
*

@ -300,7 +300,7 @@ public class TelephoneCallServiceImpl implements TelephoneCallService {
//相同说明是分机号的回调
if (sessionId.equals(otherLeg) && StrUtil.isNotBlank(rollCallBackDTO.getRecord_file_url())) {
CommonLog.infoBusinessPartyTypeNewTraceId("分机回调-点呼:" + rollCallBackDTO, BusinessPartyType.DB, traceId);
allCallInfoRepository.updateByRecord(DefaultNumberConstants.ONE_NUMBER, rollCallBackDTO.getRecord_file_url(), allCallInfo.getId());
allCallInfoRepository.updateByRecord(DefaultNumberConstants.ONE_NUMBER, rollCallBackDTO.getRecord_file_url(), allCallInfo.getId(), DateUtil.date());
} else {
CommonLog.infoBusinessPartyType("被叫回调-点呼:" + rollCallBackDTO, BusinessPartyType.DB);
UserDto user = userService.findById(allCallInfo.getMemberId());

@ -0,0 +1,35 @@
package com.baiye.timed;
import cn.hutool.core.date.DateUtil;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.time.DateUtils;
import org.springframework.data.elasticsearch.core.ElasticsearchOperations;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import java.util.Date;
/**
* @Author YQY
* @Date 2023/5/29
*/
@Component
@RequiredArgsConstructor
@Slf4j
public class ElasticsearchTask {
private final ElasticsearchOperations elasticsearchOperations;
/**
* es,logstash
*/
@Scheduled(cron = "0 0 2 * * ?")
public void removeIndex() {
log.info("定时任务删除es索引开始");
Date startDate = DateUtils.addDays(new Date(), -30);
String format = DateUtil.format(startDate, "yyyy.MM.dd");
elasticsearchOperations.deleteIndex("logstash-" + format);
log.info("删除es索引结束");
}
}

@ -32,7 +32,7 @@ public class FileTask {
@Scheduled(cron = "0 0 3 * * ? ")
@Transactional(rollbackFor = Exception.class)
public void compress() throws Exception {
CommonLog.info("---开始压缩文件夹---");
log.info("---开始压缩文件夹---");
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
DateTime date = DateUtil.yesterday();
String path = URL + dateFormat.format(date);
@ -48,7 +48,7 @@ public class FileTask {
@Scheduled(cron = "0 0 1 * * ? ")
@Transactional(rollbackFor = Exception.class)
public void emptyLog(){
CommonLog.info("---清空日志---");
log.info("---清空日志---");
turnCrmLogRepository.deleteAll();
}
}

Loading…
Cancel
Save