Merge remote-tracking branch 'origin/master'

Author: thomasJang

.gitignore

@@ -30,11 +30,13 @@ overridedb.*
 *.ipr
 *.iws
 .idea
+!maven-wrapper.jar
 *.jar
 .DS_Store
 .factorypath
 node_modules/
 rebel.xml
 axboot-dev.properties
 .rebel.*
-yarn.*
+yarn.*
+!.mvn

ax-boot-admin/src/main/java/com/chequer/axboot/admin/domain/init/DatabaseInitService.java

@@ -27,11 +27,11 @@
 public class ProjectGenerator {
 
     public void generate(ProjectGenerateRequest projectGenerateRequest, HttpServletRequest request, HttpServletResponse response) throws IOException {
-        String packageName = projectGenerateRequest.getPackageName();
-        String projectName = projectGenerateRequest.getProjectName();
-        String artifactId = projectGenerateRequest.getArtifact();
-        String description = projectGenerateRequest.getDescription();
-        String groupId = projectGenerateRequest.getGroupId();
+        String packageName = projectGenerateRequest.getPackageName().trim();
+        String projectName = projectGenerateRequest.getProjectName().trim();
+        String artifactId = projectGenerateRequest.getArtifact().trim();
+        String description = projectGenerateRequest.getDescription().trim();
+        String groupId = projectGenerateRequest.getGroupId().trim();
 
         String encodedFileName = EncodeUtils.encodeDownloadFileName(artifactId + "_" + DateUtils.getDateYyyyMmddWithoutDash() + ".zip");
         response.setHeader("Content-Disposition", "attachment; filename=" + encodedFileName);
@@ -92,10 +92,10 @@ public String getPath(String projectName, String packageName, File file) {
         }
 
         if (path.startsWith("/root")) {
-            return projectName + "/" + name;
+            return projectName + "/" + path.substring(6);
         }
 
-        return baseName + "/" + path;
+        return baseName + path;
     }
 
     public byte[] getBytes(File file, Map<String, String> values) throws IOException {

ax-boot-initialzr/src/main/java/com/chequer/axboot/initialzr/service/ProjectGenerator.java

@@ -12,7 +12,6 @@
 .factorypath
 .recommenders
 bin
-!/chequer-api-go/bin
 build
 target
 .factorypath
@@ -31,8 +30,13 @@ overridedb.*
 *.ipr
 *.iws
 .idea
+!maven-wrapper.jar
 *.jar
 .DS_Store
 .factorypath
-node_modules
-rebel.xml
+node_modules/
+rebel.xml
+.rebel.*
+yarn.*
+!.mvn
+!maven-wrapper.jar

ax-boot-initialzr/src/main/resources/templates/java/domain/init/DatabaseInitService.java

@@ -0,0 +1 @@
+distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.3.9/apache-maven-3.3.9-bin.zip