From f6a912c1a6a26c809568f964941fb4ad4483274e Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 31 May 2021 11:19:40 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/common/system/controller/LoginController.java | 36 ++++++++++++++++++++++++++++++++++--
1 files changed, 34 insertions(+), 2 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 d8bfd99..4081925 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,6 +1,7 @@
package com.xcong.excoin.common.system.controller;
import cn.hutool.core.codec.Base64;
+import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.crypto.SecureUtil;
@@ -10,18 +11,29 @@
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.enumerates.CoinTypeEnum;
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.coin.service.CoinService;
+import com.xcong.excoin.modules.member.dao.MemberWalletCoinDao;
+import com.xcong.excoin.modules.member.dao.MemberWalletContractDao;
+import com.xcong.excoin.modules.member.entity.MemberEntity;
+import com.xcong.excoin.modules.member.entity.MemberWalletCoinEntity;
+import com.xcong.excoin.modules.member.entity.MemberWalletContractEntity;
import com.xcong.excoin.modules.member.service.MemberService;
+import com.xcong.excoin.utils.CoinTypeConvert;
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.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
@@ -31,7 +43,9 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
+import java.math.BigDecimal;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
/**
@@ -57,6 +71,9 @@
@Resource
private AuthenticationManagerBuilder authenticationManagerBuilder;
+
+ @Autowired
+ private CoinService coinService;
@Resource
private RedisUtils redisUtils;
@@ -93,15 +110,29 @@
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", AppContants.TOKEN_START_WITH + generateAsaToken(token));
- authInfo.put("user", loginUserBean);
+ authInfo.put("user", memberInfoVo);
} else {
authInfo.put("token", token);
- authInfo.put("user", loginUserBean);
+ authInfo.put("user", memberInfoVo);
}
+
+// BigDecimal total = coinService.getAllWalletAmount(memberEntity.getId());
+// if (total.compareTo(AppContants.BASE_MIN_AMOUNT) > 0) {
+// authInfo.put("baseUrl", AppContants.BASE_URL_L2);
+// } else {
+ authInfo.put("baseUrl", "");
+// }
return Result.ok("success", authInfo);
}
@@ -110,6 +141,7 @@
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