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

规范包名

Browse Source
This commit is contained in:
xuwenbo
2020-05-14 15:29:47 +08:00
parent 4dfefab907
commit e2fd708ee3
78 changed files with 129 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
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

@ -6,7 +6,7 @@
* 购买后可获得全部源代码（禁止转卖、分享、上传到码云、github等开源平台）
* 一经发现盗用、分享等行为，将追究法律责任，后果自负
*/
package co.yixiang.aop.log;
package co.yixiang.logging.aop.log;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;

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

@ -6,11 +6,11 @@
* 购买后可获得全部源代码（禁止转卖、分享、上传到码云、github等开源平台）
* 一经发现盗用、分享等行为，将追究法律责任，后果自负
*/
package co.yixiang.aspect;
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;
@ -45,7 +45,7 @@ public class LogAspect {
/**
* 配置切入点
*/
@Pointcut("@annotation(co.yixiang.aop.log.Log)")
@Pointcut("@annotation(co.yixiang.logging.aop.log.Log)")
public void logPointcut() {
// 该方法无方法体,主要为了让同类中其他方法使用此切入点
}

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

@ -6,7 +6,7 @@
* 购买后可获得全部源代码（禁止转卖、分享、上传到码云、github等开源平台）
* 一经发现盗用、分享等行为，将追究法律责任，后果自负
*/
package co.yixiang.domain;
package co.yixiang.logging.domain;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;

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

@ -6,13 +6,13 @@
* 购买后可获得全部源代码（禁止转卖、分享、上传到码云、github等开源平台）
* 一经发现盗用、分享等行为，将追究法律责任，后果自负
*/
package co.yixiang.rest;
package co.yixiang.logging.rest;
import co.yixiang.aop.log.Log;
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;

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

@ -6,11 +6,11 @@
* 购买后可获得全部源代码（禁止转卖、分享、上传到码云、github等开源平台）
* 一经发现盗用、分享等行为，将追究法律责任，后果自负
*/
package co.yixiang.service;
package co.yixiang.logging.service;
import co.yixiang.logging.domain.Log;
import co.yixiang.common.service.BaseService;
import co.yixiang.domain.Log;
import co.yixiang.service.dto.LogQueryCriteria;
import co.yixiang.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/service/dto/LogErrorDTO.java → yshop-logging/src/main/java/co/yixiang/logging/service/dto/LogErrorDTO.java
View File

@ -6,7 +6,7 @@
* 购买后可获得全部源代码（禁止转卖、分享、上传到码云、github等开源平台）
* 一经发现盗用、分享等行为，将追究法律责任，后果自负
*/
package co.yixiang.service.dto;
package co.yixiang.logging.service.dto;
import lombok.Data;
import java.io.Serializable;

2
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

@ -6,7 +6,7 @@
* 购买后可获得全部源代码（禁止转卖、分享、上传到码云、github等开源平台）
* 一经发现盗用、分享等行为，将追究法律责任，后果自负
*/
package co.yixiang.service.dto;
package co.yixiang.logging.service.dto;
import co.yixiang.annotation.Query;
import lombok.Data;

2
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

@ -6,7 +6,7 @@
* 购买后可获得全部源代码（禁止转卖、分享、上传到码云、github等开源平台）
* 一经发现盗用、分享等行为，将追究法律责任，后果自负
*/
package co.yixiang.service.dto;
package co.yixiang.logging.service.dto;
import lombok.Data;
import java.io.Serializable;

41
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

@ -6,27 +6,24 @@
* 购买后可获得全部源代码（禁止转卖、分享、上传到码云、github等开源平台）
* 一经发现盗用、分享等行为，将追究法律责任，后果自负
*/
package co.yixiang.service.impl;
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.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.domain.Log;
import co.yixiang.dozer.service.IGenerator;
import co.yixiang.service.LogService;
import co.yixiang.service.dto.LogErrorDTO;
import co.yixiang.service.dto.LogQueryCriteria;
import co.yixiang.service.dto.LogSmallDTO;
import co.yixiang.service.mapper.LogMapper;
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.baomidou.mybatisplus.core.conditions.query.Query;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
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;
@ -46,7 +43,7 @@ import java.util.Map;
*/
@Service
@Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class)
public class LogServiceImpl extends BaseServiceImpl<LogMapper, Log> implements LogService {
public class LogServiceImpl extends BaseServiceImpl<LogMapper, co.yixiang.logging.domain.Log> implements LogService {
private final LogMapper logMapper;
@ -61,8 +58,8 @@ public class LogServiceImpl extends BaseServiceImpl<LogMapper, Log> implements
@Override
public Object findAllByPageable(String nickname, Pageable pageable) {
getPage(pageable);
List<Log> list = logMapper.findAllByPageable(nickname);
PageInfo<Log> page = new PageInfo<>(list);
List<co.yixiang.logging.domain.Log> list = logMapper.findAllByPageable(nickname);
PageInfo<co.yixiang.logging.domain.Log> page = new PageInfo<>(list);
Map<String,Object> map = new LinkedHashMap<>(2);
map.put("content",page.getList());
@ -75,7 +72,7 @@ public class LogServiceImpl extends BaseServiceImpl<LogMapper, Log> implements
public Object queryAll(LogQueryCriteria criteria, Pageable pageable){
getPage(pageable);
PageInfo<Log> page = new PageInfo<>(queryAll(criteria));
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())){
@ -88,14 +85,14 @@ public class LogServiceImpl extends BaseServiceImpl<LogMapper, Log> implements
}
@Override
public List<Log> queryAll(LogQueryCriteria criteria) {
return baseMapper.selectList(QueryHelpPlus.getPredicate(Log.class, criteria));
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) {
getPage(pageable);
PageInfo<Log> page = new PageInfo<>(queryAll(criteria));
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());
@ -106,11 +103,11 @@ public class LogServiceImpl extends BaseServiceImpl<LogMapper, Log> implements
@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()+"()";
@ -155,16 +152,16 @@ public class LogServiceImpl extends BaseServiceImpl<LogMapper, Log> implements
@Override
public Object findByErrDetail(Long id) {
Log log = this.getById(id);
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());

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

@ -6,10 +6,10 @@
* 购买后可获得全部源代码（禁止转卖、分享、上传到码云、github等开源平台）
* 一经发现盗用、分享等行为，将追究法律责任，后果自负
*/
package co.yixiang.service.mapper;
package co.yixiang.logging.service.mapper;
import co.yixiang.common.mapper.CoreMapper;
import co.yixiang.domain.Log;
import co.yixiang.logging.domain.Log;
import org.apache.ibatis.annotations.Delete;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;