From 2de23af54182e4701a9831b7e109b8a2bf13a57d Mon Sep 17 00:00:00 2001 From: liaozan <378024053@qq.com> Date: Sun, 20 Mar 2022 11:38:23 +0800 Subject: [PATCH] chore: format --- initializer-backend/pom.xml | 4 +- .../initializer/maven/MavenUtils.java | 18 ++++-- initializer-ui/public/index.html | 28 ++++----- initializer-ui/src/App.vue | 13 +--- .../src/components/BackendStarter.vue | 59 +++++++++---------- pom.xml | 4 +- 6 files changed, 60 insertions(+), 66 deletions(-) diff --git a/initializer-backend/pom.xml b/initializer-backend/pom.xml index d105f5a..ab8a333 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 5216e80..fd5b791 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 3e5a139..98c27a2 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 427dddd..adba176 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 45991a4..f58ffdf 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 50bf24c..ce14612 100644 --- a/pom.xml +++ b/pom.xml @@ -1,6 +1,6 @@ - 4.0.0 -- GitLab