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/AccessTokenLoginCmd.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/service-user/src/main/java/com/java110/user/cmd/login/AccessTokenLoginCmd.java b/service-user/src/main/java/com/java110/user/cmd/login/AccessTokenLoginCmd.java
index 668c666..76418a8 100644
--- a/service-user/src/main/java/com/java110/user/cmd/login/AccessTokenLoginCmd.java
+++ b/service-user/src/main/java/com/java110/user/cmd/login/AccessTokenLoginCmd.java
@@ -25,6 +25,7 @@
import com.java110.utils.exception.CmdException;
import com.java110.utils.exception.SMOException;
import com.java110.utils.util.*;
+import com.java110.vo.ResultVo;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
@@ -40,13 +41,14 @@
@Java110CmdDoc(title = "鍗曠偣鐧诲綍accessToken鑷櫥闄嗭紙鑷敤锛�",
description = "1銆侀�氳繃鎺ュ彛/app/login.getAccessToken 鑾峰彇鍒癮ccessToken,<br/>" +
"2銆佷笁鏂圭郴缁熼�氳繃302 璺宠浆鐨勬柟寮忚皟杞埌鐗╀笟绯荤粺 http://wuye.xx.com/sso.html?hcAccessToken={accessToken}&targetUrl=鎮ㄨ璺宠浆鐨勯〉闈�<br/>" +
- "3銆佺墿涓氱郴缁熷嵆鍙畬鎴愯嚜鐧婚檰鍔熻兘<br/> " ,
+ "3銆佺墿涓氱郴缁熷嵆鍙畬鎴愯嚜鐧婚檰鍔熻兘</br>"+
+ "娉ㄦ剰锛氱郴缁熼粯璁ゆ儏鍐典笅鏄笉鍚敤鍗曠偣鐧诲綍鍔熻兘鐨勶紝璇疯仈绯诲紑鍙戯紝閰嶇疆涓績涓惎鐢紙SSO_SWITCH 鐨勫�兼敼涓篛N锛�</br>",
httpMethod = "post",
url = "http://{ip}:{port}/app/login.accessTokenLogin",
resource = "userDoc",
author = "鍚村鏂�",
serviceCode = "login.accessTokenLogin",
- seq = 1
+ seq = 18
)
@Java110ParamsDoc(
@@ -167,8 +169,7 @@
userLoginPo.setUserId(userDto.getUserId());
userLoginPo.setUserName(userDto.getUserName());
userLoginInnerServiceSMOImpl.saveUserLogin(userLoginPo);
- responseEntity = new ResponseEntity<String>(user.toJSONString(), HttpStatus.OK);
- context.setResponseEntity(responseEntity);
+ context.setResponseEntity(ResultVo.createResponseEntity(user));
} catch (Exception e) {
logger.error("鐧诲綍寮傚父锛�", e);
throw new SMOException(ResponseConstant.RESULT_CODE_INNER_ERROR, "绯荤粺鍐呴儴閿欒锛岃鑱旂郴绠＄悊鍛�");
--
Gitblit v1.8.0