From 3d8ec5c23ef49d0908195c8b5b892920a46aaa8c Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 30 五月 2023 11:42:48 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-user/src/main/java/com/java110/user/cmd/login/PcUserLoginCmd.java | 23 +++++++++++++++++++----
1 files changed, 19 insertions(+), 4 deletions(-)
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 15dec28..3112751 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
@@ -27,6 +27,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.RestController;
import java.util.HashMap;
import java.util.List;
@@ -37,16 +38,28 @@
* 璇锋眰鍦板潃涓�/app/login.pcUserLogin
*/
-@Java110CmdDoc(title = "鐢ㄦ埛鐧诲綍",
- description = "鐧诲綍鍔熻兘 涓昏鐢ㄤ簬 鍛樺伐 鎴栬�呯鐞嗗憳鐧诲綍浣跨敤",
+@Java110CmdDoc(title = "鍛樺伐鐧诲綍",
+ description = "鐧诲綍鍔熻兘 涓昏鐢ㄤ簬 鍛樺伐 鎴栬�呯鐞嗗憳鐧诲綍浣跨敤,<br/>" +
+ "璇锋眰鍏朵粬鎺ュ彛鏃� 澶翠俊鎭腑闇�瑕佸姞 Authorization: Bearer token 锛�<br/>" +
+ "token 鏄繖涓帴鍙ｈ繑鍥炵殑鍐呭<br/> " +
+ "浼氳瘽淇濇寔涓�2灏忔椂锛岃蹇鍒�2灏忔椂鏃讹紝鍐嶆鐧诲綍锛屼繚鎸佷細璇�</br>",
httpMethod = "post",
url = "http://{ip}:{port}/app/login.pcUserLogin",
resource = "userDoc",
author = "鍚村鏂�",
- serviceCode = "login.pcUserLogin"
+ serviceCode = "login.pcUserLogin",
+ seq = 1
)
-@Java110ParamsDoc(params = {
+@Java110ParamsDoc(
+ headers = {
+ @Java110HeaderDoc(name="APP-ID",defaultValue = "閫氳繃dev璐︽埛鍒嗛厤搴旂敤",description = "搴旂敤APP-ID"),
+ @Java110HeaderDoc(name="TRANSACTION-ID",defaultValue = "uuid",description = "浜ゆ槗娴佹按鍙�"),
+ @Java110HeaderDoc(name="REQ-TIME",defaultValue = "20220917120915",description = "璇锋眰鏃堕棿 YYYYMMDDhhmmss"),
+ @Java110HeaderDoc(name="JAVA110-LANG",defaultValue = "zh-cn",description = "璇█涓枃"),
+ @Java110HeaderDoc(name="USER-ID",defaultValue = "-1",description = "璋冪敤鐢ㄦ埛ID 涓�鑸啓-1"),
+ },
+ params = {
@Java110ParamDoc(name = "username", length = 30, remark = "鐢ㄦ埛鍚嶏紝鐗╀笟绯荤粺鍒嗛厤"),
@Java110ParamDoc(name = "passwd", length = 30, remark = "瀵嗙爜锛岀墿涓氱郴缁熷垎閰�"),
})
@@ -83,6 +96,8 @@
Assert.isJsonObject(paramIn, "鐢ㄦ埛娉ㄥ唽璇锋眰鍙傛暟鏈夎锛屼笉鏄湁鏁堢殑json鏍煎紡 " + paramIn);
Assert.jsonObjectHaveKey(paramIn, "username", "鐢ㄦ埛鐧诲綍锛屾湭鍖呭惈username鑺傜偣锛岃妫�鏌�" + paramIn);
Assert.jsonObjectHaveKey(paramIn, "passwd", "鐢ㄦ埛鐧诲綍锛屾湭鍖呭惈passwd鑺傜偣锛岃妫�鏌�" + paramIn);
+
+
}
@Override
--
Gitblit v1.8.0