From d64adc42c078a82f58aa58743ae3871b203e3bbe Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 15 Nov 2022 15:13:58 +0800
Subject: [PATCH] 20221115,密码RSA加密
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java | 213 +++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 198 insertions(+), 15 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java
index df97c48..49c4a91 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java
@@ -17,6 +17,7 @@
import cc.mrbird.febs.dapp.enumerate.DataDictionaryEnum;
import cc.mrbird.febs.dapp.mapper.*;
import cc.mrbird.febs.dapp.service.DappMemberService;
+import cc.mrbird.febs.dapp.service.DappWalletService;
import cc.mrbird.febs.dapp.utils.CaptchaUtil;
import cc.mrbird.febs.dapp.utils.UUIDUtil;
import cc.mrbird.febs.dapp.vo.*;
@@ -43,10 +44,7 @@
import java.io.IOException;
import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.concurrent.TimeUnit;
/**
@@ -69,6 +67,8 @@
// private final DappMemberService dappMemberService;
private final DappMemberAddressDao dappMemberAddressDao;
private final IgtOnHookPlanOrderDao igtOnHookPlanOrderDao;
+ private final AppVersionMapper appVersionMapper;
+ private final DappMessageDao dappMessageDao;
private final RedisTemplate<String, Object> redisTemplate;
@@ -420,7 +420,12 @@
}
member = new DappMemberEntity();
member.setUsername(registerDto.getAccount());
- member.setPassword(SecureUtil.md5(registerDto.getPassword()));
+
+ //RSA解密
+ String password = registerDto.getPassword();
+ RSA rsa = new RSA(AppContants.PRIVATE_KEY, null);
+ password = rsa.decryptStr(password, KeyType.PrivateKey);
+ member.setPassword(SecureUtil.md5(password));
member.setIdentity(DataDictionaryEnum.LEVEL_MB.getCode());
member.setRefererId(registerDto.getRefererId());
member.setIsOnHook(2);
@@ -480,8 +485,11 @@
} else {
return new FebsResponse().fail().message(MessageSourceUtils.getString("verification_code_err_003"));
}
-
- String md5Pwd = SecureUtil.md5(loginDto.getPassword());
+ //RSA解密
+ String password = loginDto.getPassword();
+ RSA rsa = new RSA(AppContants.PRIVATE_KEY, null);
+ password = rsa.decryptStr(password, KeyType.PrivateKey);
+ String md5Pwd = SecureUtil.md5(password);
DappMemberEntity dappMemberEntity = dappMemberDao.selectMemberInfoByUsernameAndPassword(loginDto.getAccount(), md5Pwd);
if (ObjectUtil.isEmpty(dappMemberEntity)) {
return new FebsResponse().fail().message(MessageSourceUtils.getString("login_err_001"));
@@ -501,8 +509,8 @@
}
String token = IdUtil.simpleUUID();
- redisUtils.set(token, JSONObject.toJSONString(dappMemberEntity), 3600);
- redisUtils.set(redisKey, token, 3600);
+ redisUtils.set(token, JSONObject.toJSONString(dappMemberEntity));
+ redisUtils.set(redisKey, token);
Map<String, Object> authInfo = new HashMap<>();
authInfo.put("token", token);
authInfo.put("rasToken", generateAsaToken(token));
@@ -532,6 +540,7 @@
dappWalletCoinEntity.setAvailableAmount(AppContants.TOURIST_INIT_MONEY);
dappWalletCoinEntity.setFrozenAmount(AppContants.INIT_MONEY);
dappWalletCoinEntity.setTotalAmount(AppContants.TOURIST_INIT_MONEY);
+ dappWalletCoinEntity.setWalletCode("USDT");
dappWalletCoinDao.insert(dappWalletCoinEntity);
}
@@ -596,7 +605,7 @@
}else{
memberInfoVo.setInviteId(dappMemberEntity.getInviteId());
memberInfoVo.setIdentityCode(identity);
- memberInfoVo.setIdentity("会员");
+ memberInfoVo.setIdentity("Member");
memberInfoVo.setUsername(dappMemberEntity.getUsername());
}
if(ObjectUtil.isNotEmpty(dappMemberEntity.getTransferCode())){
@@ -612,7 +621,7 @@
BigDecimal totalProfit = igtOnHookPlanOrderDao.selectSumProfitByMemberId(memberId);
- memberInfoVo.setTotalProfit(totalProfit);
+ memberInfoVo.setTotalProfit(totalProfit.setScale(4,BigDecimal.ROUND_DOWN));
DappWalletCoinEntity dappWalletCoinEntity = dappWalletCoinDao.selectByMemberId(memberId);
if(ObjectUtil.isEmpty(dappMemberEntity)){
@@ -767,7 +776,12 @@
}
DappMemberEntity memberadd = new DappMemberEntity();
memberadd.setUsername(apiAddTeammateDto.getAccount());
- memberadd.setPassword(SecureUtil.md5(apiAddTeammateDto.getPassword()));
+
+ //RSA解密
+ String password = apiAddTeammateDto.getPassword();
+ RSA rsa = new RSA(AppContants.PRIVATE_KEY, null);
+ password = rsa.decryptStr(password, KeyType.PrivateKey);
+ memberadd.setPassword(SecureUtil.md5(password));
memberadd.setIdentity(DataDictionaryEnum.LEVEL_MB.getCode());
memberadd.setRefererId(member.getInviteId());
dappMemberDao.insert(memberadd);
@@ -797,6 +811,7 @@
dappWalletCoinEntity.setAvailableAmount(AppContants.INIT_MONEY);
dappWalletCoinEntity.setFrozenAmount(AppContants.INIT_MONEY);
dappWalletCoinEntity.setTotalAmount(AppContants.INIT_MONEY);
+ dappWalletCoinEntity.setWalletCode("USDT");
dappWalletCoinDao.insert(dappWalletCoinEntity);
return new FebsResponse().success().message(MessageSourceUtils.getString("register_err_006"));
@@ -818,7 +833,7 @@
if(DataDictionaryEnum.LEVEL_TM.getCode().equals(identity)){
apiMyTeammateInfoListVo.setLevelName("游客");
}else{
- apiMyTeammateInfoListVo.setLevelName("会员");
+ apiMyTeammateInfoListVo.setLevelName("Member");
}
}
}
@@ -863,7 +878,11 @@
return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_006"));
}
//验证资金密码
- Boolean aBoolean = validateTransferCodeInside(addBankDto.getTransferCode(), member.getId());
+ //RSA解密
+ RSA rsa = new RSA(AppContants.PRIVATE_KEY, null);
+ String transferCode = addBankDto.getTransferCode();
+ transferCode = rsa.decryptStr(transferCode, KeyType.PrivateKey);
+ Boolean aBoolean = validateTransferCodeInside(transferCode, member.getId());
if(!aBoolean){
return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_006"));
}
@@ -914,7 +933,11 @@
return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_006"));
}
//验证资金密码
- Boolean aBoolean = validateTransferCodeInside(apiAddAddressDto.getTransferCode(), member.getId());
+ //RSA解密
+ RSA rsa = new RSA(AppContants.PRIVATE_KEY, null);
+ String transferCode = apiAddAddressDto.getTransferCode();
+ transferCode = rsa.decryptStr(transferCode, KeyType.PrivateKey);
+ Boolean aBoolean = validateTransferCodeInside(transferCode, member.getId());
if(!aBoolean){
return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_006"));
}
@@ -930,6 +953,166 @@
return new FebsResponse().success().message(MessageSourceUtils.getString("Operation_001"));
}
+
+ @Override
+ public List<AppVersion> findAppVersion() {
+ return appVersionMapper.selectList(null);
+ }
+
+ @Override
+ public AppVersion getAppVersionInfoById(long id) {
+ return appVersionMapper.selectById(id);
+ }
+
+ @Override
+ public IPage<AppVersion> getAppVersionList(AppVersion appVersion, QueryRequest request) {
+ Page<AppVersion> page = new Page<>(request.getPageNum(), request.getPageSize());
+ IPage<AppVersion> appVersions = this.baseMapper.getAppVersionListInPage(page, appVersion);
+ return appVersions;
+ }
+
+ @Override
+ public FebsResponse delCategary(Long id) {
+ AppVersion appVersion = appVersionMapper.selectById(id);
+ if(ObjectUtil.isEmpty(appVersion)){
+ return new FebsResponse().fail().message("系统繁忙，请刷新页面重试");
+ }
+ appVersionMapper.deleteById(id);
+ return new FebsResponse().success();
+ }
+
+ @Override
+ public FebsResponse addAppVersion(AppVersion appVersion) {
+ appVersion.setCreatetime(new Date());
+ appVersionMapper.insert(appVersion);
+ return new FebsResponse().success();
+ }
+
+ @Override
+ public FebsResponse updateAppVersion(AppVersion appVersion) {
+ AppVersion appVersionBefore = appVersionMapper.selectById(appVersion.getId());
+ if(ObjectUtil.isEmpty(appVersionBefore)){
+ return new FebsResponse().fail().message("系统繁忙，请刷新页面重试");
+ }
+ appVersion.setCreatetime(new Date());
+ appVersionMapper.updateById(appVersion);
+ return new FebsResponse().success();
+ }
+
+ @Override
+ public IPage<MemberCoinChargeEntity> getChargeListInPage(MemberCoinChargeEntity memberCoinChargeEntity, QueryRequest request) {
+ Page<MemberCoinChargeEntity> page = new Page<>(request.getPageNum(), request.getPageSize());
+ IPage<MemberCoinChargeEntity> memberCoinChargeEntityIPage = this.baseMapper.getChargeListInPage(page, memberCoinChargeEntity);
+ return memberCoinChargeEntityIPage;
+ }
+
+ @Override
+ public FebsResponse payUsdt(DappMemberEntity memberEntity) {
+ DappMemberEntity dappMemberEntity = dappMemberDao.selectById(memberEntity.getId());
+ if(ObjectUtil.isEmpty(dappMemberEntity)){
+ return new FebsResponse().fail().message("会员信息不存在");
+ }
+ BigDecimal coinNumber = memberEntity.getCoinNumber() == null ? BigDecimal.ZERO : memberEntity.getCoinNumber();
+ if(BigDecimal.ZERO.compareTo(coinNumber) >= 0){
+ return new FebsResponse().fail().message("请输入正确的金额");
+ }
+ DappWalletCoinEntity dappWalletCoinEntity = dappWalletCoinDao.selectByMemberId(memberEntity.getId());
+ if(ObjectUtil.isEmpty(dappWalletCoinEntity)){
+ return new FebsResponse().fail().message("会员账户不存在");
+ }
+ BigDecimal availableAmount = dappWalletCoinEntity.getAvailableAmount();
+ dappWalletCoinDao.addTotalAndaddAvailableById(dappWalletCoinEntity.getId(),coinNumber);
+
+ DappAccountMoneyChangeEntity dappAccountMoneyChangeEntity = new DappAccountMoneyChangeEntity(memberEntity.getId(),
+ availableAmount,coinNumber,availableAmount.add(coinNumber) ,"充值", 10);
+ dappAccountMoneyChangeDao.insert(dappAccountMoneyChangeEntity);
+ return new FebsResponse().success().message("操作成功");
+ }
+
+ @Override
+ public List<AdminMemberIdentityVo> identitySetList() {
+ ArrayList<AdminMemberIdentityVo> objects = new ArrayList<>();
+ List<DataDictionaryCustom> dataDictionaryCustoms = dataDictionaryCustomMapper.selectDicByType(DataDictionaryEnum.LEVEL_AIB.getType());
+ if(CollUtil.isNotEmpty(dataDictionaryCustoms)){
+ for(DataDictionaryCustom dic :dataDictionaryCustoms){
+ if(!DataDictionaryEnum.LEVEL_TM.getCode().equals(dic.getCode())){
+ AdminMemberIdentityVo adminMemberIdentityVo = new AdminMemberIdentityVo();
+ adminMemberIdentityVo.setIdentityCode(dic.getCode());
+ adminMemberIdentityVo.setIdentityValue(dic.getDescription());
+ objects.add(adminMemberIdentityVo);
+ }
+ }
+ }
+ return objects;
+ }
+
+ @Override
+ public FebsResponse identitySet(DappMemberEntity memberEntity) {
+ DappMemberEntity dappMemberEntity = dappMemberDao.selectById(memberEntity.getId());
+ if(ObjectUtil.isEmpty(dappMemberEntity)){
+ return new FebsResponse().fail().message("会员信息不存在");
+ }
+ dappMemberEntity.setIdentity(memberEntity.getIdentity());
+ dappMemberDao.updateById(dappMemberEntity);
+ return new FebsResponse().success();
+ }
+
+ @Override
+ public FebsResponse amountFlowBack(Long id) {
+ DappAccountMoneyChangeEntity dappAccountMoneyChangeEntity = dappAccountMoneyChangeDao.selectById(id);
+ if(7 == dappAccountMoneyChangeEntity.getType() || 8 == dappAccountMoneyChangeEntity.getType() ){
+ Long memberId = dappAccountMoneyChangeEntity.getMemberId();
+ DappWalletCoinEntity dappWalletCoinEntity = dappWalletCoinDao.selectByMemberId(memberId);
+ dappWalletCoinDao.delAvailableDelTotalById(dappWalletCoinEntity.getId(),dappAccountMoneyChangeEntity.getAmount());
+
+ DappAccountMoneyChangeEntity addFlow = new DappAccountMoneyChangeEntity(65L,
+ dappAccountMoneyChangeEntity.getAmount(), "系统", 9,dappAccountMoneyChangeEntity.getOrderId());
+ dappAccountMoneyChangeDao.insert(addFlow);
+
+ dappAccountMoneyChangeDao.deleteById(dappAccountMoneyChangeEntity.getId());
+ return new FebsResponse().fail().message("操作成功");
+ }else{
+ return new FebsResponse().fail().message("只允许回退【盈利分成】和【流水佣金】");
+ }
+ }
+
+ @Override
+ public FebsResponse addMessage(AddMessageDto addMessageDto) {
+ DappMemberEntity member = LoginUserUtil.getAppUser();
+ if(ObjectUtil.isEmpty(member)){
+ return new FebsResponse().success();
+ }
+ DappMessageEntity dappMessageEntity = new DappMessageEntity();
+ dappMessageEntity.setMemberId(member.getId());
+ dappMessageEntity.setMessage(addMessageDto.getMessage());
+ dappMessageDao.insert(dappMessageEntity);
+ return new FebsResponse().success();
+ }
+
+ @Override
+ public IPage<DappMessageEntity> getMessageListInPage(DappMessageEntity dappMessageEntity, QueryRequest request) {
+ Page<DappMemberEntity> page = new Page<>(request.getPageNum(), request.getPageSize());
+ User currentUser = FebsUtil.getCurrentUser();
+ if(StrUtil.isNotEmpty(currentUser.getDescription())){
+ dappMessageEntity.setDescription(currentUser.getDescription());
+ }
+ return dappMemberDao.selectMessageListInPage(dappMessageEntity, page);
+ }
+
+ @Override
+ public IPage<MemberCoinChargeEntity> getFlowListByDay(MemberCoinChargeEntity memberCoinChargeEntity, QueryRequest request) {
+ Page<MemberCoinChargeEntity> page = new Page<>(request.getPageNum(), request.getPageSize());
+ IPage<MemberCoinChargeEntity> memberCoinChargeEntityIPage = this.baseMapper.getChargeListByDayInPage(page, memberCoinChargeEntity);
+ return memberCoinChargeEntityIPage;
+ }
+
+ @Override
+ public IPage<AdminMemberCoinWithdrawVo> getOutFlowListByDay(MemberCoinWithdrawEntity memberCoinWithdrawEntity, QueryRequest request) {
+ Page<AdminMemberCoinWithdrawVo> page = new Page<>(request.getPageNum(), request.getPageSize());
+ IPage<AdminMemberCoinWithdrawVo> adminMemberCoinWithdrawVos = this.baseMapper.getWithDrawListByDayInPage(page, memberCoinWithdrawEntity);
+ return adminMemberCoinWithdrawVos;
+ }
+
public String generateAsaToken(String token) {
RSA rsa = new RSA(null, AppContants.PUBLIC_KEY);
return rsa.encryptBase64(token + "_" + System.currentTimeMillis(), KeyType.PublicKey);
--
Gitblit v1.9.1