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

添加mybatisplus父模块，调整依赖关系，增加P结尾的mp代码生成器

Browse Source
This commit is contained in:
xuwenbo
2020-05-12 09:37:52 +08:00
parent 07a2e404ba
commit 54c3f3148c
81 changed files with 4864 additions and 3463 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
yshop-logging/pom.xml
View File

@ -18,5 +18,11 @@
<artifactId>yshop-common</artifactId>
<version>2.1</version>
</dependency>
<dependency>
<groupId>co.yixiang</groupId>
<artifactId>yshop-mproot</artifactId>
<version>2.1</version>
<scope>compile</scope>
</dependency>
</dependencies>
</project>
</project>

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

@ -33,7 +33,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 +42,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 +72,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 +80,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 +96,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);

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

@ -1,7 +1,7 @@
package co.yixiang.service.dto;
import lombok.Data;
import co.yixiang.annotation.Query;
import lombok.Data;
import java.sql.Timestamp;
import java.util.List;