diff --git a/main/manager-api/src/main/java/xiaozhi/common/utils/SensitiveDataUtils.java b/main/manager-api/src/main/java/xiaozhi/common/utils/SensitiveDataUtils.java index 05f4853a..4d5715cc 100644 --- a/main/manager-api/src/main/java/xiaozhi/common/utils/SensitiveDataUtils.java +++ b/main/manager-api/src/main/java/xiaozhi/common/utils/SensitiveDataUtils.java @@ -1,14 +1,15 @@ package xiaozhi.common.utils; -import cn.hutool.json.JSONObject; -import org.apache.commons.lang3.StringUtils; - import java.util.Arrays; +import java.util.HashMap; import java.util.HashSet; import java.util.Map; -import java.util.HashMap; import java.util.Set; +import org.apache.commons.lang3.StringUtils; + +import cn.hutool.json.JSONObject; + /** * 敏感数据处理工具类 */ @@ -30,7 +31,7 @@ public class SensitiveDataUtils { * 隐藏字符串中间部分 */ public static String maskMiddle(String value) { - if (StringUtils.isBlank(value)) { + if (StringUtils.isBlank(value) || value.length() == 1) { return value; } diff --git a/main/manager-api/src/main/java/xiaozhi/modules/model/dto/ModelConfigBodyDTO.java b/main/manager-api/src/main/java/xiaozhi/modules/model/dto/ModelConfigBodyDTO.java index dcedd535..eb1197b1 100644 --- a/main/manager-api/src/main/java/xiaozhi/modules/model/dto/ModelConfigBodyDTO.java +++ b/main/manager-api/src/main/java/xiaozhi/modules/model/dto/ModelConfigBodyDTO.java @@ -13,9 +13,6 @@ public class ModelConfigBodyDTO { @Serial private static final long serialVersionUID = 1L; - // @Schema(description = "模型类型(Memory/ASR/VAD/LLM/TTS)") - // private String modelType; - // @Schema(description = "模型ID,未填写将自动生成") private String id; diff --git a/main/manager-api/src/main/java/xiaozhi/modules/model/entity/ModelConfigEntity.java b/main/manager-api/src/main/java/xiaozhi/modules/model/entity/ModelConfigEntity.java index dcd95730..aba2c8f2 100644 --- a/main/manager-api/src/main/java/xiaozhi/modules/model/entity/ModelConfigEntity.java +++ b/main/manager-api/src/main/java/xiaozhi/modules/model/entity/ModelConfigEntity.java @@ -3,9 +3,7 @@ package xiaozhi.modules.model.entity; import java.util.Date; import com.baomidou.mybatisplus.annotation.FieldFill; -import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler; diff --git a/main/manager-api/src/main/java/xiaozhi/modules/model/service/impl/ModelConfigServiceImpl.java b/main/manager-api/src/main/java/xiaozhi/modules/model/service/impl/ModelConfigServiceImpl.java index ea70c61f..fbfc7723 100644 --- a/main/manager-api/src/main/java/xiaozhi/modules/model/service/impl/ModelConfigServiceImpl.java +++ b/main/manager-api/src/main/java/xiaozhi/modules/model/service/impl/ModelConfigServiceImpl.java @@ -1,16 +1,24 @@ package xiaozhi.modules.model.service.impl; -import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.json.JSONObject; +import java.io.Serializable; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; + import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.incrementer.DefaultIdentifierGenerator; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.OrderItem; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; + +import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.json.JSONObject; import lombok.AllArgsConstructor; -import org.apache.commons.lang3.StringUtils; -import org.springframework.stereotype.Service; import xiaozhi.common.constant.Constant; import xiaozhi.common.exception.ErrorCode; import xiaozhi.common.exception.RenException; @@ -23,17 +31,15 @@ import xiaozhi.common.utils.SensitiveDataUtils; import xiaozhi.modules.agent.dao.AgentDao; import xiaozhi.modules.agent.entity.AgentEntity; import xiaozhi.modules.model.dao.ModelConfigDao; -import xiaozhi.modules.model.dto.*; +import xiaozhi.modules.model.dto.LlmModelBasicInfoDTO; +import xiaozhi.modules.model.dto.ModelBasicInfoDTO; +import xiaozhi.modules.model.dto.ModelConfigBodyDTO; +import xiaozhi.modules.model.dto.ModelConfigDTO; +import xiaozhi.modules.model.dto.ModelProviderDTO; import xiaozhi.modules.model.entity.ModelConfigEntity; import xiaozhi.modules.model.service.ModelConfigService; import xiaozhi.modules.model.service.ModelProviderService; -import java.io.Serializable; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; - @Service @AllArgsConstructor public class ModelConfigServiceImpl extends BaseServiceImpl @@ -225,7 +231,7 @@ public class ModelConfigServiceImpl extends BaseServiceImpl
- + +
+
@@ -73,16 +75,14 @@
- +
+ + + + +
diff --git a/main/manager-web/src/components/HeaderBar.vue b/main/manager-web/src/components/HeaderBar.vue index bea94167..80094830 100644 --- a/main/manager-web/src/components/HeaderBar.vue +++ b/main/manager-web/src/components/HeaderBar.vue @@ -169,12 +169,12 @@ > - - {{ $t("header.otaManagement") }} - {{ $t("header.paramManagement") }} + + {{ $t("header.otaManagement") }} + {{ $t("header.dictManagement") }} diff --git a/main/manager-web/src/router/index.js b/main/manager-web/src/router/index.js index b904b946..af0a9bb9 100644 --- a/main/manager-web/src/router/index.js +++ b/main/manager-web/src/router/index.js @@ -162,13 +162,6 @@ const routes = [ return import('../views/TemplateQuickConfig.vue') } }, - { - path: '/provider-management', - name: 'ProviderManagement', - component: function () { - return import('../views/ProviderManagement.vue') - } - }, ] const router = new VueRouter({ base: process.env.VUE_APP_PUBLIC_PATH || '/', diff --git a/main/manager-web/src/views/ModelConfig.vue b/main/manager-web/src/views/ModelConfig.vue index a0f5036d..94501ef4 100644 --- a/main/manager-web/src/views/ModelConfig.vue +++ b/main/manager-web/src/views/ModelConfig.vue @@ -471,6 +471,7 @@ export default { const id = formData.id; if (this.editModelData.duplicateMode) { + formData.id = ""; Api.model.addModel({ modelType, provideCode, formData }, ({ data }) => { if (data.code === 0) { this.$message.success(this.$t("modelConfig.duplicateSuccess"));