From b978b40bd58e913d51152e072a74524988ae4b5b Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Tue, 2 Jul 2024 00:13:30 +0800 Subject: [PATCH] =?UTF-8?q?refactor(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?= =?UTF-8?q?=E6=B0=B4=E5=8D=B0=E7=AD=89=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/io/dataease/ai/service/AiBaseService.java | 2 +- core/core-frontend/src/components/watermark/watermark.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/core-backend/src/main/java/io/dataease/ai/service/AiBaseService.java b/core/core-backend/src/main/java/io/dataease/ai/service/AiBaseService.java index bb188bdae0..44ab5344ba 100644 --- a/core/core-backend/src/main/java/io/dataease/ai/service/AiBaseService.java +++ b/core/core-backend/src/main/java/io/dataease/ai/service/AiBaseService.java @@ -24,7 +24,7 @@ public class AiBaseService implements AiComponentApi { @Override public Map findTargetUrl() { Map templateParams = sysParameterManage.groupVal("ai."); - if (templateParams != null && StringUtils.isNotEmpty(templateParams.get("ai.baseUrl")) && UrlTestUtils.isURLAvailable(templateParams.get("ai.baseUrl"))) { + if (templateParams != null && StringUtils.isNotEmpty(templateParams.get("ai.baseUrl"))) { return templateParams; } else { diff --git a/core/core-frontend/src/components/watermark/watermark.ts b/core/core-frontend/src/components/watermark/watermark.ts index bc541fd4a1..80337236a1 100644 --- a/core/core-frontend/src/components/watermark/watermark.ts +++ b/core/core-frontend/src/components/watermark/watermark.ts @@ -45,7 +45,7 @@ export function watermark(settings, domId) { defaultSettings.watermark_x + defaultSettings.watermark_width * defaultSettings.watermark_cols + defaultSettings.watermark_x_space * (defaultSettings.watermark_cols - 1) - ) > page_width + ) < page_width ) { defaultSettings.watermark_cols = Math.floor( (page_width - defaultSettings.watermark_x + defaultSettings.watermark_x_space) /