Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
计全科技
jeepay
提交
893297f6
jeepay
项目概览
计全科技
/
jeepay
通知
10
Star
3
Fork
2
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
6
Wiki
分析
仓库
DevOps
项目成员
Pages
jeepay
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
6
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
893297f6
编写于
6月 15, 2021
作者:
X
xiaoyu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
日志输出优化、商户操作用户增加日志
上级
0268fb97
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
27 addition
and
18 deletion
+27
-18
jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/aop/MethodLogAop.java
...rc/main/java/com/jeequan/jeepay/mgr/aop/MethodLogAop.java
+12
-9
jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/aop/MethodLogAop.java
...rc/main/java/com/jeequan/jeepay/mch/aop/MethodLogAop.java
+12
-9
jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/sysuser/SysUserController.java
...om/jeequan/jeepay/mch/ctrl/sysuser/SysUserController.java
+3
-0
未找到文件。
jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/aop/MethodLogAop.java
浏览文件 @
893297f6
...
...
@@ -20,6 +20,7 @@ import com.jeequan.jeepay.core.aop.MethodLog;
import
com.jeequan.jeepay.core.beans.RequestKitBean
;
import
com.jeequan.jeepay.core.constants.CS
;
import
com.jeequan.jeepay.core.entity.SysLog
;
import
com.jeequan.jeepay.core.exception.BizException
;
import
com.jeequan.jeepay.core.model.security.JeeUserDetails
;
import
com.jeequan.jeepay.service.impl.SysLogService
;
import
org.aspectj.lang.JoinPoint
;
...
...
@@ -83,17 +84,13 @@ public class MethodLogAop {
public
Object
around
(
ProceedingJoinPoint
point
)
throws
Throwable
{
final
SysLog
sysLog
=
new
SysLog
();
// 基础日志信息
setBaseLogInfo
(
point
,
sysLog
);
//处理切面任务 发生异常将向外抛出 不记录日志
Object
result
=
point
.
proceed
();
try
{
sysLog
.
setUserId
(
JeeUserDetails
.
getCurrentUserDetails
().
getSysUser
().
getSysUserId
());
sysLog
.
setUserName
(
JeeUserDetails
.
getCurrentUserDetails
().
getSysUser
().
getRealname
());
sysLog
.
setSystem
(
JeeUserDetails
.
getCurrentUserDetails
().
getSysUser
().
getSystem
());
// 基础日志信息
setBaseLogInfo
(
point
,
sysLog
,
JeeUserDetails
.
getCurrentUserDetails
());
sysLog
.
setOptResInfo
(
JSONObject
.
toJSON
(
result
).
toString
());
scheduledThreadPool
.
execute
(()
->
sysLogService
.
save
(
sysLog
));
}
catch
(
Exception
e
)
{
logger
.
error
(
"methodLogError"
,
e
);
...
...
@@ -111,8 +108,8 @@ public class MethodLogAop {
public
void
doException
(
JoinPoint
joinPoint
,
Throwable
e
)
throws
Exception
{
final
SysLog
sysLog
=
new
SysLog
();
// 基础日志信息
setBaseLogInfo
(
joinPoint
,
sysLog
);
sysLog
.
setOptResInfo
(
"请求异常"
);
setBaseLogInfo
(
joinPoint
,
sysLog
,
JeeUserDetails
.
getCurrentUserDetails
()
);
sysLog
.
setOptResInfo
(
e
instanceof
BizException
?
e
.
getMessage
()
:
"请求异常"
);
scheduledThreadPool
.
execute
(()
->
sysLogService
.
save
(
sysLog
));
}
...
...
@@ -139,7 +136,7 @@ public class MethodLogAop {
* @date: 2021/6/7 14:12
* @describe: 日志基本信息 公共方法
*/
private
void
setBaseLogInfo
(
JoinPoint
joinPoint
,
SysLog
sysLog
)
throws
Exception
{
private
void
setBaseLogInfo
(
JoinPoint
joinPoint
,
SysLog
sysLog
,
JeeUserDetails
userDetails
)
throws
Exception
{
// 使用point.getArgs()可获取request,仅限于spring MVC参数包含request,改为通过contextHolder获取。
HttpServletRequest
request
=
((
ServletRequestAttributes
)
RequestContextHolder
.
getRequestAttributes
()).
getRequest
();
...
...
@@ -159,6 +156,12 @@ public class MethodLogAop {
sysLog
.
setUserIp
(
requestKitBean
.
getClientIp
());
sysLog
.
setCreatedAt
(
new
Date
());
sysLog
.
setSystem
(
CS
.
SYS_TYPE
.
MGR
);
if
(
userDetails
!=
null
)
{
sysLog
.
setUserId
(
JeeUserDetails
.
getCurrentUserDetails
().
getSysUser
().
getSysUserId
());
sysLog
.
setUserName
(
JeeUserDetails
.
getCurrentUserDetails
().
getSysUser
().
getRealname
());
sysLog
.
setSystem
(
JeeUserDetails
.
getCurrentUserDetails
().
getSysUser
().
getSystem
());
}
}
}
jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/aop/MethodLogAop.java
浏览文件 @
893297f6
...
...
@@ -20,6 +20,7 @@ import com.jeequan.jeepay.core.aop.MethodLog;
import
com.jeequan.jeepay.core.beans.RequestKitBean
;
import
com.jeequan.jeepay.core.constants.CS
;
import
com.jeequan.jeepay.core.entity.SysLog
;
import
com.jeequan.jeepay.core.exception.BizException
;
import
com.jeequan.jeepay.core.model.security.JeeUserDetails
;
import
com.jeequan.jeepay.service.impl.SysLogService
;
import
org.aspectj.lang.JoinPoint
;
...
...
@@ -82,18 +83,14 @@ public class MethodLogAop{
public
Object
around
(
ProceedingJoinPoint
point
)
throws
Throwable
{
final
SysLog
sysLog
=
new
SysLog
();
// 基础日志信息
setBaseLogInfo
(
point
,
sysLog
);
//处理切面任务 发生异常将向外抛出 不记录日志
Object
result
=
point
.
proceed
();
try
{
sysLog
.
setUserId
(
JeeUserDetails
.
getCurrentUserDetails
().
getSysUser
().
getSysUserId
());
sysLog
.
setUserName
(
JeeUserDetails
.
getCurrentUserDetails
().
getSysUser
().
getRealname
());
sysLog
.
setSystem
(
JeeUserDetails
.
getCurrentUserDetails
().
getSysUser
().
getSystem
());
// 基础日志信息
setBaseLogInfo
(
point
,
sysLog
,
JeeUserDetails
.
getCurrentUserDetails
());
sysLog
.
setOptResInfo
(
JSONObject
.
toJSON
(
result
).
toString
());
scheduledThreadPool
.
execute
(
new
Runnable
()
{
@Override
public
void
run
()
{
...
...
@@ -116,8 +113,8 @@ public class MethodLogAop{
public
void
doException
(
JoinPoint
joinPoint
,
Throwable
e
)
throws
Exception
{
final
SysLog
sysLog
=
new
SysLog
();
// 基础日志信息
setBaseLogInfo
(
joinPoint
,
sysLog
);
sysLog
.
setOptResInfo
(
"请求异常"
);
setBaseLogInfo
(
joinPoint
,
sysLog
,
JeeUserDetails
.
getCurrentUserDetails
()
);
sysLog
.
setOptResInfo
(
e
instanceof
BizException
?
e
.
getMessage
()
:
"请求异常"
);
scheduledThreadPool
.
execute
(()
->
sysLogService
.
save
(
sysLog
));
}
...
...
@@ -144,7 +141,7 @@ public class MethodLogAop{
* @date: 2021/6/7 14:12
* @describe: 日志基本信息 公共方法
*/
private
void
setBaseLogInfo
(
JoinPoint
joinPoint
,
SysLog
sysLog
)
throws
Exception
{
private
void
setBaseLogInfo
(
JoinPoint
joinPoint
,
SysLog
sysLog
,
JeeUserDetails
userDetails
)
throws
Exception
{
// 使用point.getArgs()可获取request,仅限于spring MVC参数包含request,改为通过contextHolder获取。
HttpServletRequest
request
=
((
ServletRequestAttributes
)
RequestContextHolder
.
getRequestAttributes
()).
getRequest
();
...
...
@@ -164,6 +161,12 @@ public class MethodLogAop{
sysLog
.
setUserIp
(
requestKitBean
.
getClientIp
());
sysLog
.
setCreatedAt
(
new
Date
());
sysLog
.
setSystem
(
CS
.
SYS_TYPE
.
MCH
);
if
(
userDetails
!=
null
)
{
sysLog
.
setUserId
(
JeeUserDetails
.
getCurrentUserDetails
().
getSysUser
().
getSysUserId
());
sysLog
.
setUserName
(
JeeUserDetails
.
getCurrentUserDetails
().
getSysUser
().
getRealname
());
sysLog
.
setSystem
(
JeeUserDetails
.
getCurrentUserDetails
().
getSysUser
().
getSystem
());
}
}
}
jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/sysuser/SysUserController.java
浏览文件 @
893297f6
...
...
@@ -17,6 +17,7 @@ package com.jeequan.jeepay.mch.ctrl.sysuser;
import
com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.jeequan.jeepay.core.aop.MethodLog
;
import
com.jeequan.jeepay.core.constants.ApiCodeEnum
;
import
com.jeequan.jeepay.core.constants.CS
;
import
com.jeequan.jeepay.core.entity.SysUser
;
...
...
@@ -94,6 +95,7 @@ public class SysUserController extends CommonCtrl {
/** add */
@PreAuthorize
(
"hasAuthority( 'ENT_UR_USER_ADD' )"
)
@RequestMapping
(
value
=
""
,
method
=
RequestMethod
.
POST
)
@MethodLog
(
remark
=
"添加管理员"
)
public
ApiRes
add
()
{
SysUser
sysUser
=
getObject
(
SysUser
.
class
);
sysUser
.
setBelongInfoId
(
getCurrentUser
().
getSysUser
().
getBelongInfoId
());
...
...
@@ -130,6 +132,7 @@ public class SysUserController extends CommonCtrl {
/** update */
@PreAuthorize
(
"hasAuthority( 'ENT_UR_USER_EDIT' )"
)
@RequestMapping
(
value
=
"/{recordId}"
,
method
=
RequestMethod
.
PUT
)
@MethodLog
(
remark
=
"修改操作员信息"
)
public
ApiRes
update
(
@PathVariable
(
"recordId"
)
Long
recordId
)
{
SysUser
sysUser
=
getObject
(
SysUser
.
class
);
sysUser
.
setSysUserId
(
recordId
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录