wuxw vor 4 Jahren
Ursprung
Commit
a158488a40

+ 7 - 7
java110-doc/src/main/java/com/java110/doc/controller/DocController.java

@@ -202,7 +202,7 @@ public class DocController {
             headers.add(header);
         }
 
-        param.put("header",headers);
+        param.put("headers",headers);
 
 
         Java110ParamDoc[] java110ParamDocs = java110ParamsDoc.params();
@@ -211,12 +211,12 @@ public class DocController {
         JSONObject p = null;
         for(Java110ParamDoc java110ParamDoc : java110ParamDocs){
             p = new JSONObject();
-            header.put("name",java110ParamDoc.name());
-            header.put("defaultValue",java110ParamDoc.defaultValue());
-            header.put("remark",java110ParamDoc.remark());
-            header.put("type",java110ParamDoc.type());
-            header.put("length",java110ParamDoc.length());
-            header.put("parentNodeName",java110ParamDoc.parentNodeName());
+            p.put("name",java110ParamDoc.name());
+            p.put("defaultValue",java110ParamDoc.defaultValue());
+            p.put("remark",java110ParamDoc.remark());
+            p.put("type",java110ParamDoc.type());
+            p.put("length",java110ParamDoc.length());
+            p.put("parentNodeName",java110ParamDoc.parentNodeName());
             params.add(p);
         }
         param.put("reqParam",params);

+ 1 - 1
java110-doc/src/main/resources/static/doc-ui.html

@@ -60,7 +60,7 @@
             </div>
             <div class="doc-margin-top" >
                 <div class="doc-title">2、请求方式:</div>
-                <div >{{content.method}}</div>
+                <div >{{content.httpMethod}}</div>
             </div>
             <div class="doc-margin-top" >
                 <div class="doc-title">3、请求头信息:</div>

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

@@ -14,7 +14,7 @@
             content: {
                 title:'',
                 url:'',
-                method:'',
+                httpMethod:'',
                 headers:[],
                 reqParam:[],
                 resParam:[],
@@ -34,8 +34,8 @@
                         }
                     }
                     //发送get请求
-                //Vue.http.get('/doc/api', _param)
-                Vue.http.get('mock/api.json', _param)
+                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;
@@ -72,8 +72,8 @@
                };
 
                //发送get请求
-              //Vue.http.get('/doc/api/pageContent', _param)
-               Vue.http.get('mock/pages.json', _param)
+             Vue.http.get('/doc/api/pageContent', _param)
+                //Vue.http.get('mock/page.json', _param)
               .then(function(res) {
                        _that.content = res.data;
                    },
@@ -92,8 +92,8 @@
                 };
 
                 //发送get请求
-               //Vue.http.get('/doc/api/page', _param)
-                Vue.http.get('mock/pages.json', _param)
+               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) {

+ 90 - 0
java110-doc/src/main/resources/static/mock/page.json

@@ -0,0 +1,90 @@
+{
+  "resParam": [
+    {
+      "defaultValue": "0",
+      "name": "code",
+      "length": 11,
+      "remark": "返回编号,0 成功 其他失败",
+      "parentNodeName": "-",
+      "type": "int"
+    },
+    {
+      "defaultValue": "成功",
+      "name": "msg",
+      "length": 250,
+      "remark": "描述",
+      "parentNodeName": "-",
+      "type": "String"
+    },
+    {
+      "defaultValue": "",
+      "name": "data",
+      "length": 0,
+      "remark": "有效数据",
+      "parentNodeName": "-",
+      "type": "Object"
+    },
+    {
+      "defaultValue": "",
+      "name": "userId",
+      "length": 0,
+      "remark": "用户ID",
+      "parentNodeName": "data",
+      "type": "String"
+    },
+    {
+      "defaultValue": "",
+      "name": "token",
+      "length": 0,
+      "remark": "临时票据",
+      "parentNodeName": "data",
+      "type": "String"
+    }
+  ],
+  "resource": "userDoc",
+  "serviceCode": "login.pcUserLogin",
+  "author": "吴学文",
+  "description": "登录功能 主要用于 员工 或者管理员登录使用",
+  "reqParam": [
+    {},
+    {}
+  ],
+  "httpMethod": "post",
+  "title": "用户登录",
+  "version": "v1.0",
+  "url": "/app/login.pcUserLogin",
+  "resBody": "{'code':0,'msg':'成功','data':{'userId':'123123','token':'123213'}}",
+  "reqBody": "{'username':'wuxw','passwd':'admin'}",
+  "header": [
+    {
+      "defaultValue": "通过dev账户分配应用",
+      "name": "APP-ID",
+      "description": "应用APP-ID"
+    },
+    {
+      "defaultValue": "uuid",
+      "name": "TRANSACTION-ID",
+      "description": "交易流水号"
+    },
+    {
+      "defaultValue": "20220917120915",
+      "name": "REQ-TIME",
+      "description": "请求时间 YYYYMMDDhhmmss"
+    },
+    {
+      "defaultValue": "zh-cn",
+      "name": "JAVA110-LANG",
+      "description": "语言中文"
+    },
+    {
+      "defaultValue": "",
+      "name": "passwd",
+      "length": 30,
+      "description": "调用用户ID 一般写-1",
+      "remark": "密码,物业系统分配",
+      "parentNodeName": "-",
+      "type": "String"
+    }
+  ],
+  "cmdClass": "com.java110.user.cmd.login.PcUserLoginCmd"
+}