diff --git a/initializer-backend/pom.xml b/initializer-backend/pom.xml index c67e18abb4cade87afb26636cb9221879dda8df4..70108ffdc2c28b13df67303f990b1c5f3b9607cd 100644 --- a/initializer-backend/pom.xml +++ b/initializer-backend/pom.xml @@ -26,29 +26,21 @@ com.schbrain.framework logger-spring-boot-starter - - org.springframework.boot - spring-boot-starter-web - org.apache.maven maven-embedder - ${maven-embedder.version} org.apache.maven maven-compat - ${maven-embedder.version} org.eclipse.aether aether-connector-basic - ${aether.version} org.eclipse.aether aether-transport-http - ${aether.version} org.eclipse.jgit diff --git a/initializer-backend/src/main/java/com/schbrain/archetype/initializer/param/ArchetypeGenerateParam.java b/initializer-backend/src/main/java/com/schbrain/archetype/initializer/param/ArchetypeGenerateParam.java index a3392fbaa04e379fadd4626fcb6f8f77ebf451d2..d42e967462ec3e1161d9ac016d1c25a159b3b314 100644 --- a/initializer-backend/src/main/java/com/schbrain/archetype/initializer/param/ArchetypeGenerateParam.java +++ b/initializer-backend/src/main/java/com/schbrain/archetype/initializer/param/ArchetypeGenerateParam.java @@ -1,6 +1,7 @@ package com.schbrain.archetype.initializer.param; import lombok.Data; +import org.springframework.util.StringUtils; import javax.validation.constraints.NotBlank; @@ -37,7 +38,7 @@ public class ArchetypeGenerateParam { private String subModuleNamePrefix; public String getSubModuleNamePrefix() { - if (this.subModuleNamePrefix == null) { + if (!StringUtils.hasText(this.subModuleNamePrefix)) { if (this.artifactId.contains(DELIMITER)) { this.subModuleNamePrefix = this.artifactId.split(DELIMITER)[1]; } else { @@ -48,7 +49,7 @@ public class ArchetypeGenerateParam { } public String getPackageName() { - if (this.packageName == null) { + if (!StringUtils.hasText(this.packageName)) { this.packageName = String.format("%s.%s", this.groupId, this.getSubModuleNamePrefix()); } return this.packageName; diff --git a/initializer-ui/babel.config.js b/initializer-ui/babel.config.js index e9558405fdcc02f12d757acb308e02937a7444f1..a6ef69e0ede37f96733440038ec067bcca1d556c 100644 --- a/initializer-ui/babel.config.js +++ b/initializer-ui/babel.config.js @@ -2,4 +2,4 @@ module.exports = { presets: [ '@vue/cli-plugin-babel/preset' ] -} +} \ No newline at end of file diff --git a/initializer-ui/package.json b/initializer-ui/package.json index ec530fce4a6045425daa9bda03207989b6c2f08e..6273b254e90df4379db196ad0d72f9a43778dd65 100644 --- a/initializer-ui/package.json +++ b/initializer-ui/package.json @@ -9,10 +9,8 @@ }, "dependencies": { "axios": "^0.26.1", - "core-js": "^3.21.1", - "element-plus": "^2.1.4", - "vue": "^3.2.31", - "vue-router": "^4.0.14" + "element-plus": "^2.1.6", + "vue": "^3.2.31" }, "devDependencies": { "@babel/core": "^7.17.8", diff --git a/initializer-ui/src/App.vue b/initializer-ui/src/App.vue index adba1761767953d38cee097ec4b736bb56e4003d..e96abc08eb433f7fba78595b7d8bab6ff49164af 100644 --- a/initializer-ui/src/App.vue +++ b/initializer-ui/src/App.vue @@ -1,13 +1,193 @@ \ 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 deleted file mode 100644 index 9077c0f105cbda4b80e1322fb206bb93648117df..0000000000000000000000000000000000000000 --- a/initializer-ui/src/components/BackendStarter.vue +++ /dev/null @@ -1,183 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/initializer-ui/src/main.js b/initializer-ui/src/main.js index 3fdefa467951dc577cb5f8a115f301493da09a3f..139ecb9ef226bb2172a5ece5dae7935aaf3e9569 100644 --- a/initializer-ui/src/main.js +++ b/initializer-ui/src/main.js @@ -1,10 +1,8 @@ import {createApp} from 'vue' import ElementPlus from 'element-plus' import 'element-plus/dist/index.css' -import vRouter from './router' import App from './App.vue' const app = createApp(App) -app.use(vRouter) app.use(ElementPlus) app.mount('#app') \ No newline at end of file diff --git a/initializer-ui/src/router/index.js b/initializer-ui/src/router/index.js deleted file mode 100644 index f7f2b21d4cfbf8fa09fbb1c27da2a5b6a5b47cff..0000000000000000000000000000000000000000 --- a/initializer-ui/src/router/index.js +++ /dev/null @@ -1,15 +0,0 @@ -import BackendStarter from "@/components/BackendStarter"; -import {createRouter, createWebHistory} from 'vue-router' - -const routes = [ - {path: '/', component: BackendStarter}, -] - -const options = { - history: createWebHistory(), - routes, -} - -const router = createRouter(options) - -export default router \ No newline at end of file diff --git a/pom.xml b/pom.xml index 6797b5365d63607743b1cae8be10cefce24e6096..3a9d99024f2a9eee21c9f2bf5d9862d84b4e2064 100644 --- a/pom.xml +++ b/pom.xml @@ -40,6 +40,26 @@ initializer-backend ${project.version} + + org.apache.maven + maven-embedder + ${maven-embedder.version} + + + org.apache.maven + maven-compat + ${maven-embedder.version} + + + org.eclipse.aether + aether-connector-basic + ${aether.version} + + + org.eclipse.aether + aether-transport-http + ${aether.version} +