Merge pull request #113 from FlowCI/develop

Develop

Author: yang.guo

.gitignore

@@ -2,6 +2,7 @@
 *.iml
 .DS_Store
 deploy.sh
+api-doc/
 
 node_modules/
 apidoc/

platform-api/src/main/java/com/flow/platform/api/config/AppConfig.java

@@ -30,8 +30,7 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.LinkedBlockingQueue;
+import org.apache.velocity.app.Velocity;
 import org.apache.velocity.app.VelocityEngine;
 import org.apache.velocity.runtime.RuntimeConstants;
 import org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader;
@@ -45,7 +44,7 @@
  * @author yang
  */
 @Configuration
-@Import({DatabaseConfig.class})
+@Import({CachingConfig.class, DatabaseConfig.class})
 public class AppConfig extends AppConfigBase {
 
     public final static String NAME = "API";
@@ -62,10 +61,6 @@ public class AppConfig extends AppConfigBase {
 
     private final static String THREAD_NAME_PREFIX = "async-task-";
 
-    public final static String ALLOW_SUFFIX = "p12,mobileprovision,jks,pem";
-
-    public final static long ALLOW_SIZE = 2 * 1024 * 1024;
-
     public final static String DEFAULT_USER_EMAIL = "[email protected]";
     public final static String DEFAULT_USER_NAME = "admin";
     public final static String DEFAULT_USER_PASSWORD = "123456";
@@ -136,6 +131,11 @@ public VelocityEngine velocityEngine() throws Exception {
         VelocityEngine ve = new VelocityEngine();
         ve.setProperty(RuntimeConstants.RESOURCE_LOADER, "classpath");
         ve.setProperty("classpath.resource.loader.class", ClasspathResourceLoader.class.getName());
+
+        ve.setProperty(Velocity.ENCODING_DEFAULT, DEFAULT_CHARSET.name());
+        ve.setProperty(Velocity.INPUT_ENCODING, DEFAULT_CHARSET.name());
+        ve.setProperty(Velocity.OUTPUT_ENCODING, DEFAULT_CHARSET.name());
+
         ve.init();
         return ve;
     }

platform-api/src/main/java/com/flow/platform/api/config/CachingConfig.java

@@ -40,7 +40,6 @@ public class CachingConfig {
         .expireAfterAccess(EXPIRE_CACHE_SECOND, TimeUnit.SECONDS)
         .maximumSize(MAX_CACHE_NUM);
 
-
     @Bean
     public CacheManager cacheManager() {
         GuavaCacheManager guavaCacheManager = new GuavaCacheManager();

platform-api/src/main/java/com/flow/platform/api/config/WebConfig.java

@@ -64,7 +64,7 @@
     "com.flow.platform.api.util",
     "com.flow.platform.api.consumer",
     "com.flow.platform.api.initializers"})
-@Import({AppConfig.class, CachingConfig.class})
+@Import({AppConfig.class})
 public class WebConfig extends WebMvcConfigurerAdapter {
 
     private final static Gson GSON_CONFIG_FOR_RESPONE = new GsonBuilder()

platform-api/src/main/java/com/flow/platform/api/consumer/CmdLoggingConsumer.java

@@ -18,9 +18,7 @@
 
 import com.flow.platform.core.http.converter.RawGsonMessageConverter;
 import com.flow.platform.domain.CmdType;
-import com.flow.platform.domain.Jsonable;
 import com.flow.platform.util.Logger;
-import com.google.gson.annotations.JsonAdapter;
 import java.util.Map;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.messaging.simp.SimpMessagingTemplate;
@@ -78,25 +76,19 @@ protected void handleTextMessage(WebSocketSession session, TextMessage message)
 
         if (category.equals(CmdType.SYSTEM_INFO.toString())) {
             sendAgentSysInfo(content);
-            return;
         }
     }
 
     /**
      * send command log
-     * @param cmdId
-     * @param content
-     * @param number
      */
     private void sendCmdLog(String cmdId, String content, String number) {
-
         String event = String.format("/topic/cmd/%s", cmdId);
         template.convertAndSend(event, "{\"number\": \"" + number + "\", \"content\": \"" + content + "\"}");
     }
 
     /**
      * send agent sys info
-     * @param content
      */
     private void sendAgentSysInfo(String content) {
         Map<String, String> dic = jsonConverter.getGson().fromJson(content, Map.class);

platform-api/src/main/java/com/flow/platform/api/controller/FlowController.java

@@ -321,7 +321,7 @@ public String getRawYml() {
     @WebSecurity(action = Actions.FLOW_YML)
     public Node loadRawYmlFromGit() {
         Flow root = nodeService.findFlow(currentNodePath.get());
-        return ymlService.loadYmlContent(root, null);
+        return ymlService.loadYmlContent(root, null, null);
     }
 
     /**

platform-api/src/main/java/com/flow/platform/api/controller/GitWebHookController.java

@@ -16,6 +16,7 @@
 
 package com.flow.platform.api.controller;
 
+import com.flow.platform.api.config.AppConfig;
 import com.flow.platform.api.domain.envs.FlowEnvs;
 import com.flow.platform.api.domain.envs.FlowEnvs.YmlStatusValue;
 import com.flow.platform.api.domain.node.Flow;
@@ -65,10 +66,11 @@ public class GitWebHookController extends NodeController {
     @PostMapping(path = "/{root}")
     public void onEventReceived(@RequestHeader HttpHeaders headers, HttpServletRequest request) {
         final String path = currentNodePath.get();
-
         Map<String, String> headerAsMap = headers.toSingleValueMap();
+
         String body;
         try {
+            request.setCharacterEncoding(AppConfig.DEFAULT_CHARSET.name());
             body = CharStreams.toString(request.getReader());
         } catch (IOException e) {
             throw new IllegalStatusException("Cannot read raw body");

platform-api/src/main/java/com/flow/platform/api/controller/JobController.java

@@ -25,12 +25,14 @@
 import com.flow.platform.api.service.job.JobSearchService;
 import com.flow.platform.api.service.node.YmlService;
 import com.flow.platform.api.util.I18nUtil;
+import com.flow.platform.core.exception.NotFoundException;
 import com.flow.platform.util.Logger;
 import com.flow.platform.util.StringUtil;
 import com.flow.platform.util.git.model.GitEventType;
 import com.google.common.collect.Lists;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -95,9 +97,13 @@ public void setLocale(@RequestParam(required = false) String locale) {
      *
      */
     @PostMapping(path = "/{root}")
-    public void create() {
+    public void create(@RequestBody(required = false) Map<String, String> envs) {
+        if (envs == null) {
+            envs = new LinkedHashMap<>();
+        }
+
         String path = currentNodePath.get();
-        jobService.createJobAndYmlLoad(path, GitEventType.MANUAL, new LinkedHashMap<>(), currentUser.get(), null);
+        jobService.createJobAndYmlLoad(path, GitEventType.MANUAL, envs, currentUser.get(), null);
     }
 
     /**
@@ -169,7 +175,12 @@ public Job show(@PathVariable Integer buildNumber) {
     @GetMapping(path = "/{root}/{buildNumber}/yml")
     public String yml(@PathVariable Integer buildNumber) {
         String path = currentNodePath.get();
-        return jobService.findYml(path, buildNumber);
+        try {
+            return jobService.findYml(path, buildNumber);
+        } catch (NotFoundException ignore) {
+            // ignore job node not found exception since maybe job node created when yml loading
+            return StringUtil.EMPTY;
+        }
     }
 
     /**

platform-api/src/main/java/com/flow/platform/api/controller/WelcomeController.java

@@ -113,6 +113,7 @@ public List<PropertySystemInfo> indexAll() {
      *          system: Java SE,
      *          version: 1.8.0
      *          status: RUNNING,
+     *          type: JVM | DB | SERVER | ZK | MQ | CONFIG,
      *          info: {
      *              MEMORY: {
      *                  jvm.memory.max: 123123
@@ -150,6 +151,7 @@ public List<SystemInfo> componentInfo(@PathVariable String system) {
      *      system: Java SE,
      *      version: 1.8.0
      *      status: RUNNING,
+     *      type: JVM | DB | SERVER | ZK | MQ | CONFIG,
      *      info: {
      *          MEMORY: {
      *              jvm.memory.max: 123123

platform-api/src/main/java/com/flow/platform/api/domain/envs/AgentEnvs.java

@@ -0,0 +1,25 @@
+/*
+ * Copyright 2017 flow.ci
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.flow.platform.api.domain.envs;
+
+/**
+ * @author yang
+ */
+public enum AgentEnvs implements EnvKey {
+
+    FLOW_AGENT_WORKSPACE
+}