From b754923efb1ca4ab8e946b80754c46eef76f7d55 Mon Sep 17 00:00:00 2001 From: liaozan <378024053@qq.com> Date: Mon, 22 Aug 2022 17:22:41 +0800 Subject: [PATCH] chore: update the default branch from "master" to "main" --- .../archetype/initializer/maven/MavenUtils.java | 6 ++---- .../schedule/GitlabGroupFetchTask.java | 4 +--- .../initializer/service/ArchetypeService.java | 15 ++++----------- .../META-INF/spring-configuration-metadata.json | 10 ++++++++++ initializer-ui/package.json | 8 ++++---- initializer-ui/pom.xml | 2 +- 6 files changed, 22 insertions(+), 23 deletions(-) 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 30eaefb..8da2ee9 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 89aa484..7389542 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 2fc5b09..27f7807 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 c0626d1..088e698 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 1946d97..02dfbb9 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 33ef794..7983a85 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/ -- GitLab