修改为mc

pom.xml

@@ -6,7 +6,7 @@
         <artifactId>mc-ddd-framework</artifactId>
         <groupId>org.mc</groupId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath/> <!-- lookup parent from repository -->
+        <relativePath /> <!-- lookup parent from repository -->
     </parent>
     <artifactId>ztb-spider-handle</artifactId>
     <version>0.0.1-SNAPSHOT</version>
@@ -16,6 +16,15 @@
         <java.version>1.8</java.version>
     </properties>
     <dependencies>
+        <!-- Spring Boot -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-cache</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-boot-starter</artifactId>
@@ -27,67 +36,110 @@
             <version>3.5.2</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-validation</artifactId>
+        </dependency>
         <!-- Swagger 3 -->
         <dependency>
             <groupId>io.springfox</groupId>
             <artifactId>springfox-boot-starter</artifactId>
             <version>3.0.0</version>
         </dependency>
+        <!-- MySQL -->
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+            <version>8.0.29</version>
+            <scope>runtime</scope>
+        </dependency>
         <!-- Lombok -->
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
             <optional>true</optional>
         </dependency>
-
-
+        <!-- Guava -->
         <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-            <scope>runtime</scope>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>31.1-jre</version>
+        </dependency>
+        <!-- Hu Tool -->
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+            <version>5.8.4</version>
         </dependency>
+        <!-- EhCache -->
+        <dependency>
+            <groupId>net.sf.ehcache</groupId>
+            <artifactId>ehcache</artifactId>
+        </dependency>
+        <!-- Mail -->
+        <dependency>
+            <groupId>javax.mail</groupId>
+            <artifactId>mail</artifactId>
+            <version>1.4.7</version>
+        </dependency>
+        <!-- Apache Lang3 -->
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>3.12.0</version>
+        </dependency>
+        <!-- Test -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.junit.vintage</groupId>
+                    <artifactId>junit-vintage-engine</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
-            <groupId>io.swagger</groupId>
-            <artifactId>swagger-annotations</artifactId>
+            <groupId>org.mc</groupId>
+            <artifactId>ddd-infrastructure</artifactId>
+            <version>0.0.1-SNAPSHOT</version>
         </dependency>
-        <!-- Hu Tool -->
         <dependency>
-            <groupId>cn.hutool</groupId>
-            <artifactId>hutool-all</artifactId>
-            <version>5.8.12</version>
+            <groupId>org.mc</groupId>
+            <artifactId>ddd-domain</artifactId>
+            <version>0.0.1-SNAPSHOT</version>
         </dependency>
         <dependency>
-            <groupId>cn.hutool</groupId>
-            <artifactId>hutool-json</artifactId>
-            <version>5.8.12</version>
+            <groupId>org.mc</groupId>
+            <artifactId>one-auth-event</artifactId>
+            <version>0.0.1-SNAPSHOT</version>
         </dependency>
         <dependency>
-            <groupId>com.qniao</groupId>
-            <artifactId>common-operation-logging</artifactId>
+            <groupId>org.mc</groupId>
+            <artifactId>one-auth-constant</artifactId>
             <version>0.0.1-SNAPSHOT</version>
+            <scope>compile</scope>
         </dependency>
     </dependencies>
 
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-    <distributionManagement>
+    <!-- 配置远程仓库 -->
+    <repositories>
         <repository>
-            <id>maven-releases</id>
-            <name>Nexus releases Repository</name>
-            <url>http://120.78.76.88:8081/repository/maven-snapshots/</url>
+            <id>spring-milestones</id>
+            <name>Spring Milestones</name>
+            <url>https://repo.spring.io/milestone</url>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
         </repository>
-
-    </distributionManagement>
-
+        <repository>
+            <id>nexus</id>
+            <url>http://120.78.76.88:8081/repository/maven-public/</url>
+            <snapshots>
+                <enabled>true</enabled>
+                <updatePolicy>always</updatePolicy>
+            </snapshots>
+        </repository>
+    </repositories>
 </project>

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<SpiderState> adminPageAiAlarm(PageUtil pageUtil) {
+    public PageQueryResult<SpiderState> adminPageAiAlarm(PageQueryParams pageUtil) {
         return spiderQueryService.adminPage(pageUtil);
     }
 

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<SpiderState> {
+public class SpiderCreateDto implements Assembler<SpiderState> {
     @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;
     }

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

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;
 
 
 /**

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) {
+
+    }
+
 }
 

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<SpiderState> adminPage(PageUtil pageUtil);
-
-
+    PageQueryResult<SpiderState> adminPage(PageQueryParams pageUtil);
 }

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<SpiderState> adminPage(PageUtil pageUtil) {
-        IPage<SpiderState> iPage = spiderStateDao.selectPage(pageUtil.toPageWithoutOrders(),null);
-        return PageUtil.convert(iPage,SpiderState.class);
+    public PageQueryResult<SpiderState> adminPage(PageQueryParams pageUtil) {
+        IPage<SpiderState> iPage = spiderStateDao.selectPage(pageUtil.toPage(),null);
+        return PageQueryResult.forClass(SpiderState.class).from(iPage);
 
     }
 }

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 #支持数据库的枚举型转换