Commit 754300ff by shenjunjie

Merge branch 'feature' into 'release'

Feature

See merge request !482
parents f29de156 d5bac37b
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
<dubbo.version>2.7.4.1</dubbo.version> <dubbo.version>2.7.4.1</dubbo.version>
<curator.version>2.12.0</curator.version> <curator.version>2.12.0</curator.version>
<push.log.version>2.17.0-SNAPSHOT</push.log.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> <cleaner-unified-filter.version>1.1.5-SNAPSHOT</cleaner-unified-filter.version>
</properties> </properties>
......
...@@ -98,7 +98,7 @@ public class AppIndexController extends BaseController { ...@@ -98,7 +98,7 @@ public class AppIndexController extends BaseController {
@GetMapping("/emotion-percent") @GetMapping("/emotion-percent")
public ResponseResult getEmotionPercent(@RequestParam(value = "startTime", required = false) Long startTime, public ResponseResult getEmotionPercent(@RequestParam(value = "startTime", required = false) Long startTime,
@RequestParam(value = "endTime", required = false) Long endTime) { @RequestParam(value = "endTime", required = false) Long endTime) {
return ResponseResult.success(indexService.getEmotionPercent(startTime, endTime, false)); return ResponseResult.success(indexService.getEmotionPercent(startTime, endTime, true));
} }
} }
...@@ -50,7 +50,7 @@ public class ExceptionCatch { ...@@ -50,7 +50,7 @@ public class ExceptionCatch {
@ExceptionHandler(Exception.class) @ExceptionHandler(Exception.class)
public ResponseResult exception(Exception exception) { public ResponseResult exception(Exception exception) {
//记录日志 //记录日志
log.info("catch exception:", exception); log.error("catch exception:", exception);
//返回400操作失败 //返回400操作失败
return new ResponseResult(CommonCodeEnum.FAIL, Collections.EMPTY_LIST); return new ResponseResult(CommonCodeEnum.FAIL, Collections.EMPTY_LIST);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment