read version from application.properties

Author: yunheli

platform-agent/pom.xml

@@ -97,6 +97,19 @@
 
   <build>
     <finalName>flow-agent-${client.version}</finalName>
+    <resources>
+      <resource>
+        <directory>src/main/resources</directory>
+        <filtering>true</filtering>
+      </resource>
+    </resources>
+    <testResources>
+      <testResource>
+        <directory>src/test/resources</directory>
+        <filtering>true</filtering>
+      </testResource>
+    </testResources>
+
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>

platform-agent/src/main/java/com/flow/platform/agent/CmdManager.java

@@ -26,14 +26,19 @@
 import com.flow.platform.domain.CmdStatus;
 import com.flow.platform.domain.CmdType;
 import com.flow.platform.domain.Jsonable;
+import com.flow.platform.util.ExceptionUtil;
 import com.flow.platform.util.Logger;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.net.URL;
 import java.time.ZonedDateTime;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Properties;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.LinkedBlockingQueue;
@@ -241,15 +246,22 @@ private String collectionAgentInfo() {
         long total = runtime.totalMemory();
         long free = runtime.freeMemory();
         long use = total - free;
-        String agentVersion = Config.VERSION;
         Map<String, String> dic = new HashMap<>(7);
         dic.put("javaVersion", javaVersion);
         dic.put("osName", osName);
         dic.put("totalMemory", total / kb + "MB");
         dic.put("useMemory", use / kb + "MB");
-        dic.put("agentVersion", agentVersion);
         dic.put("zone", Config.zone());
         dic.put("name", Config.name());
+        URL resource = this.getClass().getClassLoader().getResource("application.properties");
+        try {
+            InputStream fileInputStream = new FileInputStream(resource.getFile());
+            Properties properties = new Properties();
+            properties.load(fileInputStream);
+            dic.put("agentVersion", (String) properties.get("version"));
+        } catch (Throwable e) {
+            LOGGER.warn("read agent version from application.properties error %s", ExceptionUtil.findRootCause(e));
+        }
         return Jsonable.GSON_CONFIG.toJson(dic);
     }
 

platform-agent/src/main/java/com/flow/platform/agent/Config.java

@@ -45,8 +45,6 @@ public class Config {
     public final static String PROP_ZK_TIMEOUT = "flow.agent.zk.timeout";
     public final static String PROP_SUDO_PASSWORD = "flow.agent.sudo.pwd";
 
-    public final static String VERSION = "1.0";
-
     public static AgentSettings AGENT_SETTINGS;
     public static String ZK_URL;
     public static String ZONE;

platform-agent/src/main/resources/application.properties

@@ -0,0 +1 @@
+version=${client.version}

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

@@ -16,8 +16,10 @@
 
 package com.flow.platform.api.consumer;
 
+import com.flow.platform.core.http.converter.RawGsonMessageConverter;
 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;
@@ -39,6 +41,9 @@ public class CmdLoggingConsumer extends TextWebSocketHandler {
     @Autowired
     private SimpMessagingTemplate template;
 
+    @Autowired
+    private RawGsonMessageConverter jsonConverter;
+
     @Override
     protected void handleTextMessage(WebSocketSession session, TextMessage message) throws Exception {
         String logItem = message.getPayload();
@@ -92,8 +97,8 @@ private void sendCmdLog(String cmdId, String content, String number) {
      * @param content
      */
     private void sendAgentSysInfo(String content) {
-        Map<String, String> dic = Jsonable.GSON_CONFIG.fromJson(content, Map.class);
-        String event = String.format("/topic/agent/%s/%s", dic.get("zone"), dic.get("name"));
+        Map<String, String> dic = jsonConverter.getGson().fromJson(content, Map.class);
+        String event = String.format("/topic/agent/sysinfo/%s/%s", dic.get("zone"), dic.get("name"));
         System.out.println(content);
         template.convertAndSend(event, content);
     }

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

@@ -17,6 +17,7 @@
 package com.flow.platform.api.controller;
 
 import com.flow.platform.api.domain.AgentWithFlow;
+import com.flow.platform.api.domain.SearchCondition;
 import com.flow.platform.api.domain.response.BooleanValue;
 import com.flow.platform.api.events.AgentStatusChangeEvent;
 import com.flow.platform.api.service.AgentService;
@@ -27,6 +28,7 @@
 import com.flow.platform.domain.AgentSettings;
 import com.google.common.base.Strings;
 import java.util.List;
+import java.util.Map;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -79,17 +81,8 @@ public List<AgentWithFlow> index() {
      *  HTTP/1.1 200 OK
      *
      *  {
-     *      path: {
-     *          zone: xxx,
-     *          name: xxx
-     *      },
-     *      concurrentProc: 1,
-     *      status: OFFLINE | IDLE | BUSY,
-     *      sessionId: xxxx-xxx-xxx,
-     *      sessionDate: 15123321,
-     *      token: xx-xxx-xxx
-     *      createdDate: 15123321,
-     *      updatedDate: 15123321,
+     *        zone: xxx,
+     *        name: xxx
      *  }
      */
     @PostMapping(path = "/create")
@@ -102,23 +95,20 @@ public Agent create(@RequestBody AgentPath agentPath) {
     }
 
     /**
-     * @api {Post} /agents/sys/info Agent sys info
+     * @api {Get} /agents/sys/info Agent sys info
      * @apiName Sys info
      * @apiGroup Agent
      * @apiDescription get agent sys info
-     * @apiParam {json} Request-Body
-     *  {
-     *          zone: xxx,
-     *          name: xxx
-     *  }
+     * @apiParam {String} zone
+     * @apiParam {String} name
      *
      * @apiSuccessExample {String} Success-Response:
      *     HTTP/1.1 200 OK
      *
      *
      */
-    @PostMapping(path = "/sys/info")
-    public void agentEnvironmentInfo(@RequestBody AgentPath agentPath) {
+    @GetMapping(path = "/sys/info")
+    public void agentEnvironmentInfo(@RequestParam Map<String, String> allParams, AgentPath agentPath) {
         if (agentPath.isEmpty()) {
             throw new IllegalParameterException("Zone and agent name are required");
         }