From 279081f23665875871a52340cba34a7f9dfb0a5e Mon Sep 17 00:00:00 2001
From: ljfxxx <ljfxxx@qq.com>
Date: Fri, 18 Dec 2020 14:41:11 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feature:=20=E4=BC=98=E5=8C=96ddd=E9=A1=B9?=
=?UTF-8?q?=E7=9B=AE=E6=A8=A1=E7=89=88=E4=BB=A3=E7=A0=81=E7=BB=93=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ServiceSite/facade/.gitignore | 33 ++++++++
ServiceSite/facade/pom.xml | 48 +++++++++++
.../com/seasky/dddtemplate/api/ITest.java | 21 +++++
.../seasky/dddtemplate/dto/test}/TestCmd.java | 2 +-
.../dddtemplate/dto/test/TestQueryOut.java} | 4 +-
.../dddtemplate/dto/test/TestQueryQry.java} | 12 +--
.../seasky/dddtemplate/enums/EnumTest.java | 4 +
ServiceSite/pom.xml | 19 +++--
ServiceSite/settings.xml | 11 ++-
...udgetApplication.java => Application.java} | 4 +-
.../com/seasky/czzxcms/SwaggerConfig.java | 83 -------------------
.../application/command/TestCmdService.java | 20 -----
.../application/query/TestQueryService.java | 28 -------
.../domain/command/TestServiceImpl.java | 41 ---------
.../seasky/czzxcms/domain/package-info.java | 1 -
.../domain/service/TestImportService.java | 24 ------
.../{czzxcms => dddtemplate}/Realm.java | 2 +-
.../command/api/TestCmdService.java | 13 +++
.../command/factory}/TestFactory.java | 5 +-
.../command/service/TestCmdServiceImpl.java | 21 +++++
.../application/query/TestQueryService.java | 27 ++++++
.../config/RedisAop.java | 2 +-
.../domain/aggregate/test/TestAggregate.java | 2 +-
.../domain/aggregate/test/TestRepository.java | 2 +-
.../domain/api/TestDomainService.java | 19 +++++
.../domain/service/TestDomainServiceImpl.java | 30 +++++++
.../infrastructure/dataobject/po/BasePO.java | 2 +-
.../infrastructure/dataobject/po/TestPo.java | 3 +-
.../db/mapper/table/TestMapper.java | 8 +-
.../db/mapper/xml/TestMapper.xml | 4 +-
.../reader/test/TestQueryConvert.java | 18 ++--
.../reader/test/TestQueryServiceImpl.java | 18 ++--
.../repository/test/TestConvert.java | 6 +-
.../repository/test/TestRepositoryImpl.java} | 16 ++--
.../interfaces/controller/BaseController.java | 2 +-
.../interfaces/controller/TestController.java | 30 +++----
.../src/main/resources/application.properties | 2 +-
.../ApplicationTests.java} | 4 +-
.../controller/test/TestCmdFactory.java | 6 +-
.../interfaces/controller/test/TestCmdTc.java | 6 +-
.../controller/test/TestControllerTest.java | 12 +--
.../controller/test/TestQueryTc.java | 6 +-
.../controller/test/TestQueryTcFactory.java | 8 +-
43 files changed, 326 insertions(+), 303 deletions(-)
create mode 100644 ServiceSite/facade/.gitignore
create mode 100644 ServiceSite/facade/pom.xml
create mode 100644 ServiceSite/facade/src/main/java/com/seasky/dddtemplate/api/ITest.java
rename ServiceSite/{src/main/java/com/seasky/czzxcms/application/command/cmd => facade/src/main/java/com/seasky/dddtemplate/dto/test}/TestCmd.java (90%)
rename ServiceSite/{src/main/java/com/seasky/czzxcms/application/query/out/TestOut.java => facade/src/main/java/com/seasky/dddtemplate/dto/test/TestQueryOut.java} (90%)
rename ServiceSite/{src/main/java/com/seasky/czzxcms/application/query/qry/TestQry.java => facade/src/main/java/com/seasky/dddtemplate/dto/test/TestQueryQry.java} (52%)
create mode 100644 ServiceSite/facade/src/main/java/com/seasky/dddtemplate/enums/EnumTest.java
rename ServiceSite/src/main/java/com/seasky/{DeclarebudgetApplication.java => Application.java} (80%)
delete mode 100644 ServiceSite/src/main/java/com/seasky/czzxcms/SwaggerConfig.java
delete mode 100644 ServiceSite/src/main/java/com/seasky/czzxcms/application/command/TestCmdService.java
delete mode 100644 ServiceSite/src/main/java/com/seasky/czzxcms/application/query/TestQueryService.java
delete mode 100644 ServiceSite/src/main/java/com/seasky/czzxcms/domain/command/TestServiceImpl.java
delete mode 100644 ServiceSite/src/main/java/com/seasky/czzxcms/domain/package-info.java
delete mode 100644 ServiceSite/src/main/java/com/seasky/czzxcms/domain/service/TestImportService.java
rename ServiceSite/src/main/java/com/seasky/{czzxcms => dddtemplate}/Realm.java (95%)
create mode 100644 ServiceSite/src/main/java/com/seasky/dddtemplate/application/command/api/TestCmdService.java
rename ServiceSite/src/main/java/com/seasky/{czzxcms/domain/aggregate/test => dddtemplate/application/command/factory}/TestFactory.java (77%)
create mode 100644 ServiceSite/src/main/java/com/seasky/dddtemplate/application/command/service/TestCmdServiceImpl.java
create mode 100644 ServiceSite/src/main/java/com/seasky/dddtemplate/application/query/TestQueryService.java
rename ServiceSite/src/main/java/com/seasky/{czzxcms => dddtemplate}/config/RedisAop.java (98%)
rename ServiceSite/src/main/java/com/seasky/{czzxcms => dddtemplate}/domain/aggregate/test/TestAggregate.java (91%)
rename ServiceSite/src/main/java/com/seasky/{czzxcms => dddtemplate}/domain/aggregate/test/TestRepository.java (82%)
create mode 100644 ServiceSite/src/main/java/com/seasky/dddtemplate/domain/api/TestDomainService.java
create mode 100644 ServiceSite/src/main/java/com/seasky/dddtemplate/domain/service/TestDomainServiceImpl.java
rename ServiceSite/src/main/java/com/seasky/{czzxcms => dddtemplate}/infrastructure/dataobject/po/BasePO.java (75%)
rename ServiceSite/src/main/java/com/seasky/{czzxcms => dddtemplate}/infrastructure/dataobject/po/TestPo.java (85%)
rename ServiceSite/src/main/java/com/seasky/{czzxcms => dddtemplate}/infrastructure/db/mapper/table/TestMapper.java (62%)
rename ServiceSite/src/main/java/com/seasky/{czzxcms => dddtemplate}/infrastructure/db/mapper/xml/TestMapper.xml (87%)
rename ServiceSite/src/main/java/com/seasky/{czzxcms => dddtemplate}/infrastructure/reader/test/TestQueryConvert.java (52%)
rename ServiceSite/src/main/java/com/seasky/{czzxcms => dddtemplate}/infrastructure/reader/test/TestQueryServiceImpl.java (55%)
rename ServiceSite/src/main/java/com/seasky/{czzxcms => dddtemplate}/infrastructure/repository/test/TestConvert.java (75%)
rename ServiceSite/src/main/java/com/seasky/{czzxcms/infrastructure/repository/test/TestImpl.java => dddtemplate/infrastructure/repository/test/TestRepositoryImpl.java} (66%)
rename ServiceSite/src/main/java/com/seasky/{czzxcms => dddtemplate}/interfaces/controller/BaseController.java (86%)
rename ServiceSite/src/main/java/com/seasky/{czzxcms => dddtemplate}/interfaces/controller/TestController.java (55%)
rename ServiceSite/src/test/java/com/seasky/{czzxcms/DeclarebudgetApplicationTests.java => dddtemplate/ApplicationTests.java} (70%)
rename ServiceSite/src/test/java/com/seasky/{czzxcms => dddtemplate}/interfaces/controller/test/TestCmdFactory.java (93%)
rename ServiceSite/src/test/java/com/seasky/{czzxcms => dddtemplate}/interfaces/controller/test/TestCmdTc.java (83%)
rename ServiceSite/src/test/java/com/seasky/{czzxcms => dddtemplate}/interfaces/controller/test/TestControllerTest.java (82%)
rename ServiceSite/src/test/java/com/seasky/{czzxcms => dddtemplate}/interfaces/controller/test/TestQueryTc.java (56%)
rename ServiceSite/src/test/java/com/seasky/{czzxcms => dddtemplate}/interfaces/controller/test/TestQueryTcFactory.java (83%)
diff --git a/ServiceSite/facade/.gitignore b/ServiceSite/facade/.gitignore
new file mode 100644
index 0000000..549e00a
--- /dev/null
+++ b/ServiceSite/facade/.gitignore
@@ -0,0 +1,33 @@
+HELP.md
+target/
+!.mvn/wrapper/maven-wrapper.jar
+!**/src/main/**/target/
+!**/src/test/**/target/
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+build/
+!**/src/main/**/build/
+!**/src/test/**/build/
+
+### VS Code ###
+.vscode/
diff --git a/ServiceSite/facade/pom.xml b/ServiceSite/facade/pom.xml
new file mode 100644
index 0000000..475a41c
--- /dev/null
+++ b/ServiceSite/facade/pom.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>com.seasky</groupId>
+ <artifactId>dddtemplate-api</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <name>dddtemplate-api</name>
+ <description>dddtemplate-api project for dddtemplate</description>
+
+ <properties>
+ <java.version>1.8</java.version>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>com.seasky</groupId>
+ <artifactId>core-model</artifactId>
+ <version>1.4.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
+ <version>5.2.10.RELEASE</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.cloud</groupId>
+ <artifactId>spring-cloud-openfeign-core</artifactId>
+ <version>2.2.3.RELEASE</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+
+ <distributionManagement>
+ <repository>
+ <id>releases</id>
+ <name>Nexus Release Repository</name>
+ <url>http://git.seaskysh.com.cn:8881/nexus/repository/maven-releases/</url>
+ </repository>
+ <snapshotRepository>
+ <id>snapshots</id>
+ <name>Nexus Snapshot Repository</name>
+ <url>http://git.seaskysh.com.cn:8881/nexus/repository/maven-snapshots/</url>
+ </snapshotRepository>
+ </distributionManagement>
+</project>
diff --git a/ServiceSite/facade/src/main/java/com/seasky/dddtemplate/api/ITest.java b/ServiceSite/facade/src/main/java/com/seasky/dddtemplate/api/ITest.java
new file mode 100644
index 0000000..5901df7
--- /dev/null
+++ b/ServiceSite/facade/src/main/java/com/seasky/dddtemplate/api/ITest.java
@@ -0,0 +1,21 @@
+package com.seasky.dddtemplate.api;
+
+import com.seasky.core.common.Result;
+import com.seasky.dddtemplate.dto.test.TestCmd;
+import com.seasky.dddtemplate.dto.test.TestQueryOut;
+import com.seasky.dddtemplate.dto.test.TestQueryQry;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+@FeignClient("dddtemplate-provider")
+@RequestMapping("test")
+public interface ITest {
+
+ @PostMapping(path = "/pc/v1/add1")
+ Result<Integer> testC(@RequestBody TestCmd testCmd);
+
+ @PostMapping(path = "/pc/v1/queryList1")
+ Result<TestQueryOut> testQ(@RequestBody TestQueryQry testQry);
+}
diff --git a/ServiceSite/src/main/java/com/seasky/czzxcms/application/command/cmd/TestCmd.java b/ServiceSite/facade/src/main/java/com/seasky/dddtemplate/dto/test/TestCmd.java
similarity index 90%
rename from ServiceSite/src/main/java/com/seasky/czzxcms/application/command/cmd/TestCmd.java
rename to ServiceSite/facade/src/main/java/com/seasky/dddtemplate/dto/test/TestCmd.java
index 504035c..da8be83 100644
--- a/ServiceSite/src/main/java/com/seasky/czzxcms/application/command/cmd/TestCmd.java
+++ b/ServiceSite/facade/src/main/java/com/seasky/dddtemplate/dto/test/TestCmd.java
@@ -1,4 +1,4 @@
-package com.seasky.czzxcms.application.command.cmd;
+package com.seasky.dddtemplate.dto.test;
import com.seasky.core.ddd.base.BaseDto;
diff --git a/ServiceSite/src/main/java/com/seasky/czzxcms/application/query/out/TestOut.java b/ServiceSite/facade/src/main/java/com/seasky/dddtemplate/dto/test/TestQueryOut.java
similarity index 90%
rename from ServiceSite/src/main/java/com/seasky/czzxcms/application/query/out/TestOut.java
rename to ServiceSite/facade/src/main/java/com/seasky/dddtemplate/dto/test/TestQueryOut.java
index 3393a68..9193dd3 100644
--- a/ServiceSite/src/main/java/com/seasky/czzxcms/application/query/out/TestOut.java
+++ b/ServiceSite/facade/src/main/java/com/seasky/dddtemplate/dto/test/TestQueryOut.java
@@ -1,4 +1,4 @@
-package com.seasky.czzxcms.application.query.out;
+package com.seasky.dddtemplate.dto.test;
import com.fasterxml.jackson.annotation.JsonInclude;
@@ -20,7 +20,7 @@ import java.util.Date;
@Data
@NoArgsConstructor
@JsonInclude(JsonInclude.Include.ALWAYS)
-public class TestOut extends BaseDto implements Serializable {
+public class TestQueryOut extends BaseDto implements Serializable {
/**
* 涓婚敭
*/
diff --git a/ServiceSite/src/main/java/com/seasky/czzxcms/application/query/qry/TestQry.java b/ServiceSite/facade/src/main/java/com/seasky/dddtemplate/dto/test/TestQueryQry.java
similarity index 52%
rename from ServiceSite/src/main/java/com/seasky/czzxcms/application/query/qry/TestQry.java
rename to ServiceSite/facade/src/main/java/com/seasky/dddtemplate/dto/test/TestQueryQry.java
index 1eff167..ea184d0 100644
--- a/ServiceSite/src/main/java/com/seasky/czzxcms/application/query/qry/TestQry.java
+++ b/ServiceSite/facade/src/main/java/com/seasky/dddtemplate/dto/test/TestQueryQry.java
@@ -1,16 +1,8 @@
-package com.seasky.czzxcms.application.query.qry;
+package com.seasky.dddtemplate.dto.test;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.seasky.core.base.AbstractCacheableModel;
import com.seasky.core.ddd.base.BaseDto;
-import com.seasky.core.validate.QueryPage;
-import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
-
/**
* 娴嬭瘯qry
*
@@ -18,7 +10,7 @@ import javax.validation.constraints.NotNull;
* @date 2020/12/07
*/
@Data
-public class TestQry extends BaseDto {
+public class TestQueryQry extends BaseDto {
/**
* 鍚嶅瓧
diff --git a/ServiceSite/facade/src/main/java/com/seasky/dddtemplate/enums/EnumTest.java b/ServiceSite/facade/src/main/java/com/seasky/dddtemplate/enums/EnumTest.java
new file mode 100644
index 0000000..3386396
--- /dev/null
+++ b/ServiceSite/facade/src/main/java/com/seasky/dddtemplate/enums/EnumTest.java
@@ -0,0 +1,4 @@
+package com.seasky.dddtemplate.enums;
+
+public enum EnumTest {
+}
diff --git a/ServiceSite/pom.xml b/ServiceSite/pom.xml
index 19a298e..ca24a34 100644
--- a/ServiceSite/pom.xml
+++ b/ServiceSite/pom.xml
@@ -3,10 +3,10 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>com.seasky</groupId>
- <artifactId>czzxcms</artifactId>
+ <artifactId>dddtemplate</artifactId>
<version>0.0.1-SNAPSHOT</version>
- <name>czzxcms</name>
- <description>Demo project for Spring Boot</description>
+ <name>dddtemplate</name>
+ <description>Demo dddtemplate project for Spring Boot</description>
<properties>
<java.version>1.8</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -59,7 +59,12 @@
<dependency>
<groupId>com.seasky</groupId>
<artifactId>core</artifactId>
- <version>1.3.5-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>com.seasky</groupId>
+ <artifactId>dddtemplate-api</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
@@ -299,18 +304,18 @@
<version>1.2.2</version>
<configuration>
<dockerHost>http://192.168.1.68:2375</dockerHost>
- <imageName>demo.seaskysh.com/seaskysh/czzxcms:1.0</imageName>
+ <imageName>demo.seaskysh.com/seaskysh/dddtemplate:${project.version}</imageName>
<baseImage>java</baseImage>
<maintainer>seaskysh.com</maintainer>
<workdir>/ROOT</workdir>
<cmd>["java", "-version"]</cmd>
- <entryPoint>["java", "-jar", "${build.finalName}.jar"]</entryPoint>
+ <entryPoint>["java", "-jar", "${project.build.finalName}.jar"]</entryPoint>
<!-- 杩欓噷鏄鍒� jar 鍖呭埌 docker 瀹瑰櫒鎸囧畾鐩綍閰嶇疆 -->
<resources>
<resource>
<targetPath>/ROOT</targetPath>
<directory>${project.build.directory}</directory>
- <include>${build.finalName}.jar</include>
+ <include>${project.build.finalName}.jar</include>
</resource>
</resources>
</configuration>
diff --git a/ServiceSite/settings.xml b/ServiceSite/settings.xml
index bdcf7cc..59f56d0 100644
--- a/ServiceSite/settings.xml
+++ b/ServiceSite/settings.xml
@@ -211,6 +211,10 @@ under the License.
<releases>
<enabled>true</enabled>
</releases>
+ <snapshots>
+ <enabled>true</enabled>
+ <updatePolicy>always</updatePolicy>
+ </snapshots>
</repository>
<repository>
@@ -221,7 +225,8 @@ under the License.
<enabled>true</enabled>
</releases>
<snapshots>
- <enabled>false</enabled>
+ <enabled>true</enabled>
+ <updatePolicy>always</updatePolicy>
</snapshots>
</repository>
@@ -233,7 +238,8 @@ under the License.
<enabled>true</enabled>
</releases>
<snapshots>
- <enabled>false</enabled>
+ <enabled>true</enabled>
+ <updatePolicy>always</updatePolicy>
</snapshots>
</repository>
@@ -246,6 +252,7 @@ under the License.
</releases>
<snapshots>
<enabled>true</enabled>
+ <updatePolicy>always</updatePolicy>
</snapshots>
</repository>
</repositories>
diff --git a/ServiceSite/src/main/java/com/seasky/DeclarebudgetApplication.java b/ServiceSite/src/main/java/com/seasky/Application.java
similarity index 80%
rename from ServiceSite/src/main/java/com/seasky/DeclarebudgetApplication.java
rename to ServiceSite/src/main/java/com/seasky/Application.java
index f4e3492..7637280 100644
--- a/ServiceSite/src/main/java/com/seasky/DeclarebudgetApplication.java
+++ b/ServiceSite/src/main/java/com/seasky/Application.java
@@ -11,10 +11,10 @@ import org.springframework.context.annotation.EnableAspectJAutoProxy;
@SpringBootApplication
@EnableAspectJAutoProxy(exposeProxy = true)
@EnableFeignClients
-public class DeclarebudgetApplication {
+public class Application {
public static void main(String[] args) {
- SpringApplication.run(DeclarebudgetApplication.class, args);
+ SpringApplication.run(Application.class, args);
}
}
diff --git a/ServiceSite/src/main/java/com/seasky/czzxcms/SwaggerConfig.java b/ServiceSite/src/main/java/com/seasky/czzxcms/SwaggerConfig.java
deleted file mode 100644
index d3a4d4d..0000000
--- a/ServiceSite/src/main/java/com/seasky/czzxcms/SwaggerConfig.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package com.seasky.czzxcms;
-
-import com.github.xiaoymin.knife4j.spring.annotations.EnableKnife4j;
-import com.google.common.base.Function;
-import com.google.common.base.Optional;
-import com.google.common.base.Predicate;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
-import springfox.bean.validators.configuration.BeanValidatorPluginsConfiguration;
-import springfox.documentation.RequestHandler;
-import springfox.documentation.builders.ApiInfoBuilder;
-import springfox.documentation.builders.PathSelectors;
-import springfox.documentation.builders.RequestHandlerSelectors;
-import springfox.documentation.service.ApiInfo;
-import springfox.documentation.service.Contact;
-import springfox.documentation.spi.DocumentationType;
-import springfox.documentation.spring.web.plugins.Docket;
-import springfox.documentation.swagger2.annotations.EnableSwagger2;
-
-import java.sql.Timestamp;
-import java.util.Date;
-
-@Configuration
-@EnableSwagger2
-@EnableKnife4j
-@Import(BeanValidatorPluginsConfiguration.class)
-public class SwaggerConfig {
-
- @Value("${swagger.enable}")
- private Boolean swaggerEnale;
-
- @Bean
- public Docket api() {
- Docket docket=new Docket(DocumentationType.SWAGGER_2)
- .enable(swaggerEnale)
- .apiInfo(apiInfo())
- //鍒嗙粍鍚嶇О
- .groupName("seasky_restapi_v1")
- .select()
- //杩欓噷鎸囧畾Controller鎵弿鍖呰矾寰�
- .apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class))
- .paths(PathSelectors.any())
- .build()
- .directModelSubstitute(Timestamp.class, String.class)
- .directModelSubstitute(Date.class, String.class)
- .useDefaultResponseMessages(false);
- return docket;
- }
-
- private static Predicate<RequestHandler> basePackage(final String basePackage) {
- return input -> declaringClass(input).transform(handlerPackage(basePackage)).or(true);
- }
-
- private static Optional<? extends Class<?>> declaringClass(RequestHandler input) {
- return Optional.fromNullable(input.declaringClass());
- }
-
- private static Function<Class<?>, Boolean> handlerPackage(final String basePackage) {
- return input -> {
- // 寰幆鍒ゆ柇鍖归厤
- for (String strPackage : basePackage.split(";")) {
- boolean isMatch = input.getPackage().getName().startsWith(strPackage);
- if (isMatch) {
- return true;
- }
- }
- return false;
- };
- }
-
- private ApiInfo apiInfo() {
- return new ApiInfoBuilder()
- .title("娴峰ぉDDD妗嗘灦API") // 鏂囨。鏍囬
- .contact(new Contact("Seaksky", "", "")) //鑱旂郴浜轰俊鎭�
- .description("娴峰ぉDDD绀轰緥API") //鎻忚堪
- .version("1.0") //鏂囨。鐗堟湰鍙�
- .termsOfServiceUrl("http://localhost:8002") //缃戠珯鍦板潃
- .build();
- }
-}
diff --git a/ServiceSite/src/main/java/com/seasky/czzxcms/application/command/TestCmdService.java b/ServiceSite/src/main/java/com/seasky/czzxcms/application/command/TestCmdService.java
deleted file mode 100644
index 6ba0798..0000000
--- a/ServiceSite/src/main/java/com/seasky/czzxcms/application/command/TestCmdService.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.seasky.czzxcms.application.command;
-
-import com.seasky.czzxcms.application.command.cmd.TestCmd;
-import com.seasky.czzxcms.application.query.out.TestOut;
-
-/**
- * 绀轰緥C绾挎湇鍔℃帴鍙ｅ眰
- *
- * @author XueYawei
- * @date 2020/12/07
- */
-public interface TestCmdService {
- /**
- * 淇濆瓨绀轰緥
- *
- * @param testCmd 娴嬭瘯cmd
- * @return int
- */
- int saveTest(TestCmd testCmd);
-}
diff --git a/ServiceSite/src/main/java/com/seasky/czzxcms/application/query/TestQueryService.java b/ServiceSite/src/main/java/com/seasky/czzxcms/application/query/TestQueryService.java
deleted file mode 100644
index 50029ff..0000000
--- a/ServiceSite/src/main/java/com/seasky/czzxcms/application/query/TestQueryService.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.seasky.czzxcms.application.query;
-
-
-import com.seasky.core.base.BaseService;
-import com.seasky.czzxcms.application.query.out.TestOut;
-import com.seasky.czzxcms.application.query.qry.TestQry;
-import com.seasky.czzxcms.infrastructure.dataobject.po.TestPo;
-import org.apache.poi.xwpf.usermodel.TOC;
-
-import java.util.List;
-
-/**
- * 娴嬭瘯鏌ヨ鏈嶅姟
- *
- * @author XueYawei
- * @date 2020/12/07
- */
-public interface TestQueryService extends BaseService<TestPo> {
-
-
- /**
- * 鏌ヨ娴嬭瘯
- *
- * @param testQry 娴嬭瘯qry
- * @return {@link TestOut}
- */
- List<TestOut> queryTestList(TestQry testQry);
-}
diff --git a/ServiceSite/src/main/java/com/seasky/czzxcms/domain/command/TestServiceImpl.java b/ServiceSite/src/main/java/com/seasky/czzxcms/domain/command/TestServiceImpl.java
deleted file mode 100644
index 991a919..0000000
--- a/ServiceSite/src/main/java/com/seasky/czzxcms/domain/command/TestServiceImpl.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.seasky.czzxcms.domain.command;
-
-
-import com.seasky.czzxcms.application.command.TestCmdService;
-import com.seasky.czzxcms.application.command.cmd.TestCmd;
-import com.seasky.czzxcms.domain.aggregate.test.TestAggregate;
-import com.seasky.czzxcms.domain.aggregate.test.TestFactory;
-import com.seasky.czzxcms.domain.aggregate.test.TestRepository;
-import com.seasky.czzxcms.domain.service.TestImportService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-/**
- * 绀轰緥鏈嶅姟impl
- *
- * @author XueYawei
- * @date 2020/12/07
- */
-@Service
-public class TestServiceImpl implements TestCmdService {
-
-
-
- @Autowired
- TestRepository testRepository;
-
-
- /**
- * 淇濆瓨绀轰緥
- *
- * @param testCmd 娴嬭瘯cmd
- * @return int
- */
- @Override
- public int saveTest(TestCmd testCmd) {
- TestAggregate testAggregate = TestFactory.buildTestAggregate(testCmd);
- //涓氬姟閫昏緫浠ｇ爜 鐣�
- TestImportService.businessOperation();
- return testRepository.saveTest(testAggregate);
- }
-}
diff --git a/ServiceSite/src/main/java/com/seasky/czzxcms/domain/package-info.java b/ServiceSite/src/main/java/com/seasky/czzxcms/domain/package-info.java
deleted file mode 100644
index 04247b9..0000000
--- a/ServiceSite/src/main/java/com/seasky/czzxcms/domain/package-info.java
+++ /dev/null
@@ -1 +0,0 @@
-package com.seasky.czzxcms.domain;
\ No newline at end of file
diff --git a/ServiceSite/src/main/java/com/seasky/czzxcms/domain/service/TestImportService.java b/ServiceSite/src/main/java/com/seasky/czzxcms/domain/service/TestImportService.java
deleted file mode 100644
index b139d45..0000000
--- a/ServiceSite/src/main/java/com/seasky/czzxcms/domain/service/TestImportService.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.seasky.czzxcms.domain.service;
-
-
-import org.springframework.stereotype.Service;
-
-/**
- * 绀轰緥杩涘彛鏈嶅姟
- *
- * @author XueYawei
- * @date 2020/12/07
- */
-@Service
-public class TestImportService {
-
-
- /**
- * 涓氬姟鎿嶄綔
- */
- public static void businessOperation(){
-
-
- }
-
-}
diff --git a/ServiceSite/src/main/java/com/seasky/czzxcms/Realm.java b/ServiceSite/src/main/java/com/seasky/dddtemplate/Realm.java
similarity index 95%
rename from ServiceSite/src/main/java/com/seasky/czzxcms/Realm.java
rename to ServiceSite/src/main/java/com/seasky/dddtemplate/Realm.java
index 44afbdd..342243d 100644
--- a/ServiceSite/src/main/java/com/seasky/czzxcms/Realm.java
+++ b/ServiceSite/src/main/java/com/seasky/dddtemplate/Realm.java
@@ -1,4 +1,4 @@
-package com.seasky.czzxcms;
+package com.seasky.dddtemplate;
import org.apache.shiro.authc.AuthenticationException;
import org.apache.shiro.authc.AuthenticationInfo;
diff --git a/ServiceSite/src/main/java/com/seasky/dddtemplate/application/command/api/TestCmdService.java b/ServiceSite/src/main/java/com/seasky/dddtemplate/application/command/api/TestCmdService.java
new file mode 100644
index 0000000..ec4e8a6
--- /dev/null
+++ b/ServiceSite/src/main/java/com/seasky/dddtemplate/application/command/api/TestCmdService.java
@@ -0,0 +1,13 @@
+package com.seasky.dddtemplate.application.command.api;
+
+import com.seasky.dddtemplate.dto.test.TestCmd;
+
+public interface TestCmdService {
+ /**
+ * 淇濆瓨绀轰緥
+ *
+ * @param testCmd 娴嬭瘯cmd
+ * @return int
+ */
+ int saveTest(TestCmd testCmd);
+}
diff --git a/ServiceSite/src/main/java/com/seasky/czzxcms/domain/aggregate/test/TestFactory.java b/ServiceSite/src/main/java/com/seasky/dddtemplate/application/command/factory/TestFactory.java
similarity index 77%
rename from ServiceSite/src/main/java/com/seasky/czzxcms/domain/aggregate/test/TestFactory.java
rename to ServiceSite/src/main/java/com/seasky/dddtemplate/application/command/factory/TestFactory.java
index b1a85d5..a2670ae 100644
--- a/ServiceSite/src/main/java/com/seasky/czzxcms/domain/aggregate/test/TestFactory.java
+++ b/ServiceSite/src/main/java/com/seasky/dddtemplate/application/command/factory/TestFactory.java
@@ -1,8 +1,9 @@
-package com.seasky.czzxcms.domain.aggregate.test;
+package com.seasky.dddtemplate.application.command.factory;
import com.seasky.core.ddd.utils.MapperUtils;
-import com.seasky.czzxcms.application.command.cmd.TestCmd;
+import com.seasky.dddtemplate.domain.aggregate.test.TestAggregate;
+import com.seasky.dddtemplate.dto.test.TestCmd;
import java.util.HashMap;
import java.util.Map;
diff --git a/ServiceSite/src/main/java/com/seasky/dddtemplate/application/command/service/TestCmdServiceImpl.java b/ServiceSite/src/main/java/com/seasky/dddtemplate/application/command/service/TestCmdServiceImpl.java
new file mode 100644
index 0000000..8743fed
--- /dev/null
+++ b/ServiceSite/src/main/java/com/seasky/dddtemplate/application/command/service/TestCmdServiceImpl.java
@@ -0,0 +1,21 @@
+package com.seasky.dddtemplate.application.command.service;
+
+import com.seasky.dddtemplate.application.command.api.TestCmdService;
+import com.seasky.dddtemplate.dto.test.TestCmd;
+import com.seasky.dddtemplate.domain.aggregate.test.TestAggregate;
+import com.seasky.dddtemplate.application.command.factory.TestFactory;
+import com.seasky.dddtemplate.domain.api.TestDomainService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class TestCmdServiceImpl implements TestCmdService {
+ @Autowired
+ private TestDomainService testDomainService;
+
+ @Override
+ public int saveTest(TestCmd testCmd) {
+ TestAggregate testAggregate = TestFactory.buildTestAggregate(testCmd);
+ return testDomainService.saveTest(testAggregate);
+ }
+}
diff --git a/ServiceSite/src/main/java/com/seasky/dddtemplate/application/query/TestQueryService.java b/ServiceSite/src/main/java/com/seasky/dddtemplate/application/query/TestQueryService.java
new file mode 100644
index 0000000..5a4f7bc
--- /dev/null
+++ b/ServiceSite/src/main/java/com/seasky/dddtemplate/application/query/TestQueryService.java
@@ -0,0 +1,27 @@
+package com.seasky.dddtemplate.application.query;
+
+
+import com.seasky.core.base.BaseService;
+import com.seasky.dddtemplate.dto.test.TestQueryOut;
+import com.seasky.dddtemplate.dto.test.TestQueryQry;
+import com.seasky.dddtemplate.infrastructure.dataobject.po.TestPo;
+
+import java.util.List;
+
+/**
+ * 娴嬭瘯鏌ヨ鏈嶅姟
+ *
+ * @author XueYawei
+ * @date 2020/12/07
+ */
+public interface TestQueryService extends BaseService<TestPo> {
+
+
+ /**
+ * 鏌ヨ娴嬭瘯
+ *
+ * @param testQry 娴嬭瘯qry
+ * @return {@link TestQueryOut}
+ */
+ List<TestQueryOut> queryTestList(TestQueryQry testQry);
+}
diff --git a/ServiceSite/src/main/java/com/seasky/czzxcms/config/RedisAop.java b/ServiceSite/src/main/java/com/seasky/dddtemplate/config/RedisAop.java
similarity index 98%
rename from ServiceSite/src/main/java/com/seasky/czzxcms/config/RedisAop.java
rename to ServiceSite/src/main/java/com/seasky/dddtemplate/config/RedisAop.java
index b6fbaa0..024c3a9 100644
--- a/ServiceSite/src/main/java/com/seasky/czzxcms/config/RedisAop.java
+++ b/ServiceSite/src/main/java/com/seasky/dddtemplate/config/RedisAop.java
@@ -1,4 +1,4 @@
-package com.seasky.czzxcms.config;
+package com.seasky.dddtemplate.config;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.mapper.Mapper;
diff --git a/ServiceSite/src/main/java/com/seasky/czzxcms/domain/aggregate/test/TestAggregate.java b/ServiceSite/src/main/java/com/seasky/dddtemplate/domain/aggregate/test/TestAggregate.java
similarity index 91%
rename from ServiceSite/src/main/java/com/seasky/czzxcms/domain/aggregate/test/TestAggregate.java
rename to ServiceSite/src/main/java/com/seasky/dddtemplate/domain/aggregate/test/TestAggregate.java
index 58330ed..cf2bf96 100644
--- a/ServiceSite/src/main/java/com/seasky/czzxcms/domain/aggregate/test/TestAggregate.java
+++ b/ServiceSite/src/main/java/com/seasky/dddtemplate/domain/aggregate/test/TestAggregate.java
@@ -1,4 +1,4 @@
-package com.seasky.czzxcms.domain.aggregate.test;
+package com.seasky.dddtemplate.domain.aggregate.test;
import com.seasky.core.ddd.base.BaseAggregate;
diff --git a/ServiceSite/src/main/java/com/seasky/czzxcms/domain/aggregate/test/TestRepository.java b/ServiceSite/src/main/java/com/seasky/dddtemplate/domain/aggregate/test/TestRepository.java
similarity index 82%
rename from ServiceSite/src/main/java/com/seasky/czzxcms/domain/aggregate/test/TestRepository.java
rename to ServiceSite/src/main/java/com/seasky/dddtemplate/domain/aggregate/test/TestRepository.java
index f92735c..f116a9e 100644
--- a/ServiceSite/src/main/java/com/seasky/czzxcms/domain/aggregate/test/TestRepository.java
+++ b/ServiceSite/src/main/java/com/seasky/dddtemplate/domain/aggregate/test/TestRepository.java
@@ -1,4 +1,4 @@
-package com.seasky.czzxcms.domain.aggregate.test;
+package com.seasky.dddtemplate.domain.aggregate.test;
/**
* 绀轰緥瀛樺偍搴�
diff --git a/ServiceSite/src/main/java/com/seasky/dddtemplate/domain/api/TestDomainService.java b/ServiceSite/src/main/java/com/seasky/dddtemplate/domain/api/TestDomainService.java
new file mode 100644
index 0000000..8c11e57
--- /dev/null
+++ b/ServiceSite/src/main/java/com/seasky/dddtemplate/domain/api/TestDomainService.java
@@ -0,0 +1,19 @@
+package com.seasky.dddtemplate.domain.api;
+
+import com.seasky.dddtemplate.domain.aggregate.test.TestAggregate;
+
+/**
+ * 绀轰緥C绾挎湇鍔℃帴鍙ｅ眰
+ *
+ * @author XueYawei
+ * @date 2020/12/07
+ */
+public interface TestDomainService {
+ /**
+ * 淇濆瓨绀轰緥
+ *
+ * @param testAggregate 娴嬭瘯aggregate
+ * @return int
+ */
+ int saveTest(TestAggregate testAggregate);
+}
diff --git a/ServiceSite/src/main/java/com/seasky/dddtemplate/domain/service/TestDomainServiceImpl.java b/ServiceSite/src/main/java/com/seasky/dddtemplate/domain/service/TestDomainServiceImpl.java
new file mode 100644
index 0000000..b9cb828
--- /dev/null
+++ b/ServiceSite/src/main/java/com/seasky/dddtemplate/domain/service/TestDomainServiceImpl.java
@@ -0,0 +1,30 @@
+package com.seasky.dddtemplate.domain.service;
+
+
+import com.seasky.dddtemplate.domain.aggregate.test.TestAggregate;
+import com.seasky.dddtemplate.domain.aggregate.test.TestRepository;
+import com.seasky.dddtemplate.domain.api.TestDomainService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * 绀轰緥杩涘彛鏈嶅姟
+ *
+ * @author XueYawei
+ * @date 2020/12/07
+ */
+@Service
+public class TestDomainServiceImpl implements TestDomainService {
+
+ @Autowired
+ TestRepository testRepository;
+
+ /**
+ * 涓氬姟鎿嶄綔
+ */
+ @Override
+ public int saveTest(TestAggregate testAggregate) {
+ // 涓氬姟浠ｇ爜
+ return testRepository.saveTest(testAggregate);
+ }
+}
diff --git a/ServiceSite/src/main/java/com/seasky/czzxcms/infrastructure/dataobject/po/BasePO.java b/ServiceSite/src/main/java/com/seasky/dddtemplate/infrastructure/dataobject/po/BasePO.java
similarity index 75%
rename from ServiceSite/src/main/java/com/seasky/czzxcms/infrastructure/dataobject/po/BasePO.java
rename to ServiceSite/src/main/java/com/seasky/dddtemplate/infrastructure/dataobject/po/BasePO.java
index 1b0d94c..07b461f 100644
--- a/ServiceSite/src/main/java/com/seasky/czzxcms/infrastructure/dataobject/po/BasePO.java
+++ b/ServiceSite/src/main/java/com/seasky/dddtemplate/infrastructure/dataobject/po/BasePO.java
@@ -1,4 +1,4 @@
-package com.seasky.czzxcms.infrastructure.dataobject.po;
+package com.seasky.dddtemplate.infrastructure.dataobject.po;
import com.seasky.core.ddd.base.BaseDataObject;
import lombok.Data;
diff --git a/ServiceSite/src/main/java/com/seasky/czzxcms/infrastructure/dataobject/po/TestPo.java b/ServiceSite/src/main/java/com/seasky/dddtemplate/infrastructure/dataobject/po/TestPo.java
similarity index 85%
rename from ServiceSite/src/main/java/com/seasky/czzxcms/infrastructure/dataobject/po/TestPo.java
rename to ServiceSite/src/main/java/com/seasky/dddtemplate/infrastructure/dataobject/po/TestPo.java
index f70676d..7b78dd7 100644
--- a/ServiceSite/src/main/java/com/seasky/czzxcms/infrastructure/dataobject/po/TestPo.java
+++ b/ServiceSite/src/main/java/com/seasky/dddtemplate/infrastructure/dataobject/po/TestPo.java
@@ -1,9 +1,8 @@
-package com.seasky.czzxcms.infrastructure.dataobject.po;
+package com.seasky.dddtemplate.infrastructure.dataobject.po;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonInclude;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
diff --git a/ServiceSite/src/main/java/com/seasky/czzxcms/infrastructure/db/mapper/table/TestMapper.java b/ServiceSite/src/main/java/com/seasky/dddtemplate/infrastructure/db/mapper/table/TestMapper.java
similarity index 62%
rename from ServiceSite/src/main/java/com/seasky/czzxcms/infrastructure/db/mapper/table/TestMapper.java
rename to ServiceSite/src/main/java/com/seasky/dddtemplate/infrastructure/db/mapper/table/TestMapper.java
index dfb1950..d204533 100644
--- a/ServiceSite/src/main/java/com/seasky/czzxcms/infrastructure/db/mapper/table/TestMapper.java
+++ b/ServiceSite/src/main/java/com/seasky/dddtemplate/infrastructure/db/mapper/table/TestMapper.java
@@ -1,8 +1,8 @@
-package com.seasky.czzxcms.infrastructure.db.mapper.table;
+package com.seasky.dddtemplate.infrastructure.db.mapper.table;
import com.seasky.core.base.BaseMapper;
-import com.seasky.czzxcms.application.query.qry.TestQry;
-import com.seasky.czzxcms.infrastructure.dataobject.po.TestPo;
+import com.seasky.dddtemplate.dto.test.TestQueryQry;
+import com.seasky.dddtemplate.infrastructure.dataobject.po.TestPo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -23,7 +23,7 @@ public interface TestMapper extends BaseMapper<TestPo> {
* @param testQry 绀轰緥qry
* @return {@link List<TestPo>}
*/
- List<TestPo> selectUserList(@Param("pm") TestQry testQry);
+ List<TestPo> selectUserList(@Param("pm") TestQueryQry testQry);
}
diff --git a/ServiceSite/src/main/java/com/seasky/czzxcms/infrastructure/db/mapper/xml/TestMapper.xml b/ServiceSite/src/main/java/com/seasky/dddtemplate/infrastructure/db/mapper/xml/TestMapper.xml
similarity index 87%
rename from ServiceSite/src/main/java/com/seasky/czzxcms/infrastructure/db/mapper/xml/TestMapper.xml
rename to ServiceSite/src/main/java/com/seasky/dddtemplate/infrastructure/db/mapper/xml/TestMapper.xml
index dcc0c64..d773e95 100644
--- a/ServiceSite/src/main/java/com/seasky/czzxcms/infrastructure/db/mapper/xml/TestMapper.xml
+++ b/ServiceSite/src/main/java/com/seasky/dddtemplate/infrastructure/db/mapper/xml/TestMapper.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.seasky.czzxcms.infrastructure.db.mapper.table.TestMapper">
+<mapper namespace="com.seasky.dddtemplate.infrastructure.db.mapper.table.TestMapper">
<select id="selectIdPage" resultType="java.lang.Long">
@@ -24,7 +24,7 @@
- <select id="selectUserList" resultType="com.seasky.czzxcms.infrastructure.dataobject.po.TestPo">
+ <select id="selectUserList" resultType="com.seasky.dddtemplate.infrastructure.dataobject.po.TestPo">
select * from tb_user
<where>
available = 'YES'
diff --git a/ServiceSite/src/main/java/com/seasky/czzxcms/infrastructure/reader/test/TestQueryConvert.java b/ServiceSite/src/main/java/com/seasky/dddtemplate/infrastructure/reader/test/TestQueryConvert.java
similarity index 52%
rename from ServiceSite/src/main/java/com/seasky/czzxcms/infrastructure/reader/test/TestQueryConvert.java
rename to ServiceSite/src/main/java/com/seasky/dddtemplate/infrastructure/reader/test/TestQueryConvert.java
index 0553c51..7d52a72 100644
--- a/ServiceSite/src/main/java/com/seasky/czzxcms/infrastructure/reader/test/TestQueryConvert.java
+++ b/ServiceSite/src/main/java/com/seasky/dddtemplate/infrastructure/reader/test/TestQueryConvert.java
@@ -1,9 +1,9 @@
-package com.seasky.czzxcms.infrastructure.reader.test;
+package com.seasky.dddtemplate.infrastructure.reader.test;
import com.seasky.core.ddd.utils.MapperUtils;
-import com.seasky.czzxcms.application.query.out.TestOut;
-import com.seasky.czzxcms.infrastructure.dataobject.po.TestPo;
+import com.seasky.dddtemplate.dto.test.TestQueryOut;
+import com.seasky.dddtemplate.infrastructure.dataobject.po.TestPo;
import java.util.HashMap;
import java.util.List;
@@ -22,12 +22,12 @@ public class TestQueryConvert {
* Po绫昏浆涓篛ut绫�
*
* @param testPo 绀轰緥Po绫�
- * @return {@link TestOut}
+ * @return {@link TestQueryOut}
*/
- public static TestOut poToOut(TestPo testPo){
+ public static TestQueryOut poToOut(TestPo testPo){
//杞崲瀵瑰簲閿€糾ap
Map<String, String> map = new HashMap<>(3);
- TestOut testOut = MapperUtils.INSTANCE.map(TestOut.class,testPo);
+ TestQueryOut testOut = MapperUtils.INSTANCE.map(TestQueryOut.class,testPo);
return testOut;
}
@@ -36,12 +36,12 @@ public class TestQueryConvert {
* 鍒楄〃po杞负鍒楄〃Out绫�
*
* @param listPo 鍒楄〃Po绫�
- * @return {@link List<TestOut>}
+ * @return {@link List< TestQueryOut >}
*/
- public static List<TestOut> listPOToListOut(List<TestPo> listPo){
+ public static List<TestQueryOut> listPOToListOut(List<TestPo> listPo){
//杞崲瀵瑰簲閿€糾ap
Map<String, String> map = new HashMap<>(3);
- List<TestOut> testOuts = MapperUtils.INSTANCE.mapAsList(TestOut.class,listPo);
+ List<TestQueryOut> testOuts = MapperUtils.INSTANCE.mapAsList(TestQueryOut.class,listPo);
return testOuts;
}
}
diff --git a/ServiceSite/src/main/java/com/seasky/czzxcms/infrastructure/reader/test/TestQueryServiceImpl.java b/ServiceSite/src/main/java/com/seasky/dddtemplate/infrastructure/reader/test/TestQueryServiceImpl.java
similarity index 55%
rename from ServiceSite/src/main/java/com/seasky/czzxcms/infrastructure/reader/test/TestQueryServiceImpl.java
rename to ServiceSite/src/main/java/com/seasky/dddtemplate/infrastructure/reader/test/TestQueryServiceImpl.java
index 739f85d..0ad2e97 100644
--- a/ServiceSite/src/main/java/com/seasky/czzxcms/infrastructure/reader/test/TestQueryServiceImpl.java
+++ b/ServiceSite/src/main/java/com/seasky/dddtemplate/infrastructure/reader/test/TestQueryServiceImpl.java
@@ -1,15 +1,13 @@
-package com.seasky.czzxcms.infrastructure.reader.test;
+package com.seasky.dddtemplate.infrastructure.reader.test;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.seasky.core.base.AbstractService;
-import com.seasky.core.ddd.utils.MapperUtils;
-import com.seasky.czzxcms.application.query.TestQueryService;
-import com.seasky.czzxcms.application.query.out.TestOut;
-import com.seasky.czzxcms.application.query.qry.TestQry;
-import com.seasky.czzxcms.infrastructure.dataobject.po.TestPo;
-import com.seasky.czzxcms.infrastructure.db.mapper.table.TestMapper;
-import org.springframework.beans.factory.annotation.Autowired;
+import com.seasky.dddtemplate.application.query.TestQueryService;
+import com.seasky.dddtemplate.dto.test.TestQueryOut;
+import com.seasky.dddtemplate.dto.test.TestQueryQry;
+import com.seasky.dddtemplate.infrastructure.dataobject.po.TestPo;
+import com.seasky.dddtemplate.infrastructure.db.mapper.table.TestMapper;
import org.springframework.stereotype.Repository;
import java.util.List;
@@ -26,14 +24,14 @@ public class TestQueryServiceImpl extends AbstractService<TestPo,TestMapper> im
@Override
- public List<TestOut> queryTestList(TestQry testQry) {
+ public List<TestQueryOut> queryTestList(TestQueryQry testQry) {
//楠岃瘉浠ｇ爜鐣�
QueryWrapper<TestPo> queryWapper = new QueryWrapper<>();
if (testQry.getName()!= null && !"".equals(testQry.getName())){
queryWapper.eq("name",testQry.getName());
}
List<TestPo> testPos = list(TestPo.builder().name(testQry.getName()).build());
- List<TestOut> testOuts = TestQueryConvert.listPOToListOut(testPos);
+ List<TestQueryOut> testOuts = TestQueryConvert.listPOToListOut(testPos);
return testOuts;
}
}
diff --git a/ServiceSite/src/main/java/com/seasky/czzxcms/infrastructure/repository/test/TestConvert.java b/ServiceSite/src/main/java/com/seasky/dddtemplate/infrastructure/repository/test/TestConvert.java
similarity index 75%
rename from ServiceSite/src/main/java/com/seasky/czzxcms/infrastructure/repository/test/TestConvert.java
rename to ServiceSite/src/main/java/com/seasky/dddtemplate/infrastructure/repository/test/TestConvert.java
index 0949c16..59bafd8 100644
--- a/ServiceSite/src/main/java/com/seasky/czzxcms/infrastructure/repository/test/TestConvert.java
+++ b/ServiceSite/src/main/java/com/seasky/dddtemplate/infrastructure/repository/test/TestConvert.java
@@ -1,9 +1,9 @@
-package com.seasky.czzxcms.infrastructure.repository.test;
+package com.seasky.dddtemplate.infrastructure.repository.test;
import com.seasky.core.ddd.utils.MapperUtils;
-import com.seasky.czzxcms.domain.aggregate.test.TestAggregate;
-import com.seasky.czzxcms.infrastructure.dataobject.po.TestPo;
+import com.seasky.dddtemplate.domain.aggregate.test.TestAggregate;
+import com.seasky.dddtemplate.infrastructure.dataobject.po.TestPo;
import java.util.HashMap;
import java.util.Map;
diff --git a/ServiceSite/src/main/java/com/seasky/czzxcms/infrastructure/repository/test/TestImpl.java b/ServiceSite/src/main/java/com/seasky/dddtemplate/infrastructure/repository/test/TestRepositoryImpl.java
similarity index 66%
rename from ServiceSite/src/main/java/com/seasky/czzxcms/infrastructure/repository/test/TestImpl.java
rename to ServiceSite/src/main/java/com/seasky/dddtemplate/infrastructure/repository/test/TestRepositoryImpl.java
index 898a63a..81b3069 100644
--- a/ServiceSite/src/main/java/com/seasky/czzxcms/infrastructure/repository/test/TestImpl.java
+++ b/ServiceSite/src/main/java/com/seasky/dddtemplate/infrastructure/repository/test/TestRepositoryImpl.java
@@ -1,14 +1,14 @@
-package com.seasky.czzxcms.infrastructure.repository.test;
+package com.seasky.dddtemplate.infrastructure.repository.test;
import com.seasky.core.common.Error;
import com.seasky.core.common.ResponseCode;
import com.seasky.core.exception.DataAccessException;
-import com.seasky.czzxcms.application.query.qry.TestQry;
-import com.seasky.czzxcms.domain.aggregate.test.TestAggregate;
-import com.seasky.czzxcms.domain.aggregate.test.TestRepository;
-import com.seasky.czzxcms.infrastructure.dataobject.po.TestPo;
-import com.seasky.czzxcms.infrastructure.db.mapper.table.TestMapper;
+import com.seasky.dddtemplate.dto.test.TestQueryQry;
+import com.seasky.dddtemplate.domain.aggregate.test.TestAggregate;
+import com.seasky.dddtemplate.domain.aggregate.test.TestRepository;
+import com.seasky.dddtemplate.infrastructure.dataobject.po.TestPo;
+import com.seasky.dddtemplate.infrastructure.db.mapper.table.TestMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Repository;
@@ -19,7 +19,7 @@ import org.springframework.stereotype.Repository;
* @date 2020/12/07
*/
@Repository
-public class TestImpl implements TestRepository {
+public class TestRepositoryImpl implements TestRepository {
@Autowired
TestMapper testMapper;
@@ -35,7 +35,7 @@ public class TestImpl implements TestRepository {
//鑱氬悎杞琾o
TestPo testPo = TestConvert.TestAggregateToTestPo(testAggregate);
//楠岃瘉鍙婄壒娈婂鐞嗘搷浣� 浠ｇ爜 鐣�
- TestQry testQry = new TestQry();
+ TestQueryQry testQry = new TestQueryQry();
testQry.setCode(testPo.getCode());
if(testMapper.selectUserList(testQry).size() != 0){
throw new DataAccessException(new Error(ResponseCode.SERVER_INTERNAL_EXCEPTION,null,"缂栧彿宸插瓨鍦�",""));
diff --git a/ServiceSite/src/main/java/com/seasky/czzxcms/interfaces/controller/BaseController.java b/ServiceSite/src/main/java/com/seasky/dddtemplate/interfaces/controller/BaseController.java
similarity index 86%
rename from ServiceSite/src/main/java/com/seasky/czzxcms/interfaces/controller/BaseController.java
rename to ServiceSite/src/main/java/com/seasky/dddtemplate/interfaces/controller/BaseController.java
index e110d28..ace9e55 100644
--- a/ServiceSite/src/main/java/com/seasky/czzxcms/interfaces/controller/BaseController.java
+++ b/ServiceSite/src/main/java/com/seasky/dddtemplate/interfaces/controller/BaseController.java
@@ -1,4 +1,4 @@
-package com.seasky.czzxcms.interfaces.controller;
+package com.seasky.dddtemplate.interfaces.controller;
/**
diff --git a/ServiceSite/src/main/java/com/seasky/czzxcms/interfaces/controller/TestController.java b/ServiceSite/src/main/java/com/seasky/dddtemplate/interfaces/controller/TestController.java
similarity index 55%
rename from ServiceSite/src/main/java/com/seasky/czzxcms/interfaces/controller/TestController.java
rename to ServiceSite/src/main/java/com/seasky/dddtemplate/interfaces/controller/TestController.java
index 5c708fa..fbf28da 100644
--- a/ServiceSite/src/main/java/com/seasky/czzxcms/interfaces/controller/TestController.java
+++ b/ServiceSite/src/main/java/com/seasky/dddtemplate/interfaces/controller/TestController.java
@@ -1,17 +1,19 @@
-package com.seasky.czzxcms.interfaces.controller;
+package com.seasky.dddtemplate.interfaces.controller;
import com.seasky.core.common.ResponseCode;
-import com.seasky.czzxcms.application.command.TestCmdService;
-import com.seasky.czzxcms.application.command.cmd.TestCmd;
-import com.seasky.czzxcms.application.query.TestQueryService;
-import com.seasky.czzxcms.application.query.qry.TestQry;
+import com.seasky.core.common.Result;
+import com.seasky.dddtemplate.api.ITest;
+import com.seasky.dddtemplate.application.command.api.TestCmdService;
+import com.seasky.dddtemplate.application.query.TestQueryService;
+import com.seasky.dddtemplate.dto.test.TestCmd;
+import com.seasky.dddtemplate.dto.test.TestQueryOut;
+import com.seasky.dddtemplate.dto.test.TestQueryQry;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
import static com.seasky.core.common.Response.ok;
@@ -22,13 +24,13 @@ import static com.seasky.core.common.Response.ok;
* @author XueYawei
* @date 2020/12/07
*/
-@Api
+@Api("Test")
@RestController
@RequestMapping("test")
-public class TestController extends BaseController {
+public class TestController extends BaseController implements ITest {
@Autowired
- private TestCmdService testCmdService;
+ private TestCmdService testApplicationCmdService;
@Autowired
private TestQueryService testQueryService;
@@ -39,10 +41,10 @@ public class TestController extends BaseController {
* @return {@link Object}
*/
@ApiOperation("1.testC")
- @RequestMapping(path = "/add", method = RequestMethod.POST)
- public Object testC(@RequestBody TestCmd testCmd){
+ @Override
+ public Result<Integer> testC(@RequestBody TestCmd testCmd){
//TODO 淇濆瓨鐢ㄦ埛淇℃伅
- return ok(ResponseCode.SUCCESS, testCmdService.saveTest(testCmd));
+ return ok(ResponseCode.SUCCESS, testApplicationCmdService.saveTest(testCmd));
}
/**
@@ -52,8 +54,8 @@ public class TestController extends BaseController {
* @return {@link Object}
*/
@ApiOperation("1.testQ")
- @RequestMapping(path = "/queryList", method = RequestMethod.POST)
- public Object testQ(@RequestBody TestQry testQry){
+ @Override
+ public Result<TestQueryOut> testQ(@RequestBody TestQueryQry testQry){
//TODO 鏌ヨ鐢ㄦ埛闆嗗悎淇℃伅
return ok(ResponseCode.SUCCESS, testQueryService.queryTestList(testQry));
}
diff --git a/ServiceSite/src/main/resources/application.properties b/ServiceSite/src/main/resources/application.properties
index e5cda61..b6b0966 100644
--- a/ServiceSite/src/main/resources/application.properties
+++ b/ServiceSite/src/main/resources/application.properties
@@ -1,4 +1,4 @@
-spring.application.name=czzx
+spring.application.name=dddtemplate-provider
spring.profiles.active=@env@
server.port=8008
swagger.enable=true
diff --git a/ServiceSite/src/test/java/com/seasky/czzxcms/DeclarebudgetApplicationTests.java b/ServiceSite/src/test/java/com/seasky/dddtemplate/ApplicationTests.java
similarity index 70%
rename from ServiceSite/src/test/java/com/seasky/czzxcms/DeclarebudgetApplicationTests.java
rename to ServiceSite/src/test/java/com/seasky/dddtemplate/ApplicationTests.java
index 73f9ab5..d3085ca 100644
--- a/ServiceSite/src/test/java/com/seasky/czzxcms/DeclarebudgetApplicationTests.java
+++ b/ServiceSite/src/test/java/com/seasky/dddtemplate/ApplicationTests.java
@@ -1,10 +1,10 @@
-package com.seasky.czzxcms;
+package com.seasky.dddtemplate;
import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
@SpringBootTest
-class DeclarebudgetApplicationTests {
+class ApplicationTests {
@Test
void contextLoads() {
diff --git a/ServiceSite/src/test/java/com/seasky/czzxcms/interfaces/controller/test/TestCmdFactory.java b/ServiceSite/src/test/java/com/seasky/dddtemplate/interfaces/controller/test/TestCmdFactory.java
similarity index 93%
rename from ServiceSite/src/test/java/com/seasky/czzxcms/interfaces/controller/test/TestCmdFactory.java
rename to ServiceSite/src/test/java/com/seasky/dddtemplate/interfaces/controller/test/TestCmdFactory.java
index a0cc7a5..0f589d6 100644
--- a/ServiceSite/src/test/java/com/seasky/czzxcms/interfaces/controller/test/TestCmdFactory.java
+++ b/ServiceSite/src/test/java/com/seasky/dddtemplate/interfaces/controller/test/TestCmdFactory.java
@@ -1,9 +1,9 @@
-package com.seasky.czzxcms.interfaces.controller.test;
+package com.seasky.dddtemplate.interfaces.controller.test;
import com.seasky.core.exception.DataAccessException;
-import com.seasky.czzxcms.application.command.cmd.TestCmd;
-import com.seasky.czzxcms.infrastructure.dataobject.po.TestPo;
+import com.seasky.dddtemplate.dto.test.TestCmd;
+import com.seasky.dddtemplate.infrastructure.dataobject.po.TestPo;
import java.util.ArrayList;
import java.util.List;
diff --git a/ServiceSite/src/test/java/com/seasky/czzxcms/interfaces/controller/test/TestCmdTc.java b/ServiceSite/src/test/java/com/seasky/dddtemplate/interfaces/controller/test/TestCmdTc.java
similarity index 83%
rename from ServiceSite/src/test/java/com/seasky/czzxcms/interfaces/controller/test/TestCmdTc.java
rename to ServiceSite/src/test/java/com/seasky/dddtemplate/interfaces/controller/test/TestCmdTc.java
index a3cca8e..9a693e9 100644
--- a/ServiceSite/src/test/java/com/seasky/czzxcms/interfaces/controller/test/TestCmdTc.java
+++ b/ServiceSite/src/test/java/com/seasky/dddtemplate/interfaces/controller/test/TestCmdTc.java
@@ -1,9 +1,9 @@
-package com.seasky.czzxcms.interfaces.controller.test;
+package com.seasky.dddtemplate.interfaces.controller.test;
import com.seasky.core.ddd.test.BaseCmdTestCase;
-import com.seasky.czzxcms.application.command.cmd.TestCmd;
-import com.seasky.czzxcms.infrastructure.dataobject.po.TestPo;
+import com.seasky.dddtemplate.dto.test.TestCmd;
+import com.seasky.dddtemplate.infrastructure.dataobject.po.TestPo;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.ToString;
diff --git a/ServiceSite/src/test/java/com/seasky/czzxcms/interfaces/controller/test/TestControllerTest.java b/ServiceSite/src/test/java/com/seasky/dddtemplate/interfaces/controller/test/TestControllerTest.java
similarity index 82%
rename from ServiceSite/src/test/java/com/seasky/czzxcms/interfaces/controller/test/TestControllerTest.java
rename to ServiceSite/src/test/java/com/seasky/dddtemplate/interfaces/controller/test/TestControllerTest.java
index b3a4179..f4a6a98 100644
--- a/ServiceSite/src/test/java/com/seasky/czzxcms/interfaces/controller/test/TestControllerTest.java
+++ b/ServiceSite/src/test/java/com/seasky/dddtemplate/interfaces/controller/test/TestControllerTest.java
@@ -1,10 +1,10 @@
-package com.seasky.czzxcms.interfaces.controller.test;
+package com.seasky.dddtemplate.interfaces.controller.test;
import com.seasky.core.ddd.test.PoAssertions;
-import com.seasky.czzxcms.application.command.TestCmdService;
-import com.seasky.czzxcms.application.query.TestQueryService;
-import com.seasky.czzxcms.application.query.out.TestOut;
-import com.seasky.czzxcms.infrastructure.db.mapper.table.TestMapper;
+import com.seasky.dddtemplate.application.command.api.TestCmdService;
+import com.seasky.dddtemplate.application.query.TestQueryService;
+import com.seasky.dddtemplate.dto.test.TestQueryOut;
+import com.seasky.dddtemplate.infrastructure.db.mapper.table.TestMapper;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.MethodSource;
import org.springframework.beans.factory.annotation.Autowired;
@@ -55,7 +55,7 @@ class TestControllerTest {
@ParameterizedTest
@MethodSource("getTCQryStream")
void testQ(TestQueryTc testCase) {
- List<TestOut> outList = testQueryService.queryTestList(testCase.getQryParam());
+ List<TestQueryOut> outList = testQueryService.queryTestList(testCase.getQryParam());
System.out.println("----杩斿洖杈撳嚭-------------========>>>"+outList.size()+"========="+outList);
//楠岃瘉杩斿洖鏉℃暟涓庢湡鏈涜繑鍥炴潯鏁版槸鍚︿竴鑷�
System.out.println(testCase.getFlag());
diff --git a/ServiceSite/src/test/java/com/seasky/czzxcms/interfaces/controller/test/TestQueryTc.java b/ServiceSite/src/test/java/com/seasky/dddtemplate/interfaces/controller/test/TestQueryTc.java
similarity index 56%
rename from ServiceSite/src/test/java/com/seasky/czzxcms/interfaces/controller/test/TestQueryTc.java
rename to ServiceSite/src/test/java/com/seasky/dddtemplate/interfaces/controller/test/TestQueryTc.java
index 1a228ee..279cee6 100644
--- a/ServiceSite/src/test/java/com/seasky/czzxcms/interfaces/controller/test/TestQueryTc.java
+++ b/ServiceSite/src/test/java/com/seasky/dddtemplate/interfaces/controller/test/TestQueryTc.java
@@ -1,10 +1,10 @@
-package com.seasky.czzxcms.interfaces.controller.test;
+package com.seasky.dddtemplate.interfaces.controller.test;
import com.seasky.core.ddd.test.BaseQryTestCase;
-import com.seasky.czzxcms.application.query.qry.TestQry;
+import com.seasky.dddtemplate.dto.test.TestQueryQry;
-public class TestQueryTc extends BaseQryTestCase<TestQry> {
+public class TestQueryTc extends BaseQryTestCase<TestQueryQry> {
private static final String TEST_METHOD = "缁勫悎鏉′欢鏌ヨ鐢ㄦ埛";
diff --git a/ServiceSite/src/test/java/com/seasky/czzxcms/interfaces/controller/test/TestQueryTcFactory.java b/ServiceSite/src/test/java/com/seasky/dddtemplate/interfaces/controller/test/TestQueryTcFactory.java
similarity index 83%
rename from ServiceSite/src/test/java/com/seasky/czzxcms/interfaces/controller/test/TestQueryTcFactory.java
rename to ServiceSite/src/test/java/com/seasky/dddtemplate/interfaces/controller/test/TestQueryTcFactory.java
index e70d5d4..50d1ffb 100644
--- a/ServiceSite/src/test/java/com/seasky/czzxcms/interfaces/controller/test/TestQueryTcFactory.java
+++ b/ServiceSite/src/test/java/com/seasky/dddtemplate/interfaces/controller/test/TestQueryTcFactory.java
@@ -1,7 +1,7 @@
-package com.seasky.czzxcms.interfaces.controller.test;
+package com.seasky.dddtemplate.interfaces.controller.test;
-import com.seasky.czzxcms.application.query.qry.TestQry;
+import com.seasky.dddtemplate.dto.test.TestQueryQry;
import java.util.ArrayList;
import java.util.List;
@@ -24,7 +24,7 @@ public class TestQueryTcFactory {
private static TestQueryTc buildCase01() {
TestQueryTc findStudentByConditionTc = new TestQueryTc("鏈夋潯浠�");
- TestQry studentQry = new TestQry();
+ TestQueryQry studentQry = new TestQueryQry();
studentQry.setName("闃胯惃寰�");
findStudentByConditionTc.setQryParam(studentQry);
//璧嬪€兼湡鏈涜繑鍥炴潯鏁�
@@ -35,7 +35,7 @@ public class TestQueryTcFactory {
private static TestQueryTc buildCase02() {
TestQueryTc findStudentByConditionTc = new TestQueryTc("绌烘潯浠�");
- TestQry studentQry = new TestQry();
+ TestQueryQry studentQry = new TestQueryQry();
findStudentByConditionTc.setQryParam(studentQry);
findStudentByConditionTc.setExpectCount(3);
return findStudentByConditionTc;
--
GitLab
From 03f67bf4846dd5b3f63f42f3df22f6a15a71905a Mon Sep 17 00:00:00 2001
From: ljfxxx <ljfxxx@qq.com>
Date: Mon, 21 Dec 2020 09:02:21 +0800
Subject: [PATCH 2/2] fix: add feignclient basepackage
---
.../src/main/java/com/seasky/dddtemplate/api/ITest.java | 4 ++--
ServiceSite/src/main/java/com/seasky/Application.java | 7 ++++++-
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/ServiceSite/facade/src/main/java/com/seasky/dddtemplate/api/ITest.java b/ServiceSite/facade/src/main/java/com/seasky/dddtemplate/api/ITest.java
index 5901df7..5d79450 100644
--- a/ServiceSite/facade/src/main/java/com/seasky/dddtemplate/api/ITest.java
+++ b/ServiceSite/facade/src/main/java/com/seasky/dddtemplate/api/ITest.java
@@ -13,9 +13,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
@RequestMapping("test")
public interface ITest {
- @PostMapping(path = "/pc/v1/add1")
+ @PostMapping(path = "/pc/v1/add")
Result<Integer> testC(@RequestBody TestCmd testCmd);
- @PostMapping(path = "/pc/v1/queryList1")
+ @PostMapping(path = "/pc/v1/queryList")
Result<TestQueryOut> testQ(@RequestBody TestQueryQry testQry);
}
diff --git a/ServiceSite/src/main/java/com/seasky/Application.java b/ServiceSite/src/main/java/com/seasky/Application.java
index 7637280..7376509 100644
--- a/ServiceSite/src/main/java/com/seasky/Application.java
+++ b/ServiceSite/src/main/java/com/seasky/Application.java
@@ -2,6 +2,7 @@ package com.seasky;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
import org.springframework.cloud.openfeign.EnableFeignClients;
import org.springframework.context.annotation.EnableAspectJAutoProxy;
@@ -10,7 +11,11 @@ import org.springframework.context.annotation.EnableAspectJAutoProxy;
* */
@SpringBootApplication
@EnableAspectJAutoProxy(exposeProxy = true)
-@EnableFeignClients
+@EnableDiscoveryClient
+@EnableFeignClients(basePackages = {
+ "com.seasky.some-api"
+ ,"com.seasky.other-api"
+})
public class Application {
public static void main(String[] args) {
--
GitLab