From 667c44b287906c005bcc26b46faab68c0453702d Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 21 Dec 2020 17:02:24 +0800
Subject: [PATCH] modify
---
zq-erp/src/main/java/com/matrix/system/api/action/ApiCommonAction.java | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/api/action/ApiCommonAction.java b/zq-erp/src/main/java/com/matrix/system/api/action/ApiCommonAction.java
index 765809d..87c14c2 100644
--- a/zq-erp/src/main/java/com/matrix/system/api/action/ApiCommonAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/api/action/ApiCommonAction.java
@@ -1,10 +1,12 @@
package com.matrix.system.api.action;
import com.alibaba.fastjson.JSONObject;
+import com.jcraft.jsch.UserInfo;
import com.matrix.component.redis.RedisClient;
import com.matrix.core.pojo.AjaxResult;
import com.matrix.core.tools.UUIDUtil;
import com.matrix.system.api.dto.LoginDto;
+import com.matrix.system.api.vo.UserInfoVo;
import com.matrix.system.common.authority.DefaultAuthorityManager;
import com.matrix.system.common.authority.strategy.AccountPasswordLogin;
import com.matrix.system.common.authority.strategy.LoginStrategy;
@@ -13,6 +15,8 @@
import com.matrix.system.hive.service.SysShopInfoService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiResponse;
+import io.swagger.annotations.ApiResponses;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.PostMapping;
@@ -42,6 +46,9 @@
private RedisClient redisClient;
@ApiOperation(value = "登陆接口", notes = "手机端登陆接口")
+ @ApiResponses({
+ @ApiResponse(code = 200, message = "OK", response = UserInfoVo.class)
+ })
@PostMapping(value = "/login")
public AjaxResult login(@RequestBody @Validated LoginDto loginDto) {
@@ -60,9 +67,14 @@
redisClient.saveValue(token, JSONObject.toJSONString(user), 360000);
redisClient.saveValue(user.getSuId().toString(), token, 3600000);
- AjaxResult result = new AjaxResult();
- result.putInMap("user", user);
- result.setInfo("登陆成功 ");
+ UserInfoVo userInfoVo = new UserInfoVo();
+ userInfoVo.setId(user.getSuId());
+ userInfoVo.setName(user.getSuName());
+ userInfoVo.setRoleName(user.getRoleName());
+ userInfoVo.setPhoto(user.getSuPhoto());
+
+ AjaxResult result = AjaxResult.buildSuccessInstance("登陆成功");
+ result.putInMap("user", userInfoVo);
return result;
}
}
--
Gitblit v1.9.1