diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/monitor/HealthCheckController.java b/cutejava/cutejava-common/src/main/java/cn/odboy/monitor/controller/HealthCheckController.java similarity index 59% rename from cutejava/cutejava-common/src/main/java/cn/odboy/monitor/HealthCheckController.java rename to cutejava/cutejava-common/src/main/java/cn/odboy/monitor/controller/HealthCheckController.java index 308ca168..d2cbef8d 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/monitor/HealthCheckController.java +++ b/cutejava/cutejava-common/src/main/java/cn/odboy/monitor/controller/HealthCheckController.java @@ -13,39 +13,49 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.odboy.monitor; +package cn.odboy.monitor.controller; import cn.odboy.annotation.AnonymousGetMapping; +import cn.odboy.monitor.service.HealthCheckPointService; import io.swagger.annotations.Api; import lombok.RequiredArgsConstructor; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; /** * 健康检查接口 - * - * @author odboy - * @date 2022-01-06 */ @RestController @RequiredArgsConstructor -@RequestMapping("/health") +@RequestMapping("/healthCheck") @Api(tags = "系统:健康检查接口") public class HealthCheckController { + @Autowired + private HealthCheckPointService healthCheckPointService; + /** - * 健康检查 + * 就绪检查 */ - @AnonymousGetMapping(value = "/check") - public ResponseEntity doCheck() { - return ResponseEntity.ok().build(); + @AnonymousGetMapping(value = "/readiness") + public ResponseEntity doReadiness() { + return healthCheckPointService.doReadiness(); } /** - * 访问首页提示 + * 存活检查 */ - @AnonymousGetMapping("/") - public String index() { - return "success"; + @AnonymousGetMapping(value = "/liveness") + public ResponseEntity doLiveness() { + return healthCheckPointService.doLiveness(); } + +// /** +// * 访问首页提示 +// */ +// @AnonymousGetMapping("/") +// public String index() { +// return "success"; +// } } diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/monitor/service/HealthCheckPointService.java b/cutejava/cutejava-common/src/main/java/cn/odboy/monitor/service/HealthCheckPointService.java new file mode 100644 index 00000000..099654bb --- /dev/null +++ b/cutejava/cutejava-common/src/main/java/cn/odboy/monitor/service/HealthCheckPointService.java @@ -0,0 +1,15 @@ +package cn.odboy.monitor.service; + +import org.springframework.http.ResponseEntity; + +public interface HealthCheckPointService { + /** + * 就绪检查 + */ + ResponseEntity doReadiness(); + + /** + * 存活检查 + */ + ResponseEntity doLiveness(); +} diff --git a/cutejava/cutejava-starter/src/main/java/cn/odboy/HealthCheckPointer.java b/cutejava/cutejava-starter/src/main/java/cn/odboy/HealthCheckPointer.java new file mode 100644 index 00000000..8c1e420a --- /dev/null +++ b/cutejava/cutejava-starter/src/main/java/cn/odboy/HealthCheckPointer.java @@ -0,0 +1,23 @@ +package cn.odboy; + +import cn.odboy.application.system.service.DictService; +import cn.odboy.monitor.service.HealthCheckPointService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.ResponseEntity; +import org.springframework.stereotype.Component; + +@Component +public class HealthCheckPointer implements HealthCheckPointService { + @Autowired + private DictService dictService; + + @Override + public ResponseEntity doReadiness() { + return ResponseEntity.ok(null); + } + + @Override + public ResponseEntity doLiveness() { + return ResponseEntity.ok(dictService.getById(1)); + } +}