From 34981c30a78e8bbd7791131059a9210f9928b62c Mon Sep 17 00:00:00 2001
From: 刘光辉 <347230014@qq.com>
Date: 星期四, 17 九月 2026 09:24:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
jnpf-biz-common/jnpf-biz-common-audit/src/main/java/jnpf/bizcommon/audit/controller/AuditPingController.java | 23 +++++++++++++++++++++++
1 files changed, 23 insertions(+), 0 deletions(-)
diff --git a/jnpf-biz-common/jnpf-biz-common-audit/src/main/java/jnpf/bizcommon/audit/controller/AuditPingController.java b/jnpf-biz-common/jnpf-biz-common-audit/src/main/java/jnpf/bizcommon/audit/controller/AuditPingController.java
new file mode 100644
index 0000000..3958a58
--- /dev/null
+++ b/jnpf-biz-common/jnpf-biz-common-audit/src/main/java/jnpf/bizcommon/audit/controller/AuditPingController.java
@@ -0,0 +1,23 @@
+package jnpf.bizcommon.audit.controller;
+
+import jnpf.base.ActionResult;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 閾捐矾楠屾敹鎺㈤拡锛氱綉鍏� /api/audit/ping锛圫tripPrefix=2锛夆啋 鏈湇鍔� /ping銆�
+ *
+ * <p><b>绫诲悕涓嶅彨 PingController</b>锛氭湰鏈嶅姟鍚� JVM 鍐呭凡鏈� jnpf.bizcommon.onlyoffice.controller.PingController锛�
+ * Spring 缁勪欢鎵弿鐨勯粯璁� bean 鍚嶉兘鏄� pingController锛屽悓鍚嶄笉鍚岀被浼氭姏 ConflictingBeanDefinitionException
+ * 鈥斺�旇鍐茬獊**涓嶅彈** spring.main.allow-bean-definition-overriding 淇濇姢锛坰canner 鑷繁鐨� isCompatible 妫�鏌ワ級銆�
+ * 璺緞 /ping 鍒绘剰淇濇寔涓嶅彉锛氱綉鍏宠矾鐢变笌鍥炲綊鑴氭湰鍥犳闆舵敼鍔ㄣ��
+ * 鏀捐閰嶇疆瑙� application.yml锛坰a-token / 绉熸埛 / 鍐呴儴閴存潈涓夊锛夈��
+ */
+@RestController
+public class AuditPingController {
+
+ @GetMapping("/ping")
+ public ActionResult<String> ping() {
+ return ActionResult.success("pong");
+ }
+}
--
Gitblit v1.8.0