cxc/yshopb2c
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

升级springboot版本为2.6.7、mybatis plus版本为3.5.1、pagehelper版本为1.4.2、其它依赖升级

Browse Source
This commit is contained in:
taozi
2022-05-01 14:26:46 +08:00
parent 8d424d5425
commit 31c1d0561f
211 changed files with 604 additions and 592 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
yshop-logging/src/main/java/co/yixiang/logging/aop/log/AppLog.java → yshop-logging/src/main/java/co/yixiang/modules/logging/aop/log/AppLog.java
View File

@ -3,7 +3,7 @@
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.logging.aop.log;
package co.yixiang.modules.logging.aop.log;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;

2
yshop-logging/src/main/java/co/yixiang/logging/aop/log/Log.java → yshop-logging/src/main/java/co/yixiang/modules/logging/aop/log/Log.java
View File

@ -3,7 +3,7 @@
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.logging.aop.log;
package co.yixiang.modules.logging.aop.log;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;

8
yshop-logging/src/main/java/co/yixiang/logging/aspect/LogAspect.java → yshop-logging/src/main/java/co/yixiang/modules/logging/aspect/LogAspect.java
View File

@ -3,10 +3,10 @@
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.logging.aspect;
package co.yixiang.modules.logging.aspect;
import co.yixiang.logging.domain.Log;
import co.yixiang.logging.service.LogService;
import co.yixiang.modules.logging.domain.Log;
import co.yixiang.modules.logging.service.LogService;
import co.yixiang.utils.RequestHolder;
import co.yixiang.utils.SecurityUtils;
import co.yixiang.utils.StringUtils;
@ -42,7 +42,7 @@ public class LogAspect {
/**
* 配置切入点
*/
@Pointcut("@annotation(co.yixiang.logging.aop.log.Log)")
@Pointcut("@annotation(co.yixiang.modules.logging.aop.log.Log)")
public void logPointcut() {
// 该方法无方法体,主要为了让同类中其他方法使用此切入点
}

2
yshop-logging/src/main/java/co/yixiang/logging/domain/Log.java → yshop-logging/src/main/java/co/yixiang/modules/logging/domain/Log.java
View File

@ -3,7 +3,7 @@
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.logging.domain;
package co.yixiang.modules.logging.domain;
import co.yixiang.domain.BaseDomain;
import com.baomidou.mybatisplus.annotation.TableField;

8
yshop-logging/src/main/java/co/yixiang/logging/rest/LogController.java → yshop-logging/src/main/java/co/yixiang/modules/logging/rest/LogController.java
View File

@ -3,11 +3,11 @@
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.logging.rest;
package co.yixiang.modules.logging.rest;
import co.yixiang.logging.aop.log.Log;
import co.yixiang.logging.service.LogService;
import co.yixiang.logging.service.dto.LogQueryCriteria;
import co.yixiang.modules.logging.aop.log.Log;
import co.yixiang.modules.logging.service.LogService;
import co.yixiang.modules.logging.service.dto.LogQueryCriteria;
import co.yixiang.utils.SecurityUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;

6
yshop-logging/src/main/java/co/yixiang/logging/service/LogService.java → yshop-logging/src/main/java/co/yixiang/modules/logging/service/LogService.java
View File

@ -3,11 +3,11 @@
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.logging.service;
package co.yixiang.modules.logging.service;
import co.yixiang.common.service.BaseService;
import co.yixiang.logging.domain.Log;
import co.yixiang.logging.service.dto.LogQueryCriteria;
import co.yixiang.modules.logging.domain.Log;
import co.yixiang.modules.logging.service.dto.LogQueryCriteria;
import org.aspectj.lang.ProceedingJoinPoint;
import org.springframework.data.domain.Pageable;
import org.springframework.scheduling.annotation.Async;

2
yshop-logging/src/main/java/co/yixiang/logging/service/dto/LogErrorDTO.java → yshop-logging/src/main/java/co/yixiang/modules/logging/service/dto/LogErrorDTO.java
View File

@ -3,7 +3,7 @@
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.logging.service.dto;
package co.yixiang.modules.logging.service.dto;
import lombok.Data;

2
yshop-logging/src/main/java/co/yixiang/logging/service/dto/LogQueryCriteria.java → yshop-logging/src/main/java/co/yixiang/modules/logging/service/dto/LogQueryCriteria.java
View File

@ -3,7 +3,7 @@
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.logging.service.dto;
package co.yixiang.modules.logging.service.dto;
import co.yixiang.annotation.Query;
import lombok.Data;

2
yshop-logging/src/main/java/co/yixiang/logging/service/dto/LogSmallDTO.java → yshop-logging/src/main/java/co/yixiang/modules/logging/service/dto/LogSmallDTO.java
View File

@ -3,7 +3,7 @@
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.logging.service.dto;
package co.yixiang.modules.logging.service.dto;
import lombok.Data;

38
yshop-logging/src/main/java/co/yixiang/logging/service/impl/LogServiceImpl.java → yshop-logging/src/main/java/co/yixiang/modules/logging/service/impl/LogServiceImpl.java
View File

@ -3,7 +3,7 @@
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.logging.service.impl;
package co.yixiang.modules.logging.service.impl;
import cn.hutool.core.lang.Dict;
import cn.hutool.core.util.ObjectUtil;
@ -11,13 +11,13 @@ import cn.hutool.json.JSONObject;
import co.yixiang.common.service.impl.BaseServiceImpl;
import co.yixiang.common.utils.QueryHelpPlus;
import co.yixiang.dozer.service.IGenerator;
import co.yixiang.logging.aop.log.AppLog;
import co.yixiang.logging.aop.log.Log;
import co.yixiang.logging.service.LogService;
import co.yixiang.logging.service.dto.LogErrorDTO;
import co.yixiang.logging.service.dto.LogQueryCriteria;
import co.yixiang.logging.service.dto.LogSmallDTO;
import co.yixiang.logging.service.mapper.LogMapper;
import co.yixiang.modules.logging.aop.log.AppLog;
import co.yixiang.modules.logging.aop.log.Log;
import co.yixiang.modules.logging.service.LogService;
import co.yixiang.modules.logging.service.dto.LogErrorDTO;
import co.yixiang.modules.logging.service.dto.LogQueryCriteria;
import co.yixiang.modules.logging.service.dto.LogSmallDTO;
import co.yixiang.modules.logging.service.mapper.LogMapper;
import co.yixiang.utils.FileUtil;
import co.yixiang.utils.StringUtils;
import co.yixiang.utils.ValidationUtil;
@ -44,7 +44,7 @@ import java.util.Map;
@SuppressWarnings("unchecked")
@Service
@Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class)
public class LogServiceImpl extends BaseServiceImpl<LogMapper, co.yixiang.logging.domain.Log> implements LogService {
public class LogServiceImpl extends BaseServiceImpl<LogMapper, co.yixiang.modules.logging.domain.Log> implements LogService {
private final LogMapper logMapper;
@ -59,7 +59,7 @@ public class LogServiceImpl extends BaseServiceImpl<LogMapper, co.yixiang.loggin
@Override
public Object findAllByPageable(String nickname, Pageable pageable) {
getPage(pageable);
PageInfo<co.yixiang.logging.domain.Log> page = new PageInfo<>(logMapper.findAllByPageable(nickname));
PageInfo<co.yixiang.modules.logging.domain.Log> page = new PageInfo<>(logMapper.findAllByPageable(nickname));
Map<String,Object> map = new LinkedHashMap<>(2);
map.put("content",page.getList());
map.put("totalElements",page.getTotal());
@ -71,7 +71,7 @@ public class LogServiceImpl extends BaseServiceImpl<LogMapper, co.yixiang.loggin
public Object queryAll(LogQueryCriteria criteria, Pageable pageable){
getPage(pageable);
PageInfo<co.yixiang.logging.domain.Log> page = new PageInfo<>(queryAll(criteria));
PageInfo<co.yixiang.modules.logging.domain.Log> page = new PageInfo<>(queryAll(criteria));
Map<String, Object> map = new LinkedHashMap<>(2);
String status = "ERROR";
if(status.equals(criteria.getLogType())){
@ -84,14 +84,14 @@ public class LogServiceImpl extends BaseServiceImpl<LogMapper, co.yixiang.loggin
}
@Override
public List<co.yixiang.logging.domain.Log> queryAll(LogQueryCriteria criteria) {
return baseMapper.selectList(QueryHelpPlus.getPredicate(co.yixiang.logging.domain.Log.class, criteria));
public List<co.yixiang.modules.logging.domain.Log> queryAll(LogQueryCriteria criteria) {
return baseMapper.selectList(QueryHelpPlus.getPredicate(co.yixiang.modules.logging.domain.Log.class, criteria));
}
@Override
public Object queryAllByUser(LogQueryCriteria criteria, Pageable pageable) {
getPage(pageable);
PageInfo<co.yixiang.logging.domain.Log> page = new PageInfo<>(queryAll(criteria));
PageInfo<co.yixiang.modules.logging.domain.Log> page = new PageInfo<>(queryAll(criteria));
Map<String, Object> map = new LinkedHashMap<>(2);
map.put("content", generator.convert(page.getList(), LogSmallDTO.class));
map.put("totalElements", page.getTotal());
@ -102,7 +102,7 @@ public class LogServiceImpl extends BaseServiceImpl<LogMapper, co.yixiang.loggin
@Override
@Transactional(rollbackFor = Exception.class)
public void save(String username, String ip, ProceedingJoinPoint joinPoint,
co.yixiang.logging.domain.Log log, Long uid){
co.yixiang.modules.logging.domain.Log log, Long uid){
MethodSignature signature = (MethodSignature) joinPoint.getSignature();
Method method = signature.getMethod();
@ -152,7 +152,7 @@ public class LogServiceImpl extends BaseServiceImpl<LogMapper, co.yixiang.loggin
@Override
@Transactional(rollbackFor = Exception.class)
public void saveApp(String username, String ip, ProceedingJoinPoint joinPoint,
co.yixiang.logging.domain.Log log, Long uid){
co.yixiang.modules.logging.domain.Log log, Long uid){
MethodSignature signature = (MethodSignature) joinPoint.getSignature();
Method method = signature.getMethod();
@ -200,16 +200,16 @@ public class LogServiceImpl extends BaseServiceImpl<LogMapper, co.yixiang.loggin
}
@Override
public Object findByErrDetail(Long id) {
co.yixiang.logging.domain.Log log = this.getById(id);
co.yixiang.modules.logging.domain.Log log = this.getById(id);
ValidationUtil.isNull( log.getId(),"Log","id", id);
byte[] details = log.getExceptionDetail();
return Dict.create().set("exception",new String(ObjectUtil.isNotNull(details) ? details : "".getBytes()));
}
@Override
public void download(List<co.yixiang.logging.domain.Log> logs, HttpServletResponse response) throws IOException {
public void download(List<co.yixiang.modules.logging.domain.Log> logs, HttpServletResponse response) throws IOException {
List<Map<String, Object>> list = new ArrayList<>();
for (co.yixiang.logging.domain.Log log : logs) {
for (co.yixiang.modules.logging.domain.Log log : logs) {
Map<String,Object> map = new LinkedHashMap<>();
map.put("用户名", log.getUsername());
map.put("IP", log.getRequestIp());

4
yshop-logging/src/main/java/co/yixiang/logging/service/mapper/LogMapper.java → yshop-logging/src/main/java/co/yixiang/modules/logging/service/mapper/LogMapper.java
View File

@ -3,10 +3,10 @@
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.logging.service.mapper;
package co.yixiang.modules.logging.service.mapper;
import co.yixiang.common.mapper.CoreMapper;
import co.yixiang.logging.domain.Log;
import co.yixiang.modules.logging.domain.Log;
import org.apache.ibatis.annotations.Delete;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;