【Doe_V1.1.0】增加接口version和group支持

VIPJoey · VIPJoey · commit 4587f062b3b9 · 2018-10-31T20:49:09.000+08:00
diff --git a/README.md b/README.md
@@ -4,6 +4,7 @@
 -   修复grid序号问题
 -   修复spring 版本过低问题
 -   增加注册中心管理页面
+-   增加接口version和group支持
 -   provider 修改为starter方式
 -   增加守护程序，停止、重启、发布
         * 需要python2 环境支持
diff --git a/mmc-dubbo-doe/src/main/java/com/mmc/dubbo/doe/crontroller/DubboController.java b/mmc-dubbo-doe/src/main/java/com/mmc/dubbo/doe/crontroller/DubboController.java
@@ -139,7 +139,7 @@ public ResultDTO<Object> doListMethods(@NotNull ConnectDTO dto) {
     @RequestMapping("/doListProviders")
     public ResultDTO<Object> doListProviders(@NotNull ConnectDTO dto) {
 
-        log.info("DubboController.doListProviders({})", dto.getServiceName());
+        log.info("DubboController.doListProviders({} {} {})", dto.getServiceName(), dto.getVersion(), dto.getGroup());
 
         ResultDTO<Object> resultDTO = new ResultDTO<>();
 
diff --git a/mmc-dubbo-doe/src/main/java/com/mmc/dubbo/doe/dto/ConnectDTO.java b/mmc-dubbo-doe/src/main/java/com/mmc/dubbo/doe/dto/ConnectDTO.java
@@ -46,5 +46,12 @@ public class ConnectDTO extends BaseDTO {
      * timeout of waiting for result.
      */
     private int timeout;
-
+    /**
+     * interface version number, eg: 1.0.0
+     */
+    private String version;
+    /**
+     * the group of interface, eg: mmcgroup
+     */
+    private String group;
 }
diff --git a/mmc-dubbo-doe/src/main/java/com/mmc/dubbo/doe/handler/CuratorHandler.java b/mmc-dubbo-doe/src/main/java/com/mmc/dubbo/doe/handler/CuratorHandler.java
@@ -11,12 +11,15 @@
 
 import com.alibaba.dubbo.common.Constants;
 import com.alibaba.dubbo.common.URL;
+import com.alibaba.dubbo.common.utils.StringUtils;
 import com.alibaba.dubbo.registry.zookeeper.ZookeeperRegistry;
 import com.alibaba.dubbo.remoting.zookeeper.ZookeeperClient;
 import com.alibaba.dubbo.remoting.zookeeper.curator.CuratorZookeeperTransporter;
 import com.mmc.dubbo.doe.cache.MethodCaches;
 import com.mmc.dubbo.doe.cache.UrlCaches;
+import com.mmc.dubbo.doe.dto.ConnectDTO;
 import com.mmc.dubbo.doe.dto.MethodModelDTO;
+import com.mmc.dubbo.doe.exception.DoeException;
 import com.mmc.dubbo.doe.model.ServiceModel;
 import com.mmc.dubbo.doe.model.UrlModel;
 
@@ -71,14 +74,29 @@ public List<ServiceModel> getInterfaces() {
         return ret;
     }
 
-    public List<UrlModel> getProviders(String interfaceName) {
+    public List<UrlModel> getProviders(ConnectDTO dto) {
+
+        if (null == dto) {
+            throw new DoeException("dto can't be null.");
+        }
+        if (StringUtils.isEmpty(dto.getServiceName())) {
+            throw new DoeException("service name can't be null.");
+        }
 
         Map<String, String> map = new HashMap<>();
-        map.put(Constants.INTERFACE_KEY, interfaceName);
+        map.put(Constants.INTERFACE_KEY, dto.getServiceName());
+
+        if (StringUtils.isNotEmpty(dto.getVersion())) {
+            map.put(Constants.VERSION_KEY, dto.getVersion());
+        }
+        if (StringUtils.isNotEmpty(dto.getGroup())) {
+            map.put(Constants.GROUP_KEY, dto.getGroup());
+        }
+
         URL url = new URL(protocol, host, port, map);
         List<URL> list = registry.lookup(url);
 
-        return UrlCaches.cache(interfaceName, list);
+        return UrlCaches.cache(dto.getServiceName(), list);
     }
 
     public List<MethodModelDTO> getMethods(String interfaceName) throws ClassNotFoundException {
diff --git a/mmc-dubbo-doe/src/main/java/com/mmc/dubbo/doe/service/impl/ConnectServiceImpl.java b/mmc-dubbo-doe/src/main/java/com/mmc/dubbo/doe/service/impl/ConnectServiceImpl.java
@@ -98,8 +98,7 @@ public List<UrlModelDTO> listProviders(@NotNull ConnectDTO connect) throws NoSuc
             throw new DoeException("the cache is validate, please reconnect to zk againt.");
         }
 
-        // TODO add service version support
-        List<UrlModel> providers = client.getProviders(connect.getServiceName());
+        List<UrlModel> providers = client.getProviders(connect);
 
         // throw fast json error if you don't convert simple pojo
         // I have no idea why the UrlModel object will throw stack over flow exception.
diff --git a/mmc-dubbo-doe/src/main/java/com/mmc/dubbo/doe/util/ParamUtil.java b/mmc-dubbo-doe/src/main/java/com/mmc/dubbo/doe/util/ParamUtil.java
@@ -40,6 +40,8 @@ public static HashMap<String,String> getAttachmentFromUrl(URL url) throws Except
 
         HashMap<String, String> map = new HashMap<String, String>();
         map.put(Constants.PATH_KEY, interfaceName);
+        map.put(Constants.VERSION_KEY, url.getParameter(Constants.VERSION_KEY));
+        map.put(Constants.GROUP_KEY, url.getParameter(Constants.GROUP_KEY));
         /**
          *  doesn't necessary to set these params.
          *
diff --git a/mmc-dubbo-doe/src/main/resources/templates/pages/v3/normalCnt.html b/mmc-dubbo-doe/src/main/resources/templates/pages/v3/normalCnt.html
@@ -63,6 +63,7 @@ <h5 class="lighter">注册中心</h5>
                                                         </button>
                                                     </span>
                                                 </div>
+                                                <span class="smaller-20 lighter blue">如有需要，请先设置group和version，再连接zk.</span>
                                             </div>
                                         </div>
                                     </form>
@@ -115,10 +116,32 @@ <h4>提供者地址</h4>
                             </div>
 
                             <div class="col-xs-12 col-sm-4">
-                                <button class="btn btn-app btn-pink btn-sm" onclick="doListMethods();">
-                                    <i class="icon-share-alt bigger-200"></i>
-                                    拉取方法
-                                </button>
+                                <div class="col-xs-5">
+                                    <form class="form-horizontal">
+                                        <div class="control-group">
+                                            <label class="control-label" for="txtVersion">接口版本</label>
+
+                                            <div class="controls">
+                                                <input type="text" id="txtVersion" placeholder="" />
+                                            </div>
+                                        </div>
+
+                                        <div class="control-group">
+                                            <label class="control-label" for="txtGroup">接口分组</label>
+
+                                            <div class="controls">
+                                                <input type="text" id="txtGroup" placeholder="" />
+                                            </div>
+                                        </div>
+                                    </form>
+                                </div>
+                                <div class="col-xs-5">
+                                    <button class="btn btn-app btn-pink btn-sm" onclick="doListMethods();">
+                                        <i class="icon-share-alt bigger-200"></i>
+                                        拉取方法
+                                    </button>
+
+                                </div>
                             </div>
                         </div>
 
@@ -290,6 +313,8 @@ <h4>响应结果</h4>
         var providerKey = $("#cboProviders").val();
         var methodKey = $("input[name='rdMethodKey']:checked").val();
         var json = paramEditor.getValue();
+        var version = $("#txtVersion").val();
+        var group = $("#txtGroup").val();
 
         if (null == providerKey || providerKey.length <= 0) {
             return;
@@ -298,7 +323,7 @@ <h4>响应结果</h4>
             return;
         }
 
-        var params = {"providerKey": providerKey, "json": json, "methodKey": methodKey};
+        var params = {"providerKey": providerKey, "json": json, "methodKey": methodKey, "version": version, "group": group};
         Nora.Ajax("/doe/dubbo/doSend", params, function (data) {
 
             if (data.success && null != data.data && data.data.length > 0) {
@@ -386,8 +411,10 @@ <h4>响应结果</h4>
     function doListProviders(serviceName) {
 
         var conn = $("#txtConnect").val();// 这就是selected的值
+        var version = $("#txtVersion").val();
+        var group = $("#txtGroup").val();
 
-        var params = {"conn": conn, "serviceName": serviceName};
+        var params = {"conn": conn, "serviceName": serviceName, "version": version, "group": group};
         var cboProvider = $("#cboProviders");
         Nora.Ajax("/doe/dubbo/doListProviders", params, function (data) {
 
diff --git a/mmc-dubbo-doe/src/test/java/com/mmc/dubbo/doe/test/TestCuratorHandler.java b/mmc-dubbo-doe/src/test/java/com/mmc/dubbo/doe/test/TestCuratorHandler.java
@@ -9,6 +9,7 @@
  */
 package com.mmc.dubbo.doe.test;
 
+import com.mmc.dubbo.doe.dto.ConnectDTO;
 import com.mmc.dubbo.doe.handler.CuratorHandler;
 import com.mmc.dubbo.doe.dto.MethodModelDTO;
 import com.mmc.dubbo.doe.model.ServiceModel;
@@ -53,7 +54,17 @@ public void testGetInterfaces() {
     public void testGetProviders() {
 
         String interfaceName = "com.mmc.dubbo.api.user.UserService";
-        List<UrlModel> list = client.getProviders(interfaceName);
+
+        ConnectDTO dto = new ConnectDTO();
+        dto.setServiceName(interfaceName);
+
+        List<UrlModel> list = client.getProviders(dto);
+        Assert.assertTrue(list.size() <= 1);
+
+        dto.setVersion("2.0.0");
+        dto.setGroup("mmcgroup");
+        list = client.getProviders(dto);
+        Assert.assertTrue(list.size() == 0);
 
         System.out.println("----------------------------------------------------------------");
         list.forEach(l -> {
diff --git a/mmc-dubbo-doe/src/test/java/com/mmc/dubbo/doe/test/TestDemo.java b/mmc-dubbo-doe/src/test/java/com/mmc/dubbo/doe/test/TestDemo.java
@@ -17,6 +17,7 @@
 import com.mmc.dubbo.api.user.UserFact;
 import com.mmc.dubbo.doe.client.DoeClient;
 import com.mmc.dubbo.doe.context.ResponseDispatcher;
+import com.mmc.dubbo.doe.dto.ConnectDTO;
 import com.mmc.dubbo.doe.handler.CuratorHandler;
 import com.mmc.dubbo.doe.model.UrlModel;
 import com.mmc.dubbo.doe.util.ParamUtil;
@@ -47,7 +48,9 @@ public void testDemo() throws Exception {
 
         CuratorHandler curatorHandler = new CuratorHandler(protocol, host, port);
         curatorHandler.doConnect();
-        List<UrlModel> urls = curatorHandler.getProviders(interfaceName);
+        ConnectDTO conn = new ConnectDTO();
+        conn.setServiceName(interfaceName);
+        List<UrlModel> urls = curatorHandler.getProviders(conn);
 
         URL url = urls.get(0).getUrl();
         url = url.addParameter(Constants.CODEC_KEY, protocol); // 非常重要，必须要设置编码器协议类型
diff --git a/mmc-dubbo-provider/src/main/java/com/mmc/dubbo/provider/user/UserFeedbackServiceImpl.java b/mmc-dubbo-provider/src/main/java/com/mmc/dubbo/provider/user/UserFeedbackServiceImpl.java
@@ -16,7 +16,7 @@
  * @author Joey
  * @date 2018/5/8 20:31
  */
-@com.alibaba.dubbo.config.annotation.Service
+@com.alibaba.dubbo.config.annotation.Service(version = "2.0.0", group = "mmcgroup")
 public class UserFeedbackServiceImpl implements UserService {
 
     /**
@@ -32,7 +32,7 @@ public UserFact getCurrentById(long id) {
 
         UserFact user = new UserFact();
         user.setId(id);
-        user.setName("SUCCESS");
+        user.setName("mmcgroup");
 
         return user;
     }
diff --git a/mmc-dubbo-provider/src/main/java/com/mmc/dubbo/provider/user/UserMemberServiceImpl.java b/mmc-dubbo-provider/src/main/java/com/mmc/dubbo/provider/user/UserMemberServiceImpl.java
@@ -16,16 +16,34 @@
  * @author Joey
  * @date 2018/5/8 20:31
  */
+@com.alibaba.dubbo.config.annotation.Service
 public class UserMemberServiceImpl implements UserService {
 
 
     @Override
     public UserFact getCurrentById(long id) {
-        return null;
+
+        System.out.println("UserMemberServiceImpl.getCurrentById");
+
+        UserFact user = new UserFact();
+        user.setId(id);
+        user.setName("SUCCESS");
+
+        return user;
+
     }
 
     @Override
     public UserFact insert(UserFact u, String name, int sex) {
-        return null;
+
+        System.out.println("UserMemberServiceImpl.insert");
+
+        UserFact userFact = new UserFact();
+        userFact.setName(name);
+        userFact.setSex(sex);
+        userFact.setId(u.getId());
+
+        return userFact;
+
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -98,8 +98,7 @@ public List<UrlModelDTO> listProviders(@NotNull ConnectDTO connect) throws NoSuc`
`98`	`98`	`throw new DoeException("the cache is validate, please reconnect to zk againt.");`
`99`	`99`	`}`
`100`	`100`
`101`		`- // TODO add service version support`
`102`		`- List<UrlModel> providers = client.getProviders(connect.getServiceName());`
	`101`	`+ List<UrlModel> providers = client.getProviders(connect);`
`103`	`102`
`104`	`103`	`// throw fast json error if you don't convert simple pojo`
`105`	`104`	`// I have no idea why the UrlModel object will throw stack over flow exception.`
Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,8 @@ public static HashMap<String,String> getAttachmentFromUrl(URL url) throws Except`
`40`	`40`
`41`	`41`	`HashMap<String, String> map = new HashMap<String, String>();`
`42`	`42`	`map.put(Constants.PATH_KEY, interfaceName);`
	`43`	`+ map.put(Constants.VERSION_KEY, url.getParameter(Constants.VERSION_KEY));`
	`44`	`+ map.put(Constants.GROUP_KEY, url.getParameter(Constants.GROUP_KEY));`
`43`	`45`	`/**`
`44`	`46`	`* doesn't necessary to set these params.`
`45`	`47`	`*`