Your Name преди 3 години
родител
ревизия
ac9d7e2b74

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

@@ -44,11 +44,11 @@
                 <li style="width:100%" class="margin-top" :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>
+                        <span class="nav-label" style="color: #777;">{{index+1}} {{item.name}}</span>
                     </a>
                     <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 v-for="(subMenu,subIndex) in pages" v-if="item.active">
+                            <a @click="_gotoPage(subMenu)" style="color: #999;" href="javascript:void(0)">{{index+1}}.{{subIndex+1}}、{{subMenu.title}}</a>
                         </li>
                     </ul>
                 </li>

+ 5 - 4
service-user/src/main/java/com/java110/user/cmd/login/PcUserLoginCmd.java

@@ -38,10 +38,11 @@ import java.util.Map;
  * 请求地址为/app/login.pcUserLogin
  */
 
-@Java110CmdDoc(title = "用户登录",
-        description = "登录功能 主要用于 员工 或者管理员登录使用," +
-                "请求其他接口时 头信息中需要加 Authorization: Bearer token ," +
-                "token 是这个接口返回的内容",
+@Java110CmdDoc(title = "员工登录",
+        description = "登录功能 主要用于 员工 或者管理员登录使用,<br/>" +
+                "请求其他接口时 头信息中需要加 Authorization: Bearer token ,<br/>" +
+                "token 是这个接口返回的内容<br/> " +
+                "会话保持为2小时,请快要到2小时时,再次登录,保持会话</br>",
         httpMethod = "post",
         url = "http://{ip}:{port}/app/login.pcUserLogin",
         resource = "userDoc",

+ 2 - 1
service-user/src/main/java/com/java110/user/cmd/org/ListOrgTreeCmd.java

@@ -32,7 +32,8 @@ import java.util.Map;
         url = "http://{ip}:{port}/app/org.listOrgTree",
         resource = "userDoc",
         author = "吴学文",
-        serviceCode = "org.listOrgTree"
+        serviceCode = "org.listOrgTree",
+        seq = 8
 )
 
 @Java110ParamsDoc(params = {

+ 2 - 1
service-user/src/main/java/com/java110/user/cmd/owner/DeleteOwnerCmd.java

@@ -34,7 +34,8 @@ import java.util.List;
         url = "http://{ip}:{port}/app/owner.deleteOwner",
         resource = "userDoc",
         author = "吴学文",
-        serviceCode = "owner.deleteOwner"
+        serviceCode = "owner.deleteOwner",
+        seq = 11
 )
 
 @Java110ParamsDoc(params = {

+ 2 - 1
service-user/src/main/java/com/java110/user/cmd/owner/EditOwnerCmd.java

@@ -40,7 +40,8 @@ import java.util.List;
         url = "http://{ip}:{port}/app/owner.editOwner",
         resource = "userDoc",
         author = "吴学文",
-        serviceCode = "owner.editOwner"
+        serviceCode = "owner.editOwner",
+        seq = 10
 )
 
 @Java110ParamsDoc(params = {

+ 2 - 1
service-user/src/main/java/com/java110/user/cmd/owner/QueryCurrentOwnerCmd.java

@@ -26,7 +26,8 @@ import java.util.List;
         url = "http://{ip}:{port}/app/owner.queryCurrentOwner",
         resource = "userDoc",
         author = "吴学文",
-        serviceCode = "room.queryRooms"
+        serviceCode = "room.queryRooms",
+        seq = 13
 )
 
 @Java110ParamsDoc(params = {

+ 2 - 1
service-user/src/main/java/com/java110/user/cmd/owner/QueryOwnersCmd.java

@@ -35,7 +35,8 @@ import java.util.Map;
         url = "http://{ip}:{port}/app/owner.queryOwners",
         resource = "userDoc",
         author = "吴学文",
-        serviceCode = "owner.queryOwners"
+        serviceCode = "owner.queryOwners",
+        seq = 12
 )
 
 @Java110ParamsDoc(params = {

+ 2 - 1
service-user/src/main/java/com/java110/user/cmd/owner/SaveOwnerCmd.java

@@ -54,7 +54,8 @@ import java.util.List;
         url = "http://{ip}:{port}/app/owner.saveOwner",
         resource = "userDoc",
         author = "吴学文",
-        serviceCode = "owner.saveOwner"
+        serviceCode = "owner.saveOwner",
+        seq = 9
 )
 
 @Java110ParamsDoc(params = {

+ 2 - 1
service-user/src/main/java/com/java110/user/cmd/owner/SyncThirdEnterpriseCmd.java

@@ -34,7 +34,8 @@ import java.util.List;
         url = "http://{ip}:{port}/app/owner.syncThirdEnterprise",
         resource = "userDoc",
         author = "吴学文",
-        serviceCode = "owner.syncThirdEnterprise"
+        serviceCode = "owner.syncThirdEnterprise",
+        seq = 16
 )
 
 @Java110ParamsDoc(params = {

+ 2 - 1
service-user/src/main/java/com/java110/user/cmd/ownerSettled/SaveOwnerSettledApplyCmd.java

@@ -55,7 +55,8 @@ import java.util.List;
         url = "http://{ip}:{port}/app/ownerSettled.saveOwnerSettledApply",
         resource = "userDoc",
         author = "吴学文",
-        serviceCode = "ownerSettled.saveOwnerSettledApply"
+        serviceCode = "ownerSettled.saveOwnerSettledApply",
+        seq = 15
 )
 
 @Java110ParamsDoc(params = {

+ 2 - 1
service-user/src/main/java/com/java110/user/cmd/user/ResetStaffPwdCmd.java

@@ -33,7 +33,8 @@ import java.util.List;
         url = "http://{ip}:{port}/app/user.resetStaffPwd",
         resource = "userDoc",
         author = "吴学文",
-        serviceCode = "user.resetStaffPwd"
+        serviceCode = "user.resetStaffPwd",
+        seq = 14
 )
 
 @Java110ParamsDoc(params = {