diff --git a/pom.xml b/pom.xml
index bb8f0b072990e0e1d04c57547c9dbe1e57f58739..e595274ee56d42876c00fd71243b233aba24b5d6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,6 +13,7 @@
xfg-frame-archetype-lite-trigger
xfg-frame-archetype-lite-infrastructure
xfg-frame-archetype-lite-types
+ xfg-frame-archetype-lite-api
@@ -127,6 +128,11 @@
+
+ org.apache.maven.plugins
+ maven-archetype-plugin
+ 3.2.0
+
org.apache.maven.plugins
maven-compiler-plugin
diff --git a/scaffold-lite/README.md b/scaffold-lite/README.md
index 2153c343fc6bf42aab8292a56e22f92d259a6051..2feea38b0295db5d4022ac75e529e6bdc8013806 100644
--- a/scaffold-lite/README.md
+++ b/scaffold-lite/README.md
@@ -5,8 +5,8 @@
### 1. 生成
```shell
-md5 ddd-scaffold-lite-1.1.pom > ddd-scaffold-lite-1.1.pom.md5
-shasum ddd-scaffold-lite-1.1.pom > ddd-scaffold-lite-1.1.pom.sha1
+md5 ddd-scaffold-lite-1.21.pom > ddd-scaffold-lite-1.21.pom.md5
+shasum ddd-scaffold-lite-1.21.pom > ddd-scaffold-lite-1.21.pom.sha1
```
```shell
diff --git a/scaffold-lite/pom.xml b/scaffold-lite/pom.xml
index 533bd4a47074fbf678fffe105a829603750b4fb1..5706e412c188325507516f4615ef0c75bb96e695 100644
--- a/scaffold-lite/pom.xml
+++ b/scaffold-lite/pom.xml
@@ -5,8 +5,9 @@
io.github.fuzhengwei
ddd-scaffold-lite
- 1.1
- maven-archetype
+ 1.21
+
+ jar
ddd-scaffold-lite
@@ -72,27 +73,27 @@
-Xdoclint:none
-
-
-
+
+ /Library/Java/JavaVirtualMachines/jdk1.8.0_311.jdk/Contents/Home/bin/javadoc
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+ org.apache.maven.plugins
+ maven-gpg-plugin
+ 1.5
+
+
+ sign-artifacts
+ verify
+
+ sign
+
+
+
+
org.apache.maven.plugins
maven-release-plugin
@@ -124,9 +125,9 @@
-Xdoclint:none
-
-
-
+
+ /Library/Java/JavaVirtualMachines/jdk1.8.0_311.jdk/Contents/Home/bin/javadoc
+
diff --git a/scaffold-lite/src/main/resources/META-INF/maven/archetype-metadata.xml b/scaffold-lite/src/main/resources/META-INF/maven/archetype-metadata.xml
index d4108f03e4fe080959fa2968c11329942bbccbf3..252a01bc8bc5149aa931ed7afe894ea532e63027 100644
--- a/scaffold-lite/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ b/scaffold-lite/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -30,6 +30,17 @@
+
+
+
+ src/main/java
+
+ **/*.java
+
+
+
+
diff --git a/scaffold-lite/src/main/resources/archetype-resources/__rootArtifactId__-api/pom.xml b/scaffold-lite/src/main/resources/archetype-resources/__rootArtifactId__-api/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..f004ba84596d4d1b8920988df3e96ffe26651144
--- /dev/null
+++ b/scaffold-lite/src/main/resources/archetype-resources/__rootArtifactId__-api/pom.xml
@@ -0,0 +1,38 @@
+
+
+ 4.0.0
+
+ ${groupId}
+ ${rootArtifactId}
+ ${version}
+
+
+ ${artifactId}
+
+
+
+ org.projectlombok
+ lombok
+ 1.18.26
+
+
+ jakarta.validation
+ jakarta.validation-api
+ 3.0.2
+
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-compiler-plugin
+
+ ${java.version}
+ ${java.version}
+
+
+
+
+
+
diff --git a/scaffold-lite/src/main/resources/archetype-resources/__rootArtifactId__-api/src/main/java/api/dto/package-info.java b/scaffold-lite/src/main/resources/archetype-resources/__rootArtifactId__-api/src/main/java/api/dto/package-info.java
new file mode 100644
index 0000000000000000000000000000000000000000..8a09c5891aee5d96420d838ad466c28f85386fc4
--- /dev/null
+++ b/scaffold-lite/src/main/resources/archetype-resources/__rootArtifactId__-api/src/main/java/api/dto/package-info.java
@@ -0,0 +1,7 @@
+#set( $symbol_pound = '#' )
+#set( $symbol_dollar = '$' )
+#set( $symbol_escape = '\' )
+/**
+ * 数据传输对象 xxxRequestDTO xxxResponseDTO
+ */
+package ${package}.api.dto;
\ No newline at end of file
diff --git a/scaffold-lite/src/main/resources/archetype-resources/__rootArtifactId__-infrastructure/src/main/java/infrastructure/gateway/adapter/package-info.java b/scaffold-lite/src/main/resources/archetype-resources/__rootArtifactId__-api/src/main/java/api/package-info.java
similarity index 63%
rename from scaffold-lite/src/main/resources/archetype-resources/__rootArtifactId__-infrastructure/src/main/java/infrastructure/gateway/adapter/package-info.java
rename to scaffold-lite/src/main/resources/archetype-resources/__rootArtifactId__-api/src/main/java/api/package-info.java
index eed895764b5544efa137752166585ac941c669bc..2bb5fc1dfa6bfdc79977f5208511f7d0d2c0a198 100644
--- a/scaffold-lite/src/main/resources/archetype-resources/__rootArtifactId__-infrastructure/src/main/java/infrastructure/gateway/adapter/package-info.java
+++ b/scaffold-lite/src/main/resources/archetype-resources/__rootArtifactId__-api/src/main/java/api/package-info.java
@@ -1,4 +1,7 @@
#set( $symbol_pound = '#' )
#set( $symbol_dollar = '$' )
#set( $symbol_escape = '\' )
-package ${package}.infrastructure.gateway.adapter;
\ No newline at end of file
+/**
+ * 定义api接口
+ */
+package ${package}.api;
\ No newline at end of file
diff --git a/scaffold-lite/src/main/resources/archetype-resources/__rootArtifactId__-api/src/main/java/api/response/Response.java b/scaffold-lite/src/main/resources/archetype-resources/__rootArtifactId__-api/src/main/java/api/response/Response.java
new file mode 100644
index 0000000000000000000000000000000000000000..2db4a77e112306fb5b2fd4c8deda33d3e2521420
--- /dev/null
+++ b/scaffold-lite/src/main/resources/archetype-resources/__rootArtifactId__-api/src/main/java/api/response/Response.java
@@ -0,0 +1,25 @@
+#set( $symbol_pound = '#' )
+#set( $symbol_dollar = '$' )
+#set( $symbol_escape = '\' )
+package ${package}.api.response;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class Response implements Serializable {
+
+ private static final long serialVersionUID = 7000723935764546321L;
+
+ private String code;
+ private String info;
+ private T data;
+
+}
diff --git a/scaffold-lite/src/main/resources/archetype-resources/__rootArtifactId__-app/Dockerfile b/scaffold-lite/src/main/resources/archetype-resources/__rootArtifactId__-app/Dockerfile
index 101a307086586bdad3492927de4f0967aa0ad0af..1b414010902782b674c24730195a666525126ea8 100644
--- a/scaffold-lite/src/main/resources/archetype-resources/__rootArtifactId__-app/Dockerfile
+++ b/scaffold-lite/src/main/resources/archetype-resources/__rootArtifactId__-app/Dockerfile
@@ -12,7 +12,7 @@ ENV TZ=PRC
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
# 添加应用
-ADD target/${artifactId}-app.jar /${artifactId}-app.jar
+ADD target/${artifactId}.jar /${artifactId}.jar
## 在镜像运行为容器后执行的命令
-ENTRYPOINT ["sh","-c","java -jar $JAVA_OPTS /${artifactId}-app.jar $PARAMS"]
\ No newline at end of file
+ENTRYPOINT ["sh","-c","java -jar $JAVA_OPTS /${artifactId}.jar $PARAMS"]
\ No newline at end of file
diff --git a/scaffold-lite/src/main/resources/archetype-resources/__rootArtifactId__-app/pom.xml b/scaffold-lite/src/main/resources/archetype-resources/__rootArtifactId__-app/pom.xml
index fec4499e1e0604abcd39440834f978827c99f696..46333bee4c64e48e065381fb5166dac093a5b4c2 100644
--- a/scaffold-lite/src/main/resources/archetype-resources/__rootArtifactId__-app/pom.xml
+++ b/scaffold-lite/src/main/resources/archetype-resources/__rootArtifactId__-app/pom.xml
@@ -134,5 +134,4 @@
-
diff --git a/scaffold-lite/src/main/resources/archetype-resources/__rootArtifactId__-domain/src/main/java/domain/xxx/repository/package-info.java b/scaffold-lite/src/main/resources/archetype-resources/__rootArtifactId__-domain/src/main/java/domain/xxx/adapter/repository/package-info.java
similarity index 78%
rename from scaffold-lite/src/main/resources/archetype-resources/__rootArtifactId__-domain/src/main/java/domain/xxx/repository/package-info.java
rename to scaffold-lite/src/main/resources/archetype-resources/__rootArtifactId__-domain/src/main/java/domain/xxx/adapter/repository/package-info.java
index ab5d4057b92301b1ee9f3fccb7daa53ee6606ac5..efc4bb742e3ac8eaa1015586333a0254ff3cdb3e 100644
--- a/scaffold-lite/src/main/resources/archetype-resources/__rootArtifactId__-domain/src/main/java/domain/xxx/repository/package-info.java
+++ b/scaffold-lite/src/main/resources/archetype-resources/__rootArtifactId__-domain/src/main/java/domain/xxx/adapter/repository/package-info.java
@@ -5,4 +5,4 @@
* 仓储服务
* 1. 定义仓储接口,之后由基础设施层做具体实现
*/
-package ${package}.domain.xxx.repository;
\ No newline at end of file
+package ${package}.domain.xxx.adapter.repository;
\ No newline at end of file
diff --git a/scaffold-lite/src/main/resources/archetype-resources/__rootArtifactId__-domain/src/main/java/domain/yyy/repository/package-info.java b/scaffold-lite/src/main/resources/archetype-resources/__rootArtifactId__-domain/src/main/java/domain/yyy/repository/package-info.java
deleted file mode 100644
index 84a49cff5d6fc5b51fc77965478fcb7d01478cb3..0000000000000000000000000000000000000000
--- a/scaffold-lite/src/main/resources/archetype-resources/__rootArtifactId__-domain/src/main/java/domain/yyy/repository/package-info.java
+++ /dev/null
@@ -1,8 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-/**
- * 仓储服务
- * 1. 定义仓储接口,之后由基础设施层做具体实现
- */
-package ${package}.domain.yyy.repository;
\ No newline at end of file
diff --git a/scaffold-lite/src/main/resources/archetype-resources/__rootArtifactId__-infrastructure/src/main/java/infrastructure/adapter/port/package-info.java b/scaffold-lite/src/main/resources/archetype-resources/__rootArtifactId__-infrastructure/src/main/java/infrastructure/adapter/port/package-info.java
new file mode 100644
index 0000000000000000000000000000000000000000..1e1dc99d3182c54eac443e235e433c60b5674ec4
--- /dev/null
+++ b/scaffold-lite/src/main/resources/archetype-resources/__rootArtifactId__-infrastructure/src/main/java/infrastructure/adapter/port/package-info.java
@@ -0,0 +1,7 @@
+#set( $symbol_pound = '#' )
+#set( $symbol_dollar = '$' )
+#set( $symbol_escape = '\' )
+/**
+ * 实现对外部的api调用,类的名称为 XxxPort 接口定义在 domain 中
+ */
+package ${package}.infrastructure.adapter.port;
\ No newline at end of file
diff --git a/scaffold-lite/src/main/resources/archetype-resources/__rootArtifactId__-infrastructure/src/main/java/infrastructure/persistent/repository/package-info.java b/scaffold-lite/src/main/resources/archetype-resources/__rootArtifactId__-infrastructure/src/main/java/infrastructure/adapter/repository/package-info.java
similarity index 79%
rename from scaffold-lite/src/main/resources/archetype-resources/__rootArtifactId__-infrastructure/src/main/java/infrastructure/persistent/repository/package-info.java
rename to scaffold-lite/src/main/resources/archetype-resources/__rootArtifactId__-infrastructure/src/main/java/infrastructure/adapter/repository/package-info.java
index 2b5a3bb95f640843ddebc45af018a48281f33243..7a26e90406739bcbd7c43e67fe0786c2cf5df2d0 100644
--- a/scaffold-lite/src/main/resources/archetype-resources/__rootArtifactId__-infrastructure/src/main/java/infrastructure/persistent/repository/package-info.java
+++ b/scaffold-lite/src/main/resources/archetype-resources/__rootArtifactId__-infrastructure/src/main/java/infrastructure/adapter/repository/package-info.java
@@ -4,4 +4,4 @@
/**
* 仓储实现;用于实现 domain 中定义的仓储接口,如;IXxxRepository 在 Repository 中调用服务
*/
-package ${package}.infrastructure.persistent.repository;
\ No newline at end of file
+package ${package}.infrastructure.adapter.repository;
\ No newline at end of file
diff --git a/scaffold-lite/src/main/resources/archetype-resources/__rootArtifactId__-infrastructure/src/main/java/infrastructure/persistent/dao/package-info.java b/scaffold-lite/src/main/resources/archetype-resources/__rootArtifactId__-infrastructure/src/main/java/infrastructure/dao/package-info.java
similarity index 70%
rename from scaffold-lite/src/main/resources/archetype-resources/__rootArtifactId__-infrastructure/src/main/java/infrastructure/persistent/dao/package-info.java
rename to scaffold-lite/src/main/resources/archetype-resources/__rootArtifactId__-infrastructure/src/main/java/infrastructure/dao/package-info.java
index 2de1a8d2166a1ef97c2bbb6f38562ec75a071933..49d97149f0e7a15c1f96a52bf5d3cf499ed0edea 100644
--- a/scaffold-lite/src/main/resources/archetype-resources/__rootArtifactId__-infrastructure/src/main/java/infrastructure/persistent/dao/package-info.java
+++ b/scaffold-lite/src/main/resources/archetype-resources/__rootArtifactId__-infrastructure/src/main/java/infrastructure/dao/package-info.java
@@ -4,4 +4,4 @@
/**
* DAO 接口;IXxxDao
*/
-package ${package}.infrastructure.persistent.dao;
\ No newline at end of file
+package ${package}.infrastructure.dao;
\ No newline at end of file
diff --git a/scaffold-lite/src/main/resources/archetype-resources/__rootArtifactId__-infrastructure/src/main/java/infrastructure/persistent/po/package-info.java b/scaffold-lite/src/main/resources/archetype-resources/__rootArtifactId__-infrastructure/src/main/java/infrastructure/dao/po/package-info.java
similarity index 76%
rename from scaffold-lite/src/main/resources/archetype-resources/__rootArtifactId__-infrastructure/src/main/java/infrastructure/persistent/po/package-info.java
rename to scaffold-lite/src/main/resources/archetype-resources/__rootArtifactId__-infrastructure/src/main/java/infrastructure/dao/po/package-info.java
index db590aa2b12d87093f62038e2c3e38b2b9cb7f64..361e73db0650285b5d7ac8f00c958d63206910a6 100644
--- a/scaffold-lite/src/main/resources/archetype-resources/__rootArtifactId__-infrastructure/src/main/java/infrastructure/persistent/po/package-info.java
+++ b/scaffold-lite/src/main/resources/archetype-resources/__rootArtifactId__-infrastructure/src/main/java/infrastructure/dao/po/package-info.java
@@ -4,4 +4,4 @@
/**
* 持久化对象;XxxPO 最后的 PO 是大写,UserPO
*/
-package ${package}.infrastructure.persistent.po;
\ No newline at end of file
+package ${package}.infrastructure.dao.po;
\ No newline at end of file
diff --git a/scaffold-lite/src/main/resources/archetype-resources/__rootArtifactId__-infrastructure/src/main/java/infrastructure/gateway/dto/package-info.java b/scaffold-lite/src/main/resources/archetype-resources/__rootArtifactId__-infrastructure/src/main/java/infrastructure/gateway/dto/package-info.java
index e87393969ceca4380c1c39dc92ec22ae087152ec..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
--- a/scaffold-lite/src/main/resources/archetype-resources/__rootArtifactId__-infrastructure/src/main/java/infrastructure/gateway/dto/package-info.java
+++ b/scaffold-lite/src/main/resources/archetype-resources/__rootArtifactId__-infrastructure/src/main/java/infrastructure/gateway/dto/package-info.java
@@ -1,4 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-package ${package}.infrastructure.gateway.dto;
\ No newline at end of file
diff --git a/scaffold-lite/src/main/resources/archetype-resources/__rootArtifactId__-infrastructure/src/main/java/infrastructure/gateway/package-info.java b/scaffold-lite/src/main/resources/archetype-resources/__rootArtifactId__-infrastructure/src/main/java/infrastructure/gateway/package-info.java
new file mode 100644
index 0000000000000000000000000000000000000000..6858286b498d47b4cafbc043571b16f7d0ed3a5d
--- /dev/null
+++ b/scaffold-lite/src/main/resources/archetype-resources/__rootArtifactId__-infrastructure/src/main/java/infrastructure/gateway/package-info.java
@@ -0,0 +1,7 @@
+#set( $symbol_pound = '#' )
+#set( $symbol_dollar = '$' )
+#set( $symbol_escape = '\' )
+/**
+ * 定义http、rpc接口,调用外部。在 adapter 中调用这部分内容。
+ */
+package ${package}.infrastructure.gateway;
\ No newline at end of file
diff --git a/scaffold-lite/src/main/resources/archetype-resources/__rootArtifactId__-infrastructure/src/main/java/infrastructure/gateway/api/package-info.java b/scaffold-lite/src/main/resources/archetype-resources/__rootArtifactId__-infrastructure/src/main/java/infrastructure/redis/package-info.java
similarity index 53%
rename from scaffold-lite/src/main/resources/archetype-resources/__rootArtifactId__-infrastructure/src/main/java/infrastructure/gateway/api/package-info.java
rename to scaffold-lite/src/main/resources/archetype-resources/__rootArtifactId__-infrastructure/src/main/java/infrastructure/redis/package-info.java
index f1d4da2d34896009751e796b990f665b55c0df67..2c8ff3a9f09d38d8b9958864a286c6340df44769 100644
--- a/scaffold-lite/src/main/resources/archetype-resources/__rootArtifactId__-infrastructure/src/main/java/infrastructure/gateway/api/package-info.java
+++ b/scaffold-lite/src/main/resources/archetype-resources/__rootArtifactId__-infrastructure/src/main/java/infrastructure/redis/package-info.java
@@ -1,4 +1,7 @@
#set( $symbol_pound = '#' )
#set( $symbol_dollar = '$' )
#set( $symbol_escape = '\' )
-package ${package}.infrastructure.gateway.api;
\ No newline at end of file
+/**
+ * 提供redis链接配置
+ */
+package ${package}.infrastructure.redis;
\ No newline at end of file
diff --git a/scaffold-lite/src/main/resources/archetype-resources/pom.xml b/scaffold-lite/src/main/resources/archetype-resources/pom.xml
index 7b481b2e12d3f0018c5d04ac121ec103bd90180d..11d7f4b429dcc748a4998242b0bfce52eaf0ce47 100644
--- a/scaffold-lite/src/main/resources/archetype-resources/pom.xml
+++ b/scaffold-lite/src/main/resources/archetype-resources/pom.xml
@@ -8,6 +8,7 @@
pom
+ ${rootArtifactId}-api
${rootArtifactId}-app
${rootArtifactId}-domain
${rootArtifactId}-trigger
diff --git a/xfg-frame-archetype-lite-api/pom.xml b/xfg-frame-archetype-lite-api/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..af338454e6625f6adbf12c8fc309272fb1f02e90
--- /dev/null
+++ b/xfg-frame-archetype-lite-api/pom.xml
@@ -0,0 +1,40 @@
+
+
+ 4.0.0
+
+ cn.bugstack
+ xfg-frame-archetype-lite
+ 1.0-SNAPSHOT
+
+
+ xfg-frame-archetype-lite-api
+
+
+
+ org.projectlombok
+ lombok
+ 1.18.26
+
+
+ jakarta.validation
+ jakarta.validation-api
+ 3.0.2
+
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-compiler-plugin
+
+ ${java.version}
+ ${java.version}
+
+
+
+
+
+
\ No newline at end of file
diff --git a/xfg-frame-archetype-lite-api/src/main/java/cn/bugstack/api/dto/package-info.java b/xfg-frame-archetype-lite-api/src/main/java/cn/bugstack/api/dto/package-info.java
new file mode 100644
index 0000000000000000000000000000000000000000..6d98ae483f6fe6b9d3230523305c4629379ab356
--- /dev/null
+++ b/xfg-frame-archetype-lite-api/src/main/java/cn/bugstack/api/dto/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * 数据传输对象 xxxRequestDTO xxxResponseDTO
+ */
+package cn.bugstack.api.dto;
\ No newline at end of file
diff --git a/xfg-frame-archetype-lite-api/src/main/java/cn/bugstack/api/package-info.java b/xfg-frame-archetype-lite-api/src/main/java/cn/bugstack/api/package-info.java
new file mode 100644
index 0000000000000000000000000000000000000000..a2e881f9737bf8d1aee10da912744431b1aa3bde
--- /dev/null
+++ b/xfg-frame-archetype-lite-api/src/main/java/cn/bugstack/api/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * 定义api接口
+ */
+package cn.bugstack.api;
\ No newline at end of file
diff --git a/xfg-frame-archetype-lite-api/src/main/java/cn/bugstack/api/response/Response.java b/xfg-frame-archetype-lite-api/src/main/java/cn/bugstack/api/response/Response.java
new file mode 100644
index 0000000000000000000000000000000000000000..68365c2dbabae25956781285567117549e0c1f4d
--- /dev/null
+++ b/xfg-frame-archetype-lite-api/src/main/java/cn/bugstack/api/response/Response.java
@@ -0,0 +1,22 @@
+package cn.bugstack.api.response;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class Response implements Serializable {
+
+ private static final long serialVersionUID = 7000723935764546321L;
+
+ private String code;
+ private String info;
+ private T data;
+
+}
diff --git a/xfg-frame-archetype-lite-app/Dockerfile b/xfg-frame-archetype-lite-app/Dockerfile
index 2d092d9c096515e82381abbe1cabe22f74dfd8a4..8e542ccde057d56c1caef9d877f2167c084bbb83 100644
--- a/xfg-frame-archetype-lite-app/Dockerfile
+++ b/xfg-frame-archetype-lite-app/Dockerfile
@@ -12,6 +12,6 @@ ENV TZ=PRC
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
# 添加应用
-ADD target/xfg-frame-archetype-lite-app-app.jar /xfg-frame-archetype-lite-app-app.jar
+ADD target/xfg-frame-archetype-lite-app.jar /xfg-frame-archetype-lite-app.jar
-ENTRYPOINT ["sh","-c","java -jar $JAVA_OPTS /xfg-frame-archetype-lite-app-app.jar $PARAMS"]
\ No newline at end of file
+ENTRYPOINT ["sh","-c","java -jar $JAVA_OPTS /xfg-frame-archetype-lite-app.jar $PARAMS"]
\ No newline at end of file
diff --git a/xfg-frame-archetype-lite-app/src/main/resources/mybatis/mapper/frame_case_mapper.xml b/xfg-frame-archetype-lite-app/src/main/resources/mybatis/mapper/frame_case_mapper.xml
index 7e2ed513346996e764d31fe0edd9774d780eb880..2c3f77af56c10912fab2cf604e6cbfef25098623 100644
--- a/xfg-frame-archetype-lite-app/src/main/resources/mybatis/mapper/frame_case_mapper.xml
+++ b/xfg-frame-archetype-lite-app/src/main/resources/mybatis/mapper/frame_case_mapper.xml
@@ -1,18 +1,18 @@
-
+
-
+
-
+
INSERT INTO table(a,b,c) VALUES(#{a}, #{b}, #{c})
-
+
UPDATE table SET a = #{a} WHERE b = #{b}
diff --git a/xfg-frame-archetype-lite-domain/src/main/java/cn/bugstack/domain/xxx/adapter/package-info.java b/xfg-frame-archetype-lite-domain/src/main/java/cn/bugstack/domain/xxx/adapter/port/package-info.java
similarity index 78%
rename from xfg-frame-archetype-lite-domain/src/main/java/cn/bugstack/domain/xxx/adapter/package-info.java
rename to xfg-frame-archetype-lite-domain/src/main/java/cn/bugstack/domain/xxx/adapter/port/package-info.java
index 9a649da9f046cdac4ec8889b06b635c04124acad..60230c38f851dada2a8afe3c84bc94015af0cbcd 100644
--- a/xfg-frame-archetype-lite-domain/src/main/java/cn/bugstack/domain/xxx/adapter/package-info.java
+++ b/xfg-frame-archetype-lite-domain/src/main/java/cn/bugstack/domain/xxx/adapter/port/package-info.java
@@ -1,4 +1,4 @@
/**
* 外部接口适配器层;当需要调用外部接口时,则创建出这一层,并定义接口,之后由基础设施层的 adapter 层具体实现
*/
-package cn.bugstack.domain.xxx.adapter;
\ No newline at end of file
+package cn.bugstack.domain.xxx.adapter.port;
\ No newline at end of file
diff --git a/xfg-frame-archetype-lite-domain/src/main/java/cn/bugstack/domain/xxx/repository/package-info.java b/xfg-frame-archetype-lite-domain/src/main/java/cn/bugstack/domain/xxx/adapter/repository/package-info.java
similarity index 64%
rename from xfg-frame-archetype-lite-domain/src/main/java/cn/bugstack/domain/xxx/repository/package-info.java
rename to xfg-frame-archetype-lite-domain/src/main/java/cn/bugstack/domain/xxx/adapter/repository/package-info.java
index 28347611b0cd3edf3164e0949a9fd526f6c773c3..e70a90340f98ea140f8b31aba0c158e6291f6547 100644
--- a/xfg-frame-archetype-lite-domain/src/main/java/cn/bugstack/domain/xxx/repository/package-info.java
+++ b/xfg-frame-archetype-lite-domain/src/main/java/cn/bugstack/domain/xxx/adapter/repository/package-info.java
@@ -2,4 +2,4 @@
* 仓储服务
* 1. 定义仓储接口,之后由基础设施层做具体实现
*/
-package cn.bugstack.domain.xxx.repository;
\ No newline at end of file
+package cn.bugstack.domain.xxx.adapter.repository;
\ No newline at end of file
diff --git a/xfg-frame-archetype-lite-infrastructure/src/main/java/cn/bugstack/infrastructure/adapter/port/package-info.java b/xfg-frame-archetype-lite-infrastructure/src/main/java/cn/bugstack/infrastructure/adapter/port/package-info.java
new file mode 100644
index 0000000000000000000000000000000000000000..6a4e83b7ea630790b36a566411960fc3270b2f1b
--- /dev/null
+++ b/xfg-frame-archetype-lite-infrastructure/src/main/java/cn/bugstack/infrastructure/adapter/port/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * 实现对外部的api调用,类的名称为 XxxPort 接口定义在 domain 中
+ */
+package cn.bugstack.infrastructure.adapter.port;
\ No newline at end of file
diff --git a/xfg-frame-archetype-lite-infrastructure/src/main/java/cn/bugstack/infrastructure/persistent/repository/package-info.java b/xfg-frame-archetype-lite-infrastructure/src/main/java/cn/bugstack/infrastructure/adapter/repository/package-info.java
similarity index 68%
rename from xfg-frame-archetype-lite-infrastructure/src/main/java/cn/bugstack/infrastructure/persistent/repository/package-info.java
rename to xfg-frame-archetype-lite-infrastructure/src/main/java/cn/bugstack/infrastructure/adapter/repository/package-info.java
index 18041e1b4a2535945dc79b45357dd8e35051f540..e9f7a345b9b3fb61db5a841837d77513eebbc72c 100644
--- a/xfg-frame-archetype-lite-infrastructure/src/main/java/cn/bugstack/infrastructure/persistent/repository/package-info.java
+++ b/xfg-frame-archetype-lite-infrastructure/src/main/java/cn/bugstack/infrastructure/adapter/repository/package-info.java
@@ -1,4 +1,4 @@
/**
* 仓储实现;用于实现 domain 中定义的仓储接口,如;IXxxRepository 在 Repository 中调用服务
*/
-package cn.bugstack.infrastructure.persistent.repository;
\ No newline at end of file
+package cn.bugstack.infrastructure.adapter.repository;
\ No newline at end of file
diff --git a/xfg-frame-archetype-lite-infrastructure/src/main/java/cn/bugstack/infrastructure/dao/package-info.java b/xfg-frame-archetype-lite-infrastructure/src/main/java/cn/bugstack/infrastructure/dao/package-info.java
new file mode 100644
index 0000000000000000000000000000000000000000..bbb404c9337f8c407a33470c62682978543073ed
--- /dev/null
+++ b/xfg-frame-archetype-lite-infrastructure/src/main/java/cn/bugstack/infrastructure/dao/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * DAO 接口;IXxxDao
+ */
+package cn.bugstack.infrastructure.dao;
\ No newline at end of file
diff --git a/xfg-frame-archetype-lite-infrastructure/src/main/java/cn/bugstack/infrastructure/persistent/po/package-info.java b/xfg-frame-archetype-lite-infrastructure/src/main/java/cn/bugstack/infrastructure/dao/po/package-info.java
similarity index 57%
rename from xfg-frame-archetype-lite-infrastructure/src/main/java/cn/bugstack/infrastructure/persistent/po/package-info.java
rename to xfg-frame-archetype-lite-infrastructure/src/main/java/cn/bugstack/infrastructure/dao/po/package-info.java
index 0ff65fe2237c1a5a188be4772a987129343ea709..d123c7c896642ac6a7bcf5b8604c3560e8133a4b 100644
--- a/xfg-frame-archetype-lite-infrastructure/src/main/java/cn/bugstack/infrastructure/persistent/po/package-info.java
+++ b/xfg-frame-archetype-lite-infrastructure/src/main/java/cn/bugstack/infrastructure/dao/po/package-info.java
@@ -1,4 +1,4 @@
/**
* 持久化对象;XxxPO 最后的 PO 是大写,UserPO
*/
-package cn.bugstack.infrastructure.persistent.po;
\ No newline at end of file
+package cn.bugstack.infrastructure.dao.po;
\ No newline at end of file
diff --git a/xfg-frame-archetype-lite-infrastructure/src/main/java/cn/bugstack/infrastructure/gateway/adapter/package-info.java b/xfg-frame-archetype-lite-infrastructure/src/main/java/cn/bugstack/infrastructure/gateway/adapter/package-info.java
deleted file mode 100644
index c79e36613db4c332068df4b3883d9a35f0dafe05..0000000000000000000000000000000000000000
--- a/xfg-frame-archetype-lite-infrastructure/src/main/java/cn/bugstack/infrastructure/gateway/adapter/package-info.java
+++ /dev/null
@@ -1 +0,0 @@
-package cn.bugstack.infrastructure.gateway.adapter;
\ No newline at end of file
diff --git a/xfg-frame-archetype-lite-infrastructure/src/main/java/cn/bugstack/infrastructure/gateway/api/package-info.java b/xfg-frame-archetype-lite-infrastructure/src/main/java/cn/bugstack/infrastructure/gateway/api/package-info.java
deleted file mode 100644
index e1319b9c9dd389a9f52b3c38c53f6dfbfe7e69c3..0000000000000000000000000000000000000000
--- a/xfg-frame-archetype-lite-infrastructure/src/main/java/cn/bugstack/infrastructure/gateway/api/package-info.java
+++ /dev/null
@@ -1 +0,0 @@
-package cn.bugstack.infrastructure.gateway.api;
\ No newline at end of file
diff --git a/xfg-frame-archetype-lite-infrastructure/src/main/java/cn/bugstack/infrastructure/gateway/package-info.java b/xfg-frame-archetype-lite-infrastructure/src/main/java/cn/bugstack/infrastructure/gateway/package-info.java
new file mode 100644
index 0000000000000000000000000000000000000000..292c86f237ac879fdc10234b82c84b2e52fe97e0
--- /dev/null
+++ b/xfg-frame-archetype-lite-infrastructure/src/main/java/cn/bugstack/infrastructure/gateway/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * 定义http、rpc接口,调用外部。在 adapter 中调用这部分内容。
+ */
+package cn.bugstack.infrastructure.gateway;
\ No newline at end of file
diff --git a/xfg-frame-archetype-lite-infrastructure/src/main/java/cn/bugstack/infrastructure/persistent/dao/package-info.java b/xfg-frame-archetype-lite-infrastructure/src/main/java/cn/bugstack/infrastructure/persistent/dao/package-info.java
deleted file mode 100644
index 7e6cb8b06e18cd922b015e78e89eb4739c68f5db..0000000000000000000000000000000000000000
--- a/xfg-frame-archetype-lite-infrastructure/src/main/java/cn/bugstack/infrastructure/persistent/dao/package-info.java
+++ /dev/null
@@ -1,4 +0,0 @@
-/**
- * DAO 接口;IXxxDao
- */
-package cn.bugstack.infrastructure.persistent.dao;
\ No newline at end of file
diff --git a/xfg-frame-archetype-lite-infrastructure/src/main/java/cn/bugstack/infrastructure/redis/package-info.java b/xfg-frame-archetype-lite-infrastructure/src/main/java/cn/bugstack/infrastructure/redis/package-info.java
new file mode 100644
index 0000000000000000000000000000000000000000..6c4af599f36b3ce3e4b4b9dd56a530470f9f1270
--- /dev/null
+++ b/xfg-frame-archetype-lite-infrastructure/src/main/java/cn/bugstack/infrastructure/redis/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * 提供redis链接配置
+ */
+package cn.bugstack.infrastructure.redis;
\ No newline at end of file