Commit b754923e authored by liaozan's avatar liaozan 🏀

chore: update the default branch from "master" to "main"

parent 213593fa
...@@ -8,9 +8,7 @@ import com.schbrain.common.util.IdWorker; ...@@ -8,9 +8,7 @@ import com.schbrain.common.util.IdWorker;
import com.schbrain.common.util.JacksonUtils; import com.schbrain.common.util.JacksonUtils;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.maven.cli.MavenCli; import org.apache.maven.cli.MavenCli;
import org.apache.maven.settings.Mirror; import org.apache.maven.settings.*;
import org.apache.maven.settings.Server;
import org.apache.maven.settings.Settings;
import org.apache.maven.settings.io.DefaultSettingsWriter; import org.apache.maven.settings.io.DefaultSettingsWriter;
import org.eclipse.jgit.api.Git; import org.eclipse.jgit.api.Git;
import org.eclipse.jgit.api.errors.GitAPIException; import org.eclipse.jgit.api.errors.GitAPIException;
...@@ -76,7 +74,7 @@ public class MavenUtils { ...@@ -76,7 +74,7 @@ public class MavenUtils {
private static void initGitRepo(Path directory, Long repoGroupId, ArchetypeGenerateParam param) { private static void initGitRepo(Path directory, Long repoGroupId, ArchetypeGenerateParam param) {
try { 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.add().addFilepattern(".").call();
git.commit().setAllowEmpty(true).setAuthor("initializer", "no-reply@schbrain.com").setMessage("Initial Commit").call(); git.commit().setAllowEmpty(true).setAuthor("initializer", "no-reply@schbrain.com").setMessage("Initial Commit").call();
......
package com.schbrain.archetype.initializer.schedule; package com.schbrain.archetype.initializer.schedule;
import cn.hutool.core.lang.tree.Tree; import cn.hutool.core.lang.tree.*;
import cn.hutool.core.lang.tree.TreeNode;
import cn.hutool.core.lang.tree.TreeUtil;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.gitlab4j.api.GitLabApi; import org.gitlab4j.api.GitLabApi;
import org.gitlab4j.api.GroupApi; import org.gitlab4j.api.GroupApi;
......
...@@ -7,24 +7,17 @@ import com.schbrain.archetype.initializer.maven.MavenUtils; ...@@ -7,24 +7,17 @@ import com.schbrain.archetype.initializer.maven.MavenUtils;
import com.schbrain.archetype.initializer.param.ArchetypeGenerateParam; import com.schbrain.archetype.initializer.param.ArchetypeGenerateParam;
import com.schbrain.archetype.initializer.response.PreviewFileTree; import com.schbrain.archetype.initializer.response.PreviewFileTree;
import com.schbrain.archetype.initializer.runner.ArchetypePreparer; 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.beans.factory.annotation.Autowired;
import org.springframework.http.ContentDisposition; import org.springframework.http.*;
import org.springframework.http.HttpHeaders;
import org.springframework.http.MediaType;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.util.StreamUtils; import org.springframework.util.StreamUtils;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.io.File; import java.io.*;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.time.Duration; import java.time.Duration;
import java.util.Arrays; import java.util.*;
import java.util.Comparator;
import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
/** /**
......
{ {
"groups": [ "groups": [
{
"name": "archetype",
"type": "com.schbrain.archetype.initializer.config.properties.ArchetypeProperties",
"sourceType": "com.schbrain.archetype.initializer.config.properties.ArchetypeProperties"
},
{ {
"name": "gitlab", "name": "gitlab",
"type": "com.schbrain.archetype.initializer.config.properties.GitProperties", "type": "com.schbrain.archetype.initializer.config.properties.GitProperties",
...@@ -7,6 +12,11 @@ ...@@ -7,6 +12,11 @@
} }
], ],
"properties": [ "properties": [
{
"name": "archetype.source-url",
"type": "java.lang.String",
"sourceType": "com.schbrain.archetype.initializer.config.properties.ArchetypeProperties"
},
{ {
"name": "gitlab.personal-access-token", "name": "gitlab.personal-access-token",
"type": "java.lang.String", "type": "java.lang.String",
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
"build": "vite build --mode production" "build": "vite build --mode production"
}, },
"dependencies": { "dependencies": {
"vue": "^3.2.37", "vue": "^3.2.38",
"axios": "^0.27.2", "axios": "^0.27.2",
"ant-design-vue": "^3.2.11", "ant-design-vue": "^3.2.11",
"highlight.js": "^11.6.0", "highlight.js": "^11.6.0",
...@@ -14,8 +14,8 @@ ...@@ -14,8 +14,8 @@
}, },
"devDependencies": { "devDependencies": {
"@vitejs/plugin-vue": "^3.0.3", "@vitejs/plugin-vue": "^3.0.3",
"typescript": "^4.7.4", "typescript": "^4.8.2",
"vite": "^3.0.7", "vite": "^3.0.9",
"vue-tsc": "^0.40.1" "vue-tsc": "^0.40.5"
} }
} }
\ No newline at end of file
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<artifactId>frontend-maven-plugin</artifactId> <artifactId>frontend-maven-plugin</artifactId>
<version>${frontend-maven-plugin.version}</version> <version>${frontend-maven-plugin.version}</version>
<configuration> <configuration>
<nodeVersion>v18.7.0</nodeVersion> <nodeVersion>v18.8.0</nodeVersion>
<nodeDownloadRoot>https://mirrors.tuna.tsinghua.edu.cn/nodejs-release/</nodeDownloadRoot> <nodeDownloadRoot>https://mirrors.tuna.tsinghua.edu.cn/nodejs-release/</nodeDownloadRoot>
</configuration> </configuration>
<executions> <executions>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment