Главная Обзор Помощь
Вход
wuye
/
MicroCommunity
Следить 2
В избранное 0
Ответвить 0
Файлы Обсуждения 0 Запросы на слияние 0 Вики
Просмотр исходного кода

优化代码

java110 лет назад: 3
Родитель
31e6175d07
Сommit
83b638b03c
22 измененных файлов с 3465 добавлено и 79 удалено
Разделённый вид Показать статистику Diff
  1. 10 0
      java110-doc/pom.xml
  2. 72 8
      java110-doc/src/main/java/com/java110/doc/controller/DocController.java
  3. 16 1
      java110-doc/src/main/java/com/java110/doc/registrar/ApiDocCmdPublishing.java
  4. 8 0
      java110-doc/src/main/java/com/java110/doc/registrar/ApiDocPublishing.java
  5. 7 0
      java110-doc/src/main/resources/static/css/bootstrap.min.css
  6. 1 0
      java110-doc/src/main/resources/static/css/bootstrap.min.css.map
  7. 32 0
      java110-doc/src/main/resources/static/css/doc-ui.css
  8. 163 34
      java110-doc/src/main/resources/static/doc-ui.html
  9. 7 0
      java110-doc/src/main/resources/static/js/bootstrap.min.js
  10. 1 0
      java110-doc/src/main/resources/static/js/bootstrap.min.js.map
  11. 84 6
      java110-doc/src/main/resources/static/js/doc-ui.js
  12. 2 0
      java110-doc/src/main/resources/static/js/jquery-3.3.1.min.js
  13. 2923 0
      java110-doc/src/main/resources/static/js/vcFramework.js
  14. 7 0
      java110-doc/src/main/resources/static/js/vue-resource.min.js
  15. 6 0
      java110-doc/src/main/resources/static/js/vue.min.js
  16. 87 0
      java110-doc/src/main/resources/static/mock/api.json
  17. 13 0
      java110-doc/src/main/resources/static/mock/pages.json
  18. 11 11
      service-api/src/main/java/com/java110/api/rest/RestApi.java
  19. 1 1
      service-api/src/main/resources/banner.txt
  20. 1 1
      springboot/src/main/java/com/java110/boot/BootApplicationStart.java
  21. 12 16
      springboot/src/main/java/com/java110/boot/rest/RestApi.java
  22. 1 1
      springboot/src/main/resources/banner.txt

+ 10 - 0
java110-doc/pom.xml
Просмотреть файл 

@@ -28,6 +28,16 @@
 
             <version>4.11</version>
 
             <scope>test</scope>
 
         </dependency>
 
+
 
+        <dependency>
 
+            <groupId>com.alibaba</groupId>
 
+            <artifactId>fastjson</artifactId>
 
+        </dependency>
 
+
 
+        <dependency>
 
+            <groupId>com.java110</groupId>
 
+            <artifactId>java110-core</artifactId>
 
+        </dependency>
 
     </dependencies>

+ 72 - 8
java110-doc/src/main/java/com/java110/doc/controller/DocController.java
Просмотреть файл 

@@ -1,27 +1,91 @@
 
 package com.java110.doc.controller;
 
 
 
-import org.springframework.http.HttpStatus;
 
-import org.springframework.http.ResponseEntity;
 
+import com.alibaba.fastjson.JSONArray;
 
+import com.alibaba.fastjson.JSONObject;
 
+import com.java110.doc.entity.ApiDocDto;
 
+import com.java110.doc.entity.CmdDocDto;
 
+import com.java110.doc.entity.RequestMappingsDocDto;
 
+import com.java110.doc.registrar.ApiDocCmdPublishing;
 
+import com.java110.doc.registrar.ApiDocPublishing;
 
+import com.java110.utils.factory.ApplicationContextFactory;
 
+import org.springframework.http.*;
 
 import org.springframework.web.bind.annotation.*;
 
+import org.springframework.web.client.HttpStatusCodeException;
 
+import org.springframework.web.client.RestTemplate;
 
 
 import javax.servlet.http.HttpServletRequest;
 
+import java.util.List;
 
 
 @RestController
 
