Merge pull request alibaba#104 from sinopower/master

修复本地生成脚手架后部分依赖问题
woodstone121 · Aug 15, 2020 · 94fad64 · 94fad64
2 parents 3ee5081 + 4df7036
commit 94fad64
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 18 deletions.
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=demoService -Dversion=1.0.0-SNAPSHOT -Dpackage=com.alibaba.demo -DarchetypeArtifactId=cola-framework-archetype-service -DarchetypeGroupId=com.aliyun -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.alibaba.cola -DarchetypeVersion=3.0.0
 ```
 
 ### cola-archetype-web
 用来生成Web后端应用（有Controller），生成应用的命令为：
 ```
-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
+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.alibaba.cola -DarchetypeVersion=3.0.0
 ```
 
 ## COLA框架

diff --git a/cola-archetype-web/src/main/resources/archetype-resources/__rootArtifactId__-app/pom.xml b/cola-archetype-web/src/main/resources/archetype-resources/__rootArtifactId__-app/pom.xml
@@ -36,15 +36,15 @@
 	</dependencies>
 
 	<build>
-			<pluginManagement>
-					<plugins>
-							<plugin>
-								<artifactId>maven-deploy-plugin</artifactId>
-								<configuration>
-									<skip>true</skip>
-								</configuration>
-							</plugin>
-					</plugins>
-			</pluginManagement>
+		<pluginManagement>
+			<plugins>
+				<plugin>
+					<artifactId>maven-deploy-plugin</artifactId>
+					<configuration>
+						<skip>true</skip>
+					</configuration>
+				</plugin>
+			</plugins>
+		</pluginManagement>
 	</build>
 </project>
diff --git a/cola-archetype-web/src/main/resources/archetype-resources/__rootArtifactId__-client/pom.xml b/cola-archetype-web/src/main/resources/archetype-resources/__rootArtifactId__-client/pom.xml
@@ -12,7 +12,7 @@
 	<name>${parentArtifactId}-client</name>
 	<dependencies>
 		<dependency>
-			<groupId>com.alibaba.cola</groupId>
+			<groupId>com.aliyun</groupId>
 			<artifactId>cola-common</artifactId>
 		</dependency>
 		<dependency>

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
@@ -14,11 +14,11 @@
 	<dependencies>
 		<!-- COLA Framework -->
 		<dependency>
-			<groupId>com.alibaba.cola</groupId>
+			<groupId>com.aliyun</groupId>
 			<artifactId>cola-core</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>com.alibaba.cola</groupId>
+			<groupId>com.aliyun</groupId>
 			<artifactId>cola-common</artifactId>
 		</dependency>
 		<!-- COLA Framework End-->
@@ -34,7 +34,7 @@
 				<plugin>
 					<artifactId>maven-deploy-plugin</artifactId>
 					<configuration>
-						<skip>true</skip>
+					<skip>true</skip>
 					</configuration>
 				</plugin>
 			</plugins>

diff --git a/cola-archetype-web/src/main/resources/archetype-resources/pom.xml b/cola-archetype-web/src/main/resources/archetype-resources/pom.xml
@@ -24,12 +24,12 @@
         <dependencies>
             <!--Framework-->
             <dependency>
-                <groupId>com.alibaba.cola</groupId>
+                <groupId>com.aliyun</groupId>
                 <artifactId>cola-common</artifactId>
                 <version>${cola.framework.version}</version>
             </dependency>
             <dependency>
-                <groupId>com.alibaba.cola</groupId>
+                <groupId>com.aliyun</groupId>
                 <artifactId>cola-core</artifactId>
                 <version>${cola.framework.version}</version>
             </dependency>

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
@@ -4,6 +4,7 @@
 package ${package}.test;
 
 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;