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 30eaefb967f9e25bd54d13706487aaff4fee8468..8da2ee901bb01a4814f29de8534a870e4289579c 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
@@ -8,9 +8,7 @@ import com.schbrain.common.util.IdWorker;
import com.schbrain.common.util.JacksonUtils;
import lombok.extern.slf4j.Slf4j;
import org.apache.maven.cli.MavenCli;
-import org.apache.maven.settings.Mirror;
-import org.apache.maven.settings.Server;
-import org.apache.maven.settings.Settings;
+import org.apache.maven.settings.*;
import org.apache.maven.settings.io.DefaultSettingsWriter;
import org.eclipse.jgit.api.Git;
import org.eclipse.jgit.api.errors.GitAPIException;
@@ -76,7 +74,7 @@ public class MavenUtils {
private static void initGitRepo(Path directory, Long repoGroupId, ArchetypeGenerateParam param) {
try {
- Git git = Git.init().setInitialBranch("master").setDirectory(directory.toFile()).call();
+ Git git = Git.init().setInitialBranch("main").setDirectory(directory.toFile()).call();
git.add().addFilepattern(".").call();
git.commit().setAllowEmpty(true).setAuthor("initializer", "no-reply@schbrain.com").setMessage("Initial Commit").call();
diff --git a/initializer-backend/src/main/java/com/schbrain/archetype/initializer/schedule/GitlabGroupFetchTask.java b/initializer-backend/src/main/java/com/schbrain/archetype/initializer/schedule/GitlabGroupFetchTask.java
index 89aa484ed742bd61c6470901b2e3565b8bd46940..7389542224d3afc131c617c9a9ef4071819e36ad 100644
--- a/initializer-backend/src/main/java/com/schbrain/archetype/initializer/schedule/GitlabGroupFetchTask.java
+++ b/initializer-backend/src/main/java/com/schbrain/archetype/initializer/schedule/GitlabGroupFetchTask.java
@@ -1,8 +1,6 @@
package com.schbrain.archetype.initializer.schedule;
-import cn.hutool.core.lang.tree.Tree;
-import cn.hutool.core.lang.tree.TreeNode;
-import cn.hutool.core.lang.tree.TreeUtil;
+import cn.hutool.core.lang.tree.*;
import lombok.extern.slf4j.Slf4j;
import org.gitlab4j.api.GitLabApi;
import org.gitlab4j.api.GroupApi;
diff --git a/initializer-backend/src/main/java/com/schbrain/archetype/initializer/service/ArchetypeService.java b/initializer-backend/src/main/java/com/schbrain/archetype/initializer/service/ArchetypeService.java
index 2fc5b09045d124a2642c7bb4c575d013a0d15505..27f7807501a46db18e978798f317c21031a2fde7 100644
--- a/initializer-backend/src/main/java/com/schbrain/archetype/initializer/service/ArchetypeService.java
+++ b/initializer-backend/src/main/java/com/schbrain/archetype/initializer/service/ArchetypeService.java
@@ -7,24 +7,17 @@ import com.schbrain.archetype.initializer.maven.MavenUtils;
import com.schbrain.archetype.initializer.param.ArchetypeGenerateParam;
import com.schbrain.archetype.initializer.response.PreviewFileTree;
import com.schbrain.archetype.initializer.runner.ArchetypePreparer;
-import com.schbrain.common.util.ServletUtils;
+import com.schbrain.common.web.utils.ServletUtils;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.ContentDisposition;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.MediaType;
+import org.springframework.http.*;
import org.springframework.stereotype.Service;
import org.springframework.util.StreamUtils;
import org.springframework.util.StringUtils;
import javax.servlet.http.HttpServletResponse;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
+import java.io.*;
import java.time.Duration;
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.List;
+import java.util.*;
import java.util.stream.Collectors;
/**
diff --git a/initializer-backend/src/main/resources/META-INF/spring-configuration-metadata.json b/initializer-backend/src/main/resources/META-INF/spring-configuration-metadata.json
index c0626d1ca7bba18b01252a073e58ea7022938f40..088e698f06dc8dcd001b3fc3f00d19472789c48e 100644
--- a/initializer-backend/src/main/resources/META-INF/spring-configuration-metadata.json
+++ b/initializer-backend/src/main/resources/META-INF/spring-configuration-metadata.json
@@ -1,5 +1,10 @@
{
"groups": [
+ {
+ "name": "archetype",
+ "type": "com.schbrain.archetype.initializer.config.properties.ArchetypeProperties",
+ "sourceType": "com.schbrain.archetype.initializer.config.properties.ArchetypeProperties"
+ },
{
"name": "gitlab",
"type": "com.schbrain.archetype.initializer.config.properties.GitProperties",
@@ -7,6 +12,11 @@
}
],
"properties": [
+ {
+ "name": "archetype.source-url",
+ "type": "java.lang.String",
+ "sourceType": "com.schbrain.archetype.initializer.config.properties.ArchetypeProperties"
+ },
{
"name": "gitlab.personal-access-token",
"type": "java.lang.String",
diff --git a/initializer-ui/package.json b/initializer-ui/package.json
index 1946d97db377592a7dd901929fb9cd821d50b026..02dfbb942c1fd663e02fd78690c8c96d4cc5c990 100644
--- a/initializer-ui/package.json
+++ b/initializer-ui/package.json
@@ -6,7 +6,7 @@
"build": "vite build --mode production"
},
"dependencies": {
- "vue": "^3.2.37",
+ "vue": "^3.2.38",
"axios": "^0.27.2",
"ant-design-vue": "^3.2.11",
"highlight.js": "^11.6.0",
@@ -14,8 +14,8 @@
},
"devDependencies": {
"@vitejs/plugin-vue": "^3.0.3",
- "typescript": "^4.7.4",
- "vite": "^3.0.7",
- "vue-tsc": "^0.40.1"
+ "typescript": "^4.8.2",
+ "vite": "^3.0.9",
+ "vue-tsc": "^0.40.5"
}
}
\ No newline at end of file
diff --git a/initializer-ui/pom.xml b/initializer-ui/pom.xml
index 33ef794c0c87f1ef799265521ab703e1b3be7436..7983a85fe994881f28bf4694297cf5eff8091bdc 100644
--- a/initializer-ui/pom.xml
+++ b/initializer-ui/pom.xml
@@ -20,7 +20,7 @@
frontend-maven-plugin
${frontend-maven-plugin.version}
- v18.7.0
+ v18.8.0
https://mirrors.tuna.tsinghua.edu.cn/nodejs-release/