Merge pull request #126 from FlowCI/develop

Develop

Author: yang.guo

config/app-api.properties

@@ -4,7 +4,7 @@
 jdbc.url = jdbc:mysql://127.0.0.1:3306/flow_api_db?useSSL=false
 jdbc.username = db_username
 jdbc.password = db_password
-jdbc.pool.size = 200
+jdbc.pool.size = 50
 jdbc.commit.auto = false
 jdbc.connection.timeout = 20000
 

config/app-cc.properties

@@ -1,10 +1,10 @@
 ## for flow control center docker env ##
 
 ### jdbc config ###
-jdbc.url = jdbc:mysql://127.0.0.1:3306/flow_cc_db?useSSL=false&createDatabaseIfNotExist=true
-jdbc.username = root
-jdbc.password =
-jdbc.pool.size = 10
+jdbc.url = jdbc:mysql://127.0.0.1:3306/flow_cc_db?useSSL=false
+jdbc.username = db_username
+jdbc.password = db_password
+jdbc.pool.size = 50
 jdbc.commit.auto = false
 jdbc.connection.timeout = 20000
 

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

@@ -84,7 +84,8 @@ protected void handleTextMessage(WebSocketSession session, TextMessage message)
      */
     private void sendCmdLog(String cmdId, String content, String number) {
         String event = String.format("/topic/cmd/%s", cmdId);
-        template.convertAndSend(event, "{\"number\": " + number + ", \"content\": \"" + content + "\"}");
+
+        template.convertAndSend(event, number + '#' + content);
     }
 
     /**