Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
B
brandkbs2
Overview
Overview
Details
Activity
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
shenjunjie
brandkbs2
Commits
754300ff
Commit
754300ff
authored
Apr 17, 2024
by
shenjunjie
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'feature' into 'release'
Feature See merge request
!482
parents
f29de156
d5bac37b
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
pom.xml
+1
-1
src/main/java/com/zhiwei/brandkbs2/controller/app/AppIndexController.java
+1
-1
src/main/java/com/zhiwei/brandkbs2/exception/ExceptionCatch.java
+1
-1
No files found.
pom.xml
View file @
754300ff
...
...
@@ -35,7 +35,7 @@
<dubbo.version>
2.7.4.1
</dubbo.version>
<curator.version>
2.12.0
</curator.version>
<push.log.version>
2.17.0-SNAPSHOT
</push.log.version>
<event-client.version>
1.0.9.
8
-SNAPSHOT
</event-client.version>
<event-client.version>
1.0.9.
9
-SNAPSHOT
</event-client.version>
<cleaner-unified-filter.version>
1.1.5-SNAPSHOT
</cleaner-unified-filter.version>
</properties>
...
...
src/main/java/com/zhiwei/brandkbs2/controller/app/AppIndexController.java
View file @
754300ff
...
...
@@ -98,7 +98,7 @@ public class AppIndexController extends BaseController {
@GetMapping
(
"/emotion-percent"
)
public
ResponseResult
getEmotionPercent
(
@RequestParam
(
value
=
"startTime"
,
required
=
false
)
Long
startTime
,
@RequestParam
(
value
=
"endTime"
,
required
=
false
)
Long
endTime
)
{
return
ResponseResult
.
success
(
indexService
.
getEmotionPercent
(
startTime
,
endTime
,
fals
e
));
return
ResponseResult
.
success
(
indexService
.
getEmotionPercent
(
startTime
,
endTime
,
tru
e
));
}
}
src/main/java/com/zhiwei/brandkbs2/exception/ExceptionCatch.java
View file @
754300ff
...
...
@@ -50,7 +50,7 @@ public class ExceptionCatch {
@ExceptionHandler
(
Exception
.
class
)
public
ResponseResult
exception
(
Exception
exception
)
{
//记录日志
log
.
info
(
"catch exception:"
,
exception
);
log
.
error
(
"catch exception:"
,
exception
);
//返回400操作失败
return
new
ResponseResult
(
CommonCodeEnum
.
FAIL
,
Collections
.
EMPTY_LIST
);
}
...
...
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