diff --git a/doc/FAQ.md b/doc/FAQ.md index 7a4ba43a..b3cb98d8 100644 --- a/doc/FAQ.md +++ b/doc/FAQ.md @@ -275,8 +275,4 @@ node_modules是litemall-admin和litemall-vue模块所依赖的项目库,可能 2. 然后分别创建空的node_modules文件夹; 3. 重新打开IDEA,分别设置litemall-admin模块和litemall-vue模块的node_modules文件夹Excluded状态。 -![](./pics/faq/excluded.png) - -### 4.2 项目war打包 - -目前不支持,请开发者自行实践。 +![](./pics/faq/excluded.png) \ No newline at end of file diff --git a/doc/platform.md b/doc/platform.md index 633c08c4..93725913 100644 --- a/doc/platform.md +++ b/doc/platform.md @@ -5,6 +5,7 @@ * litemall-core模块 * litemall-db模块 * litemall-all模块 +* litemall-all-war模块 litemall-db模块提供数据库访问服务。 @@ -13,6 +14,8 @@ litemall-core模块提供通用服务。 litemall-all模块则只是一个包裹模块,几乎没有任何代码。该模块的作用是融合两个spring boot模块 和litemall-admin模块静态文件到一个单独Spring Boot可执行jar包中。 +litemall-all-war模块和litemall-all模块是一样的作用,只是采用war打包方式。 + ## 2.2 litemall-db litemall-db模块是一个普通的Spring Boot应用,基于mybatis框架实现数据库访问操作,对外提供业务数据访问服务。 @@ -646,3 +649,9 @@ public interface Storage { 注意: > 这个插件只是简单的拷贝操作;因此开发者应该在打包litemall-all > 之前确保先编译litemall-admin模块得到最终静态文件。 + + +## 2.5 litemall-all-war + +litemall-all-war模块就是对litemall-all模块进行少量调整, +最后打包时会在target目录下面生成litemall.war,用于tomcat部署。 \ No newline at end of file diff --git a/litemall-all-war/.gitignore b/litemall-all-war/.gitignore new file mode 100644 index 00000000..f23f8cae --- /dev/null +++ b/litemall-all-war/.gitignore @@ -0,0 +1,3 @@ + +/target/ +/litemall-all-war.iml diff --git a/litemall-all-war/pom.xml b/litemall-all-war/pom.xml new file mode 100644 index 00000000..ae8107a5 --- /dev/null +++ b/litemall-all-war/pom.xml @@ -0,0 +1,83 @@ + + 4.0.0 + litemall-all-war + war + + + org.linlinjava + litemall + 0.1.0 + + + + + + org.linlinjava + litemall-core + + + + org.linlinjava + litemall-db + + + + org.linlinjava + litemall-wx-api + + + + org.linlinjava + litemall-admin-api + + + + org.springframework.boot + spring-boot-starter-tomcat + provided + + + + + litemall + + + maven-resources-plugin + + + copy-resources + validate + + copy-resources + + + ${basedir}/target/classes/static + + + ../litemall-admin/dist + + + + + + copy-resources-vue + validate + + copy-resources + + + ${basedir}/target/classes/static/vue + + + ../litemall-vue/dist + + + + + + + + + + \ No newline at end of file diff --git a/litemall-all-war/src/main/java/org/linlinjava/litemall/Application.java b/litemall-all-war/src/main/java/org/linlinjava/litemall/Application.java new file mode 100644 index 00000000..0eba1741 --- /dev/null +++ b/litemall-all-war/src/main/java/org/linlinjava/litemall/Application.java @@ -0,0 +1,25 @@ +package org.linlinjava.litemall; + +import org.mybatis.spring.annotation.MapperScan; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.builder.SpringApplicationBuilder; +import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; +import org.springframework.scheduling.annotation.EnableScheduling; +import org.springframework.transaction.annotation.EnableTransactionManagement; + +@SpringBootApplication(scanBasePackages = {"org.linlinjava.litemall"}) +@MapperScan("org.linlinjava.litemall.db.dao") +@EnableTransactionManagement +@EnableScheduling +public class Application extends SpringBootServletInitializer { + + public static void main(String[] args) throws Exception { + SpringApplication.run(Application.class, args); + } + + @Override + protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) { + return builder.sources(Application.class); + } +} \ No newline at end of file diff --git a/litemall-all-war/src/main/resources/application.yml b/litemall-all-war/src/main/resources/application.yml new file mode 100644 index 00000000..8ecbaa93 --- /dev/null +++ b/litemall-all-war/src/main/resources/application.yml @@ -0,0 +1,8 @@ +spring: + profiles: + active: db, core, admin, wx + messages: + encoding: UTF-8 + +logging: + config: classpath:logback-spring.xml \ No newline at end of file diff --git a/litemall-all-war/src/main/resources/logback-spring.xml b/litemall-all-war/src/main/resources/logback-spring.xml new file mode 100644 index 00000000..3845eb4b --- /dev/null +++ b/litemall-all-war/src/main/resources/logback-spring.xml @@ -0,0 +1,58 @@ + + + logback + + + + + debug + + + %d{HH:mm:ss.SSS} %contextName [%thread] %-5level %logger{36} - %msg%n + + + + + + ${log.path}/log.log + + ${log.path}/log-%d{yyyy-MM-dd}.log + + + + %date %level [%thread] %logger{36} [%file : %line] %msg%n + + + + + + ${log.path}/error.log + + ${log.path}/error-%d{yyyy-MM-dd}.log + + + + %date %level [%thread] %logger{36} [%file : %line] %msg%n + + + + + ERROR + ACCEPT + DENY + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index ce85a16f..15063464 100644 --- a/pom.xml +++ b/pom.xml @@ -25,6 +25,7 @@ litemall-wx-api litemall-admin-api litemall-all + litemall-all-war