diff --git a/initializer-backend/pom.xml b/initializer-backend/pom.xml index d105f5abe3d4a66d0f02f322c7e948c2358e1481..ab8a33335ba0734eb06176e633acc485eccdb9cb 100644 --- a/initializer-backend/pom.xml +++ b/initializer-backend/pom.xml @@ -1,6 +1,6 @@ - 4.0.0 diff --git a/initializer-backend/src/main/java/com/schbrain/archetype/initializer/maven/MavenUtils.java b/initializer-backend/src/main/java/com/schbrain/archetype/initializer/maven/MavenUtils.java index 5216e80f26f8900796661d1d5edd2918ff2a331a..fd5b79110d571bab60dd00c3c3abcccfa845654e 100644 --- a/initializer-backend/src/main/java/com/schbrain/archetype/initializer/maven/MavenUtils.java +++ b/initializer-backend/src/main/java/com/schbrain/archetype/initializer/maven/MavenUtils.java @@ -3,6 +3,7 @@ package com.schbrain.archetype.initializer.maven; import cn.hutool.core.io.FileUtil; import cn.hutool.core.util.ZipUtil; import com.schbrain.archetype.initializer.param.ArchetypeGenerateParam; +import com.schbrain.common.util.JacksonUtils; import lombok.extern.slf4j.Slf4j; import org.apache.maven.cli.MavenCli; @@ -16,12 +17,19 @@ import java.io.File; public class MavenUtils { public static File generate(ArchetypeGenerateParam param) { - MavenCli cli = new MavenCli(); - System.getProperties().setProperty("maven.multiModuleProjectDirectory", "$M2_HOME"); + log.info("Prepare to generate archetype project: {}", JacksonUtils.toJsonString(param, true)); + + MavenCli mavenCli = new MavenCli(); + File archetype = getArchetypeDirectory(param.getArtifact()); - String[] args = getArgs(param, archetype.getAbsolutePath()); - cli.doMain(args, null, System.out, System.err); - log.info("Generate archetype project at {}", archetype.getAbsolutePath()); + String outputDirectory = archetype.getAbsolutePath(); + + String[] args = getArgs(param, outputDirectory); + + System.getProperties().setProperty("maven.multiModuleProjectDirectory", "$M2_HOME"); + mavenCli.doMain(args, null, System.out, System.err); + + log.info("Generate archetype project at {}", outputDirectory); return ZipUtil.zip(archetype); } diff --git a/initializer-ui/public/index.html b/initializer-ui/public/index.html index 3e5a13962197105f2078d2a224cc57dfa09b4893..98c27a254f955b694875dd3d2fb9f42e28c52d75 100644 --- a/initializer-ui/public/index.html +++ b/initializer-ui/public/index.html @@ -1,17 +1,17 @@ - - + + - - - + + + <%= htmlWebpackPlugin.options.title %> - - - -
- - - + + + +
+ + + \ No newline at end of file diff --git a/initializer-ui/src/App.vue b/initializer-ui/src/App.vue index 427dddd4d842bb9300bb006fed780bd68c0c6905..adba1761767953d38cee097ec4b736bb56e4003d 100644 --- a/initializer-ui/src/App.vue +++ b/initializer-ui/src/App.vue @@ -10,15 +10,4 @@ export default { BackendStarter } } - - - \ No newline at end of file + \ No newline at end of file diff --git a/initializer-ui/src/components/BackendStarter.vue b/initializer-ui/src/components/BackendStarter.vue index 45991a4c00bac40e416ad93e20606ebfed82c1db..f58ffdfb1079a8443eee6273b03c34e616af7ee2 100644 --- a/initializer-ui/src/components/BackendStarter.vue +++ b/initializer-ui/src/components/BackendStarter.vue @@ -1,34 +1,32 @@ @@ -40,7 +38,7 @@ export default { name: "BackendStarter", data() { return { - generateForm: { + form: { projectName: '', gitlabUrl: '', group: '', @@ -51,8 +49,7 @@ export default { }, methods: { submit: function () { - - axios.post('/archetype/generate', this.generateForm, { + axios.post('/archetype/generate', this.form, { responseType: 'blob' }).then(res => { const {headers, data} = res @@ -74,35 +71,35 @@ export default { \ No newline at end of file diff --git a/pom.xml b/pom.xml index 50bf24c9be8512103caec4562fe756cc677e1003..ce14612fd26a85149310eef99b45af66cc889b12 100644 --- a/pom.xml +++ b/pom.xml @@ -1,6 +1,6 @@ - 4.0.0