From baffc2bd369c90da6d3fab5146d0433eafd8186c Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期一, 19 九月 2022 01:02:07 +0800
Subject: [PATCH] 抒写文档

---
 java110-doc/src/main/java/com/java110/doc/controller/DocController.java                  |    8 +++++++-
 service-user/src/main/java/com/java110/user/cmd/login/AdminLoginPropertyCmd.java         |   33 +++++++++++++++++++++++++++++++++
 java110-doc/src/main/java/com/java110/doc/entity/CmdDocDto.java                          |    6 +++---
 java110-doc/src/main/java/com/java110/doc/registrar/Java110CmdDocDiscoveryRegistrar.java |    9 ++-------
 service-user/src/main/java/com/java110/user/cmd/login/PcUserLoginCmd.java                |    2 +-
 5 files changed, 46 insertions(+), 12 deletions(-)

diff --git a/java110-doc/src/main/java/com/java110/doc/controller/DocController.java b/java110-doc/src/main/java/com/java110/doc/controller/DocController.java
index 5c1f638..4697621 100644
--- a/java110-doc/src/main/java/com/java110/doc/controller/DocController.java
+++ b/java110-doc/src/main/java/com/java110/doc/controller/DocController.java
@@ -134,7 +134,13 @@
 
         JSONObject param = JSONObject.parseObject(JSONObject.toJSONString(cmdDocDto));
 
-        Class clazz = cmdDocDto.getCmdClass();
+
+        Class<?> clazz = null;
+        try {
+            clazz = Class.forName(cmdDocDto.getCmdClass());
+        } catch (ClassNotFoundException e) {
+            return new ResponseEntity<>(e.getLocalizedMessage(), HttpStatus.OK);
+        }
 
 
         doJava110ParamsDoc(clazz,param);
diff --git a/java110-doc/src/main/java/com/java110/doc/entity/CmdDocDto.java b/java110-doc/src/main/java/com/java110/doc/entity/CmdDocDto.java
index 4ca605f..8fefd39 100644
--- a/java110-doc/src/main/java/com/java110/doc/entity/CmdDocDto.java
+++ b/java110-doc/src/main/java/com/java110/doc/entity/CmdDocDto.java
@@ -44,7 +44,7 @@
 
     private String author;
 
-    private Class<?> cmdClass;
+    private String cmdClass;
 
     private String serviceCode;
 
@@ -104,11 +104,11 @@
         this.author = author;
     }
 
