From 18aab7d6156b93d65c1b18809d924cbb214d737a Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 26 Feb 2021 16:04:03 +0800
Subject: [PATCH] Merge branch 'whole_new' of http://120.27.238.55:7000/r/exchange into whole_new
---
src/main/java/com/xcong/excoin/common/system/controller/LoginController.java | 44 ++++++++++++++++++++++++++++++++++++++------
1 files changed, 38 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/common/system/controller/LoginController.java b/src/main/java/com/xcong/excoin/common/system/controller/LoginController.java
index a5e363c..8b50722 100644
--- a/src/main/java/com/xcong/excoin/common/system/controller/LoginController.java
+++ b/src/main/java/com/xcong/excoin/common/system/controller/LoginController.java
@@ -2,19 +2,24 @@
import cn.hutool.core.codec.Base64;
import cn.hutool.core.util.IdUtil;
+import cn.hutool.core.util.StrUtil;
import cn.hutool.crypto.SecureUtil;
import cn.hutool.crypto.asymmetric.KeyType;
import cn.hutool.crypto.asymmetric.RSA;
import cn.hutool.crypto.asymmetric.Sign;
import cn.hutool.crypto.asymmetric.SignAlgorithm;
import com.alibaba.fastjson.JSONObject;
+import com.xcong.excoin.common.LoginUserUtils;
+import com.xcong.excoin.common.annotations.SubmitRepeat;
import com.xcong.excoin.common.contants.AppContants;
import com.xcong.excoin.common.response.Result;
import com.xcong.excoin.common.system.bean.LoginUserBean;
import com.xcong.excoin.common.system.dto.LoginDto;
import com.xcong.excoin.common.system.dto.RegisterDto;
+import com.xcong.excoin.common.system.vo.MemberInfoVo;
import com.xcong.excoin.configurations.properties.ApplicationProperties;
import com.xcong.excoin.configurations.properties.SecurityProperties;
+import com.xcong.excoin.modules.member.entity.MemberEntity;
import com.xcong.excoin.modules.member.service.MemberService;
import com.xcong.excoin.utils.RedisUtils;
import io.swagger.annotations.Api;
@@ -28,6 +33,7 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
import java.util.HashMap;
import java.util.Map;
@@ -60,7 +66,7 @@
@ApiOperation(value = "登陆接口", notes = "登陆接口")
@PostMapping("/login")
- public Result login(@RequestBody @Validated LoginDto loginDto) {
+ public Result login(@RequestBody @Validated LoginDto loginDto, HttpServletRequest request) {
// 将账号密码交给spring security验证，并调用userServiceDetails
UsernamePasswordAuthenticationToken authToken = new UsernamePasswordAuthenticationToken(loginDto.getUsername(), SecureUtil.md5(loginDto.getPassword()));
Authentication authentication = authenticationManagerBuilder.getObject().authenticate(authToken);
@@ -70,25 +76,51 @@
// 生成UUID作为token
String token = IdUtil.simpleUUID();
- redisUtils.set(AppContants.APP_LOGIN_PREFIX + token, JSONObject.toJSONString(loginUserBean), applicationProperties.getRedisExpire());
+ String redisToken = "";
+ String redisMember = "";
+ if (LoginUserUtils.isBrowser(request)) {
+ redisToken = AppContants.PC_LOGIN_PREFIX + token;
+ redisMember = AppContants.PC_LOGIN_PREFIX + loginUserBean.getMemberEntity().getId();
+ } else {
+ redisToken = AppContants.APP_LOGIN_PREFIX + token;
+ redisMember = AppContants.APP_LOGIN_PREFIX + loginUserBean.getMemberEntity().getId();
+ }
+
+ if (StrUtil.isNotBlank(redisUtils.getString(redisMember))) {
+ if (redisMember.contains(AppContants.APP_LOGIN_PREFIX)) {
+ redisUtils.del(AppContants.APP_LOGIN_PREFIX + redisUtils.getString(redisMember));
+ } else {
+ redisUtils.del(AppContants.PC_LOGIN_PREFIX + redisUtils.getString(redisMember));
+ }
+ }
+ redisUtils.set(redisToken, JSONObject.toJSONString(loginUserBean.getMemberEntity()), applicationProperties.getRedisExpire());
+ redisUtils.set(redisMember, token);
Map<String, Object> authInfo = new HashMap<>();
+ //获取返回的个人信息
+ MemberInfoVo memberInfoVo = new MemberInfoVo();
+ MemberEntity memberEntity = loginUserBean.getMemberEntity();
+ memberInfoVo.setEmail(memberEntity.getEmail());
+ memberInfoVo.setPhone(memberEntity.getPhone());
+ memberInfoVo.setInviteId(memberEntity.getInviteId());
+ memberInfoVo.setFingerprintState(memberEntity.getFingerprintState());
// 开启debug模式，则将加密后的token返回
if (applicationProperties.isDebug()) {
authInfo.put("token", token);
- authInfo.put("rsaToken", generateAsaToken(token));
- authInfo.put("user", loginUserBean);
+ authInfo.put("rsaToken", AppContants.TOKEN_START_WITH + generateAsaToken(token));
+ authInfo.put("user", memberInfoVo);
} else {
authInfo.put("token", token);
- authInfo.put("user", loginUserBean);
+ authInfo.put("user", memberInfoVo);
}
return Result.ok("success", authInfo);
}
public String generateAsaToken(String token) {
RSA rsa = new RSA(null, securityProperties.getPublicKey());
- return rsa.encryptBase64(token + "_" +System.currentTimeMillis(), KeyType.PublicKey);
+ return rsa.encryptBase64(token + "_" + System.currentTimeMillis(), KeyType.PublicKey);
}
+ @SubmitRepeat
@ApiOperation(value = "app注册接口", notes = "app注册接口，验证码必须输入可默认为123456")
@PostMapping(value = "/register")
public Result register(@RequestBody @Validated RegisterDto registerDto) {
--
Gitblit v1.9.1