合并代码

java110-doc/src/main/java/com/java110/doc/registrar/Java110CmdDocDiscoveryRegistrar.java

@@ -102,7 +102,13 @@ public class Java110CmdDocDiscoveryRegistrar implements ImportBeanDefinitionRegi
 
                     String beanName = getListenerName(attributes, beanDefinition);
                     CmdDocDto cmdDocDto = new CmdDocDto();
-                    cmdDocDto.setCmdClass(candidateComponent.getClass());
+                    Class<?> clazz = null;
+                    try {
+                        clazz = Class.forName(beanDefinition.getBeanClassName());
+                    } catch (ClassNotFoundException e) {
+                        throw new RuntimeException(e);
+                    }
+                    cmdDocDto.setCmdClass(clazz);
                     cmdDocDto.setDescription(attributes.get("description").toString());
                     cmdDocDto.setAuthor(attributes.get("author").toString());
                     cmdDocDto.setResource(attributes.get("resource").toString());

java110-doc/src/main/resources/static/js/doc-ui.js

@@ -93,7 +93,11 @@
 
                 //发送get请求
                Vue.http.get('/doc/api/page', _param)
+<<<<<<< HEAD
                  //Vue.http.get('mock/pages.json', _param)
+=======
+               // Vue.http.get('mock/pages.json', _param)
+>>>>>>> cd8657e2dcffe17efd02cd055f8e6dfd6d703c96
                .then(function(res) {
                         _that.pages = res.data;
                         if (_that.pages.length < 1) {