-
 
 @RequestMapping(value = "/doc")
 
 public class DocController {
 
 
+
 
     @RequestMapping(path = "/api", method = RequestMethod.GET)
 
     public ResponseEntity<String> html(
 
-            HttpServletRequest request){
 
-        return new ResponseEntity<>("<html></html>", HttpStatus.OK);
 
+            HttpServletRequest request) {
 
+
 
+
 
+        ApiDocDto apiDocDto = ApiDocPublishing.getApiDocDto();
 
+
 
+        List<RequestMappingsDocDto> mappingsDocDtos = ApiDocPublishing.getMappingsDocDtos();
 
+
 
+        JSONObject param = new JSONObject();
 
+        param.put("api", apiDocDto);
 
+        param.put("mappings", mappingsDocDtos);
 
+        return new ResponseEntity<>(param.toString(), HttpStatus.OK);
 
+    }
 
+
 
+    @RequestMapping(path = "/api/page", method = RequestMethod.GET)
 
+    public ResponseEntity<String> pages(
 
+            @RequestParam("name") String name,
 
+            @RequestParam("resource") String resource,
 
+            HttpServletRequest request) {
 
+
 
+        List<RequestMappingsDocDto> mappingsDocDtos = ApiDocPublishing.getMappingsDocDtos();
 
+
 
+        RequestMappingsDocDto newMappingsDocDto = null;
 
+        for (RequestMappingsDocDto mappingsDocDto : mappingsDocDtos) {
 
+            if (mappingsDocDto.getName().equals(name)) {
 
+                newMappingsDocDto = mappingsDocDto;
 
+            }
 
+        }
 
+
 
+        if (newMappingsDocDto == null) {
 
+            return new ResponseEntity<>("[]", HttpStatus.OK);
 
+        }
 
+
 
+        RestTemplate restTemplate = ApplicationContextFactory.getBean("restTemplate", RestTemplate.class);
 
+        if ("boot".equals(newMappingsDocDto.getStartWay())) {
 
+            restTemplate = ApplicationContextFactory.getBean("outRestTemplate", RestTemplate.class);
 
+        }
 
+        ResponseEntity<String> responseEntity = null;
 
+        HttpEntity<String> httpEntity = new HttpEntity<String>("", new HttpHeaders());
 
+        try {
 
+            responseEntity = restTemplate.exchange(newMappingsDocDto.getUrl()+"/doc/api/"+resource, HttpMethod.GET, httpEntity, String.class);
 
+        } catch (HttpStatusCodeException e) { //这里spring 框架 在4XX 或 5XX 时抛出 HttpServerErrorException 异常，需要重新封装一下
 
+            responseEntity = new ResponseEntity<String>(e.getResponseBodyAsString(), e.getStatusCode());
 
+        } catch (Exception e) {
 
+            responseEntity = new ResponseEntity<String>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
 
+        }
 
+        return responseEntity;
 
+    }
 
+
 
+    @RequestMapping(path = "/api/{resource}", method = RequestMethod.GET)
 
+    public ResponseEntity<String> resourcePages(
 
+            @PathVariable String resource,
 
+            HttpServletRequest request) {
 
+
 
+        List<CmdDocDto> cmdDocDtos = ApiDocCmdPublishing.getCmdDocs(resource);
 
+
 
+        return new ResponseEntity<>(JSONArray.toJSONString(cmdDocDtos), HttpStatus.OK);
 
     }
 
 
     @RequestMapping(path = "/api/{resource}/{serviceCode}", method = RequestMethod.GET)
 
-    public ResponseEntity<String> api( @PathVariable String resource,
 
-                                       @PathVariable String serviceCode,
 
-                                       HttpServletRequest request){
 
+    public ResponseEntity<String> api(@PathVariable String resource,
 
+                                      @PathVariable String serviceCode,
 
+                                      HttpServletRequest request) {
 
         return null;
 
     }
 
 }

+ 16 - 1
java110-doc/src/main/java/com/java110/doc/registrar/ApiDocCmdPublishing.java
Просмотреть файл 

@@ -4,7 +4,6 @@ import com.java110.doc.entity.CmdDocDto;
 
 
 import java.util.ArrayList;
 
 import java.util.List;
 
-import java.util.Map;
 
 
 /**
 
  * 文档 发布类
 
@@ -25,4 +24,20 @@ public class ApiDocCmdPublishing {
 
     public static void addCmdDoc(CmdDocDto doc) {
 
         cmdDocs.add(doc);
 
     }
 
+
 
+
 
+    public static List<CmdDocDto> getCmdDocs(String resource) {
 
+        List<CmdDocDto> retCmdDocDto = new ArrayList<>();
 
+        if (cmdDocs.size() < 1) {
 
+            return retCmdDocDto;
 
+        }
 
+
 
+        for (CmdDocDto cmdDocDto : cmdDocs) {
 
+            if (cmdDocDto.getResource().equals(resource)) {
 
+                retCmdDocDto.add(cmdDocDto);
 
+            }
 
+        }
 
+
 
+        return retCmdDocDto;
 
+    }
 
 }

+ 8 - 0
java110-doc/src/main/java/com/java110/doc/registrar/ApiDocPublishing.java
Просмотреть файл 

@@ -27,4 +27,12 @@ public class ApiDocPublishing {
 
         ApiDocPublishing.apiDocDto = apiDocDto;
 
         ApiDocPublishing.mappingsDocDtos = mappingsDocDtos;
 
     }
 
+
 
+    public static ApiDocDto getApiDocDto(){
 
+        return ApiDocPublishing.apiDocDto;
 
+    }
 
+
 
+    public static List<RequestMappingsDocDto> getMappingsDocDtos(){
 
+        return ApiDocPublishing.mappingsDocDtos;
 
+    }
 
 }

Разница между файлами не показана из-за своего большого размера
+ 7 - 0
java110-doc/src/main/resources/static/css/bootstrap.min.css


Разница между файлами не показана из-за своего большого размера
+ 1 - 0
java110-doc/src/main/resources/static/css/bootstrap.min.css.map


+ 32 - 0
java110-doc/src/main/resources/static/css/doc-ui.css
Просмотреть файл 

@@ -18,4 +18,36 @@ a{
 
     padding-left: 52px;
 
     font-size:14px;
 
     text-decoration:none
 
+}
 
+
 
+.doc-interface{
 
+    padding:35px;
 
+}
 
+
 
+.doc-title{
 
+    color: #777;
 
+    font-weight: 600;
 
+    font-size: 18px;
 
+    margin-bottom:10px;
 
+}
 
+
 
+.doc-margin-top{
 
+    margin-top:35px;
 
+}
 
+
 
+.highlight{
 
+    background-color: #f8f9fa;
 
+    padding:10px;
 
+    border-radius: 10px;
 
+}
 
+
 
+.nav>li.active {
 
+    border-left: 4px solid #19aa8d;
 
+}
 
+
 
+.metismenu .collapse.in {
 
+    display: block;
 
+}
 
+.metismenu .collapse {
 
+    display: none;
 
 }

+ 163 - 34
java110-doc/src/main/resources/static/doc-ui.html
Просмотреть файл 

@@ -3,71 +3,200 @@
 
 <head>
 
     <meta charset="UTF-8">
 
     <title>api document ui</title>
 
-    <link href='/css/vc.css'  rel='stylesheet' type='text/css'/>
 
-    <link href='/css/doc-ui.css'  rel='stylesheet' type='text/css'/>
 
-    <script src='/js/doc-ui.js' type='text/javascript'></script>
 
+    <link href='css/bootstrap.min.css'  rel='stylesheet' type='text/css'/>
 
+    <link href='css/vc.css'  rel='stylesheet' type='text/css'/>
 
+    <link href='css/doc-ui.css'  rel='stylesheet' type='text/css'/>
 
+    <script src="js/jquery-3.3.1.min.js"></script>
 
+    <script src="js/bootstrap.min.js"></script>
 
+    <script src='js/vue.min.js' type='text/javascript'></script>
 
+    <script src='js/vue-resource.min.js' type='text/javascript'></script>
 
+
 
 </head>
 
 <body>
 
 
 <div>
 
-    <div class="flex justify-start">
 
+    <div class="flex justify-start" id="component">
 
         <div class="line-y left white-bg border-radius padding">
 
             <ul class="nav metismenu" id="side-menu">
 
                 <li class="" style="color: #444;padding: 10px 20px;font-size: 20px;">
 
                     <div class="dropdown profile-element">
 
-                        <span class="block m-t-xs font-bold">HC小区管理系统文档</span>
 
+                        <span class="block m-t-xs font-bold">{{docInfo.title}}</span>
 
                     </div>
 
                 </li>
 
-                <li class="flex justify-around" style="color: #999;padding: 0px 10px;font-size: 14px;">
 
-                    <div class="dropdown profile-element">
 
-                        <span class="block m-t-xs font-bold">作者：</span>
 
-                        <span class="block m-t-xs font-bold">吴学文</span>
 
+                <li class="flex justify-around" style="color: #999;padding: 0px 10px;font-size: 14px;width:100%">
 
+                    <div class="">
 
+                        <span class="">作者：</span>
 
+                        <span class="">{{docInfo.company}}</span>
 
                     </div>
 
-                    <div class="dropdown profile-element">
 
-                        <span class="block m-t-xs font-bold">版本：</span>
 
-                        <span class="block m-t-xs font-bold">v1.40</span>
 
+                    <div class="">
 
+                        <span class="">版本：</span>
 
+                        <span class="">{{docInfo.version}}</span>
 
                     </div>
 
                 </li>
 
 
                 <li class="" style="color: #999;padding: 10px 10px;font-size: 14px;">
 
                     <div class="dropdown profile-element">
 
-                        <span class="block m-t-xs font-bold">hc系统描述水电费水电费水电费</span>
 
+                        <span class="block m-t-xs font-bold">{{docInfo.description}}</span>
 
                     </div>
 
                 </li>
 
 
-
 
-                <li  class="active" >
 
-                    <a  href="javascript:void(0)" onclick="switchMenu(123)">
 
-                        <span class="nav-label" style="color: #777;">计算中心</span>
 
+                <li  style="width:100%" :class="{ active: item.active }" v-for="(item,index) in menus" :key="item.name">
 
+                    <a  href="javascript:void(0)" @click="switchMenu(item)">
 
+                        <span class="nav-label" style="color: #777;">{{item.name}}</span>
 
                     </a>
 
-                    <ul class="nav nav-second-level collapse" class="in">
 
-                        <li><a onclick="_gotoPage(123)" style="color: #999;" href="javascript:void(0)">我的菜单</a></li>
 
-                        <li><a onclick="_gotoPage(123)" style="color: #999;" href="javascript:void(0)">我的菜单</a></li>
 
-                        <li><a onclick="_gotoPage(123)" style="color: #999;" href="javascript:void(0)">我的菜单</a></li>
 
-                        <li><a onclick="_gotoPage(123)" style="color: #999;" href="javascript:void(0)">我的菜单</a></li>
 
+                    <ul class="nav nav-second-level collapse" :class="{in: item.active}">
 
+                        <li v-for="subMenu in pages" v-if="item.active">
 
+                            <a @click="_gotoPage(subMenu)" style="color: #999;" href="javascript:void(0)">{{subMenu.title}}</a>
 
+                        </li>
 
                     </ul>
 
                 </li>
 
             </ul>
 
         </div>
 
-        <div class="margin-left right white-bg border-radius padding">
 
-            <div>登录接口</div>
 
-            <div>请求头信息</div>
 
-            <div>
 
-                <table>
 
-                    <tr>
 
-                        <th>上级</th>
 
-                        <th>名称</th>
 
-                        <th>名称</th>
 
+        <div class="margin-left right white-bg border-radius doc-interface">
 
+            <h3 class="">登录接口</h3>
 
+            <div class="doc-margin-top" >
 
+                <div class="doc-title">1、请求地址：</div>
 
+                <div >http://127.0.0.1:8008/app/login.userPcLogin</div>
 
+            </div>
 
+            <div class="doc-margin-top" >
 
+                <div class="doc-title">2、请求方式：</div>
 
+                <div >POST</div>
 
+            </div>
 
+            <div class="doc-margin-top" >
 
+                <div class="doc-title">3、请求头信息：</div>
 
+                <div>
 
+                        <table class="table table-bordered">
 
+                            <thead>
 
+                            <tr>
 
+                                <th scope="col">名称</th>
 
+                                <th scope="col">默认值</th>
 
+                                <th scope="col">描述</th>
 
+                            </tr>
 
+                            </thead>
 
+                            <tbody>
 
+                            <tr>
 
+                                <th>1</th>
 
+                                <td>Mark</td>
 
+                                <td>Otto</td>
 
+                            </tr>
 
+                            <tr>
 
+                                <th>2</th>
 
+                                <td>Jacob</td>
 
+                                <td>Thornton</td>
 
+                            </tr>
 
+                            <tr>
 
+                                <th>3</th>
 
+                                <td>Larry</td>
 
+                                <td>the Bird</td>
 
+                            </tr>
 
+                            </tbody>
 
+                        </table>
 
+                </div>
 
+            </div>
 
+
 
+            <div class="doc-margin-top" >
 
+                <div class="doc-title">4、请求信息：</div>
 
+                <div>
 
+                    <table class="table table-bordered">
 
+                        <thead>
 
+                        <tr>
 
+                            <th scope="col">上级</th>
 
+                            <th scope="col">名称</th>
 
+                            <th scope="col">类型</th>
 
+                            <th scope="col">长度</th>
 
+                            <th scope="col">默认值</th>
 
+                            <th scope="col">描述</th>
 
+                        </tr>
 
+                        </thead>
 
+                        <tbody>
 
+                        <tr>
 
+                            <th>1</th>
 
+                            <td>Mark</td>
 
+                            <td>Otto</td>
 
+                            <td>Otto</td>
 
+                            <td>Otto</td>
 
+                            <td>Otto</td>
 
+                        </tr>
 
+                        <tr>
 
+                            <th>2</th>
 
+                            <td>Jacob</td>
 
+                            <td>Thornton</td>
 
+                            <td>Otto</td>
 
+                            <td>Otto</td>
 
+                            <td>Otto</td>
 
+                        </tr>
 
+                        <tr>
 
+                            <th>3</th>
 
+                            <td>Larry</td>
 
+                            <td>the Bird</td>
 
+                            <td>Otto</td>
 
+                            <td>Otto</td>
 
+                            <td>Otto</td>
 
+                        </tr>
 
+                        </tbody>
 
+                    </table>
 
+                </div>
 
+                <div class="highlight">
 
+                    <div>请求报文：</div>
 
+                    <div>{"111":"BB"}</div>
 
+                </div>
 
+            </div>
 
 
-                    </tr>
 
-                </table>
 
+            <div class="doc-margin-top" >
 
+                <div class="doc-title">5、返回信息：</div>
 
+                <div>
 
+                    <table class="table table-bordered">
 
+                        <thead>
 
+                        <tr>
 
+                            <th scope="col">上级</th>
 
+                            <th scope="col">名称</th>
 
+                            <th scope="col">类型</th>
 
+                            <th scope="col">长度</th>
 
+                            <th scope="col">默认值</th>
 
+                            <th scope="col">描述</th>
 
+                        </tr>
 
+                        </thead>
 
+                        <tbody>
 
+                        <tr>
 
+                            <th>1</th>
 
+                            <td>Mark</td>
 
+                            <td>Otto</td>
 
+                            <td>Otto</td>
 
+                            <td>Otto</td>
 
+                            <td>Otto</td>
 
+                        </tr>
 
+                        <tr>
 
+                            <th>2</th>
 
+                            <td>Jacob</td>
 
+                            <td>Thornton</td>
 
+                            <td>Otto</td>
 
+                            <td>Otto</td>
 
+                            <td>Otto</td>
 
+                        </tr>
 
+                        <tr>
 
+                            <th>3</th>
 
+                            <td>Larry</td>
 
+                            <td>the Bird</td>
 
+                            <td>Otto</td>
 
+                            <td>Otto</td>
 
+                            <td>Otto</td>
 
+                        </tr>
 
+                        </tbody>
 
+                    </table>
 
+                </div>
 
             </div>
 
+            <div class="highlight">
 
+                <div>请求报文：</div>
 
+                <div>{"111":"BB"}</div>
 
+            </div>
 
+
 
         </div>
 
 
     </div>
 
 
 
 </div>
 
-
 
+<!--<script src="js/vcFramework.js"></script>-->
 
+<script src='js/doc-ui.js' ></script>
 
 </body>
 
 </html>

Разница между файлами не показана из-за своего большого размера
+ 7 - 0
java110-doc/src/main/resources/static/js/bootstrap.min.js


Разница между файлами не показана из-за своего большого размера
+ 1 - 0
java110-doc/src/main/resources/static/js/bootstrap.min.js.map


+ 84 - 6
java110-doc/src/main/resources/static/js/doc-ui.js
Просмотреть файл 

@@ -1,9 +1,87 @@
 
+(function(vc) {
 
+    var vm = new Vue({
 
+        el: '#component',
 
+        data: {
 
+            docInfo:{
 
+                title:'',
 
+                description:'',
 
+                version:'',
 
+                company:''
 
+           },
 
+            menus: [],
 
+            pages: [],
 
+            curMenuName: '',
 
+            logo: '',
 
+        },
 
+        mounted: function() {
 
+            this.getDocumentAndMenus();
 
+        },
 
+        methods: {
 
+            getDocumentAndMenus: function(_catalog) {
 
+                let _that = this;
 
+                let _param = {
 
+                        params: {
 
 
+                        }
 
+                    }
 
+                    //发送get请求
 
+                //Vue.http.get('/doc/api', _param)
 
+                Vue.http.get('mock/api.json', _param)
 
+                .then(function(res) {
 
+                    _that.docInfo = res.data.api;
 
+                    _that.menus = res.data.mappings;
 
+                    _that.switchMenu(_that.menus[0])
 
+                }, function(res) {
 
 
-switchMenu = function(){
 
-    console.log('123123')
 
-}
 
+                });
 
+            },
 
+            _activeMenu: function (_menuName) {
 
+               this.menus.forEach(item => {
 
+                    item.active = false;
 
+                    if (_menuName == item.name) {
 
+                        item.active = true;
 
+                    }
 
+                });
 
 
-_gotoPage= function(){
 
-    console.log('_gotoPage')
 
-}
 
+                console.log(this.menus)
 
+            },
 
+             switchMenu: function(_menu){
 
+                this.pages = [];
 
+                this.curMenuName = _menu.name;
 
+                this._activeMenu(_menu.name);
 
+                this._listDocumentPages(_menu);
 
+                console.log('123123')
 
+            },
 
+
 
+            _gotoPage: function(){
 
+                console.log('_gotoPage')
 
+            },
 
+            _listDocumentPages: function (_menu) {
 
+                let _that  = this;
 
+                let _param = {
 
+                    params: {
 
+                        name: _menu.name,
 
+                        resource:_menu.resource
 
+                    }
 
+                };
 
+
 
+                //发送get请求
 
+               //Vue.http.get('/doc/api/page', _param)
 
+                Vue.http.get('mock/pages.json', _param)
 
+               .then(function(res) {
 
+                        _that.pages = res.data;
 
+                        if (_that.pages.length < 1) {
 
+                            return;
 
+                        }
 
+                        _that._gotoPage(res.data[0]);
 
+                    },
 
+                    function (errInfo, error) {
 
+                        console.log('请求失败处理');
 
+                    }
 
+                );
 
+            },
 
+        },
 
+
 
+    });
 
+
 
+})(window.vc)

Разница между файлами не показана из-за своего большого размера
+ 2 - 0
java110-doc/src/main/resources/static/js/jquery-3.3.1.min.js


Разница между файлами не показана из-за своего большого размера
+ 2923 - 0
java110-doc/src/main/resources/static/js/vcFramework.js


Разница между файлами не показана из-за своего большого размера
+ 7 - 0
java110-doc/src/main/resources/static/js/vue-resource.min.js


Разница между файлами не показана из-за своего большого размера
+ 6 - 0
java110-doc/src/main/resources/static/js/vue.min.js


+ 87 - 0
java110-doc/src/main/resources/static/mock/api.json
Просмотреть файл 

@@ -0,0 +1,87 @@
 
+{
 
+  "mappings": [
 
+    {
 
+      "name": "用户中心",
 
+      "resource": "userDoc",
 
+      "seq": 1,
 
+      "startWay": "cloud",
 
+      "url": "http://127.0.0.1:8008/userDoc"
 
+    },
 
+    {
 
+      "name": "账户中心",
 
+      "resource": "acct",
 
+      "seq": 2,
 
+      "startWay": "cloud",
 
+      "url": "http://127.0.0.1:8008/acctDoc"
 
+    },
 
+    {
 
+      "name": "通用中心",
 
+      "resource": "common",
 
+      "seq": 3,
 
+      "startWay": "cloud",
 
+      "url": "http://127.0.0.1:8008/commonDoc"
 
+    },
 
+    {
 
+      "name": "小区中心",
 
+      "resource": "community",
 
+      "seq": 4,
 
+      "startWay": "cloud",
 
+      "url": "http://127.0.0.1:8008/communityDoc"
 
+    },
 
+    {
 
+      "name": "开发中心",
 
+      "resource": "dev",
 
+      "seq": 5,
 
+      "startWay": "cloud",
 
+      "url": "http://127.0.0.1:8008/devDoc"
 
+    },
 
+    {
 
+      "name": "费用中心",
 
+      "resource": "fee",
 
+      "seq": 6,
 
+      "startWay": "cloud",
 
+      "url": "http://127.0.0.1:8008/feeDoc"
 
+    },
 
+    {
 
+      "name": "定时任务",
 
+      "resource": "job",
 
+      "seq": 7,
 
+      "startWay": "cloud",
 
+      "url": "http://127.0.0.1:8008/jobDoc"
 
+    },
 
+    {
 
+      "name": "oa",
 
+      "resource": "oa",
 
+      "seq": 8,
 
+      "startWay": "cloud",
 
+      "url": "http://127.0.0.1:8008/oaDoc"
 
+    },
 
+    {
 
+      "name": "订单中心",
 
+      "resource": "order",
 
+      "seq": 9,
 
+      "startWay": "cloud",
 
+      "url": "http://127.0.0.1:8008/orderDoc"
 
+    },
 
+    {
 
+      "name": "报表中心",
 
+      "resource": "report",
 
+      "seq": 10,
 
+      "startWay": "cloud",
 
+      "url": "http://127.0.0.1:8008/reportDoc"
 
+    },
 
+    {
 
+      "name": "商户中心",
 
+      "resource": "store",
 
+      "seq": 11,
 
+      "startWay": "cloud",
 
+      "url": "http://127.0.0.1:8008/storeDoc"
 
+    }
 
+  ],
 
+  "api": {
 
+    "company": "Java110工作室",
 
+    "description": "HC小区管理系统api接口文档",
 
+    "title": "HC小区管理系统api接口文档",
 
+    "version": "v1.4"
 
+  }
 
+}

+ 13 - 0
java110-doc/src/main/resources/static/mock/pages.json
Просмотреть файл 

@@ -0,0 +1,13 @@
 
+[
 
+  {
 
+    "author": "吴学文",
 
+    "cmdClass": "org.springframework.context.annotation.ScannedGenericBeanDefinition",
 
+    "description": "登录功能 主要用于 员工 或者管理员登录使用",
 
+    "httpMethod": "post",
 
+    "resource": "userDoc",
 
+    "serviceCode": "login.pcUserLogin",
 
+    "title": "用户登录",
 
+    "url": "/app/login.pcUserLogin",
 
+    "version": "v1.0"
 
+  }
 
+]

+ 11 - 11
service-api/src/main/java/com/java110/api/rest/RestApi.java
Просмотреть файл 

@@ -41,17 +41,17 @@ import java.util.Map;
 
 
 @Java110RequestMappingsDoc(
 
         mappingsDocs = {
 
-                @Java110RequestMappingDoc(name="用户中心",resource = "user",url="http://service-user/userDoc",seq = 1),
 
-                @Java110RequestMappingDoc(name="账户中心",resource = "acct",url="http://service-acct/acctDoc",seq = 2),
 
-                @Java110RequestMappingDoc(name="通用中心",resource = "common",url="http://service-common/commonDoc",seq = 3),
 
-                @Java110RequestMappingDoc(name="小区中心",resource = "community",url="http://service-community/communityDoc",seq = 4),
 
-                @Java110RequestMappingDoc(name="开发中心",resource = "dev",url="http://service-dev/devDoc",seq = 5),
 
-                @Java110RequestMappingDoc(name="费用中心",resource = "fee",url="http://service-fee/feeDoc",seq = 6),
 
-                @Java110RequestMappingDoc(name="定时任务",resource = "job",url="http://service-job/jobDoc",seq = 7),
 
-                @Java110RequestMappingDoc(name="oa",resource = "oa",url="http://service-oa/oaDoc",seq = 8),
 
-                @Java110RequestMappingDoc(name="订单中心",resource = "order",url="http://service-order/orderDoc",seq = 9),
 
-                @Java110RequestMappingDoc(name="报表中心",resource = "report",url="http://service-report/reportDoc",seq = 10),
 
-                @Java110RequestMappingDoc(name="商户中心",resource = "store",url="http://service-store/storeDoc",seq = 11),
 
+                @Java110RequestMappingDoc(name="用户中心",resource = "userDoc",url="http://service-user",seq = 1),
 
+                @Java110RequestMappingDoc(name="账户中心",resource = "acctDoc",url="http://service-acct",seq = 2),
 
+                @Java110RequestMappingDoc(name="通用中心",resource = "commonDoc",url="http://service-common",seq = 3),
 
+                @Java110RequestMappingDoc(name="小区中心",resource = "communityDoc",url="http://service-community",seq = 4),
 
+                @Java110RequestMappingDoc(name="开发中心",resource = "devDoc",url="http://service-dev",seq = 5),
 
+                @Java110RequestMappingDoc(name="费用中心",resource = "feeDoc",url="http://service-fee",seq = 6),
 
+                @Java110RequestMappingDoc(name="定时任务",resource = "jobDoc",url="http://service-job",seq = 7),
 
+                @Java110RequestMappingDoc(name="oa",resource = "oaDoc",url="http://service-oa",seq = 8),
 
+                @Java110RequestMappingDoc(name="订单中心",resource = "orderDoc",url="http://service-order",seq = 9),
 
+                @Java110RequestMappingDoc(name="报表中心",resource = "reportDoc",url="http://service-report",seq = 10),
 
+                @Java110RequestMappingDoc(name="商户中心",resource = "storeDoc",url="http://service-store",seq = 11),
 
         }
 
 )
 
 public class RestApi extends BaseController {

+ 1 - 1
service-api/src/main/resources/banner.txt
Просмотреть файл 

@@ -12,4 +12,4 @@ _________                   __                   _________
 
  \______  / \___  >|___|  /|__|   \___  >|__|  /_______  / \___  >|__|     \_/  |__| \___  >\___  >
 
         \/      \/      \/            \/               \/      \/                        \/     \/
 
 
- java110 CenterService starting, more information scan https://github.com/java110/MicroCommunity
 
+ java110 ApiService starting, more information scan https://github.com/java110/MicroCommunity

+ 1 - 1
springboot/src/main/java/com/java110/boot/BootApplicationStart.java
Просмотреть файл 

@@ -116,7 +116,7 @@ import java.util.concurrent.TimeUnit;
 
         })
 
 @EnableAsync
 
 //文档
 
-@Java110ApiDocDiscovery(basePackages = {"com.java110.api.rest"},apiDocClass = ApiDocPublishing.class)
 
+@Java110ApiDocDiscovery(basePackages = {"com.java110.boot.rest"},apiDocClass = ApiDocPublishing.class)
 
 @Java110CmdDocDiscovery(basePackages = {
 
         "com.java110.acct.cmd",
 
         "com.java110.common.cmd",

+ 12 - 16
springboot/src/main/java/com/java110/boot/rest/RestApi.java
Просмотреть файл 

@@ -33,23 +33,23 @@ import java.util.Map;
 
 @Java110ApiDoc(
 
         title = "HC小区管理系统api接口文档",
 
         description = "HC小区管理系统api接口文档",
 
-        company="Java110工作室",
 
+        company = "Java110工作室",
 
         version = "v1.4"
 
 )
 
 
 @Java110RequestMappingsDoc(
 
         mappingsDocs = {
 
-                @Java110RequestMappingDoc(name="用户中心",resource = "user",url="http://127.0.0.1:8008/userDoc",seq = 1),
 
-                @Java110RequestMappingDoc(name="账户中心",resource = "acct",url="http://127.0.0.1:8008/acctDoc",seq = 2),
 
-                @Java110RequestMappingDoc(name="通用中心",resource = "common",url="http://127.0.0.1:8008/commonDoc",seq = 3),
 
-                @Java110RequestMappingDoc(name="小区中心",resource = "community",url="http://127.0.0.1:8008/communityDoc",seq = 4),
 
-                @Java110RequestMappingDoc(name="开发中心",resource = "dev",url="http://127.0.0.1:8008/devDoc",seq = 5),
 
-                @Java110RequestMappingDoc(name="费用中心",resource = "fee",url="http://127.0.0.1:8008/feeDoc",seq = 6),
 
-                @Java110RequestMappingDoc(name="定时任务",resource = "job",url="http://127.0.0.1:8008/jobDoc",seq = 7),
 
-                @Java110RequestMappingDoc(name="oa",resource = "oa",url="http://127.0.0.1:8008/oaDoc",seq = 8),
 
-                @Java110RequestMappingDoc(name="订单中心",resource = "order",url="http://127.0.0.1:8008/orderDoc",seq = 9),
 
-                @Java110RequestMappingDoc(name="报表中心",resource = "report",url="http://127.0.0.1:8008/reportDoc",seq = 10),
 
-                @Java110RequestMappingDoc(name="商户中心",resource = "store",url="http://127.0.0.1:8008/storeDoc",seq = 11),
 
+                @Java110RequestMappingDoc(name = "用户中心", resource = "userDoc", url = "http://127.0.0.1:8008", seq = 1, startWay = "boot"),
 
+                @Java110RequestMappingDoc(name = "账户中心", resource = "acctDoc", url = "http://127.0.0.1:8008", seq = 2, startWay = "boot"),
 
+                @Java110RequestMappingDoc(name = "通用中心", resource = "commonDoc", url = "http://127.0.0.1:8008", seq = 3, startWay = "boot"),
 
+                @Java110RequestMappingDoc(name = "小区中心", resource = "communityDoc", url = "http://127.0.0.1:8008", seq = 4, startWay = "boot"),
 
+                @Java110RequestMappingDoc(name = "开发中心", resource = "devDoc", url = "http://127.0.0.1:8008", seq = 5, startWay = "boot"),
 
+                @Java110RequestMappingDoc(name = "费用中心", resource = "feeDoc", url = "http://127.0.0.1:8008", seq = 6, startWay = "boot"),
 
+                @Java110RequestMappingDoc(name = "定时任务", resource = "jobDoc", url = "http://127.0.0.1:8008", seq = 7, startWay = "boot"),
 
+                @Java110RequestMappingDoc(name = "oa", resource = "oaDoc", url = "http://127.0.0.1:8008", seq = 8, startWay = "boot"),
 
+                @Java110RequestMappingDoc(name = "订单中心", resource = "orderDoc", url = "http://127.0.0.1:8008", seq = 9, startWay = "boot"),
 
+                @Java110RequestMappingDoc(name = "报表中心", resource = "reportDoc", url = "http://127.0.0.1:8008", seq = 10, startWay = "boot"),
 
+                @Java110RequestMappingDoc(name = "商户中心", resource = "storeDoc", url = "http://127.0.0.1:8008", seq = 11, startWay = "boot"),
 
         }
 
 )
 
 public class RestApi extends BaseController {
 
@@ -64,7 +64,6 @@ public class RestApi extends BaseController {
 
     private IUserInnerServiceSMO userInnerServiceSMOImpl;
 
 
 
-
 
     /**
 
      * 健康检查 服务
 
      *
 
@@ -345,9 +344,6 @@ public class RestApi extends BaseController {
 
     }
 
 
 
-
 
-
 
-
 
     public IApiServiceSMO getApiServiceSMOImpl() {
 
         return apiServiceSMOImpl;
 
     }

+ 1 - 1
springboot/src/main/resources/banner.txt
Просмотреть файл 

@@ -12,4 +12,4 @@ ${AnsiColor.BRIGHT_RED}
 
 |______//____  >\___  >__| /_______  /\___  >__|    \_/ |__|\___  >___  >
 
              \/     \/             \/     \/                    \/    \/
 
 
- java110 UserService starting, more information scan https://github.com/java110/MicroCommunity
 
+ java110 BootService starting, more information scan https://github.com/java110/MicroCommunity