merge master

Author: gy2006

README.md

@@ -1,27 +1,39 @@
-flow-platform-x
-============
+<h3 align="center">
+  <a href="https://flowci.github.io">
+    <img src="https://github.com/FlowCI/docs/raw/master/src/icon.png" alt="fastlane Logo" width="100">
+  </a>
+</h3>
 
-[![LICENSE](https://img.shields.io/github/license/pingcap/tidb.svg)](https://github.com/pingcap/tidb/blob/master/LICENSE)
+<h3 align="center">A powerful and user-friendly CI/CD server</h3>
 
-Powerful and user-friendly CI/CD server
+<p align="center">
+    <a href="https://github.com/FlowCI/docs/blob/master/LICENSE"><img src="https://img.shields.io/github/license/flowci/flow-core-x"></a>
+    <a href="https://github.com/FlowCI/flow-core-x/releases/"><img src="https://img.shields.io/github/v/release/flowci/flow-core-x"></a>
+</p>
 
-- Getting started within a minute &nbsp; :tada:
+## Key Features
 
-- Simple YAML configuration and templates &nbsp; :ghost:
+- Zero configuration, can be getting started within a minute
 
-- Elastic Agents to speed up build &nbsp; :rocket:
+- Simple YAML configuration and templates
 
-- Online TTY to debug your job in time &nbsp; :shell:
+- Elastic agents to speed up build
 
-- Flexible plugins &nbsp; :electric_plug:
+- Online TTY to debug your job in time
 
-- Run steps either on any docker images or native os &nbsp; :computer:
+- Flexible plugins
 
-## [Document](./en/index.md) | [中文文档](./zh/index.md)
+- Run steps either on any docker images or native os
 
-## [Templates (maven, npm, golang..)](./en/index.md)
+## Document
 
-## Quick Start
+[English](https://github.com/FlowCI/docs/tree/master/en/index.md) | [中文文档](https://github.com/FlowCI/docs/tree/master/cn/index.md)
+
+## Templates
+
+[maven, npm, golang, ruby, android and more](https://github.com/FlowCI/templates)
+
+## Installation
 
 > [Docker](https://docs.docker.com/install/) & [Docker-Compose](https://docs.docker.com/compose/install/) are required
 
@@ -31,4 +43,8 @@ cd flow-docker
 ./server.sh start
 ```
 
+## Preview
+
 ![demo](https://github.com/FlowCI/docs/raw/master/src/demo.gif)
+
+![tty](https://github.com/FlowCI/docs/raw/master/src/step_tty.gif)

core/src/main/java/com/flowci/core/common/config/AppConfig.java

@@ -22,9 +22,6 @@
 import com.flowci.core.common.helper.ThreadHelper;
 import com.flowci.util.FileHelper;
 import lombok.extern.log4j.Log4j2;
-import org.apache.http.client.HttpClient;
-import org.apache.http.client.config.RequestConfig;
-import org.apache.http.impl.client.HttpClientBuilder;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.web.servlet.MultipartProperties;
 import org.springframework.cache.annotation.EnableCaching;
@@ -82,18 +79,6 @@ public ObjectMapper objectMapper() {
         return JacksonHelper.create();
     }
 
-    @Bean("httpClient")
-    public HttpClient httpClient() {
-        int timeout = 10 * 1000;
-        RequestConfig config = RequestConfig.custom()
-                .setConnectTimeout(timeout)
-                .setConnectionRequestTimeout(timeout)
-                .setSocketTimeout(timeout)
-                .build();
-
-        return HttpClientBuilder.create().setDefaultRequestConfig(config).build();
-    }
-
     @Bean("appTaskExecutor")
     public TaskExecutor getAppTaskExecutor() {
         return ThreadHelper.createTaskExecutor(100, 100, 50, "app-task-");

core/src/main/java/com/flowci/core/common/manager/HttpRequestManager.java

@@ -0,0 +1,40 @@
+package com.flowci.core.common.manager;
+
+import org.apache.http.HttpResponse;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.config.RequestConfig;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.impl.client.HttpClientBuilder;
+import org.apache.http.util.EntityUtils;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.PostConstruct;
+import java.io.IOException;
+
+@Component("httpManager")
+public class HttpRequestManager {
+
+    private final static int DefaultTimeout = 30 * 1000;
+
+    private final static String DefaultUserAgent = "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/85.0.4183.83 Safari/537.36";
+
+    private HttpClient client;
+
+    @PostConstruct
+    public void init() {
+        RequestConfig config = RequestConfig.custom()
+                .setConnectTimeout(DefaultTimeout)
+                .setConnectionRequestTimeout(DefaultTimeout)
+                .setSocketTimeout(DefaultTimeout)
+                .build();
+        client = HttpClientBuilder.create().setDefaultRequestConfig(config).build();
+    }
+
+    public String get(String url) throws IOException {
+        HttpGet request = new HttpGet(url);
+        request.setHeader("User-Agent", DefaultUserAgent);
+
+        HttpResponse execute = client.execute(request);
+        return EntityUtils.toString(execute.getEntity());
+    }
+}

core/src/main/java/com/flowci/core/flow/config/FlowConfig.java

@@ -20,6 +20,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.flowci.core.common.config.AppProperties;
 import com.flowci.core.common.helper.CacheHelper;
+import com.flowci.core.common.manager.HttpRequestManager;
 import com.flowci.core.flow.domain.Template;
 import com.github.benmanes.caffeine.cache.Cache;
 import lombok.extern.log4j.Log4j2;
@@ -30,7 +31,6 @@
 import org.springframework.scheduling.concurrent.ConcurrentTaskScheduler;
 
 import java.io.IOException;
-import java.net.URL;
 import java.util.List;
 
 /**
@@ -52,12 +52,14 @@ public Cache<String, List<String>> gitBranchCache() {
     }
 
     @Bean("templates")
-    public List<Template> getTemplates() throws IOException {
+    public List<Template> getTemplates(HttpRequestManager httpManager) throws IOException {
+        String body = httpManager.get(flowProperties.getTemplatesUrl());
+
         TypeReference<List<Template>> typeRef = new TypeReference<List<Template>>() {
         };
-        String url = flowProperties.getTemplatesUrl();
-        List<Template> list = objectMapper.readValue(new URL(url), typeRef);
-        log.info("Templates is loaded from {}", url);
+
+        List<Template> list = objectMapper.readValue(body, typeRef);
+        log.info("Templates is loaded from {}", flowProperties.getTemplatesUrl());
         return list;
     }
 

core/src/main/java/com/flowci/core/plugin/service/PluginServiceImpl.java

@@ -20,6 +20,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.flowci.core.common.config.AppProperties;
 import com.flowci.core.common.git.GitClient;
+import com.flowci.core.common.manager.HttpRequestManager;
 import com.flowci.core.common.manager.VarManager;
 import com.flowci.core.plugin.dao.PluginDao;
 import com.flowci.core.plugin.domain.Plugin;
@@ -90,6 +91,9 @@ public class PluginServiceImpl implements PluginService {
     @Autowired
     private VarManager varManager;
 
+    @Autowired
+    private HttpRequestManager httpManager;
+
     private final Object reloadLock = new Object();
 
     @EventListener
@@ -191,7 +195,8 @@ public Path getDir(Plugin plugin) {
     public List<PluginRepoInfo> load(String repoUrl) {
         try {
             repoUrl = repoUrl + "?t=" + Instant.now().toEpochMilli();
-            return objectMapper.readValue(new URL(repoUrl), RepoListType);
+            String body = httpManager.get(repoUrl);
+            return objectMapper.readValue(body, RepoListType);
         } catch (Throwable e) {
             log.warn("Unable to load plugin repo '{}' : {}", repoUrl, e.getMessage());
             return Collections.emptyList();