Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
X
xyqb-user2
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
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
head_group
xyqb-user2
Commits
01e0cadc
Commit
01e0cadc
authored
Jul 12, 2023
by
王亮
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix an issue.
parent
255ec988
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
29 additions
and
9 deletions
+29
-9
ISessionService.java
...a/cn/quantgroup/xyqb/service/session/ISessionService.java
+14
-1
SessionServiceImpl.java
...ntgroup/xyqb/service/session/impl/SessionServiceImpl.java
+10
-3
PhonePasswordLoginStrategy.java
...uantgroup/xyqb/service/v2/PhonePasswordLoginStrategy.java
+1
-1
SMSDirectJiLoginStrategy.java
.../quantgroup/xyqb/service/v2/SMSDirectJiLoginStrategy.java
+1
-1
SMSLoginStrategy.java
.../java/cn/quantgroup/xyqb/service/v2/SMSLoginStrategy.java
+1
-1
WechatMiniLoginStrategy.java
...n/quantgroup/xyqb/service/v2/WechatMiniLoginStrategy.java
+1
-1
WechatMiniPhoneLoginStrategy.java
...ntgroup/xyqb/service/v2/WechatMiniPhoneLoginStrategy.java
+1
-1
No files found.
src/main/java/cn/quantgroup/xyqb/service/session/ISessionService.java
View file @
01e0cadc
...
...
@@ -44,9 +44,22 @@ public interface ISessionService {
* @param user - 登录用户
* @param loginProperties - 登录参数
* @param ordinal - 登录方式
* @return
* @return
AuthBean
*/
AuthBean
createSession
(
User
user
,
LoginProperties
loginProperties
,
int
ordinal
,
Integer
tenantId
);
/**
* 更新session
* 用户信息存在,更新session中的最后访问时间,重新写入缓存.
* 存在则保存用户session信息,userId为uuid
*
* @param user 用户表
* @param loginProperties 登录信息
* @param ordinal 登录类型
* @param tenantId 租户id
* @param send 是否发送登录成功消息
* @return AuthBean
*/
AuthBean
createSession
(
User
user
,
LoginProperties
loginProperties
,
int
ordinal
,
Integer
tenantId
,
boolean
send
);
}
src/main/java/cn/quantgroup/xyqb/service/session/impl/SessionServiceImpl.java
View file @
01e0cadc
...
...
@@ -64,6 +64,10 @@ public class SessionServiceImpl implements ISessionService {
*/
@Override
public
AuthBean
createSession
(
User
user
,
LoginProperties
properties
,
int
loginType
,
Integer
tenantId
)
{
return
this
.
createSession
(
user
,
properties
,
loginType
,
tenantId
,
true
);
}
public
AuthBean
createSession
(
User
user
,
LoginProperties
properties
,
int
loginType
,
Integer
tenantId
,
boolean
send
){
//找到用户
//TODO: 使用userId
String
sessionId
=
findSessionIdByUserIdLoginProperties
(
user
.
getId
(),
properties
,
tenantId
);
...
...
@@ -91,13 +95,16 @@ public class SessionServiceImpl implements ISessionService {
// 添加登陆日志
loginRecordService
.
saveLoginRecord
(
user
.
getId
(),
RecordType
.
LOGINRECORD
.
getName
(),
loginType
);
//更新user_tag记录
applicationEventPublisher
.
publishEvent
(
new
UserLoginEvent
(
this
,
UserTag
.
builder
()
.
userId
(
user
.
getId
()).
registeredFrom
(
sessionStruct
.
getRegisteredFrom
()).
tenantId
(
user
.
getTenantId
()).
build
()));
if
(
send
){
//更新user_tag记录
applicationEventPublisher
.
publishEvent
(
new
UserLoginEvent
(
this
,
UserTag
.
builder
()
.
userId
(
user
.
getId
()).
registeredFrom
(
sessionStruct
.
getRegisteredFrom
()).
tenantId
(
user
.
getTenantId
()).
build
()));
}
return
authBean
;
}
@Override
public
SessionStruct
createSessionAndPersist
(
User
user
,
LoginProperties
properties
,
Integer
tenantId
)
{
SessionStruct
sessionStruct
;
...
...
src/main/java/cn/quantgroup/xyqb/service/v2/PhonePasswordLoginStrategy.java
View file @
01e0cadc
...
...
@@ -95,7 +95,7 @@ public class PhonePasswordLoginStrategy implements LoginStrategy {
lockIpv4Service
.
unLockPhone
(
phonePasswordLoginParam
.
getPhone
());
LoginProperties
loginProperties
=
new
LoginProperties
(
1
,
sessionStruct
.
getRegisteredFrom
(),
sessionStruct
.
getTenantId
());
AuthBean
authBean
=
sessionService
.
createSession
(
user
,
loginProperties
,
LoginType
.
ACCOUNTPASSWORD
.
ordinal
(),
sessionStruct
.
getTenantId
());
AuthBean
authBean
=
sessionService
.
createSession
(
user
,
loginProperties
,
LoginType
.
ACCOUNTPASSWORD
.
ordinal
(),
sessionStruct
.
getTenantId
()
,
false
);
LoginBean
loginBean
=
new
LoginBean
();
if
(
authBean
!=
null
)
{
authBean
.
setRegister
(
false
);
...
...
src/main/java/cn/quantgroup/xyqb/service/v2/SMSDirectJiLoginStrategy.java
View file @
01e0cadc
...
...
@@ -126,7 +126,7 @@ public class SMSDirectJiLoginStrategy implements LoginStrategy {
LoginProperties
loginProperties
=
new
LoginProperties
(
1
,
sessionStruct
.
getRegisteredFrom
(),
sessionStruct
.
getTenantId
());
AuthBean
authBean
=
sessionService
.
createSession
(
user
,
loginProperties
,
LoginType
.
AUTHLOGIN
.
ordinal
(),
sessionStruct
.
getTenantId
());
AuthBean
authBean
=
sessionService
.
createSession
(
user
,
loginProperties
,
LoginType
.
AUTHLOGIN
.
ordinal
(),
sessionStruct
.
getTenantId
()
,
false
);
LoginBean
loginBean
=
new
LoginBean
();
if
(
authBean
!=
null
)
{
loginBean
.
setToken
(
authBean
.
getToken
());
...
...
src/main/java/cn/quantgroup/xyqb/service/v2/SMSLoginStrategy.java
View file @
01e0cadc
...
...
@@ -116,7 +116,7 @@ public class SMSLoginStrategy implements LoginStrategy {
LoginProperties
loginProperties
=
new
LoginProperties
(
1
,
sessionStruct
.
getRegisteredFrom
(),
sessionStruct
.
getTenantId
());
AuthBean
authBean
=
sessionService
.
createSession
(
user
,
loginProperties
,
LoginType
.
VERIFICATIONCODE
.
ordinal
(),
sessionStruct
.
getTenantId
());
AuthBean
authBean
=
sessionService
.
createSession
(
user
,
loginProperties
,
LoginType
.
VERIFICATIONCODE
.
ordinal
(),
sessionStruct
.
getTenantId
()
,
false
);
LoginBean
loginBean
=
new
LoginBean
();
if
(
authBean
!=
null
)
{
loginBean
.
setToken
(
authBean
.
getToken
());
...
...
src/main/java/cn/quantgroup/xyqb/service/v2/WechatMiniLoginStrategy.java
View file @
01e0cadc
...
...
@@ -114,7 +114,7 @@ public class WechatMiniLoginStrategy implements LoginStrategy {
LoginProperties
loginProperties
=
new
LoginProperties
(
1
,
sessionStruct
.
getRegisteredFrom
(),
sessionStruct
.
getTenantId
());
AuthBean
authBean
=
null
;
if
(
user
!=
null
)
{
authBean
=
sessionService
.
createSession
(
user
,
loginProperties
,
LoginType
.
WECHATLOGIN
.
ordinal
(),
sessionStruct
.
getTenantId
());
authBean
=
sessionService
.
createSession
(
user
,
loginProperties
,
LoginType
.
WECHATLOGIN
.
ordinal
(),
sessionStruct
.
getTenantId
()
,
false
);
}
//TODO:需要针对微信登录用户签发token
LoginBean
loginBean
=
new
LoginBean
();
...
...
src/main/java/cn/quantgroup/xyqb/service/v2/WechatMiniPhoneLoginStrategy.java
View file @
01e0cadc
...
...
@@ -141,7 +141,7 @@ public class WechatMiniPhoneLoginStrategy implements LoginStrategy {
}
LoginProperties
loginProperties
=
new
LoginProperties
(
1
,
sessionStruct
.
getRegisteredFrom
(),
sessionStruct
.
getTenantId
());
AuthBean
authBean
=
sessionService
.
createSession
(
user
,
loginProperties
,
LoginType
.
WECHATLOGIN
.
ordinal
(),
sessionStruct
.
getTenantId
());
AuthBean
authBean
=
sessionService
.
createSession
(
user
,
loginProperties
,
LoginType
.
WECHATLOGIN
.
ordinal
(),
sessionStruct
.
getTenantId
()
,
false
);
LoginBean
loginBean
=
new
LoginBean
();
if
(
authBean
!=
null
)
{
loginBean
.
setToken
(
authBean
.
getToken
());
...
...
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