Tproxy: Rename 'id' to 'instance_id' to avoid potential confusion

Author: Leechael

tproxy/rpc/proto/tproxy_rpc.proto

@@ -49,7 +49,7 @@ message ListResponse {
 // HostInfo is the information of a host.
 message HostInfo {
   // The Instance id
-  string id = 1;
+  string instance_id = 1;
   // The IP address of the host.
   string ip = 2;
   // The app id of the host.

tproxy/src/main_service.rs

@@ -387,7 +387,7 @@ impl TproxyRpc for RpcHandler {
             .instances
             .values()
             .map(|instance| PbHostInfo {
-                id: instance.id.clone(),
+                instance_id: instance.id.clone(),
                 ip: instance.ip.to_string(),
                 app_id: instance.app_id.clone(),
                 base_domain: base_domain.clone(),
@@ -411,7 +411,7 @@ impl TproxyRpc for RpcHandler {
 
         if let Some(instance) = state.state.instances.get(&request.id) {
             let host_info = PbHostInfo {
-                id: instance.id.clone(),
+                instance_id: instance.id.clone(),
                 ip: instance.ip.to_string(),
                 app_id: instance.app_id.clone(),
                 base_domain: base_domain.clone(),

tproxy/templates/cvmlist.html

@@ -128,7 +128,7 @@ <h2>CVM List</h2>
         </tr>
         {% for host in hosts %}
         <tr>
-            <td>{{ host.id }}</td>
+            <td>{{ host.instance_id }}</td>
             <td>{{ host.app_id }}</td>
             <td>{{ host.ip }}</td>
             <td class="timestamp">{{ host.latest_handshake }}</td>