From 514f372270b181f82e4deff98f8d0f38ace63183 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期五, 16 十月 2026 18:03:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_新疆_塔河种业' into dev_新疆_塔河种业
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/trace/MesTraceConfigController.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/trace/MesTraceConfigController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/trace/MesTraceConfigController.java
index 60e075d..1a72e3c 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/trace/MesTraceConfigController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/trace/MesTraceConfigController.java
@@ -2,7 +2,8 @@
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.module.mes.controller.admin.trace.vo.MesTraceQrConfigRespVO;
-import cn.iocoder.yudao.module.mes.framework.config.MesProperties;
+import cn.iocoder.yudao.module.mes.framework.config.MesTraceConfigResolver;
+import cn.iocoder.yudao.module.mes.framework.config.MesTraceConfigSnapshot;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource;
@@ -17,6 +18,8 @@
* 绠＄悊鍚庡彴 - MES 婧簮閰嶇疆
* <p>
* 鍚戠鐞嗙鍓嶇鏆撮湶婧簮 H5 椤甸潰鍩虹鍦板潃锛岀敤浜�"鏌ョ湅浜岀淮鐮�"棰勮/涓嬭浇涓庢墦鍗版爣绛句繚鎸佷竴鑷寸殑浜岀淮鐮佸唴瀹广��
+ * 鍊煎彇鑷� {@link MesTraceConfigResolver} 鐨�**鐢熸晥蹇収**鑰岄潪閰嶇疆鏂囦欢鈥斺�旇拷婧綉鍧�鍙湪瀛楀吀
+ * {@code mes_trace_config} 涓慨鏀癸紝鑻ユ澶勭洿璇婚厤缃枃浠讹紝绠＄悊绔瑙堢殑浜岀淮鐮佸氨浼氫笌瀹為檯鎵撳嵃鐨勬爣绛句笉涓�鑷淬��
*/
@Tag(name = "绠＄悊鍚庡彴 - MES 婧簮閰嶇疆")
@RestController
@@ -25,13 +28,15 @@
public class MesTraceConfigController {
@Resource
- private MesProperties mesProperties;
+ private MesTraceConfigResolver mesTraceConfigResolver;
@GetMapping("/qr-config")
@Operation(summary = "鑾峰緱婧簮 H5 椤甸潰鍩虹鍦板潃锛堜簩缁寸爜鍐呭鍓嶇紑锛�")
public CommonResult<MesTraceQrConfigRespVO> getQrConfig() {
+ MesTraceConfigSnapshot snapshot = mesTraceConfigResolver.resolveSnapshot();
MesTraceQrConfigRespVO respVO = new MesTraceQrConfigRespVO();
- respVO.setTraceBaseUrl(mesProperties.getTraceBaseUrl());
+ respVO.setTraceBaseUrl(snapshot.traceUrl());
+ respVO.setTraceUrlSource(snapshot.traceUrlSource().name());
return success(respVO);
}
--
Gitblit v1.9.3