-    public Class<?> getCmdClass() {
+    public String getCmdClass() {
         return cmdClass;
     }
 
-    public void setCmdClass(Class<?> cmdClass) {
+    public void setCmdClass(String cmdClass) {
         this.cmdClass = cmdClass;
     }
 
diff --git a/java110-doc/src/main/java/com/java110/doc/registrar/Java110CmdDocDiscoveryRegistrar.java b/java110-doc/src/main/java/com/java110/doc/registrar/Java110CmdDocDiscoveryRegistrar.java
index 7671168..77da818 100644
--- a/java110-doc/src/main/java/com/java110/doc/registrar/Java110CmdDocDiscoveryRegistrar.java
+++ b/java110-doc/src/main/java/com/java110/doc/registrar/Java110CmdDocDiscoveryRegistrar.java
@@ -102,13 +102,8 @@
 
                     String beanName = getListenerName(attributes, beanDefinition);
                     CmdDocDto cmdDocDto = new CmdDocDto();
-                    Class<?> clazz = null;
-                    try {
-                        clazz = Class.forName(beanDefinition.getBeanClassName());
-                    } catch (ClassNotFoundException e) {
-                        throw new RuntimeException(e);
-                    }
-                    cmdDocDto.setCmdClass(clazz);
+
+                    cmdDocDto.setCmdClass(beanDefinition.getBeanClassName());
                     cmdDocDto.setDescription(attributes.get("description").toString());
                     cmdDocDto.setAuthor(attributes.get("author").toString());
                     cmdDocDto.setResource(attributes.get("resource").toString());
diff --git a/service-user/src/main/java/com/java110/user/cmd/login/AdminLoginPropertyCmd.java b/service-user/src/main/java/com/java110/user/cmd/login/AdminLoginPropertyCmd.java
index 388d42e..62dac32 100644
--- a/service-user/src/main/java/com/java110/user/cmd/login/AdminLoginPropertyCmd.java
+++ b/service-user/src/main/java/com/java110/user/cmd/login/AdminLoginPropertyCmd.java
@@ -7,6 +7,7 @@
 import com.java110.core.event.cmd.CmdEvent;
 import com.java110.core.factory.AuthenticationFactory;
 import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.doc.annotation.*;
 import com.java110.dto.store.StoreUserDto;
 import com.java110.dto.user.UserDto;
 import com.java110.dto.userLogin.UserLoginDto;
@@ -29,6 +30,38 @@
 import java.util.List;
 import java.util.Map;
 
+
+@Java110CmdDoc(title = "杩愯惀鍥㈤槦admin鐧诲綍鍒扮墿涓氳处鍙�",
+        description = "鍦╝dmin璐﹀彿涓嬪彲浠ョ櫥褰曞埌绠$悊鐨勭墿涓氱郴缁熻处鍙蜂笅",
+        httpMethod = "post",
+        url = "http://{ip}:{port}/app/login.adminLoginProperty",
+        resource = "userDoc",
+        author = "鍚村鏂�",
+        serviceCode = "login.adminLoginProperty"
+)
+
+@Java110ParamsDoc(params = {
+        @Java110ParamDoc(name = "username", length = 30, remark = "闇�瑕佺櫥褰曠殑鐢ㄦ埛"),
+        @Java110ParamDoc(name = "userId", length = 30, remark = "闇�瑕佺櫥褰曠殑鐢ㄦ埛ID"),
+        @Java110ParamDoc(name = "curPasswd", length = 30, remark = "褰撳墠鐢ㄦ埛瀵嗙爜"),
+        @Java110ParamDoc(name = "curUserName", length = 64, remark = "褰撳墠鐢ㄦ埛"),
+})
+
+@Java110ResponseDoc(
+        params = {
+                @Java110ParamDoc(name = "code", type = "int", length = 11, defaultValue = "0", remark = "杩斿洖缂栧彿锛�0 鎴愬姛 鍏朵粬澶辫触"),
+                @Java110ParamDoc(name = "msg", type = "String", length = 250, defaultValue = "鎴愬姛", remark = "鎻忚堪"),
+                @Java110ParamDoc(name = "data", type = "Object", remark = "鏈夋晥鏁版嵁"),
+                @Java110ParamDoc(parentNodeName = "data",name = "userId", type = "String", remark = "鐢ㄦ埛ID"),
+                @Java110ParamDoc(parentNodeName = "data",name = "token", type = "String", remark = "涓存椂绁ㄦ嵁"),
+        }
+)
+
+@Java110ExampleDoc(
+        reqBody="{'username':'admin','userId':'123','curPassWd':'admin','curUserName':'18909711443'}",
+        resBody="{'code':0,'msg':'鎴愬姛','data':{'userId':'123123','token':'123213'}}"
+)
+
 @Java110Cmd(serviceCode = "login.adminLoginProperty")
 public class AdminLoginPropertyCmd extends Cmd {
 
diff --git a/service-user/src/main/java/com/java110/user/cmd/login/PcUserLoginCmd.java b/service-user/src/main/java/com/java110/user/cmd/login/PcUserLoginCmd.java
index f1885ed..15dec28 100644
--- a/service-user/src/main/java/com/java110/user/cmd/login/PcUserLoginCmd.java
+++ b/service-user/src/main/java/com/java110/user/cmd/login/PcUserLoginCmd.java
@@ -40,7 +40,7 @@
 @Java110CmdDoc(title = "鐢ㄦ埛鐧诲綍",
         description = "鐧诲綍鍔熻兘 涓昏鐢ㄤ簬 鍛樺伐 鎴栬�呯鐞嗗憳鐧诲綍浣跨敤",
         httpMethod = "post",
-        url = "/app/login.pcUserLogin",
+        url = "http://{ip}:{port}/app/login.pcUserLogin",
         resource = "userDoc",
         author = "鍚村鏂�",
         serviceCode = "login.pcUserLogin"

--
Gitblit v1.8.0