Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
提交反馈
为 GitLab 提交贡献
登录
切换导航
P
pica-cloud-account
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
1
合并请求
1
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
收起侧边栏
Close sidebar
动态
分支图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
com.pica.cloud.account
pica-cloud-account
提交
7f261835
提交
7f261835
编写于
2月 24, 2020
作者:
rushui.chen
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
20200224 token变更日志记录
上级
c5ee68c9
流水线
#21923
已失败 于阶段
in 0 second
变更
6
流水线
1
隐藏空白字符变更
内嵌
并排
正在显示
6 个修改的文件
包含
19 行增加
和
7 行删除
+19
-7
LoginController.java
...ud/account/account/server/controller/LoginController.java
+2
-1
LogLoginEntity.java
...a/cloud/account/account/server/entity/LogLoginEntity.java
+10
-0
AccountLogEntityUtils.java
...oud/account/account/server/log/AccountLogEntityUtils.java
+2
-1
LoginServiceImpl.java
...account/account/server/service/impl/LoginServiceImpl.java
+2
-2
RegisterServiceImpl.java
...ount/account/server/service/impl/RegisterServiceImpl.java
+1
-1
LogLoginEntityMapper.xml
server/src/main/resources/mybatis/LogLoginEntityMapper.xml
+2
-2
未找到文件。
server/src/main/java/com/pica/cloud/account/account/server/controller/LoginController.java
浏览文件 @
7f261835
...
@@ -181,7 +181,8 @@ public class LoginController extends AccountBaseController {
...
@@ -181,7 +181,8 @@ public class LoginController extends AccountBaseController {
Map
<
String
,
Object
>
headersMap
=
super
.
getHeaders
();
Map
<
String
,
Object
>
headersMap
=
super
.
getHeaders
();
String
newToken
=
tokenService
.
getToken
(
headersMap
);
String
newToken
=
tokenService
.
getToken
(
headersMap
);
LogLoginEntity
entity
=
AccountLogEntityUtils
.
getLogLoginEntity
(
acctId
,
super
.
getProductType
(),
super
.
getSourceType
(),
LogLoginEntity
entity
=
AccountLogEntityUtils
.
getLogLoginEntity
(
acctId
,
super
.
getProductType
(),
super
.
getSourceType
(),
AccountTypeEnum
.
LOGIN_OUT
.
getCode
(),
super
.
getIpAddr
(),
AccountTypeEnum
.
LOGIN_STATUS_SUCCESS
.
getCode
(),
AccountTypeEnum
.
LOG_TYPE_LOGIN
.
getCode
());
AccountTypeEnum
.
LOGIN_OUT
.
getCode
(),
super
.
getIpAddr
(),
AccountTypeEnum
.
LOGIN_STATUS_SUCCESS
.
getCode
(),
AccountTypeEnum
.
LOG_TYPE_LOGIN
.
getCode
(),
newToken
);
picaLogUtils
.
info
(
entity
);
picaLogUtils
.
info
(
entity
);
return
PicaResponse
.
toResponse
(
newToken
);
return
PicaResponse
.
toResponse
(
newToken
);
}
else
{
}
else
{
...
...
server/src/main/java/com/pica/cloud/account/account/server/entity/LogLoginEntity.java
浏览文件 @
7f261835
...
@@ -38,6 +38,8 @@ public class LogLoginEntity extends AccountLogEntity {
...
@@ -38,6 +38,8 @@ public class LogLoginEntity extends AccountLogEntity {
private
int
deleteFlag
;
private
int
deleteFlag
;
private
String
token
;
public
Integer
getId
()
{
public
Integer
getId
()
{
return
id
;
return
id
;
}
}
...
@@ -149,4 +151,12 @@ public class LogLoginEntity extends AccountLogEntity {
...
@@ -149,4 +151,12 @@ public class LogLoginEntity extends AccountLogEntity {
public
void
setDeleteFlag
(
int
deleteFlag
)
{
public
void
setDeleteFlag
(
int
deleteFlag
)
{
this
.
deleteFlag
=
deleteFlag
;
this
.
deleteFlag
=
deleteFlag
;
}
}
public
String
getToken
()
{
return
token
;
}
public
void
setToken
(
String
token
)
{
this
.
token
=
token
;
}
}
}
\ No newline at end of file
server/src/main/java/com/pica/cloud/account/account/server/log/AccountLogEntityUtils.java
浏览文件 @
7f261835
...
@@ -21,7 +21,7 @@ public class AccountLogEntityUtils {
...
@@ -21,7 +21,7 @@ public class AccountLogEntityUtils {
* @return
* @return
*/
*/
public
static
LogLoginEntity
getLogLoginEntity
(
Integer
acctId
,
Integer
productType
,
Integer
sourceType
,
public
static
LogLoginEntity
getLogLoginEntity
(
Integer
acctId
,
Integer
productType
,
Integer
sourceType
,
int
code
,
String
ipAddr
,
int
code1
,
int
code2
)
{
int
code
,
String
ipAddr
,
int
code1
,
int
code2
,
String
token
)
{
LogLoginEntity
entity
=
new
LogLoginEntity
();
LogLoginEntity
entity
=
new
LogLoginEntity
();
Date
currentTime
=
new
Date
();
Date
currentTime
=
new
Date
();
entity
.
setAcctId
(
acctId
);
entity
.
setAcctId
(
acctId
);
...
@@ -37,6 +37,7 @@ public class AccountLogEntityUtils {
...
@@ -37,6 +37,7 @@ public class AccountLogEntityUtils {
entity
.
setLoginIp
(
ipAddr
);
entity
.
setLoginIp
(
ipAddr
);
entity
.
setLoginStatus
(
code1
);
entity
.
setLoginStatus
(
code1
);
entity
.
setLogType
(
code2
);
entity
.
setLogType
(
code2
);
entity
.
setToken
(
token
);
return
entity
;
return
entity
;
}
}
...
...
server/src/main/java/com/pica/cloud/account/account/server/service/impl/LoginServiceImpl.java
浏览文件 @
7f261835
...
@@ -133,7 +133,7 @@ public class LoginServiceImpl implements LoginService {
...
@@ -133,7 +133,7 @@ public class LoginServiceImpl implements LoginService {
LogLoginEntity
entity
=
AccountLogEntityUtils
.
getLogLoginEntity
(
acctId
,
productType
,
sourceType
,
LogLoginEntity
entity
=
AccountLogEntityUtils
.
getLogLoginEntity
(
acctId
,
productType
,
sourceType
,
AccountTypeEnum
.
LOGIN_PWD
.
getCode
(),
request
.
getLoginIp
(),
AccountTypeEnum
.
LOGIN_STATUS_SUCCESS
.
getCode
(),
AccountTypeEnum
.
LOGIN_PWD
.
getCode
(),
request
.
getLoginIp
(),
AccountTypeEnum
.
LOGIN_STATUS_SUCCESS
.
getCode
(),
AccountTypeEnum
.
LOG_TYPE_LOGIN
.
getCode
());
AccountTypeEnum
.
LOG_TYPE_LOGIN
.
getCode
()
,
newToken
);
picaLogUtils
.
info
(
entity
);
picaLogUtils
.
info
(
entity
);
return
result
;
return
result
;
...
@@ -188,7 +188,7 @@ public class LoginServiceImpl implements LoginService {
...
@@ -188,7 +188,7 @@ public class LoginServiceImpl implements LoginService {
}
}
//记录登录日志
//记录登录日志
LogLoginEntity
entity
=
AccountLogEntityUtils
.
getLogLoginEntity
(
acctId
,
baseRequest
.
getProductType
(),
baseRequest
.
getSourceType
(),
LogLoginEntity
entity
=
AccountLogEntityUtils
.
getLogLoginEntity
(
acctId
,
baseRequest
.
getProductType
(),
baseRequest
.
getSourceType
(),
loginType
,
baseRequest
.
getLoginIp
(),
AccountTypeEnum
.
LOGIN_STATUS_SUCCESS
.
getCode
(),
AccountTypeEnum
.
LOG_TYPE_LOGIN
.
getCode
());
loginType
,
baseRequest
.
getLoginIp
(),
AccountTypeEnum
.
LOGIN_STATUS_SUCCESS
.
getCode
(),
AccountTypeEnum
.
LOG_TYPE_LOGIN
.
getCode
()
,
newToken
);
picaLogUtils
.
info
(
entity
);
picaLogUtils
.
info
(
entity
);
return
result
;
return
result
;
}
}
...
...
server/src/main/java/com/pica/cloud/account/account/server/service/impl/RegisterServiceImpl.java
浏览文件 @
7f261835
...
@@ -151,7 +151,7 @@ public class RegisterServiceImpl implements RegisterService {
...
@@ -151,7 +151,7 @@ public class RegisterServiceImpl implements RegisterService {
queueProducer.send(bos.toByteArray());*/
queueProducer.send(bos.toByteArray());*/
LogLoginEntity
entity
=
AccountLogEntityUtils
.
getLogLoginEntity
(
acctId
,
productType
,
baseRequest
.
getSourceType
(),
LogLoginEntity
entity
=
AccountLogEntityUtils
.
getLogLoginEntity
(
acctId
,
productType
,
baseRequest
.
getSourceType
(),
AccountTypeEnum
.
LOGIN_REGISTER
.
getCode
(),
baseRequest
.
getLoginIp
(),
AccountTypeEnum
.
LOGIN_STATUS_SUCCESS
.
getCode
(),
AccountTypeEnum
.
LOGIN_REGISTER
.
getCode
(),
baseRequest
.
getLoginIp
(),
AccountTypeEnum
.
LOGIN_STATUS_SUCCESS
.
getCode
(),
AccountTypeEnum
.
LOG_TYPE_LOGIN
.
getCode
());
AccountTypeEnum
.
LOG_TYPE_LOGIN
.
getCode
()
,
newToken
);
picaLogUtils
.
info
(
entity
);
picaLogUtils
.
info
(
entity
);
processAgreement
(
userId
);
processAgreement
(
userId
);
processRoleMap
(
userId
);
processRoleMap
(
userId
);
...
...
server/src/main/resources/mybatis/LogLoginEntityMapper.xml
浏览文件 @
7f261835
...
@@ -37,12 +37,12 @@
...
@@ -37,12 +37,12 @@
product_type, source_type, login_type,
product_type, source_type, login_type,
login_ip, login_time, login_status,
login_ip, login_time, login_status,
create_id, create_time, modify_id,
create_id, create_time, modify_id,
modify_time, delete_flag)
modify_time, delete_flag
,token
)
values (#{acctId,jdbcType=INTEGER}, #{acctName,jdbcType=VARCHAR},
values (#{acctId,jdbcType=INTEGER}, #{acctName,jdbcType=VARCHAR},
#{productType,jdbcType=TINYINT}, #{sourceType,jdbcType=TINYINT}, #{loginType,jdbcType=TINYINT},
#{productType,jdbcType=TINYINT}, #{sourceType,jdbcType=TINYINT}, #{loginType,jdbcType=TINYINT},
#{loginIp,jdbcType=VARCHAR}, #{loginTime,jdbcType=TIMESTAMP}, #{loginStatus,jdbcType=TINYINT},
#{loginIp,jdbcType=VARCHAR}, #{loginTime,jdbcType=TIMESTAMP}, #{loginStatus,jdbcType=TINYINT},
#{createId,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{modifyId,jdbcType=INTEGER},
#{createId,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{modifyId,jdbcType=INTEGER},
#{modifyTime,jdbcType=TIMESTAMP}, #{deleteFlag,jdbcType=TINYINT})
#{modifyTime,jdbcType=TIMESTAMP}, #{deleteFlag,jdbcType=TINYINT}
,#{token}
)
</insert>
</insert>
...
...
写
预览
Markdown
格式
0%
请重试
or
附加一个文件
附加文件
取消
您添加了
0
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录