Merge remote-tracking branch 'origin/jdk17' into jdk17

lltx · lltx · commit a24a044ede1f · 2024-11-08T15:32:53.000+08:00
diff --git a/pig-common/pig-common-feign/src/main/java/com/pig4cloud/pig/common/feign/sentinel/handle/GlobalBizExceptionHandler.java b/pig-common/pig-common-feign/src/main/java/com/pig4cloud/pig/common/feign/sentinel/handle/GlobalBizExceptionHandler.java
@@ -131,7 +131,7 @@ public R bindExceptionHandler(BindException exception) {
 	 */
 	@ExceptionHandler({ NoResourceFoundException.class })
 	@ResponseStatus(HttpStatus.NOT_FOUND)
-	public R bindExceptionHandler(NoResourceFoundException exception) {
+	public R notFoundExceptionHandler(NoResourceFoundException exception) {
 		log.debug("请求路径 404 {}", exception.getMessage());
 		return R.failed(exception.getMessage());
 	}

Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,7 @@ public R bindExceptionHandler(BindException exception) {`
`131`	`131`	`*/`
`132`	`132`	`@ExceptionHandler({ NoResourceFoundException.class })`
`133`	`133`	`@ResponseStatus(HttpStatus.NOT_FOUND)`
`134`		`- public R bindExceptionHandler(NoResourceFoundException exception) {`
	`134`	`+ public R notFoundExceptionHandler(NoResourceFoundException exception) {`
`135`	`135`	`log.debug("请求路径 404 {}", exception.getMessage());`
`136`	`136`	`return R.failed(exception.getMessage());`
`137`	`137`	`}`