Merge pull request #103 from FederatedAI/develop

Develop

Author: forgivedengkai

fate-serving-admin/src/main/java/com/webank/ai/fate/serving/admin/services/provider/ValidateServiceProvider.java

@@ -119,6 +119,9 @@ public Object inference(Context context, InboundPackage data) throws Exception {
         if (StringUtils.isNotBlank(serviceId)) {
             inferenceRequest.setServiceId(serviceId);
         }
+        if(params.get("applyId")!=null){
+            inferenceRequest.setApplyId(params.get("applyId").toString());
+        }
 
         for (Map.Entry<String, Object> entry : featureData.entrySet()) {
             inferenceRequest.getFeatureData().put(entry.getKey(), entry.getValue());

fate-serving-core/src/main/java/com/webank/ai/fate/serving/core/bean/GrpcConnectionPool.java

@@ -219,12 +219,11 @@ public synchronized ManagedChannel createManagedChannel(String ip, int port, Net
             } else {
                 channelBuilder.usePlaintext();
             }
-
             return channelBuilder.build();
-        } catch (SSLException e) {
-            throw new SecurityException(e);
-        } catch (Exception e) {
-            e.printStackTrace();
+        }
+        catch (Exception e) {
+            logger.error("create channel error : " ,e);
+            //e.printStackTrace();
         }
         return null;
     }