This commit is contained in:
jack ning
2025-11-04 09:26:31 +08:00
parent 234f5332e7
commit e89a80b135
15 changed files with 27 additions and 32 deletions

View File

@@ -1,6 +1,6 @@
{
"/admin/umi.css": "/admin/umi.c10bed78.css",
"/admin/umi.js": "/admin/umi.187f0a6b.js",
"/admin/umi.js": "/admin/umi.7a0ac9fa.js",
"/admin/8605.d21a2e5f.async.js": "/admin/8605.d21a2e5f.async.js",
"/admin/6938.6daed71a.async.js": "/admin/6938.6daed71a.async.js",
"/admin/1320.d69cbba1.async.js": "/admin/1320.d69cbba1.async.js",
@@ -30,7 +30,7 @@
"/admin/p__Dashboard__Service__Form__index.js": "/admin/p__Dashboard__Service__Form__index.929a4c7d.async.js",
"/admin/p__Dashboard__Service__Screen__index.js": "/admin/p__Dashboard__Service__Screen__index.a0343a06.async.js",
"/admin/p__Dashboard__Service__Statistic__index.js": "/admin/p__Dashboard__Service__Statistic__index.6c7c3d71.async.js",
"/admin/p__Dashboard__Ai__Robot__index.js": "/admin/p__Dashboard__Ai__Robot__index.048b9892.async.js",
"/admin/p__Dashboard__Ai__Robot__index.js": "/admin/p__Dashboard__Ai__Robot__index.71be089b.async.js",
"/admin/p__Dashboard__Ai__LlmProvider__index.css": "/admin/p__Dashboard__Ai__LlmProvider__index.7c72a3a2.chunk.css",
"/admin/p__Dashboard__Ai__LlmProvider__index.js": "/admin/p__Dashboard__Ai__LlmProvider__index.443e0760.async.js",
"/admin/p__Dashboard__Ai__Mcp__index.css": "/admin/p__Dashboard__Ai__Mcp__index.f9c908ef.chunk.css",
@@ -195,7 +195,7 @@
"/admin/1124.df8f2586.async.js": "/admin/1124.df8f2586.async.js",
"/admin/4464.3b65e7f2.async.js": "/admin/4464.3b65e7f2.async.js",
"/admin/6694.ae108ddb.async.js": "/admin/6694.ae108ddb.async.js",
"/admin/9210.34e0b7e6.async.js": "/admin/9210.34e0b7e6.async.js",
"/admin/9210.38154c0c.async.js": "/admin/9210.38154c0c.async.js",
"/admin/9604.70213788.async.js": "/admin/9604.70213788.async.js",
"/admin/4651.e201337f.async.js": "/admin/4651.e201337f.async.js",
"/admin/5520.1805bc62.async.js": "/admin/5520.1805bc62.async.js",

View File

@@ -7,10 +7,10 @@
<link rel="shortcut icon" href="/admin/favicon.ico">
<title>微语</title>
<link rel="stylesheet" href="/admin/umi.c10bed78.css">
<script src="/admin/preload_helper.9fb0ce9b.js"></script>
<script src="/admin/preload_helper.8f237c9e.js"></script>
</head>
<body>
<div id="root"></div>
<script src="/admin/umi.187f0a6b.js"></script>
<script src="/admin/umi.7a0ac9fa.js"></script>
</body>
</html>

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@@ -3,6 +3,7 @@ package com.bytedesk.ai.robot_settings;
import java.util.Optional;
import org.modelmapper.ModelMapper;
import org.springframework.beans.BeanUtils;
import org.springframework.cache.annotation.CacheEvict;
import org.springframework.cache.annotation.CachePut;
import org.springframework.cache.annotation.Cacheable;
@@ -22,7 +23,9 @@ import com.bytedesk.kbase.settings_intention.IntentionSettingsEntity;
import com.bytedesk.kbase.settings_ratedown.RatedownSettingsEntity;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@Slf4j
@Service
@AllArgsConstructor
public class RobotSettingsRestService
@@ -366,27 +369,19 @@ public class RobotSettingsRestService
if (entity.getDraftServiceSettings() != null) {
ServiceSettingsEntity published = entity.getServiceSettings();
if (published != null) {
log.info("welcomeTip {}, draftWelcomeTip {}", entity.getServiceSettings().getWelcomeTip(),
entity.getDraftServiceSettings().getWelcomeTip());
//
copyPropertiesExcludingIds(entity.getDraftServiceSettings(), published);
} else {
ServiceSettingsEntity newPublished = new ServiceSettingsEntity();
copyPropertiesExcludingIds(entity.getDraftServiceSettings(), newPublished);
log.info("new welcomeTip {}", newPublished.getWelcomeTip());
newPublished.setUid(uidUtils.getUid());
entity.setServiceSettings(newPublished);
}
}
// if (entity.getDraftLlm() != null) {
// RobotLlmEntity published = entity.getLlm();
// if (published != null) {
// copyPropertiesExcludingIds(entity.getDraftLlm(), published);
// } else {
// RobotLlmEntity newPublished = new RobotLlmEntity();
// copyPropertiesExcludingIds(entity.getDraftLlm(), newPublished);
// newPublished.setUid(uidUtils.getUid());
// entity.setLlm(newPublished);
// }
// }
if (entity.getDraftRateDownSettings() != null) {
RatedownSettingsEntity published = entity.getRateDownSettings();
if (published != null) {
@@ -435,7 +430,7 @@ public class RobotSettingsRestService
if (source instanceof ServiceSettingsEntity && target instanceof ServiceSettingsEntity) {
serviceSettingsHelper.copyServiceSettingsProperties((ServiceSettingsEntity) source, (ServiceSettingsEntity) target);
} else {
org.springframework.beans.BeanUtils.copyProperties(source, target, "id", "uid", "version", "createdAt", "updatedAt");
BeanUtils.copyProperties(source, target, "id", "uid", "version", "createdAt", "updatedAt");
}
}

View File

@@ -1,6 +1,6 @@
{
"/admin/umi.css": "/admin/umi.c10bed78.css",
"/admin/umi.js": "/admin/umi.187f0a6b.js",
"/admin/umi.js": "/admin/umi.7a0ac9fa.js",
"/admin/8605.d21a2e5f.async.js": "/admin/8605.d21a2e5f.async.js",
"/admin/6938.6daed71a.async.js": "/admin/6938.6daed71a.async.js",
"/admin/1320.d69cbba1.async.js": "/admin/1320.d69cbba1.async.js",
@@ -30,7 +30,7 @@
"/admin/p__Dashboard__Service__Form__index.js": "/admin/p__Dashboard__Service__Form__index.929a4c7d.async.js",
"/admin/p__Dashboard__Service__Screen__index.js": "/admin/p__Dashboard__Service__Screen__index.a0343a06.async.js",
"/admin/p__Dashboard__Service__Statistic__index.js": "/admin/p__Dashboard__Service__Statistic__index.6c7c3d71.async.js",
"/admin/p__Dashboard__Ai__Robot__index.js": "/admin/p__Dashboard__Ai__Robot__index.048b9892.async.js",
"/admin/p__Dashboard__Ai__Robot__index.js": "/admin/p__Dashboard__Ai__Robot__index.71be089b.async.js",
"/admin/p__Dashboard__Ai__LlmProvider__index.css": "/admin/p__Dashboard__Ai__LlmProvider__index.7c72a3a2.chunk.css",
"/admin/p__Dashboard__Ai__LlmProvider__index.js": "/admin/p__Dashboard__Ai__LlmProvider__index.443e0760.async.js",
"/admin/p__Dashboard__Ai__Mcp__index.css": "/admin/p__Dashboard__Ai__Mcp__index.f9c908ef.chunk.css",
@@ -195,7 +195,7 @@
"/admin/1124.df8f2586.async.js": "/admin/1124.df8f2586.async.js",
"/admin/4464.3b65e7f2.async.js": "/admin/4464.3b65e7f2.async.js",
"/admin/6694.ae108ddb.async.js": "/admin/6694.ae108ddb.async.js",
"/admin/9210.34e0b7e6.async.js": "/admin/9210.34e0b7e6.async.js",
"/admin/9210.38154c0c.async.js": "/admin/9210.38154c0c.async.js",
"/admin/9604.70213788.async.js": "/admin/9604.70213788.async.js",
"/admin/4651.e201337f.async.js": "/admin/4651.e201337f.async.js",
"/admin/5520.1805bc62.async.js": "/admin/5520.1805bc62.async.js",

View File

@@ -7,10 +7,10 @@
<link rel="shortcut icon" href="/admin/favicon.ico">
<title>微语</title>
<link rel="stylesheet" href="/admin/umi.c10bed78.css">
<script src="/admin/preload_helper.9fb0ce9b.js"></script>
<script src="/admin/preload_helper.8f237c9e.js"></script>
</head>
<body>
<div id="root"></div>
<script src="/admin/umi.187f0a6b.js"></script>
<script src="/admin/umi.7a0ac9fa.js"></script>
</body>
</html>

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long