diff --git a/pom.xml b/pom.xml index b765c27..ae5bb4e 100644 --- a/pom.xml +++ b/pom.xml @@ -12,8 +12,8 @@ com.yupi - springboot-init - 0.0.1-SNAPSHOT + crawl-client + 1.0 springboot-init 1.8 diff --git a/src/main/java/com/yupi/springbootinit/mapper/NewHostsMapper.java b/src/main/java/com/yupi/springbootinit/mapper/NewHostsMapper.java index 52b444e..d685f8a 100644 --- a/src/main/java/com/yupi/springbootinit/mapper/NewHostsMapper.java +++ b/src/main/java/com/yupi/springbootinit/mapper/NewHostsMapper.java @@ -33,6 +33,5 @@ public interface NewHostsMapper extends BaseMapper { Page selectPageByCondition(@Param("page") Page page, @Param("hostInfoDTO") HostInfoDTO hostInfoDTO); - List selectSevenDaysData(HistoryDataDTO historyDataDTO); } \ No newline at end of file diff --git a/src/main/java/com/yupi/springbootinit/model/vo/hosts/NewHostsVO.java b/src/main/java/com/yupi/springbootinit/model/vo/hosts/NewHostsVO.java index cb7c739..1dde14c 100644 --- a/src/main/java/com/yupi/springbootinit/model/vo/hosts/NewHostsVO.java +++ b/src/main/java/com/yupi/springbootinit/model/vo/hosts/NewHostsVO.java @@ -84,4 +84,5 @@ public class NewHostsVO { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date createTime; + private String uid; } \ No newline at end of file diff --git a/src/main/java/com/yupi/springbootinit/service/HostInfoService.java b/src/main/java/com/yupi/springbootinit/service/HostInfoService.java index 325ba4c..480a982 100644 --- a/src/main/java/com/yupi/springbootinit/service/HostInfoService.java +++ b/src/main/java/com/yupi/springbootinit/service/HostInfoService.java @@ -21,5 +21,4 @@ public interface HostInfoService extends IService { Page getConditionHosts(HostInfoDTO hostInfoDTO); - List getSevenDaysData(HistoryDataDTO historyDataDTO); } diff --git a/src/main/java/com/yupi/springbootinit/service/impl/HostInfoServiceImpl.java b/src/main/java/com/yupi/springbootinit/service/impl/HostInfoServiceImpl.java index 7df1c42..13defaa 100644 --- a/src/main/java/com/yupi/springbootinit/service/impl/HostInfoServiceImpl.java +++ b/src/main/java/com/yupi/springbootinit/service/impl/HostInfoServiceImpl.java @@ -44,9 +44,5 @@ public class HostInfoServiceImpl extends ServiceImpl i return newHostsMapper.selectPageByCondition(page, hostInfoDTO); } - @Override - public List getSevenDaysData(HistoryDataDTO historyDataDTO) { - List data = newHostsMapper.selectSevenDaysData(historyDataDTO); - return data; - } + } diff --git a/src/main/java/com/yupi/springbootinit/service/impl/SystemTenantServiceImpl.java b/src/main/java/com/yupi/springbootinit/service/impl/SystemTenantServiceImpl.java index ce84952..5c6b554 100644 --- a/src/main/java/com/yupi/springbootinit/service/impl/SystemTenantServiceImpl.java +++ b/src/main/java/com/yupi/springbootinit/service/impl/SystemTenantServiceImpl.java @@ -22,7 +22,8 @@ public class SystemTenantServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("name",name); + queryWrapper.eq("name",name) + .eq("deleted",false ); SystemTenant systemTenant = baseMapper.selectOne(queryWrapper); if (systemTenant == null){ throw new BusinessException(ErrorCode.TENANT_NAME_NOT_EXISTS); diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 16843e6..6521556 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -8,7 +8,7 @@ spring: # todo 需替换配置 datasource: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://47.79.98.113:3306/ruoyi-vue-pro?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true + url: jdbc:mysql://localhost:3306/ruoyi-vue-pro?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true username: root password: 123asd # Redis 配置 diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 541dfc3..d4577fd 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -6,7 +6,7 @@ spring: name: springboot-init # 默认 dev 环境 profiles: - active: prod + active: dev # 支持 swagger3 mvc: pathmatch: diff --git a/src/main/resources/mapper/NewHostsMapper.xml b/src/main/resources/mapper/NewHostsMapper.xml index 72ac6ae..9d41ef5 100644 --- a/src/main/resources/mapper/NewHostsMapper.xml +++ b/src/main/resources/mapper/NewHostsMapper.xml @@ -38,6 +38,7 @@ + @@ -245,7 +246,7 @@