From e1f0030f5287ce68bbbd5261f4f797e1627f2a37 Mon Sep 17 00:00:00 2001 From: liaozan <378024053@qq.com> Date: Thu, 3 Nov 2022 00:43:09 +0800 Subject: [PATCH] chore: update dependencies --- .../InitializerBackendApplication.java | 2 -- .../controller/GitlabController.java | 6 ++--- .../initializer/maven/MavenUtils.java | 1 + .../GitlabService.java} | 25 ++++++------------- initializer-ui/package.json | 6 ++--- 5 files changed, 14 insertions(+), 26 deletions(-) rename initializer-backend/src/main/java/com/schbrain/archetype/initializer/{schedule/GitlabGroupFetchTask.java => service/GitlabService.java} (56%) diff --git a/initializer-backend/src/main/java/com/schbrain/archetype/initializer/InitializerBackendApplication.java b/initializer-backend/src/main/java/com/schbrain/archetype/initializer/InitializerBackendApplication.java index 78c0a4d..594bc34 100644 --- a/initializer-backend/src/main/java/com/schbrain/archetype/initializer/InitializerBackendApplication.java +++ b/initializer-backend/src/main/java/com/schbrain/archetype/initializer/InitializerBackendApplication.java @@ -2,9 +2,7 @@ package com.schbrain.archetype.initializer; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.scheduling.annotation.EnableScheduling; -@EnableScheduling @SpringBootApplication public class InitializerBackendApplication { diff --git a/initializer-backend/src/main/java/com/schbrain/archetype/initializer/controller/GitlabController.java b/initializer-backend/src/main/java/com/schbrain/archetype/initializer/controller/GitlabController.java index f60a6d0..aba0c90 100644 --- a/initializer-backend/src/main/java/com/schbrain/archetype/initializer/controller/GitlabController.java +++ b/initializer-backend/src/main/java/com/schbrain/archetype/initializer/controller/GitlabController.java @@ -1,7 +1,7 @@ package com.schbrain.archetype.initializer.controller; import cn.hutool.core.lang.tree.Tree; -import com.schbrain.archetype.initializer.schedule.GitlabGroupFetchTask; +import com.schbrain.archetype.initializer.service.GitlabService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; @@ -16,11 +16,11 @@ import java.util.List; public class GitlabController { @Autowired - private GitlabGroupFetchTask gitlabGroupFetchTask; + private GitlabService gitlabService; @GetMapping("/gitlab/groups") public List> groupList() { - return gitlabGroupFetchTask.getGroupTree(); + return gitlabService.fetchGroups(); } } \ No newline at end of file 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 8da2ee9..56781f0 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 @@ -111,6 +111,7 @@ public class MavenUtils { return SETTINGS_FILE; } Settings settings = new Settings(); + settings.setLocalRepository("/data/maven/repository"); Mirror mirror = new Mirror(); mirror.setId("aliyun"); 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/service/GitlabService.java similarity index 56% rename from initializer-backend/src/main/java/com/schbrain/archetype/initializer/schedule/GitlabGroupFetchTask.java rename to initializer-backend/src/main/java/com/schbrain/archetype/initializer/service/GitlabService.java index 7389542..764f582 100644 --- a/initializer-backend/src/main/java/com/schbrain/archetype/initializer/schedule/GitlabGroupFetchTask.java +++ b/initializer-backend/src/main/java/com/schbrain/archetype/initializer/service/GitlabService.java @@ -1,17 +1,14 @@ -package com.schbrain.archetype.initializer.schedule; +package com.schbrain.archetype.initializer.service; import cn.hutool.core.lang.tree.*; +import com.schbrain.common.exception.BaseException; import lombok.extern.slf4j.Slf4j; import org.gitlab4j.api.GitLabApi; import org.gitlab4j.api.GroupApi; -import org.gitlab4j.api.models.Group; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; -import java.util.Collections; import java.util.List; -import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; /** @@ -20,23 +17,15 @@ import java.util.stream.Collectors; */ @Slf4j @Component -public class GitlabGroupFetchTask { +public class GitlabService { @Autowired private GitLabApi gitLabApi; - private List> groupTree = Collections.emptyList(); - - public List> getGroupTree() { - return groupTree; - } - - @Scheduled(fixedRate = 1, timeUnit = TimeUnit.HOURS) - public void fetchGroups() { + public List> fetchGroups() { try { GroupApi groupApi = gitLabApi.getGroupApi(); - List groups = groupApi.getGroups(); - List> treeNodes = groups.stream() + List> treeNodes = groupApi.getGroupsStream() .map(group -> { TreeNode treeNode = new TreeNode<>(); treeNode.setId(group.getId()); @@ -44,9 +33,9 @@ public class GitlabGroupFetchTask { treeNode.setParentId(group.getParentId()); return treeNode; }).collect(Collectors.toList()); - this.groupTree = TreeUtil.build(treeNodes, null); + return TreeUtil.build(treeNodes, null); } catch (Exception e) { - log.warn("Failed to fetch Gitlab groups", e); + throw new BaseException("Failed to fetch Gitlab groups", e); } } diff --git a/initializer-ui/package.json b/initializer-ui/package.json index 320c8c6..b0edd73 100644 --- a/initializer-ui/package.json +++ b/initializer-ui/package.json @@ -13,9 +13,9 @@ "@highlightjs/vue-plugin": "^2.1.0" }, "devDependencies": { - "@vitejs/plugin-vue": "^3.1.2", + "@vitejs/plugin-vue": "^3.2.0", "typescript": "^4.8.4", - "vite": "^3.1.8", - "vue-tsc": "^1.0.8" + "vite": "^3.2.2", + "vue-tsc": "^1.0.9" } } \ No newline at end of file -- GitLab