diff --git a/novalon-manage-api/manage-app/src/main/resources/application-dev.yml b/novalon-manage-api/manage-app/src/main/resources/application-dev.yml index 81f2223..c7052e4 100644 --- a/novalon-manage-api/manage-app/src/main/resources/application-dev.yml +++ b/novalon-manage-api/manage-app/src/main/resources/application-dev.yml @@ -11,6 +11,11 @@ spring: max-idle-time: 10m max-life-time: 30m acquire-timeout: 3s + datasource: + url: jdbc:postgresql://localhost:55432/manage_system + username: novalon + password: novalon123 + driver-class-name: org.postgresql.Driver flyway: enabled: true locations: classpath:db/migration diff --git a/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/repository/SysExceptionLogRepository.java b/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/repository/SysExceptionLogRepository.java index e991707..e9a7256 100644 --- a/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/repository/SysExceptionLogRepository.java +++ b/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/repository/SysExceptionLogRepository.java @@ -51,7 +51,7 @@ public class SysExceptionLogRepository implements ISysExceptionLogRepository { SysExceptionLogQueryCriteria criteria = new SysExceptionLogQueryCriteria(); criteria.setUsername(username); - Query dbQuery = QueryUtil.getQuery(criteria); + Query dbQuery = QueryUtil.getQueryAll(criteria); Sort sort = Sort.by(Sort.Direction.DESC, "createTime"); dbQuery = dbQuery.sort(sort); @@ -107,7 +107,7 @@ public class SysExceptionLogRepository implements ISysExceptionLogRepository { criteria.setKeyword(keyword); } - Query queryObj = QueryUtil.getQuery(criteria); + Query queryObj = QueryUtil.getQueryAll(criteria); Sort sortObj = Sort.unsorted(); if (sort != null && !sort.isEmpty()) { diff --git a/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/repository/SysLoginLogRepository.java b/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/repository/SysLoginLogRepository.java index b0b2649..1e465b7 100644 --- a/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/repository/SysLoginLogRepository.java +++ b/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/repository/SysLoginLogRepository.java @@ -50,10 +50,10 @@ public class SysLoginLogRepository implements ISysLoginLogRepository { SysLoginLogQueryCriteria criteria = new SysLoginLogQueryCriteria(); criteria.setUsername(username); - Query dbQuery = QueryUtil.getQuery(criteria); + Query dbQuery = QueryUtil.getQueryAll(criteria); Sort sort = Sort.by(Sort.Direction.DESC, "loginTime"); dbQuery = dbQuery.sort(sort); - + return r2dbcEntityTemplate.select(SysLoginLogEntity.class) .matching(dbQuery) .all() @@ -112,7 +112,7 @@ public class SysLoginLogRepository implements ISysLoginLogRepository { criteria.setKeyword(keyword); } - Query queryObj = QueryUtil.getQuery(criteria); + Query queryObj = QueryUtil.getQueryAll(criteria); Sort sortObj = Sort.unsorted(); if (sort != null && !sort.isEmpty()) {