diff --git a/README.md b/README.md index 2723de0f..9d92591f 100644 --- a/README.md +++ b/README.md @@ -15,6 +15,19 @@ ContiNew-Admin (incubating) 中后台管理框架,Continue New Admin,持续 | [Undertow](https://undertow.io/) | 2.2.20.Final | 采用 Java 开发的灵活的高性能 Web 服务器,提供包括阻塞和基于 NIO 的非堵塞机制。 | | [Lombok](https://projectlombok.org/) | 1.18.24 | 在 Java 开发过程中用注解的方式,简化了 JavaBean 的编写,避免了冗余和样板式代码,让编写的类更加简洁。 | +### 项目结构 + +采用按功能拆分模块的开发方式,项目结构如下: + +> 项目结构按模块的层次顺序介绍,实际 IDE 中 `continew-admin-common` 模块会因为字母排序原因排在上方 +> + +``` +continew-admin 全局通用项目配置及依赖版本管理 + ├─continew-admin-webapi API 模块(存放 Controller 层代码,打包部署的模块) + ├─continew-admin-system 系统管理模块(存放系统管理模块相关功能,例如:部门管理、角色管理、用户管理等) + ├─continew-admin-common 公共模块(存放公共工具类,公共配置等) +``` ### License diff --git a/continew-admin-common/pom.xml b/continew-admin-common/pom.xml new file mode 100644 index 00000000..f6ca1650 --- /dev/null +++ b/continew-admin-common/pom.xml @@ -0,0 +1,62 @@ + + + + 4.0.0 + + + top.charles7c + continew-admin + ${revision} + + + continew-admin-common + jar + + ${project.artifactId} + 公共模块(存放公共工具类,公共配置等) + + + + + + org.springframework.boot + spring-boot-starter-web + + + + org.springframework.boot + spring-boot-starter-tomcat + + + + + + + org.springframework.boot + spring-boot-starter-undertow + + + + io.undertow + undertow-websockets-jsr + + + + + \ No newline at end of file diff --git a/continew-admin-system/pom.xml b/continew-admin-system/pom.xml new file mode 100644 index 00000000..f33e7e55 --- /dev/null +++ b/continew-admin-system/pom.xml @@ -0,0 +1,41 @@ + + + + 4.0.0 + + + top.charles7c + continew-admin + ${revision} + + + continew-admin-system + jar + + ${project.artifactId} + 系统管理模块(存放系统管理模块相关功能,例如:部门管理、角色管理、用户管理等) + + + + + top.charles7c + continew-admin-common + + + \ No newline at end of file diff --git a/continew-admin-webapi/pom.xml b/continew-admin-webapi/pom.xml new file mode 100644 index 00000000..4ece2d89 --- /dev/null +++ b/continew-admin-webapi/pom.xml @@ -0,0 +1,87 @@ + + + + 4.0.0 + + + top.charles7c + continew-admin + ${revision} + + + continew-admin-webapi + jar + + ${project.artifactId} + API 模块(存放 Controller 层代码,打包部署的模块) + + + + org.springframework.boot + spring-boot-starter-test + test + + + + + top.charles7c + continew-admin-system + + + + + + ${project.parent.name} + + + + org.apache.maven.plugins + maven-surefire-plugin + + -Dfile.encoding=UTF-8 + + ${profiles.active} + + exclude + + + + org.springframework.boot + spring-boot-maven-plugin + + + + repackage + + + + + + true + + + org.projectlombok + lombok + + + + + + + \ No newline at end of file diff --git a/src/main/java/top/charles7c/ContinewAdminApplication.java b/continew-admin-webapi/src/main/java/top/charles7c/ContinewAdminApplication.java similarity index 100% rename from src/main/java/top/charles7c/ContinewAdminApplication.java rename to continew-admin-webapi/src/main/java/top/charles7c/ContinewAdminApplication.java diff --git a/src/main/resources/application-dev.yml b/continew-admin-webapi/src/main/resources/application-dev.yml similarity index 100% rename from src/main/resources/application-dev.yml rename to continew-admin-webapi/src/main/resources/application-dev.yml diff --git a/src/main/resources/application-prod.yml b/continew-admin-webapi/src/main/resources/application-prod.yml similarity index 100% rename from src/main/resources/application-prod.yml rename to continew-admin-webapi/src/main/resources/application-prod.yml diff --git a/src/main/resources/application.yml b/continew-admin-webapi/src/main/resources/application.yml similarity index 95% rename from src/main/resources/application.yml rename to continew-admin-webapi/src/main/resources/application.yml index 91538e7c..737620ea 100644 --- a/src/main/resources/application.yml +++ b/continew-admin-webapi/src/main/resources/application.yml @@ -7,7 +7,7 @@ continew-admin: # 版本 version: @project.version@ ---- ### 日志配置 +--- ### 日志配置(重叠部分,优先级高于 logback-spring.xml 中的配置) logging: level: top.charles7c: @logging.level@ diff --git a/src/main/resources/banner.txt b/continew-admin-webapi/src/main/resources/banner.txt similarity index 100% rename from src/main/resources/banner.txt rename to continew-admin-webapi/src/main/resources/banner.txt diff --git a/src/main/resources/logback-spring.xml b/continew-admin-webapi/src/main/resources/logback-spring.xml similarity index 95% rename from src/main/resources/logback-spring.xml rename to continew-admin-webapi/src/main/resources/logback-spring.xml index 1bc082ef..7afff388 100644 --- a/src/main/resources/logback-spring.xml +++ b/continew-admin-webapi/src/main/resources/logback-spring.xml @@ -55,6 +55,7 @@ + @@ -63,6 +64,7 @@ + diff --git a/src/test/java/top/charles7c/ContinewAdminApplicationTests.java b/continew-admin-webapi/src/test/java/top/charles7c/ContinewAdminApplicationTests.java similarity index 100% rename from src/test/java/top/charles7c/ContinewAdminApplicationTests.java rename to continew-admin-webapi/src/test/java/top/charles7c/ContinewAdminApplicationTests.java diff --git a/pom.xml b/pom.xml index 0093f0ae..bd1dfd81 100644 --- a/pom.xml +++ b/pom.xml @@ -19,6 +19,21 @@ limitations under the License. xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 + top.charles7c + continew-admin + ${revision} + pom + + ${project.artifactId} + ContiNew-Admin (incubating) 中后台管理框架,Continue New Admin,持续以最新流行技术栈构建。 + https://github.com/Charles7c/continew-admin + + + continew-admin-webapi + continew-admin-system + continew-admin-common + + org.springframework.boot spring-boot-starter-parent @@ -26,16 +41,9 @@ limitations under the License. - top.charles7c - continew-admin - 0.0.1-SNAPSHOT - - ${project.artifactId} - ContiNew-Admin (incubating) 中后台管理框架,Continue New Admin,持续以最新流行技术栈构建。 - https://github.com/Charles7c/continew-admin - + 0.0.1-SNAPSHOT 1.8 2.28.0 8 @@ -43,34 +51,34 @@ limitations under the License. UTF-8 + + + + + + + top.charles7c + continew-admin-webapi + ${project.version} + + + + + top.charles7c + continew-admin-system + ${project.version} + + + + + top.charles7c + continew-admin-common + ${project.version} + + + + - - - - org.springframework.boot - spring-boot-starter-web - - - - org.springframework.boot - spring-boot-starter-tomcat - - - - - - - org.springframework.boot - spring-boot-starter-undertow - - - - io.undertow - undertow-websockets-jsr - - - - org.springframework.boot spring-boot-devtools @@ -84,12 +92,6 @@ limitations under the License. true - - org.springframework.boot - spring-boot-starter-test - test - - org.projectlombok @@ -99,28 +101,12 @@ limitations under the License. - - ${project.name} com.diffplug.spotless spotless-maven-plugin ${spotless.version} - - - - java,javax,org,com,top.charles7c, - - - - ${project.basedir}/code-style/spotless-formatter.xml - - - ${project.basedir}/code-style/license-header - - - compile @@ -129,38 +115,19 @@ limitations under the License. - - - - org.apache.maven.plugins - maven-surefire-plugin - -Dfile.encoding=UTF-8 - - ${profiles.active} - - exclude - - - - org.springframework.boot - spring-boot-maven-plugin - - - - repackage - - - - - - true - - - org.projectlombok - lombok - - + + + java,javax,org,com,top.charles7c, + + + + code-style/spotless-formatter.xml + + + code-style/license-header + + @@ -171,7 +138,7 @@ limitations under the License. **/** - + true @@ -185,7 +152,7 @@ limitations under the License. dev - debug + DEBUG ./logs @@ -198,7 +165,7 @@ limitations under the License. prod prod - info + INFO ./logs