fix

apps/iot/include/message_pb.hrl

@@ -35,21 +35,45 @@
         }).
 -endif.
 
--ifndef('ASYNC_CALL_REPLY_PB_H').
+-ifndef('COMMAND_PB_H').
--define('ASYNC_CALL_REPLY_PB_H', true).
+-define('COMMAND_PB_H', true).
--record(async_call_reply,
+-record(command,
-        {code = 0               :: non_neg_integer() | undefined, % = 1, optional, 32 bits
+        {command_type = <<>>    :: unicode:chardata() | undefined, % = 1, optional
-         result = <<>>          :: unicode:chardata() | undefined, % = 2, optional
+         command = <<>>         :: iodata() | undefined % = 2, optional
-         message = <<>>         :: unicode:chardata() | undefined % = 3, optional
         }).
 -endif.
 
--ifndef('DEPLOY_PB_H').
+-ifndef('RPC_DEPLOY_PB_H').
--define('DEPLOY_PB_H', true).
+-define('RPC_DEPLOY_PB_H', true).
--record(deploy,
+-record(rpc_deploy,
-        {task_id = 0            :: non_neg_integer() | undefined, % = 1, optional, 32 bits
+        {packet_id = 0          :: non_neg_integer() | undefined, % = 1, optional, 32 bits
-         service_id = <<>>      :: unicode:chardata() | undefined, % = 2, optional
+         task_id = 0            :: non_neg_integer() | undefined, % = 2, optional, 32 bits
-         tar_url = <<>>         :: unicode:chardata() | undefined % = 3, optional
+         config = <<>>          :: unicode:chardata() | undefined % = 3, optional
+        }).
+-endif.
+
+-ifndef('RPC_START_CONTAINER_PB_H').
+-define('RPC_START_CONTAINER_PB_H', true).
+-record(rpc_start_container,
+        {packet_id = 0          :: non_neg_integer() | undefined, % = 1, optional, 32 bits
+         container_name = <<>>  :: unicode:chardata() | undefined % = 2, optional
+        }).
+-endif.
+
+-ifndef('RPC_STOP_CONTAINER_PB_H').
+-define('RPC_STOP_CONTAINER_PB_H', true).
+-record(rpc_stop_container,
+        {packet_id = 0          :: non_neg_integer() | undefined, % = 1, optional, 32 bits
+         container_name = <<>>  :: unicode:chardata() | undefined % = 2, optional
+        }).
+-endif.
+
+-ifndef('RPC_CONFIG_CONTAINER_PB_H').
+-define('RPC_CONFIG_CONTAINER_PB_H', true).
+-record(rpc_config_container,
+        {packet_id = 0          :: non_neg_integer() | undefined, % = 1, optional, 32 bits
+         container_name = <<>>  :: unicode:chardata() | undefined, % = 2, optional
+         config = <<>>          :: iodata() | undefined % = 3, optional
         }).
 -endif.
 
@@ -60,21 +84,11 @@
         }).
 -endif.
 
--ifndef('INVOKE_PB_H').
+-ifndef('CONTAINER_CONFIG_PB_H').
--define('INVOKE_PB_H', true).
+-define('CONTAINER_CONFIG_PB_H', true).
--record(invoke,
+-record(container_config,
-        {service_id = <<>>      :: unicode:chardata() | undefined, % = 1, optional
+        {container_name = <<>>  :: unicode:chardata() | undefined, % = 1, optional
-         payload = <<>>         :: iodata() | undefined, % = 2, optional
+         config = <<>>          :: iodata() | undefined % = 2, optional
-         timeout = 0            :: non_neg_integer() | undefined % = 3, optional, 32 bits
-        }).
--endif.
-
--ifndef('PUSH_SERVICE_CONFIG_PB_H').
--define('PUSH_SERVICE_CONFIG_PB_H', true).
--record(push_service_config,
-        {service_id = <<>>      :: unicode:chardata() | undefined, % = 1, optional
-         config_json = <<>>     :: unicode:chardata() | undefined, % = 2, optional
-         timeout = 0            :: non_neg_integer() | undefined % = 3, optional, 32 bits
         }).
 -endif.
 
@@ -88,6 +102,15 @@
         }).
 -endif.
 
+-ifndef('EVENT_PB_H').
+-define('EVENT_PB_H', true).
+-record(event,
+        {service_id = <<>>      :: unicode:chardata() | undefined, % = 1, optional
+         event_type = 0         :: non_neg_integer() | undefined, % = 2, optional, 32 bits
+         params = <<>>          :: unicode:chardata() | undefined % = 3, optional
+        }).
+-endif.
+
 -ifndef('PING_PB_H').
 -define('PING_PB_H', true).
 -record(ping,
@@ -107,31 +130,4 @@
         }).
 -endif.
 
--ifndef('SERVICE_INFORM_PB_H').
--define('SERVICE_INFORM_PB_H', true).
--record(service_inform,
-        {service_id = <<>>      :: unicode:chardata() | undefined, % = 1, optional
-         props = <<>>           :: unicode:chardata() | undefined, % = 2, optional
-         status = 0             :: non_neg_integer() | undefined, % = 3, optional, 32 bits
-         timestamp = 0          :: non_neg_integer() | undefined % = 4, optional, 32 bits
-        }).
--endif.
-
--ifndef('EVENT_PB_H').
--define('EVENT_PB_H', true).
--record(event,
-        {service_id = <<>>      :: unicode:chardata() | undefined, % = 1, optional
-         event_type = 0         :: non_neg_integer() | undefined, % = 2, optional, 32 bits
-         params = <<>>          :: unicode:chardata() | undefined % = 3, optional
-        }).
--endif.
-
--ifndef('ALARM_PB_H').
--define('ALARM_PB_H', true).
--record(alarm,
-        {service_id = <<>>      :: unicode:chardata() | undefined, % = 1, optional
-         params = <<>>          :: unicode:chardata() | undefined % = 2, optional
-        }).
--endif.
-
 -endif.

todo_docs/todo.md

@@ -25,3 +25,5 @@
     1. pub/sub机制，微服务可以通过topic监听自己关注的消息(将一对一和一对多的消息机制统一)
     2. 增加了endpoint，支持将数据路由到http|kafka|mqtt; 增加路由机制，数据上报的时候通过route_key路由到对应的endpoint
     3. 新增远程调用
+
+## 新增微服务日志的收集平台, efka基于udp协议