Merge remote-tracking branch 'origin/developer' into developer

byit-myth-admin/src/main/java/com/byit/config/AdminRegisterConfig.java

@@ -25,6 +25,10 @@ public class AdminRegisterConfig {
 //    @Value("${myth-rpc.registry.port}")
 //    private int port;
 
+    /**
+     * 初始化 rpc客户端 属于消费者
+     * @return
+     */
     @Bean
     public RpcSpringInvokerFactory invokerFactory(){
         RpcSpringInvokerFactory invokerFactory = new RpcSpringInvokerFactory();
@@ -39,6 +43,10 @@ public class AdminRegisterConfig {
         return invokerFactory;
     }
 
+    /**
+     * 设置对外提供服务的接口   这个其实是配合网关调用的方式 属于生产者
+     * @return
+     */
     @Bean
     public RpcSpringProviderFactory rpcSpringProviderFactory() {
         RpcSpringProviderFactory providerFactory = new RpcSpringProviderFactory();

byit-myth-rpc/src/main/java/com/byit/rpc/remoting/invoker/impl/RpcSpringInvokerFactory.java

@@ -87,7 +87,7 @@ public class RpcSpringInvokerFactory extends InstantiationAwareBeanPostProcessor
                             null,
                             rpcInvokerFactory
                     );
-
+                    //获取一个代理对象
                     Object serviceProxy = referenceBean.getObject();
 
                     // set bean

byit-myth-rpc/src/main/java/com/byit/rpc/remoting/invoker/reference/RpcReferenceBean.java

@@ -136,9 +136,7 @@ public class RpcReferenceBean {
 	public Object getObject() {
 		return Proxy.newProxyInstance(Thread.currentThread()
 				.getContextClassLoader(), new Class[] { iface },
-				new InvocationHandler() {
-					@Override
-					public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
+				(proxy, method, args) -> {
 
 					// method param
 					String className = method.getDeclaringClass().getName();	// iface.getName()
@@ -232,23 +230,23 @@ public class RpcReferenceBean {
 					} else if (CallType.FUTURE == callType) {
 						// future-response set
 						RpcFutureResponse futureResponse = new RpcFutureResponse(invokerFactory, rpcRequest, null);
-                            try {
+try {
 							// invoke future set
 							RpcInvokeFuture invokeFuture = new RpcInvokeFuture(futureResponse);
 							RpcInvokeFuture.setFuture(invokeFuture);
 
-                                // do invoke
-                                client.asyncSend(finalAddress, rpcRequest);
+// do invoke
+client.asyncSend(finalAddress, rpcRequest);
 
-                                return null;
-                            } catch (Exception e) {
+return null;
+} catch (Exception e) {
 							logger.info(">>>>>>>>>>> myth-rpc, invoke error, address:{}, RpcRequest{}", finalAddress, rpcRequest);
 
 							// future-response remove
 							futureResponse.removeInvokerFuture();
 
 							throw (e instanceof RpcException)?e:new RpcException(e);
-                            }
+}
 
 					} else if (CallType.CALLBACK == callType) {
 
@@ -277,13 +275,12 @@ public class RpcReferenceBean {
 
 						return null;
 					} else if (CallType.ONEWAY == callType) {
-                            client.asyncSend(finalAddress, rpcRequest);
-                            return null;
-                        } else {
+client.asyncSend(finalAddress, rpcRequest);
+return null;
+} else {
 						throw new RpcException("myth-rpc callType["+ callType +"] invalid");
 					}
 
-					}
 				});
 	}
 

byit-myth-rpc/src/main/java/com/byit/rpc/remoting/net/common/ConnectClient.java

@@ -82,7 +82,7 @@ public abstract class ConnectClient {
         if (connectClient!=null && connectClient.isValidate()) {
             return connectClient;
         }
-
+        //获取对应地址的锁对象
         // lock
         Object clientLock = connectClientLockMap.get(address);
         if (clientLock == null) {

demo-client/byit-demo-client/src/main/java/com/byit/job/AddComplexPy.java

@@ -19,7 +19,7 @@ public class AddComplexPy {
         runNode.setNodeId("2");
         runNode.setNodeName("lijkki");
         runNode.setRunCmd("python ${biz_file}");
-        JobUtils.setRequestUrl("http://127.0.0.1:8081/myth-job-admin");
+        JobUtils.setRequestUrl("http://10.0.120.208:8081/myth-job-admin/");
         JobUtils.setTOKEN("test");
         JobUtils.realExectNode(runNode);
        /* PluginPackage pluginPackage = new PluginPackage();

demo-client/byit-demo-client/src/main/java/com/byit/job/AddComplexPy1.java

@@ -16,7 +16,7 @@ public class AddComplexPy1 {
         PluginPackage pluginPackage = new PluginPackage();
         pluginPackage.setWorkspaceName("test");
         pluginPackage.setFlow(createFlow());
-        JobUtils.setRequestUrl("http://127.0.0.1:8081/myth-job-admin");
+        JobUtils.setRequestUrl("http://10.0.120.208:8081/myth-job-admin");
         JobUtils.setTOKEN("test");
         JobUtils.publish(pluginPackage);
     }