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

v2.2 正式发布，移除jpa升级后台为mytisplus

Browse Source
This commit is contained in:
xuwenbo
2020-05-19 12:29:07 +08:00
parent 7a69a2abaf
commit 5db1bd8b35
902 changed files with 22572 additions and 18839 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,9 @@
package co.yixiang.aop.log;
/**
* Copyright (C) 2018-2020
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.logging.aop.log;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
@ -6,7 +11,7 @@ import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
/**
* @author Zheng Jie
* @author hupeng
* @date 2018-11-24
*/
@Target(ElementType.METHOD)

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

@ -1,8 +1,13 @@
package co.yixiang.aspect;
/**
* Copyright (C) 2018-2020
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.logging.aspect;
import lombok.extern.slf4j.Slf4j;
import co.yixiang.domain.Log;
import co.yixiang.service.LogService;
import co.yixiang.logging.domain.Log;
import co.yixiang.logging.service.LogService;
import co.yixiang.utils.RequestHolder;
import co.yixiang.utils.SecurityUtils;
import co.yixiang.utils.StringUtils;
@ -18,7 +23,7 @@ import org.springframework.stereotype.Component;
import javax.servlet.http.HttpServletRequest;
/**
* @author Zheng Jie
* @author hupeng
* @date 2018-11-24
*/
@Component
@ -37,7 +42,7 @@ public class LogAspect {
/**
* 配置切入点
*/
@Pointcut("@annotation(co.yixiang.aop.log.Log)")
@Pointcut("@annotation(co.yixiang.logging.aop.log.Log)")
public void logPointcut() {
// 该方法无方法体,主要为了让同类中其他方法使用此切入点
}

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

@ -1,5 +1,14 @@
package co.yixiang.domain;
/**
* Copyright (C) 2018-2020
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.logging.domain;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import lombok.NoArgsConstructor;
import org.hibernate.annotations.CreationTimestamp;
@ -8,22 +17,23 @@ import java.io.Serializable;
import java.sql.Timestamp;
/**
* @author Zheng Jie
* @author hupeng
* @date 2018-11-24
*/
@Entity
@Data
@Table(name = "log")
@TableName("log")
@NoArgsConstructor
public class Log implements Serializable {
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@TableId
private Long id;
/** 操作用户 */
private String username;
@TableField(exist = false)
private String nickname;
/** 描述 */
private String description;
@ -35,19 +45,15 @@ public class Log implements Serializable {
private Integer type;
/** 参数 */
@Column(columnDefinition = "text")
private String params;
/** 日志类型 */
@Column(name = "log_type")
private String logType;
/** 请求ip */
@Column(name = "request_ip")
private String requestIp;
/** 地址 */
@Column(name = "address")
private String address;
/** 浏览器 */
@ -57,12 +63,10 @@ public class Log implements Serializable {
private Long time;
/** 异常详细 */
@Column(name = "exception_detail", columnDefinition = "text")
private byte[] exceptionDetail;
/** 创建日期 */
@CreationTimestamp
@Column(name = "create_time")
@TableField(fill = FieldFill.INSERT)
private Timestamp createTime;
public Log(String logType, Long time) {

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

@ -1,10 +1,15 @@
package co.yixiang.rest;
/**
* Copyright (C) 2018-2020
* All rights reserved, Designed By www.yixiang.co
import co.yixiang.aop.log.Log;
*/
package co.yixiang.logging.rest;
import co.yixiang.logging.aop.log.Log;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import co.yixiang.service.LogService;
import co.yixiang.service.dto.LogQueryCriteria;
import co.yixiang.logging.service.LogService;
import co.yixiang.logging.service.dto.LogQueryCriteria;
import co.yixiang.utils.SecurityUtils;
import org.springframework.data.domain.Pageable;
import org.springframework.http.HttpStatus;
@ -15,7 +20,7 @@ import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
/**
* @author Zheng Jie
* @author hupeng
* @date 2018-11-24
*/
@RestController
@ -33,7 +38,7 @@ public class LogController {
@Log("导出数据")
@ApiOperation("导出数据")
@GetMapping(value = "/download")
@PreAuthorize("@el.check()")
@PreAuthorize("@el.check('admin','log:list')")
public void download(HttpServletResponse response, LogQueryCriteria criteria) throws IOException {
criteria.setLogType("INFO");
logService.download(logService.queryAll(criteria), response);
@ -42,21 +47,21 @@ public class LogController {
@Log("导出错误数据")
@ApiOperation("导出错误数据")
@GetMapping(value = "/error/download")
@PreAuthorize("@el.check()")
@PreAuthorize("@el.check('admin','log:list')")
public void errorDownload(HttpServletResponse response, LogQueryCriteria criteria) throws IOException {
criteria.setLogType("ERROR");
logService.download(logService.queryAll(criteria), response);
}
@GetMapping
@ApiOperation("日志查询")
@PreAuthorize("@el.check()")
@PreAuthorize("@el.check('admin','log:list')")
public ResponseEntity<Object> getLogs(LogQueryCriteria criteria, Pageable pageable){
criteria.setLogType("INFO");
criteria.setType(0);
return new ResponseEntity<>(logService.queryAll(criteria,pageable), HttpStatus.OK);
}
@GetMapping(value = "/mlogs")
@PreAuthorize("@el.check()")
@PreAuthorize("@el.check('admin','log:list')")
public ResponseEntity getApiLogs(LogQueryCriteria criteria, Pageable pageable){
criteria.setLogType("INFO");
criteria.setType(1);
@ -72,7 +77,7 @@ public class LogController {
@GetMapping(value = "/error")
@ApiOperation("错误日志查询")
@PreAuthorize("@el.check()")
@PreAuthorize("@el.check('admin','logError:list')")
public ResponseEntity<Object> getErrorLogs(LogQueryCriteria criteria, Pageable pageable){
criteria.setLogType("ERROR");
return new ResponseEntity<>(logService.queryAll(criteria,pageable), HttpStatus.OK);
@ -80,14 +85,14 @@ public class LogController {
@GetMapping(value = "/error/{id}")
@ApiOperation("日志异常详情查询")
@PreAuthorize("@el.check()")
@PreAuthorize("@el.check('admin','logError:detail')")
public ResponseEntity<Object> getErrorLogs(@PathVariable Long id){
return new ResponseEntity<>(logService.findByErrDetail(id), HttpStatus.OK);
}
@DeleteMapping(value = "/del/error")
@Log("删除所有ERROR日志")
@ApiOperation("删除所有ERROR日志")
@PreAuthorize("@el.check()")
@PreAuthorize("@el.check('admin','logError:remove')")
public ResponseEntity<Object> delAllByError(){
logService.delAllByError();
return new ResponseEntity<>(HttpStatus.OK);
@ -96,7 +101,7 @@ public class LogController {
@DeleteMapping(value = "/del/info")
@Log("删除所有INFO日志")
@ApiOperation("删除所有INFO日志")
@PreAuthorize("@el.check()")
@PreAuthorize("@el.check('admin','logInfo:remove')")
public ResponseEntity<Object> delAllByInfo(){
logService.delAllByInfo();
return new ResponseEntity<>(HttpStatus.OK);

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

@ -1,7 +1,13 @@
package co.yixiang.service;
/**
* Copyright (C) 2018-2020
* All rights reserved, Designed By www.yixiang.co
import co.yixiang.domain.Log;
import co.yixiang.service.dto.LogQueryCriteria;
*/
package co.yixiang.logging.service;
import co.yixiang.logging.domain.Log;
import co.yixiang.common.service.BaseService;
import co.yixiang.logging.service.dto.LogQueryCriteria;
import org.aspectj.lang.ProceedingJoinPoint;
import org.springframework.data.domain.Pageable;
import org.springframework.scheduling.annotation.Async;
@ -11,10 +17,10 @@ import java.io.IOException;
import java.util.List;
/**
* @author Zheng Jie
* @author hupeng
* @date 2018-11-24
*/
public interface LogService {
public interface LogService extends BaseService<Log> {

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

@ -1,11 +1,16 @@
package co.yixiang.service.dto;
/**
* Copyright (C) 2018-2020
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.logging.service.dto;
import lombok.Data;
import java.io.Serializable;
import java.sql.Timestamp;
/**
* @author Zheng Jie
* @author hupeng
* @date 2019-5-22
*/
@Data
@ -28,4 +33,4 @@ public class LogErrorDTO implements Serializable {
private String address;
private Timestamp createTime;
}
}

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

@ -1,13 +1,18 @@
package co.yixiang.service.dto;
/**
* Copyright (C) 2018-2020
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.logging.service.dto;
import lombok.Data;
import co.yixiang.annotation.Query;
import lombok.Data;
import java.sql.Timestamp;
import java.util.List;
/**
* 日志查询类
* @author Zheng Jie
* @author hupeng
* @date 2019-6-4 09:23:07
*/
@Data

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

@ -1,11 +1,16 @@
package co.yixiang.service.dto;
/**
* Copyright (C) 2018-2020
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.logging.service.dto;
import lombok.Data;
import java.io.Serializable;
import java.sql.Timestamp;
/**
* @author Zheng Jie
* @author hupeng
* @date 2019-5-22
*/
@Data

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

@ -1,18 +1,26 @@
package co.yixiang.service.impl;
/**
* Copyright (C) 2018-2020
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.logging.service.impl;
import cn.hutool.core.lang.Dict;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.json.JSONObject;
import co.yixiang.domain.Log;
import co.yixiang.repository.LogRepository;
import co.yixiang.service.LogService;
import co.yixiang.service.dto.LogQueryCriteria;
import co.yixiang.service.mapper.LogErrorMapper;
import co.yixiang.service.mapper.LogSmallMapper;
import co.yixiang.logging.aop.log.Log;
import co.yixiang.logging.service.mapper.LogMapper;
import co.yixiang.common.service.impl.BaseServiceImpl;
import co.yixiang.common.utils.QueryHelpPlus;
import co.yixiang.dozer.service.IGenerator;
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.utils.*;
import com.github.pagehelper.PageInfo;
import org.aspectj.lang.ProceedingJoinPoint;
import org.aspectj.lang.reflect.MethodSignature;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
@ -27,64 +35,74 @@ import java.util.List;
import java.util.Map;
/**
* @author Zheng Jie
* @author hupeng
* @date 2018-11-24
*/
@Service
@Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class)
public class LogServiceImpl implements LogService {
public class LogServiceImpl extends BaseServiceImpl<LogMapper, co.yixiang.logging.domain.Log> implements LogService {
private final LogRepository logRepository;
private final LogErrorMapper logErrorMapper;
private final LogMapper logMapper;
private final LogSmallMapper logSmallMapper;
private final IGenerator generator;
public LogServiceImpl(LogMapper logMapper, IGenerator generator) {
this.logMapper = logMapper;
this.generator = generator;
}
@Override
public Object findAllByPageable(String nickname, Pageable pageable) {
Page<Map> page = logRepository.findAllByPageable(nickname,pageable);
getPage(pageable);
PageInfo<co.yixiang.logging.domain.Log> page = new PageInfo<>(logMapper.findAllByPageable(nickname));
Map<String,Object> map = new LinkedHashMap<>(2);
map.put("content",page.getContent());
map.put("totalElements",page.getTotalElements());
map.put("content",page.getList());
map.put("totalElements",page.getTotal());
return map;
}
public LogServiceImpl(LogRepository logRepository, LogErrorMapper logErrorMapper, LogSmallMapper logSmallMapper) {
this.logRepository = logRepository;
this.logErrorMapper = logErrorMapper;
this.logSmallMapper = logSmallMapper;
}
@Override
public Object queryAll(LogQueryCriteria criteria, Pageable pageable){
Page<Log> page = logRepository.findAll(((root, criteriaQuery, cb) -> QueryHelp.getPredicate(root, criteria, cb)),pageable);
getPage(pageable);
PageInfo<co.yixiang.logging.domain.Log> page = new PageInfo<>(queryAll(criteria));
Map<String, Object> map = new LinkedHashMap<>(2);
String status = "ERROR";
if (status.equals(criteria.getLogType())) {
return PageUtil.toPage(page.map(logErrorMapper::toDto));
if(status.equals(criteria.getLogType())){
map.put("content", generator.convert(page.getList(), LogErrorDTO.class));
map.put("totalElements", page.getTotal());
}
return page;
map.put("content", page.getList());
map.put("totalElements", page.getTotal());
return map;
}
@Override
public List<Log> queryAll(LogQueryCriteria criteria) {
return logRepository.findAll(((root, criteriaQuery, cb) -> QueryHelp.getPredicate(root, criteria, cb)));
public List<co.yixiang.logging.domain.Log> queryAll(LogQueryCriteria criteria) {
return baseMapper.selectList(QueryHelpPlus.getPredicate(co.yixiang.logging.domain.Log.class, criteria));
}
@Override
public Object queryAllByUser(LogQueryCriteria criteria, Pageable pageable) {
Page<Log> page = logRepository.findAll(((root, criteriaQuery, cb) -> QueryHelp.getPredicate(root, criteria, cb)),pageable);
return PageUtil.toPage(page.map(logSmallMapper::toDto));
getPage(pageable);
PageInfo<co.yixiang.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());
return map;
}
@Override
@Transactional(rollbackFor = Exception.class)
public void save(String username, String ip, ProceedingJoinPoint joinPoint,
Log log,Long uid){
co.yixiang.logging.domain.Log log, Long uid){
MethodSignature signature = (MethodSignature) joinPoint.getSignature();
Method method = signature.getMethod();
co.yixiang.aop.log.Log aopLog = method.getAnnotation(co.yixiang.aop.log.Log.class);
Log aopLog = method.getAnnotation(Log.class);
// 方法路径
String methodName = joinPoint.getTarget().getClass().getName()+"."+signature.getName()+"()";
@ -124,21 +142,21 @@ public class LogServiceImpl implements LogService {
log.setMethod(methodName);
log.setUsername(username);
log.setParams(params.toString() + " }");
logRepository.save(log);
this.save(log);
}
@Override
public Object findByErrDetail(Long id) {
Log log = logRepository.findById(id).orElseGet(Log::new);
co.yixiang.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<Log> logs, HttpServletResponse response) throws IOException {
public void download(List<co.yixiang.logging.domain.Log> logs, HttpServletResponse response) throws IOException {
List<Map<String, Object>> list = new ArrayList<>();
for (Log log : logs) {
for (co.yixiang.logging.domain.Log log : logs) {
Map<String,Object> map = new LinkedHashMap<>();
map.put("用户名", log.getUsername());
map.put("IP", log.getRequestIp());
@ -156,12 +174,12 @@ public class LogServiceImpl implements LogService {
@Override
@Transactional(rollbackFor = Exception.class)
public void delAllByError() {
logRepository.deleteByLogType("ERROR");
logMapper.deleteByLogType("ERROR");
}
@Override
@Transactional(rollbackFor = Exception.class)
public void delAllByInfo() {
logRepository.deleteByLogType("INFO");
logMapper.deleteByLogType("INFO");
}
}

33
yshop-logging/src/main/java/co/yixiang/logging/service/mapper/LogMapper.java Normal file
View File

@ -0,0 +1,33 @@
/**
* Copyright (C) 2018-2020
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.logging.service.mapper;
import co.yixiang.common.mapper.CoreMapper;
import co.yixiang.logging.domain.Log;
import org.apache.ibatis.annotations.Delete;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import org.springframework.stereotype.Repository;
import java.util.List;
/**
* @author hupeng
* @date 2019-5-22
*/
@Repository
@Mapper
public interface LogMapper extends CoreMapper<Log> {
@Delete("delete from log where log_type = #{logType}")
void deleteByLogType(@Param("logType") String logType);
@Select("<script>select l.id,l.create_time as createTime,l.description, l.request_ip as requestIp,l.address,u.nickname from log l " +
" left join yx_user u on u.uid=l.uid where l.type=1 " +
" <if test = \"nickname !=null\"> and u.nickname LIKE CONCAT('%',#{nickname},'%')</if> order by l.id desc</script>")
List<Log> findAllByPageable(@Param("nickname") String nickname);
@Select( "select count(*) FROM (select request_ip FROM log where create_time between #{date1} and #{date2} GROUP BY request_ip) as s")
long findIp(@Param("date1") String date1, @Param("date2")String date2);
}

50
yshop-logging/src/main/java/co/yixiang/repository/LogRepository.java
View File

@ -1,50 +0,0 @@
package co.yixiang.repository;
import co.yixiang.domain.Log;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.stereotype.Repository;
import java.util.Map;
/**
* @author Zheng Jie
* @date 2018-11-24
*/
@Repository
public interface LogRepository extends JpaRepository<Log,Long>, JpaSpecificationExecutor<Log> {
@Query(nativeQuery = true,
value = "select l.id,l.create_time as createTime,l.description," +
"l.request_ip as requestIp,l.address," +
"u.nickname from log l left join yx_user u on u.uid=l.uid " +
" where l.type=1" +
" and if(?1 !='',u.nickname LIKE CONCAT('%',?1,'%'),1=1) order by l.id desc",
countQuery = "select count(*) from log l left join yx_user u on u.uid=l.uid" +
" where l.type=1 " +
"and if(?1 !='',u.nickname LIKE CONCAT('%',?1,'%'),1=1)")
Page<Map> findAllByPageable(String nickname,
Pageable pageable);
/**
* 获取一个时间段的IP记录
* @param date1 startTime
* @param date2 entTime
* @return IP数目
*/
@Query(value = "select count(*) FROM (select request_ip FROM log where create_time between ?1 and ?2 GROUP BY request_ip) as s",nativeQuery = true)
Long findIp(String date1, String date2);
/**
* 根据日志类型删除信息
* @param logType 日志类型
*/
@Query(nativeQuery = true,value = "delete from log where log_type = ?1")
@Modifying
void deleteByLogType(String logType);
}

16
yshop-logging/src/main/java/co/yixiang/service/mapper/LogErrorMapper.java
View File

@ -1,16 +0,0 @@
package co.yixiang.service.mapper;
import co.yixiang.domain.Log;
import co.yixiang.service.dto.LogErrorDTO;
import co.yixiang.base.BaseMapper;
import org.mapstruct.Mapper;
import org.mapstruct.ReportingPolicy;
/**
* @author Zheng Jie
* @date 2019-5-22
*/
@Mapper(componentModel = "spring",unmappedTargetPolicy = ReportingPolicy.IGNORE)
public interface LogErrorMapper extends BaseMapper<LogErrorDTO, Log> {
}

16
yshop-logging/src/main/java/co/yixiang/service/mapper/LogSmallMapper.java
View File

@ -1,16 +0,0 @@
package co.yixiang.service.mapper;
import co.yixiang.domain.Log;
import co.yixiang.base.BaseMapper;
import co.yixiang.service.dto.LogSmallDTO;
import org.mapstruct.Mapper;
import org.mapstruct.ReportingPolicy;
/**
* @author Zheng Jie
* @date 2019-5-22
*/
@Mapper(componentModel = "spring",unmappedTargetPolicy = ReportingPolicy.IGNORE)
public interface LogSmallMapper extends BaseMapper<LogSmallDTO, Log> {
}