fix archetype web issue

sunquanchao · Jul 7, 2020 · 25ffd2b · 25ffd2b
1 parent b4fc71d
commit 25ffd2b
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 12 deletions.
diff --git a/COLA MOCK 介绍.pptx b/COLA MOCK 介绍.pptx
diff --git a/README.md b/README.md
@@ -22,13 +22,13 @@ COLA首先是作为架构的存在，是一种应用架构思想，主要是制
 ### cola-archetype-service
 用来生成纯后端应用（没有Controller），生成应用的命令为：
 ```
-mvn archetype:generate  -DgroupId=com.alibaba.demo -DartifactId=demo -Dversion=1.0.0-SNAPSHOT -Dpackage=com.alibaba.demo -DarchetypeArtifactId=cola-framework-archetype-service -DarchetypeGroupId=com.alibaba.cola -DarchetypeVersion=3.0.0
+mvn archetype:generate  -DgroupId=com.alibaba.demo -DartifactId=demoService -Dversion=1.0.0-SNAPSHOT -Dpackage=com.alibaba.demo -DarchetypeArtifactId=cola-framework-archetype-service -DarchetypeGroupId=com.aliyun -DarchetypeVersion=3.0.0
 ```
 
 ### cola-archetype-web
 用来生成Web后端应用（有Controller），生成应用的命令为：
 ```
-mvn archetype:generate  -DgroupId=com.alibaba.demo -DartifactId=demo -Dversion=1.0.0-SNAPSHOT -Dpackage=com.alibaba.demo -DarchetypeArtifactId=cola-framework-archetype-web -DarchetypeGroupId=com.alibaba.cola -DarchetypeVersion=3.0.0
+mvn archetype:generate  -DgroupId=com.alibaba.demo -DartifactId=demoWeb -Dversion=1.0.0-SNAPSHOT -Dpackage=com.alibaba.demo -DarchetypeArtifactId=cola-framework-archetype-web -DarchetypeGroupId=com.aliyun -DarchetypeVersion=3.0.0
 ```
 
 ## COLA框架
@@ -73,7 +73,7 @@ com
 
 **2、启动SpringBoot：**
 
-首先在demo目录下运行mvn install（如果不想运行测试，可以加上-DskipTests参数）。然后进入start目录，执行mvn spring-boot:run。
+首先在demoWeb目录下运行mvn install（如果不想运行测试，可以加上-DskipTests参数）。然后进入start目录，执行mvn spring-boot:run。
 运行成功的话，可以看到SpringBoot启动成功的界面。
 
 **3、 执行测试：**

diff --git a/.../archetype-resources/__rootArtifactId__-app/src/main/java/executor/CustomerAddCmdExe.java b/.../archetype-resources/__rootArtifactId__-app/src/main/java/executor/CustomerAddCmdExe.java
@@ -3,7 +3,6 @@
 #set( $symbol_escape = '\' )
 package ${package}.executor;
 
-import com.alibaba.cola.domain.DomainEventServiceI;
 import com.alibaba.cola.dto.Response;
 import com.alibaba.cola.exception.BizException;
 import ${package}.dto.CustomerAddCmd;

diff --git a/...rchetype-resources/__rootArtifactId__-infrastructure/src/main/java/config/ColaConfig.java b/...rchetype-resources/__rootArtifactId__-infrastructure/src/main/java/config/ColaConfig.java
@@ -3,7 +3,7 @@
 #set( $symbol_escape = '\' )
 package ${package}.config;
 
-import com.alibaba.cola.boot.Bootstrap;
+import com.alibaba.cola.boot.SpringBootstrap;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
@@ -17,11 +17,8 @@
 public class ColaConfig {
 
     @Bean(initMethod = "init")
-    public Bootstrap bootstrap() {
-        Bootstrap bootstrap = new Bootstrap();
-        List<String> packagesToScan  = new ArrayList<>();
-        packagesToScan.add("${package}");
-        bootstrap.setPackages(packagesToScan);
+    public SpringBootstrap bootstrap() {
+        SpringBootstrap bootstrap = new SpringBootstrap();
         return bootstrap;
     }
-}
+}
diff --git a/.../src/main/resources/archetype-resources/start/src/test/java/test/CustomerServiceTest.java b/.../src/main/resources/archetype-resources/start/src/test/java/test/CustomerServiceTest.java
@@ -50,7 +50,7 @@ public void testCustomerAddSuccess(){
         Assert.assertTrue(response.isSuccess());
     }
 
-    @Test
+    @Test(expected = BizException.class)
     public void testCustomerAddCompanyNameConflict(){
         //1.prepare
         CustomerAddCmd customerAddCmd = new CustomerAddCmd();