Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
log-platform
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
赵啸非
log-platform
Commits
14e1f2c3
Commit
14e1f2c3
authored
Jul 12, 2023
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改查询时间段
parent
3342e152
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
21 additions
and
13 deletions
+21
-13
log-manager/src/main/java/com/mortals/xhx/module/error/web/ErrorLogController.java
.../com/mortals/xhx/module/error/web/ErrorLogController.java
+6
-1
log-manager/src/test/java/com/mortals/httpclient/error/ErrorLogController.http
...java/com/mortals/httpclient/error/ErrorLogController.http
+12
-12
log-manager/src/test/java/com/mortals/httpclient/http-client.env.json
...src/test/java/com/mortals/httpclient/http-client.env.json
+3
-0
No files found.
log-manager/src/main/java/com/mortals/xhx/module/error/web/ErrorLogController.java
View file @
14e1f2c3
...
@@ -49,7 +49,12 @@ public class ErrorLogController extends BaseCRUDJsonBodyMappingController<ErrorL
...
@@ -49,7 +49,12 @@ public class ErrorLogController extends BaseCRUDJsonBodyMappingController<ErrorL
protected
void
init
(
Map
<
String
,
Object
>
model
,
Context
context
)
{
protected
void
init
(
Map
<
String
,
Object
>
model
,
Context
context
)
{
this
.
addDict
(
model
,
"platform"
,
paramService
.
getParamBySecondOrganize
(
"ErrorLog"
,
"platform"
));
this
.
addDict
(
model
,
"platform"
,
paramService
.
getParamBySecondOrganize
(
"ErrorLog"
,
"platform"
));
this
.
addDict
(
model
,
"level"
,
paramService
.
getParamBySecondOrganize
(
"ErrorLog"
,
"level"
));
this
.
addDict
(
model
,
"level"
,
paramService
.
getParamBySecondOrganize
(
"ErrorLog"
,
"level"
));
this
.
addDict
(
model
,
"appName"
,
paramService
.
getParamBySecondOrganize
(
"OperateLog"
,
"platformMark"
));
Map
<
String
,
String
>
map
=
paramService
.
getParamBySecondOrganize
(
"BizLog"
,
"appName"
);
Map
<
String
,
String
>
map1
=
paramService
.
getParamBySecondOrganize
(
"OperateLog"
,
"platformMark"
);
map
.
putAll
(
map1
);
this
.
addDict
(
model
,
"appName"
,
map
);
super
.
init
(
model
,
context
);
super
.
init
(
model
,
context
);
}
}
...
...
log-manager/src/test/java/com/mortals/httpclient/error/ErrorLogController.http
View file @
14e1f2c3
...
@@ -33,21 +33,21 @@ Content-Type: application/json
...
@@ -33,21 +33,21 @@ Content-Type: application/json
{
{
"traceID":"64364f4f9b8d47e61cb6b24c",
"traceID":"64364f4f9b8d47e61cb6b24c",
"appName":"
portal
-manager",
"appName":"
device
-manager",
"hostName":"",
"hostName":"",
"message":"
更新失败
!",
"message":"
设备离线
!",
"platform":"
java
",
"platform":"
android
",
"culprit":"com.mortals.xhx.module.page.dao.ibatis.PageAccessDaoImpl.insert",
"culprit":"com.mortals.xhx.module.page.dao.ibatis.PageAccessDaoImpl.insert",
"tags":"
sw7jp2
",
"tags":"
app,system
",
"level":"
INFO
",
"level":"
ERROR
",
"environment":"
ayr3ua
",
"environment":"",
"releaseVersion":"
chxwkw
",
"releaseVersion":"",
"fingerprint":"
2txnit
",
"fingerprint":"",
"threadNo":"
2z9vq4
",
"threadNo":"
http-nio-17212-exec-1138
",
"checkNum":1,
"checkNum":1,
"errorStack":"
z3yxnh
",
"errorStack":"
at com.mortals.framework.springcloud.aspectj.LogAspect.logThrowing(LogAspect.java:99)
",
"context":"
az7aus
",
"context":"",
"extra":"
9c0pnj
",
"extra":"",
"logTime":"1688695785180"
"logTime":"1688695785180"
}
}
...
...
log-manager/src/test/java/com/mortals/httpclient/http-client.env.json
View file @
14e1f2c3
...
@@ -11,6 +11,9 @@
...
@@ -11,6 +11,9 @@
"baseUrl"
:
"http://192.168.0.98:11078/logservice"
,
"baseUrl"
:
"http://192.168.0.98:11078/logservice"
,
"baseLogin"
:
"http://192.168.0.98:11078/zwfw"
"baseLogin"
:
"http://192.168.0.98:11078/zwfw"
},
},
"base-yibin-web"
:
{
"baseUrl"
:
"http://112.19.80.237:11078/logservice"
},
"portal"
:
{
"portal"
:
{
"baseUrl"
:
"http://192.168.0.98:11072/zwfw"
,
"baseUrl"
:
"http://192.168.0.98:11072/zwfw"
,
"baseLogin"
:
"http://192.168.0.98:11078/base"
"baseLogin"
:
"http://192.168.0.98:11078/base"
...
...
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