From d61072f997839b4564ce35132d5902a1b6f7d54f Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 03 Aug 2020 17:39:10 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/common/system/controller/LoginController.java | 86 +++++++++++++++++++++++++++++++++++++-----
1 files changed, 75 insertions(+), 11 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 28feccb..4754bb5 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
@@ -1,12 +1,27 @@
package com.xcong.excoin.common.system.controller;
+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.configurations.properties.ApplicationProperties;
+import com.xcong.excoin.configurations.properties.SecurityProperties;
+import com.xcong.excoin.modules.member.service.MemberService;
import com.xcong.excoin.utils.RedisUtils;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
@@ -16,6 +31,7 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
import java.util.HashMap;
import java.util.Map;
@@ -26,12 +42,19 @@
* @Version V1.0
**/
@Slf4j
+@Api(value = "登陆注册类", tags = "登陆注册类")
@RestController
@RequestMapping(value = "/")
public class LoginController {
- @Value("${rsa.private_key}")
- private String privateKey;
+ @Resource
+ private MemberService memberservice;
+
+ @Resource
+ private ApplicationProperties applicationProperties;
+
+ @Resource
+ private SecurityProperties securityProperties;
@Resource
private AuthenticationManagerBuilder authenticationManagerBuilder;
@@ -39,19 +62,60 @@
@Resource
private RedisUtils redisUtils;
+ @ApiOperation(value = "登陆接口", notes = "登陆接口")
@PostMapping("/login")
- public Result login(@RequestBody @Validated LoginDto loginDto) {
- UsernamePasswordAuthenticationToken authToken = new UsernamePasswordAuthenticationToken(loginDto.getUsername(), loginDto.getPassword());
+ 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);
- String token = IdUtil.simpleUUID();
+
+ // 获取当前验证过后的用户
LoginUserBean loginUserBean = (LoginUserBean) authentication.getPrincipal();
- redisUtils.set(AppContants.APP_LOGIN_PREFIX + token, JSONObject.toJSONString(loginUserBean), 300000);
- Map<String, Object> authInfo = new HashMap<String, Object>(2){
- {
- put("token", token);
- put("user", loginUserBean);
+
+ // 生成UUID作为token
+ String token = IdUtil.simpleUUID();
+ 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<>();
+ // 开启debug模式，则将加密后的token返回
+ if (applicationProperties.isDebug()) {
+ authInfo.put("token", token);
+ authInfo.put("rsaToken", AppContants.TOKEN_START_WITH + generateAsaToken(token));
+ authInfo.put("user", loginUserBean);
+ } else {
+ authInfo.put("token", token);
+ authInfo.put("user", loginUserBean);
+ }
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);
+ }
+
+ @SubmitRepeat
+ @ApiOperation(value = "app注册接口", notes = "app注册接口，验证码必须输入可默认为123456")
+ @PostMapping(value = "/register")
+ public Result register(@RequestBody @Validated RegisterDto registerDto) {
+ return memberservice.register(registerDto);
+ }
+
}
--
Gitblit v1.9.1