记得上下班打卡 | git大法好,push需谨慎
Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
liquidnet-bus-v1
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
董敬伟
liquidnet-bus-v1
Commits
b021b4bc
Commit
b021b4bc
authored
Jun 08, 2021
by
anjiabin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
注释掉mongo事物
parent
91b7435a
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
23 additions
and
1 deletion
+23
-1
AdamLoginController.java
...iquidnet/service/adam/controller/AdamLoginController.java
+5
-1
AdamRdmServiceImpl.java
...quidnet/service/adam/service/impl/AdamRdmServiceImpl.java
+14
-0
AdamUserServiceImpl.java
...uidnet/service/adam/service/impl/AdamUserServiceImpl.java
+4
-0
No files found.
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamLoginController.java
View file @
b021b4bc
...
@@ -125,7 +125,10 @@ public class AdamLoginController {
...
@@ -125,7 +125,10 @@ public class AdamLoginController {
if
(!
this
.
checkSmsCode
(
mobile
,
code
))
return
ResponseDto
.
failure
(
ErrorMapping
.
get
(
"10002"
));
if
(!
this
.
checkSmsCode
(
mobile
,
code
))
return
ResponseDto
.
failure
(
ErrorMapping
.
get
(
"10002"
));
long
startTime
=
System
.
currentTimeMillis
();
String
uid
=
adamRdmService
.
getUidByMobile
(
mobile
);
String
uid
=
adamRdmService
.
getUidByMobile
(
mobile
);
log
.
info
(
"redis getUidByMobile calltime: "
,
System
.
currentTimeMillis
()
-
startTime
);
AdamUserInfoVo
userInfoVo
=
AdamUserInfoVo
userInfoVo
=
StringUtils
.
isEmpty
(
uid
)
?
adamUserService
.
register
(
mobile
)
:
adamRdmService
.
getUserInfoVoByUid
(
uid
);
StringUtils
.
isEmpty
(
uid
)
?
adamUserService
.
register
(
mobile
)
:
adamRdmService
.
getUserInfoVoByUid
(
uid
);
AdamLoginInfoVo
loginInfoVo
=
AdamLoginInfoVo
.
getNew
();
AdamLoginInfoVo
loginInfoVo
=
AdamLoginInfoVo
.
getNew
();
...
@@ -266,6 +269,7 @@ public class AdamLoginController {
...
@@ -266,6 +269,7 @@ public class AdamLoginController {
}
}
private
String
ssoProcess
(
AdamUserInfoVo
userInfoVo
)
{
private
String
ssoProcess
(
AdamUserInfoVo
userInfoVo
)
{
long
startTime
=
System
.
currentTimeMillis
();
Map
<
String
,
Object
>
claimsMap
=
new
HashMap
<>();
Map
<
String
,
Object
>
claimsMap
=
new
HashMap
<>();
claimsMap
.
put
(
"sub"
,
userInfoVo
.
getUid
());
claimsMap
.
put
(
"sub"
,
userInfoVo
.
getUid
());
// TODO: 2021/5/25 修改手机号更新TOKEN
// TODO: 2021/5/25 修改手机号更新TOKEN
...
@@ -280,7 +284,7 @@ public class AdamLoginController {
...
@@ -280,7 +284,7 @@ public class AdamLoginController {
DigestUtils
.
md5DigestAsHex
(
token
.
getBytes
(
StandardCharsets
.
UTF_8
)),
DigestUtils
.
md5DigestAsHex
(
token
.
getBytes
(
StandardCharsets
.
UTF_8
)),
jwtValidator
.
getExpireTtl
()
*
60
jwtValidator
.
getExpireTtl
()
*
60
);
);
log
.
info
(
" redis ssoProcess calltime: "
,
System
.
currentTimeMillis
()
-
startTime
);
return
token
;
return
token
;
}
}
}
}
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamRdmServiceImpl.java
View file @
b021b4bc
...
@@ -6,6 +6,7 @@ import com.liquidnet.service.adam.dto.vo.*;
...
@@ -6,6 +6,7 @@ import com.liquidnet.service.adam.dto.vo.*;
import
com.liquidnet.service.adam.entity.AdamAddresses
;
import
com.liquidnet.service.adam.entity.AdamAddresses
;
import
com.liquidnet.service.adam.entity.AdamEnters
;
import
com.liquidnet.service.adam.entity.AdamEnters
;
import
com.liquidnet.service.adam.service.IAdamRdmService
;
import
com.liquidnet.service.adam.service.IAdamRdmService
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.data.mongodb.core.MongoTemplate
;
import
org.springframework.data.mongodb.core.MongoTemplate
;
import
org.springframework.data.mongodb.core.query.Criteria
;
import
org.springframework.data.mongodb.core.query.Criteria
;
...
@@ -15,6 +16,7 @@ import org.springframework.util.CollectionUtils;
...
@@ -15,6 +16,7 @@ import org.springframework.util.CollectionUtils;
import
java.util.List
;
import
java.util.List
;
@Slf4j
@Service
@Service
public
class
AdamRdmServiceImpl
implements
IAdamRdmService
{
public
class
AdamRdmServiceImpl
implements
IAdamRdmService
{
@Autowired
@Autowired
...
@@ -62,10 +64,14 @@ public class AdamRdmServiceImpl implements IAdamRdmService {
...
@@ -62,10 +64,14 @@ public class AdamRdmServiceImpl implements IAdamRdmService {
String
rk
=
AdamRedisConst
.
INFO_USER
.
concat
(
uid
);
String
rk
=
AdamRedisConst
.
INFO_USER
.
concat
(
uid
);
AdamUserInfoVo
userInfoVo
=
(
AdamUserInfoVo
)
redisUtil
.
get
(
rk
);
AdamUserInfoVo
userInfoVo
=
(
AdamUserInfoVo
)
redisUtil
.
get
(
rk
);
if
(
null
==
userInfoVo
)
{
if
(
null
==
userInfoVo
)
{
long
startTime
=
System
.
currentTimeMillis
();
userInfoVo
=
mongoTemplate
.
findOne
(
Query
.
query
(
Criteria
.
where
(
"uid"
).
is
(
uid
).
and
(
"state"
).
is
(
1
)),
userInfoVo
=
mongoTemplate
.
findOne
(
Query
.
query
(
Criteria
.
where
(
"uid"
).
is
(
uid
).
and
(
"state"
).
is
(
1
)),
AdamUserInfoVo
.
class
,
AdamUserInfoVo
.
class
.
getSimpleName
());
AdamUserInfoVo
.
class
,
AdamUserInfoVo
.
class
.
getSimpleName
());
log
.
info
(
"mongo getUserInfoVoByUid calltime: "
,
System
.
currentTimeMillis
()
-
startTime
);
startTime
=
System
.
currentTimeMillis
();
if
(
null
!=
userInfoVo
)
redisUtil
.
set
(
rk
,
userInfoVo
);
if
(
null
!=
userInfoVo
)
redisUtil
.
set
(
rk
,
userInfoVo
);
log
.
info
(
"redis redisUtil set userInfoVo calltime: "
,
System
.
currentTimeMillis
()
-
startTime
);
}
}
return
userInfoVo
;
return
userInfoVo
;
}
}
...
@@ -82,6 +88,7 @@ public class AdamRdmServiceImpl implements IAdamRdmService {
...
@@ -82,6 +88,7 @@ public class AdamRdmServiceImpl implements IAdamRdmService {
@Override
@Override
public
AdamRealInfoVo
getRealInfoVoByUid
(
String
uid
)
{
public
AdamRealInfoVo
getRealInfoVoByUid
(
String
uid
)
{
long
startTime
=
System
.
currentTimeMillis
();
String
rk
=
AdamRedisConst
.
INFO_REAL_NAME
.
concat
(
uid
);
String
rk
=
AdamRedisConst
.
INFO_REAL_NAME
.
concat
(
uid
);
AdamRealInfoVo
realInfoVo
=
(
AdamRealInfoVo
)
redisUtil
.
get
(
rk
);
AdamRealInfoVo
realInfoVo
=
(
AdamRealInfoVo
)
redisUtil
.
get
(
rk
);
if
(
null
==
realInfoVo
)
{
if
(
null
==
realInfoVo
)
{
...
@@ -90,6 +97,7 @@ public class AdamRdmServiceImpl implements IAdamRdmService {
...
@@ -90,6 +97,7 @@ public class AdamRdmServiceImpl implements IAdamRdmService {
if
(
null
!=
realInfoVo
)
redisUtil
.
set
(
rk
,
realInfoVo
);
if
(
null
!=
realInfoVo
)
redisUtil
.
set
(
rk
,
realInfoVo
);
}
}
log
.
info
(
"mongo redis getRealInfoVoByUid calltime: "
,
System
.
currentTimeMillis
()
-
startTime
);
return
realInfoVo
;
return
realInfoVo
;
}
}
...
@@ -105,6 +113,7 @@ public class AdamRdmServiceImpl implements IAdamRdmService {
...
@@ -105,6 +113,7 @@ public class AdamRdmServiceImpl implements IAdamRdmService {
@Override
@Override
public
List
<
AdamThirdPartInfoVo
>
getThirdPartVoListByUid
(
String
uid
)
{
public
List
<
AdamThirdPartInfoVo
>
getThirdPartVoListByUid
(
String
uid
)
{
long
startTime
=
System
.
currentTimeMillis
();
String
rk
=
AdamRedisConst
.
INFO_THIRD_PARTY
.
concat
(
uid
);
String
rk
=
AdamRedisConst
.
INFO_THIRD_PARTY
.
concat
(
uid
);
List
<
AdamThirdPartInfoVo
>
thirdPartInfoVos
=
(
List
<
AdamThirdPartInfoVo
>)
redisUtil
.
get
(
rk
);
List
<
AdamThirdPartInfoVo
>
thirdPartInfoVos
=
(
List
<
AdamThirdPartInfoVo
>)
redisUtil
.
get
(
rk
);
if
(
CollectionUtils
.
isEmpty
(
thirdPartInfoVos
))
{
if
(
CollectionUtils
.
isEmpty
(
thirdPartInfoVos
))
{
...
@@ -113,6 +122,7 @@ public class AdamRdmServiceImpl implements IAdamRdmService {
...
@@ -113,6 +122,7 @@ public class AdamRdmServiceImpl implements IAdamRdmService {
if
(!
CollectionUtils
.
isEmpty
(
thirdPartInfoVos
))
redisUtil
.
set
(
rk
,
thirdPartInfoVos
);
if
(!
CollectionUtils
.
isEmpty
(
thirdPartInfoVos
))
redisUtil
.
set
(
rk
,
thirdPartInfoVos
);
}
}
log
.
info
(
"mongo redis getThirdPartVoListByUid calltime: "
,
System
.
currentTimeMillis
()
-
startTime
);
return
thirdPartInfoVos
;
return
thirdPartInfoVos
;
}
}
...
@@ -200,6 +210,7 @@ public class AdamRdmServiceImpl implements IAdamRdmService {
...
@@ -200,6 +210,7 @@ public class AdamRdmServiceImpl implements IAdamRdmService {
@Override
@Override
public
AdamUserMemberVo
getUserMemberVoByUid
(
String
uid
)
{
public
AdamUserMemberVo
getUserMemberVoByUid
(
String
uid
)
{
long
startTime
=
System
.
currentTimeMillis
();
String
rk
=
AdamRedisConst
.
INFO_USER_MEMBER
.
concat
(
uid
);
String
rk
=
AdamRedisConst
.
INFO_USER_MEMBER
.
concat
(
uid
);
AdamUserMemberVo
adamUserMemberVo
=
(
AdamUserMemberVo
)
redisUtil
.
get
(
rk
);
AdamUserMemberVo
adamUserMemberVo
=
(
AdamUserMemberVo
)
redisUtil
.
get
(
rk
);
if
(
null
==
adamUserMemberVo
)
{
if
(
null
==
adamUserMemberVo
)
{
...
@@ -207,6 +218,7 @@ public class AdamRdmServiceImpl implements IAdamRdmService {
...
@@ -207,6 +218,7 @@ public class AdamRdmServiceImpl implements IAdamRdmService {
if
(
null
!=
adamUserMemberVo
)
redisUtil
.
set
(
rk
,
adamUserMemberVo
);
if
(
null
!=
adamUserMemberVo
)
redisUtil
.
set
(
rk
,
adamUserMemberVo
);
}
}
log
.
info
(
"mongo redis getUserMemberVoByUid calltime: "
,
System
.
currentTimeMillis
()
-
startTime
);
return
adamUserMemberVo
;
return
adamUserMemberVo
;
}
}
...
@@ -217,6 +229,7 @@ public class AdamRdmServiceImpl implements IAdamRdmService {
...
@@ -217,6 +229,7 @@ public class AdamRdmServiceImpl implements IAdamRdmService {
@Override
@Override
public
AdamMemberSimpleVo
getMemberSimpleVo
()
{
public
AdamMemberSimpleVo
getMemberSimpleVo
()
{
long
startTime
=
System
.
currentTimeMillis
();
AdamMemberSimpleVo
simpleVo
=
(
AdamMemberSimpleVo
)
redisUtil
.
get
(
AdamRedisConst
.
INFO_MEMBER_SIMPLE
);
AdamMemberSimpleVo
simpleVo
=
(
AdamMemberSimpleVo
)
redisUtil
.
get
(
AdamRedisConst
.
INFO_MEMBER_SIMPLE
);
if
(
null
==
simpleVo
)
{
if
(
null
==
simpleVo
)
{
// TODO: 2021/6/8
// TODO: 2021/6/8
...
@@ -226,6 +239,7 @@ public class AdamRdmServiceImpl implements IAdamRdmService {
...
@@ -226,6 +239,7 @@ public class AdamRdmServiceImpl implements IAdamRdmService {
if
(
null
!=
simpleVo
)
redisUtil
.
set
(
AdamRedisConst
.
INFO_MEMBER_SIMPLE
,
simpleVo
);
if
(
null
!=
simpleVo
)
redisUtil
.
set
(
AdamRedisConst
.
INFO_MEMBER_SIMPLE
,
simpleVo
);
}
}
log
.
info
(
"mongo redis getMemberSimpleVo calltime: "
,
System
.
currentTimeMillis
()
-
startTime
);
return
simpleVo
;
return
simpleVo
;
}
}
...
...
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamUserServiceImpl.java
View file @
b021b4bc
...
@@ -17,6 +17,7 @@ import com.mongodb.BasicDBObject;
...
@@ -17,6 +17,7 @@ import com.mongodb.BasicDBObject;
import
com.mongodb.client.model.FindOneAndUpdateOptions
;
import
com.mongodb.client.model.FindOneAndUpdateOptions
;
import
com.mongodb.client.model.ReturnDocument
;
import
com.mongodb.client.model.ReturnDocument
;
import
com.mongodb.client.result.UpdateResult
;
import
com.mongodb.client.result.UpdateResult
;
import
lombok.extern.slf4j.Slf4j
;
import
org.apache.commons.lang3.RandomStringUtils
;
import
org.apache.commons.lang3.RandomStringUtils
;
import
org.apache.commons.lang3.StringUtils
;
import
org.apache.commons.lang3.StringUtils
;
import
org.bson.Document
;
import
org.bson.Document
;
...
@@ -43,6 +44,7 @@ import java.util.List;
...
@@ -43,6 +44,7 @@ import java.util.List;
* @author liquidnet
* @author liquidnet
* @since 2021-05-10
* @since 2021-05-10
*/
*/
@Slf4j
@Service
@Service
public
class
AdamUserServiceImpl
extends
ServiceImpl
<
AdamUserMapper
,
AdamUser
>
implements
IAdamUserService
{
public
class
AdamUserServiceImpl
extends
ServiceImpl
<
AdamUserMapper
,
AdamUser
>
implements
IAdamUserService
{
@Autowired
@Autowired
...
@@ -96,7 +98,9 @@ public class AdamUserServiceImpl extends ServiceImpl<AdamUserMapper, AdamUser> i
...
@@ -96,7 +98,9 @@ public class AdamUserServiceImpl extends ServiceImpl<AdamUserMapper, AdamUser> i
userInfoVo
.
setQrCode
(
"lN"
.
concat
(
userInfoVo
.
getUid
()).
concat
(
RandomStringUtils
.
randomAlphanumeric
(
5
).
toUpperCase
()));
userInfoVo
.
setQrCode
(
"lN"
.
concat
(
userInfoVo
.
getUid
()).
concat
(
RandomStringUtils
.
randomAlphanumeric
(
5
).
toUpperCase
()));
userInfoVo
.
setCreateAt
(
nowStr
);
userInfoVo
.
setCreateAt
(
nowStr
);
long
startTime
=
System
.
currentTimeMillis
();
AdamUserInfoVo
insert
=
mongoTemplate
.
insert
(
userInfoVo
,
AdamUserInfoVo
.
class
.
getSimpleName
());
AdamUserInfoVo
insert
=
mongoTemplate
.
insert
(
userInfoVo
,
AdamUserInfoVo
.
class
.
getSimpleName
());
log
.
info
(
"mongodb register insert calltime: "
,
System
.
currentTimeMillis
()
-
startTime
);
List
<
Object
>
paramList
=
Arrays
.
asList
(
userInfoVo
.
getUid
(),
userInfoVo
.
getMobile
(),
userInfoVo
.
getState
(),
now
);
List
<
Object
>
paramList
=
Arrays
.
asList
(
userInfoVo
.
getUid
(),
userInfoVo
.
getMobile
(),
userInfoVo
.
getState
(),
now
);
// rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
// rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment