Merge branch 'master' into master

daniellansun · Aug 15, 2020 · 4df7036 · 4df7036
2 parents cdfaf61 + 3ee5081
commit 4df7036
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 9 deletions.
diff --git a/...rchetype-web/src/main/resources/archetype-resources/__rootArtifactId__-controller/pom.xml b/...rchetype-web/src/main/resources/archetype-resources/__rootArtifactId__-controller/pom.xml
@@ -1,5 +1,6 @@
 <?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 http://maven.apache.org/maven-v4_0_0.xsd">
+<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 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>${groupId}</groupId>

diff --git a/cola-archetype-web/src/main/resources/archetype-resources/__rootArtifactId__-domain/pom.xml b/cola-archetype-web/src/main/resources/archetype-resources/__rootArtifactId__-domain/pom.xml
@@ -1,5 +1,6 @@
 <?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 http://maven.apache.org/maven-v4_0_0.xsd">
+<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 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>${groupId}</groupId>

diff --git a/cola-archetype-web/src/main/resources/archetype-resources/pom.xml b/cola-archetype-web/src/main/resources/archetype-resources/pom.xml
@@ -1,5 +1,6 @@
 <?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 http://maven.apache.org/maven-v4_0_0.xsd">
+<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 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>${groupId}</groupId>

diff --git a/cola-archetype-web/src/main/resources/archetype-resources/start/pom.xml b/cola-archetype-web/src/main/resources/archetype-resources/start/pom.xml
@@ -1,5 +1,6 @@
 <?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 http://maven.apache.org/maven-v4_0_0.xsd">
+<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 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <parent>
         <groupId>${groupId}</groupId>
@@ -26,7 +27,7 @@
         <dependency>
             <groupId>org.mybatis.spring.boot</groupId>
             <artifactId>mybatis-spring-boot-starter</artifactId>
-        </dependency>        
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter</artifactId>

diff --git a/...etype-web/src/main/resources/archetype-resources/start/src/test/java/TestApplication.java b/...etype-web/src/main/resources/archetype-resources/start/src/test/java/TestApplication.java
@@ -3,7 +3,6 @@
 #set( $symbol_escape = '\' )
 package ${package};
 
-import com.alibaba.cola.container.TestsContainer;
 import org.springframework.boot.SpringApplication;
 import org.springframework.context.ApplicationContext;
 
@@ -12,8 +11,5 @@ public class TestApplication {
     public static void main(String[] args) {
         //这里填的是TestApplication
         ApplicationContext context = SpringApplication.run(Application.class, args);
-
-        //启动测试容器
-        TestsContainer.start();
     }
 }
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
@@ -6,6 +6,7 @@
 import com.alibaba.cola.dto.Response;
 import com.alibaba.cola.exception.BizException;
 import ${package}.api.CustomerServiceI;
+import com.alibaba.cola.exception.BizException;
 import ${package}.common.BizCode;
 import ${package}.dto.CustomerAddCmd;
 import ${package}.dto.domainmodel.Customer;