diff --git a/pom.xml b/pom.xml index 681af67..05a5de1 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ mc-ddd-framework org.mc 0.0.1-SNAPSHOT - + ztb-spider-handle 0.0.1-SNAPSHOT @@ -16,6 +16,15 @@ 1.8 + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-cache + com.baomidou mybatis-plus-boot-starter @@ -27,67 +36,110 @@ 3.5.2 + + org.springframework.boot + spring-boot-starter-validation + io.springfox springfox-boot-starter 3.0.0 + + + mysql + mysql-connector-java + 8.0.29 + runtime + org.projectlombok lombok true - - + - mysql - mysql-connector-java - runtime + com.google.guava + guava + 31.1-jre + + + + cn.hutool + hutool-all + 5.8.4 + + + net.sf.ehcache + ehcache + + + + javax.mail + mail + 1.4.7 + + + + org.apache.commons + commons-lang3 + 3.12.0 + + org.springframework.boot spring-boot-starter-test + test + + + org.junit.vintage + junit-vintage-engine + + - io.swagger - swagger-annotations + org.mc + ddd-infrastructure + 0.0.1-SNAPSHOT - - cn.hutool - hutool-all - 5.8.12 + org.mc + ddd-domain + 0.0.1-SNAPSHOT - cn.hutool - hutool-json - 5.8.12 + org.mc + one-auth-event + 0.0.1-SNAPSHOT - com.qniao - common-operation-logging + org.mc + one-auth-constant 0.0.1-SNAPSHOT + compile - - - - - org.springframework.boot - spring-boot-maven-plugin - - - - + + - maven-releases - Nexus releases Repository - http://120.78.76.88:8081/repository/maven-snapshots/ + spring-milestones + Spring Milestones + https://repo.spring.io/milestone + + false + - - - + + nexus + http://120.78.76.88:8081/repository/maven-public/ + + true + always + + + diff --git a/src/main/java/com/qniao/zsh/api/command/controlspider/admin/SpiderStateAdminCommandController.java b/src/main/java/com/qniao/zsh/api/command/controlspider/admin/SpiderStateAdminCommandController.java index ca0727c..7568ed9 100644 --- a/src/main/java/com/qniao/zsh/api/command/controlspider/admin/SpiderStateAdminCommandController.java +++ b/src/main/java/com/qniao/zsh/api/command/controlspider/admin/SpiderStateAdminCommandController.java @@ -1,13 +1,15 @@ package com.qniao.zsh.api.command.controlspider.admin; -import com.qniao.domain.QnPage; -import com.qniao.framework.utils.PageUtil; + +import org.mc.ddd.infrastructure.persistent.PageQueryParams; + import com.qniao.zsh.api.command.controlspider.admin.request.SpiderCreateDto; import com.qniao.zsh.application.service.createspider.CreateSpiderApplicationService; import com.qniao.zsh.application.service.startspider.SpiderStateApplicationService; import com.qniao.zsh.domain.aggregate.spiderstate.entity.SpiderState; import com.qniao.zsh.query.spider.SpiderQueryService; import io.swagger.annotations.ApiOperation; +import org.mc.ddd.infrastructure.persistent.PageQueryResult; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -42,15 +44,15 @@ public class SpiderStateAdminCommandController { @PostMapping("/create/spider") public String create(@RequestBody @Validated SpiderCreateDto dto) { //判断爬虫是否已经存在 - return createSpiderApplicationService.create(dto.trans2Domain().getSpiderName()); + return createSpiderApplicationService.create(dto.transform().getSpiderName()); } - @ApiOperation("查询爬虫列表") + @ApiOperation("查询爬虫列表分页") @GetMapping("/query/spider") - public QnPage adminPageAiAlarm(PageUtil pageUtil) { + public PageQueryResult adminPageAiAlarm(PageQueryParams pageUtil) { return spiderQueryService.adminPage(pageUtil); } diff --git a/src/main/java/com/qniao/zsh/api/command/controlspider/admin/request/SpiderCreateDto.java b/src/main/java/com/qniao/zsh/api/command/controlspider/admin/request/SpiderCreateDto.java index 7110a7e..678001e 100644 --- a/src/main/java/com/qniao/zsh/api/command/controlspider/admin/request/SpiderCreateDto.java +++ b/src/main/java/com/qniao/zsh/api/command/controlspider/admin/request/SpiderCreateDto.java @@ -1,26 +1,31 @@ package com.qniao.zsh.api.command.controlspider.admin.request; -import com.qniao.domain.Trans2DomainAssembler; -import com.qniao.framework.utils.TypeConvertUtils; + import com.qniao.zsh.api.validator.SpiderExisted; import com.qniao.zsh.domain.aggregate.spiderstate.entity.SpiderState; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import org.mc.ddd.domain.Assembler; +import org.mc.ddd.infrastructure.util.CollectionConverter; +import org.mc.ddd.infrastructure.util.ObjectConverter; + +import java.util.List; + /** * @author wh * @date 2023/3/14 */ @Data -public class SpiderCreateDto implements Trans2DomainAssembler { +public class SpiderCreateDto implements Assembler { @SpiderExisted @ApiModelProperty("爬虫名字") private String spiderName; @Override - public SpiderState trans2Domain() { - SpiderState spiderState = TypeConvertUtils.convert(this, SpiderState.class); + public SpiderState transform() { + SpiderState spiderState = ObjectConverter.convert(this, SpiderState.class); spiderState.setSpiderName(spiderName); return spiderState; } diff --git a/src/main/java/com/qniao/zsh/domain/aggregate/spiderstate/entity/SpiderState.java b/src/main/java/com/qniao/zsh/domain/aggregate/spiderstate/entity/SpiderState.java index 48b61d3..442b41f 100644 --- a/src/main/java/com/qniao/zsh/domain/aggregate/spiderstate/entity/SpiderState.java +++ b/src/main/java/com/qniao/zsh/domain/aggregate/spiderstate/entity/SpiderState.java @@ -1,11 +1,11 @@ package com.qniao.zsh.domain.aggregate.spiderstate.entity; import com.baomidou.mybatisplus.annotation.TableName; -import com.qniao.domain.Entity; import com.qniao.zsh.domain.aggregate.spiderstate.constant.SpiderStateEnum; import lombok.Data; import lombok.EqualsAndHashCode; import io.swagger.annotations.ApiModelProperty; +import org.mc.ddd.infrastructure.persistent.Entity; /** * @author Administrator diff --git a/src/main/java/com/qniao/zsh/domain/aggregate/spiderstate/repository/SpiderStateRepository.java b/src/main/java/com/qniao/zsh/domain/aggregate/spiderstate/repository/SpiderStateRepository.java index 6ff0eec..47c301f 100644 --- a/src/main/java/com/qniao/zsh/domain/aggregate/spiderstate/repository/SpiderStateRepository.java +++ b/src/main/java/com/qniao/zsh/domain/aggregate/spiderstate/repository/SpiderStateRepository.java @@ -1,9 +1,7 @@ package com.qniao.zsh.domain.aggregate.spiderstate.repository; import com.qniao.zsh.domain.aggregate.spiderstate.entity.SpiderState; -import com.qniao.domain.Repository; - - +import org.mc.ddd.domain.Repository; /** diff --git a/src/main/java/com/qniao/zsh/infrastructure/persistence/repository/impl/SpiderState/SpiderStateRepositoryImpl.java b/src/main/java/com/qniao/zsh/infrastructure/persistence/repository/impl/SpiderState/SpiderStateRepositoryImpl.java index bc3ca60..59d4190 100644 --- a/src/main/java/com/qniao/zsh/infrastructure/persistence/repository/impl/SpiderState/SpiderStateRepositoryImpl.java +++ b/src/main/java/com/qniao/zsh/infrastructure/persistence/repository/impl/SpiderState/SpiderStateRepositoryImpl.java @@ -35,5 +35,10 @@ public class SpiderStateRepositoryImpl implements SpiderStateRepository { return entity.getId(); } + @Override + public void delete(Long id) { + + } + } diff --git a/src/main/java/com/qniao/zsh/query/spider/SpiderQueryService.java b/src/main/java/com/qniao/zsh/query/spider/SpiderQueryService.java index abb322c..aac1a1f 100644 --- a/src/main/java/com/qniao/zsh/query/spider/SpiderQueryService.java +++ b/src/main/java/com/qniao/zsh/query/spider/SpiderQueryService.java @@ -2,9 +2,10 @@ package com.qniao.zsh.query.spider; -import com.qniao.domain.QnPage; -import com.qniao.framework.utils.PageUtil; + import com.qniao.zsh.domain.aggregate.spiderstate.entity.SpiderState; +import org.mc.ddd.infrastructure.persistent.PageQueryParams; +import org.mc.ddd.infrastructure.persistent.PageQueryResult; /** @@ -17,9 +18,7 @@ public interface SpiderQueryService { * admin页面 * * @param pageUtil 分页参数 - * @return {@link QnPage} + * @return {@link PageQueryResult} */ - QnPage adminPage(PageUtil pageUtil); - - + PageQueryResult adminPage(PageQueryParams pageUtil); } diff --git a/src/main/java/com/qniao/zsh/query/spider/impl/SpiderQueryServiceImpl.java b/src/main/java/com/qniao/zsh/query/spider/impl/SpiderQueryServiceImpl.java index cf4e4d5..f7199f9 100644 --- a/src/main/java/com/qniao/zsh/query/spider/impl/SpiderQueryServiceImpl.java +++ b/src/main/java/com/qniao/zsh/query/spider/impl/SpiderQueryServiceImpl.java @@ -2,12 +2,12 @@ package com.qniao.zsh.query.spider.impl; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.qniao.domain.QnPage; -import com.qniao.framework.utils.PageUtil; import com.qniao.zsh.domain.aggregate.spiderstate.entity.SpiderState; import com.qniao.zsh.infrastructure.dao.SpiderStateDao; import com.qniao.zsh.query.spider.SpiderQueryService; +import org.mc.ddd.infrastructure.persistent.PageQueryParams; +import org.mc.ddd.infrastructure.persistent.PageQueryResult; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -24,9 +24,9 @@ public class SpiderQueryServiceImpl implements SpiderQueryService { private SpiderStateDao spiderStateDao; @Override - public QnPage adminPage(PageUtil pageUtil) { - IPage iPage = spiderStateDao.selectPage(pageUtil.toPageWithoutOrders(),null); - return PageUtil.convert(iPage,SpiderState.class); + public PageQueryResult adminPage(PageQueryParams pageUtil) { + IPage iPage = spiderStateDao.selectPage(pageUtil.toPage(),null); + return PageQueryResult.forClass(SpiderState.class).from(iPage); } } diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 1e5f7ac..59c92dc 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -33,11 +33,21 @@ spring: profiles: active: local datasource: - url: jdbc:mysql://52.81.89.46:3306/springboot?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useTimezone=true&serverTimezone=GMT%2B8&useSSL=false&allowMultiQueries=true - #useSSL安全连接 useUnicode编码 characterEncoding编码格式 serverTimezone时区 - username: root - password: 704177820 driver-class-name: com.mysql.cj.jdbc.Driver + dynamic: + primary: oas #设置默认的数据源或者数据源组 + strict: true #严格匹配数据源,默认false. true未匹配到指定数据源时抛异常,false使用默认数据源 + datasource: + oas: + url: jdbc:mysql://52.81.89.46:3306/springboot?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useTimezone=true&serverTimezone=GMT%2B8&useSSL=false&allowMultiQueries=true + #useSSL安全连接 useUnicode编码 characterEncoding编码格式 serverTimezone时区 + username: root + password: 704177820 + hikari: + minimum-idle: 3 + maximum-pool-size: 10 + max-lifetime: 30000 + connection-test-query: SELECT 1 # mybatis-plus配置控制台打印完整带参数SQL语句 @@ -48,7 +58,6 @@ mybatis-plus: logic-delete-field: isDelete # 全局逻辑删除的实体字段名 logic-delete-value: 1 # 逻辑已删除值(默认为 1) logic-not-delete-value: 0 # 逻辑未删除值(默认为 0) - type-enums-package: com.qniao.**.constant configuration: log-impl: org.apache.ibatis.logging.stdout.StdOutImpl default-enum-type-handler: org.apache.ibatis.type.EnumOrdinalTypeHandler #支持数据库的枚举型转换