From ebea673301f5f1ae47e69abcdfaadb2d581cbbae Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 25 Nov 2020 16:34:56 +0800
Subject: [PATCH] 20201125
---
src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java | 43 +++++++++++++++++++++++++------------------
src/main/java/com/xcong/excoin/configurations/security/TokenFilter.java | 7 ++++---
src/main/resources/application-test.yml | 4 ++--
3 files changed, 31 insertions(+), 23 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/configurations/security/TokenFilter.java b/src/main/java/com/xcong/excoin/configurations/security/TokenFilter.java
index 832e456..e98bac2 100644
--- a/src/main/java/com/xcong/excoin/configurations/security/TokenFilter.java
+++ b/src/main/java/com/xcong/excoin/configurations/security/TokenFilter.java
@@ -55,9 +55,9 @@
String redisKey = "";
// 根据user-agent判断pc端还是app端
if (LoginUserUtils.isBrowser(request)) {
- redisKey = AppContants.APP_LOGIN_PREFIX + token;;
+ redisKey = token;;
} else {
- redisKey = AppContants.APP_LOGIN_PREFIX + token;;
+ redisKey = token;;
}
String loginStr = (String) redisUtils.get(redisKey);
@@ -96,7 +96,8 @@
// 去掉令牌前缀
String rsaToken = bearerToken.replace(AppContants.TOKEN_START_WITH, "");
RSA rsa = new RSA(securityProperties.getPrivateKey(), null);
- String[] tokens = StrUtil.split(rsa.decryptStr(rsaToken, KeyType.PrivateKey), "_");
+ String decryptStr = rsa.decryptStr(rsaToken, KeyType.PrivateKey);
+ String[] tokens = StrUtil.split(decryptStr, "_");
if (StrUtil.isNotEmpty(requestURL) && requestURL.toString().contains(tokens[2])) {
return tokens[0];
diff --git a/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java b/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java
index 236956c..220ad62 100644
--- a/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java
@@ -1182,25 +1182,32 @@
String inviteId = ShareCodeUtil.toSerialCode(member.getId());
member.setInviteId(inviteId);
-
- boolean flag = false;
- String parentId = member.getRefererId();
- String ids = "";
- while (!flag && StringUtils.isNotBlank(parentId)) {
- ids += ("," + parentId);
- MemberEntity parentMember = memberDao.selectMemberInfoByInviteId(parentId);
- if (parentMember == null) {
- break;
- }
- parentId = parentMember.getRefererId();
- if(StringUtils.isBlank(parentId)){
- break;
- }
- if (parentMember.getRefererId().equals(parentMember.getInviteId())) {
- flag = true;
- }
+
+ String refererId = outCenterRegisterDto.getRefererId();
+ if(StrUtil.isNotEmpty(refererId)) {
+ MemberEntity selectMemberInfoByInviteId = memberDao.selectMemberInfoByInviteId(refererId);
+ if(ObjectUtil.isNotEmpty(selectMemberInfoByInviteId)) {
+ boolean flag = false;
+ String parentId = member.getRefererId();
+ String ids = "";
+ while (!flag && StringUtils.isNotBlank(parentId)) {
+ ids += ("," + parentId);
+ MemberEntity parentMember = memberDao.selectMemberInfoByInviteId(parentId);
+ if (parentMember == null) {
+ break;
+ }
+ parentId = parentMember.getRefererId();
+ if(StringUtils.isBlank(parentId)){
+ break;
+ }
+ if (parentMember.getRefererId().equals(parentMember.getInviteId())) {
+ flag = true;
+ }
+ }
+ member.setRefererIds(ids);
+ }
}
- member.setRefererIds(ids);
+
memberDao.updateById(member);
//初始化合约钱包
diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml
index 3b0c853..ea4cc9a 100644
--- a/src/main/resources/application-test.yml
+++ b/src/main/resources/application-test.yml
@@ -110,5 +110,5 @@
access-key-secret: vbCjQtPxABWjqtUlQfzjlA0qAY96fh
rsa:
- public_key: MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCCf8UFZK54AiK4PRu7tNd+Z8qZ77o/QXCnk25DRmygVpOEu5mGNSAvfnWmKp2pEV2RljeXq3Rid/+LQkonaebMJeXKSF0yxL/VgyeT8JaQ5gNbOrdfdlc+mFkXJyzyJt8YkvApEdPRNSU2ENBn7mgRfD0BYPM4vZ6/rv+de38FJwIDAQAB
- private_key: MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAIJ/xQVkrngCIrg9G7u0135nypnvuj9BcKeTbkNGbKBWk4S7mYY1IC9+daYqnakRXZGWN5erdGJ3/4tCSidp5swl5cpIXTLEv9WDJ5PwlpDmA1s6t192Vz6YWRcnLPIm3xiS8CkR09E1JTYQ0GfuaBF8PQFg8zi9nr+u/517fwUnAgMBAAECgYBhPt9NvpI4wbanvnndLczr2GJkxfzvSE+vwLCJF4C5FusFHVsxZINggQcg1V75bwRgCiXRMyYefreCSdrCditS43PzTOmE4RRrpxLlm8oubJc0C98LQ2qlN9AsUqL5IHpVGgbHDyWAwjc1GBID6nwXKpxq1/VodFqhahG9D5EZsQJBALnkb+5VTxQbiyQI4Uc9NIvAyVcNY1OisbvY6tvNgdBbJkADgAb78M1HWxxYjUqsvzggNHc7cWqWBHMgpnJaqm8CQQCztze4D7uAk7OC9MJHY5eE980J8Kk+GEZKxz4LahzU6V6dcb9GFac3wEtgilj/tOAn9y0/Q8sm9vvCIbMDzgzJAkEAqRYcqhF26LdVDOX25DHMBgLKISDQZFbsjA13M4/usHL4i+mjHrc0BcUOHu59NpuDI65HitzLAUSLr5zXSdUmiQJAW77wOg4GCejdXsB3IhzMsHwU97sdm26nC+vVV9xvJZ6Rx8zW+f9543NOx9U5BCmhuaVtOvvwDU9PTVcI3atmSQJAXAIJ5gGdtXx0DXiX4VvzNFHqgaqHMGvXyjNVkU2FYQbSAd2A6app4uRO+BkZu9dSjh14m+oXMnV2HzAN2rRnjA==
+ public_key: MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDhiZ2Gevs6sL16dss4AYCwsb3HchEevjjNxeY9wVnWlrm2uicMoXPWne8Khvprxtg7J/pOjtb5Sok33uFZZOUl3nIoTEoOQbG82Zat+2bc+N4MXOp9pVCEgQJoXT29NU5DizNfDTfb0edCH2YjMFaar/KwiMLmijyj0Z6QM3uipwIDAQAB
+ private_key: MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAOGJnYZ6+zqwvXp2yzgBgLCxvcdyER6+OM3F5j3BWdaWuba6Jwyhc9ad7wqG+mvG2Dsn+k6O1vlKiTfe4Vlk5SXecihMSg5BsbzZlq37Ztz43gxc6n2lUISBAmhdPb01TkOLM18NN9vR50IfZiMwVpqv8rCIwuaKPKPRnpAze6KnAgMBAAECgYAwdUHsQAY0kP7VDisRqHj+/eF5tc9p3JMV2zxh7mYgDhhu40Y6l4HtDdfrWh76Ayo4Y5mLQXN88n/TCkc+zsfQ2MA4AY/z0F3cF2tRKPy7auMa6/g1+tuZBR+28bdwoGag5BfMIOdriLJ5TqFXObaCH5CULa+qHTHDgrTIvSF1SQJBAPv/Ti+xpUCJNjHYAgqfiJohqPCH6frCucGAFdbcf4w8vEqHVAmDdxolJTU8xwffNBE+cAgS+CQkWFHrx8VPdAsCQQDlHreJTCd54gghw9xZiWribRagoixYVL5j8EbmVGYwDeMNGXxbeGPFMYqT5r/JUHq1RYTf9L+IL4RN7tM7LDFVAkEAx5OrmJpZBoOlKFSrST6QMYH3CoiaBr+x3k5S/ZgkbCyt81i6dc5oxYwlq8Q23UUpN377u2lKnVUrnbXewaXrgQJASOR227VgscQZdjSLu+ieGp8+Hai6lvePAtiEle6v/AXPAHHlQGySwT+7qMY2qeNyxozxcxa4gKktXGXoyeCLaQJARXA82H8HHDsW2SaUz5TgQUfvaUDDQ18lB2NAKelwMUFR+nK6L+W+vRg6pFCzUN27snysfUYYE+CR7IaY4nHNWA==
--
Gitblit v1.9.1