Merge pull request #2451 from xinnan-tech/manager-model-id

Manager model

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;
         }
 

main/manager-api/src/main/java/xiaozhi/modules/model/dto/ModelConfigBodyDTO.java

@@ -13,9 +13,9 @@ public class ModelConfigBodyDTO {
     @Serial
     private static final long serialVersionUID = 1L;
 
-    // @Schema(description = "模型类型(Memory/ASR/VAD/LLM/TTS)")
+    @Schema(description = "模型ID,未填写将自动生成")
-    // private String modelType;
+    private String id;
-    //
+
     @Schema(description = "模型编码(如AliLLM、DoubaoTTS)")
     private String modelCode;
 

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;
 
@@ -18,7 +16,6 @@ import lombok.Data;
 @Schema(description = "模型配置表")
 public class ModelConfigEntity {
 
-    @TableId(type = IdType.ASSIGN_UUID)
     @Schema(description = "主键")
     private String id;
 

main/manager-api/src/main/java/xiaozhi/modules/model/service/impl/ModelConfigServiceImpl.java

@@ -11,6 +11,7 @@ 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;
@@ -252,6 +253,12 @@ public class ModelConfigServiceImpl extends BaseServiceImpl<ModelConfigDao, Mode
         if (modelConfigBodyDTO == null) {
             throw new RenException(ErrorCode.PARAMS_GET_ERROR);
         }
+        if (StringUtils.isBlank(modelConfigBodyDTO.getId())) {
+            // 参照 MP @TableId AutoUUID 策略使用
+            // com.baomidou.mybatisplus.core.incrementer.DefaultIdentifierGenerator(UUID.replace("-",""))
+            // 进行分配默认模型ID
+            modelConfigBodyDTO.setId(DefaultIdentifierGenerator.getInstance().nextUUID(ModelConfigEntity.class));
+        }
     }
 
     /**

main/manager-web/src/apis/module/model.js

@@ -47,6 +47,7 @@ export default {
   addModel(params, callback) {
     const { modelType, provideCode, formData } = params;
     const postData = {
+      id: formData.id,
       modelCode: formData.modelCode,
       modelName: formData.modelName,
       isDefault: formData.isDefault ? 1 : 0,

main/manager-web/src/components/AddModelDialog.vue

@@ -27,6 +27,12 @@
 
       <div style="height: 2px; background: #e9e9e9; margin-bottom: 22px;"></div>
       <el-form :model="formData" label-width="100px" label-position="left" class="custom-form">
+        <div style="display: flex; gap: 20px; margin-bottom: 0;">
+          <el-form-item :label="$t('modelConfigDialog.modelId')" prop="id" style="flex: 1;">
+            <el-input v-model="formData.id" :placeholder="$t('modelConfigDialog.enterModelId')" class="custom-input-bg"
+              maxlength="32"></el-input>
+          </el-form-item>
+        </div>
         <div style="display: flex; gap: 20px; margin-bottom: 0;">
           <el-form-item :label="$t('modelConfigDialog.modelName')" prop="modelName" style="flex: 1;">
             <el-input v-model="formData.modelName" :placeholder="$t('modelConfigDialog.enterModelName')"
@@ -69,16 +75,14 @@
       <div style="height: 2px; background: #e9e9e9; margin-bottom: 22px;"></div>
 
       <el-form :model="formData.configJson" label-width="auto" label-position="left" class="custom-form">
-        <template v-for="(row, rowIndex) in chunkedCallInfoFields">
+        <div v-for="(row, rowIndex) in chunkedCallInfoFields" :key="rowIndex"
-          <div :key="rowIndex" style="display: flex; gap: 20px; margin-bottom: 0;">
+          style="display: flex; gap: 20px; margin-bottom: 0;">
-            <el-form-item v-for="field in row" :key="field.prop" :label="field.label" :prop="field.prop"
+          <el-form-item v-for="field in row" :key="field.prop" :label="field.label" :prop="field.prop" style="flex: 1;">
-              style="flex: 1;">
+            <el-input v-model="formData.configJson[field.prop]" :placeholder="field.placeholder"
-              <el-input v-model="formData.configJson[field.prop]" :placeholder="field.placeholder"
+              :type="field.type || 'text'" class="custom-input-bg" :show-password="field.type === 'password'">
-                :type="field.type || 'text'" class="custom-input-bg" :show-password="field.type === 'password'">
+            </el-input>
-              </el-input>
+          </el-form-item>
-            </el-form-item>
+        </div>
-          </div>
-        </template>
       </el-form>
     </div>
 
@@ -107,6 +111,7 @@ export default {
       providerFields: [],
       currentProvider: null,
       formData: {
+        id: '',
         modelName: '',
         modelCode: '',
         supplier: '',
@@ -202,6 +207,7 @@ export default {
       }
 
       const submitData = {
+        id: this.formData.id || '',
         modelName: this.formData.modelName || '',
         modelCode: this.formData.modelCode || '',
         supplier: this.formData.supplier,
@@ -230,6 +236,7 @@ export default {
     resetForm() {
       this.saving = false;
       this.formData = {
+        id: '',
         modelName: '',
         modelCode: '',
         supplier: '',

main/manager-web/src/components/HeaderBar.vue

@@ -169,12 +169,12 @@
             ></i>
           </span>
           <el-dropdown-menu slot="dropdown">
-            <el-dropdown-item @click.native="goOtaManagement">
-              {{ $t("header.otaManagement") }}
-            </el-dropdown-item>
             <el-dropdown-item @click.native="goParamManagement">
               {{ $t("header.paramManagement") }}
             </el-dropdown-item>
+            <el-dropdown-item @click.native="goOtaManagement">
+              {{ $t("header.otaManagement") }}
+            </el-dropdown-item>
             <el-dropdown-item @click.native="goDictManagement">
               {{ $t("header.dictManagement") }}
             </el-dropdown-item>

main/manager-web/src/i18n/en.js

@@ -841,6 +841,8 @@ export default {
   'modelConfigDialog.modelInfo': 'Model Information',
   'modelConfigDialog.enable': 'Enable',
   'modelConfigDialog.setDefault': 'Set as Default',
+  'modelConfigDialog.modelId': 'Model ID',
+  'modelConfigDialog.enterModelId': 'If not filled in, it will be generated automatically',
   'modelConfigDialog.modelName': 'Model Name',
   'modelConfigDialog.enterModelName': 'Please enter model name',
   'modelConfigDialog.modelCode': 'Model Code',

main/manager-web/src/i18n/zh_CN.js

@@ -841,6 +841,8 @@ export default {
   'modelConfigDialog.modelInfo': '模型信息',
   'modelConfigDialog.enable': '是否启用',
   'modelConfigDialog.setDefault': '设为默认',
+  'modelConfigDialog.modelId': '模型ID',
+  'modelConfigDialog.enterModelId': '未填写将自动生成模型ID',
   'modelConfigDialog.modelName': '模型名称',
   'modelConfigDialog.enterModelName': '请输入模型名称',
   'modelConfigDialog.modelCode': '模型编码',

main/manager-web/src/i18n/zh_TW.js

@@ -841,6 +841,8 @@ export default {
   'modelConfigDialog.modelInfo': '模型信息',
   'modelConfigDialog.enable': '是否啟用',
   'modelConfigDialog.setDefault': '設為默認',
+  'modelConfigDialog.modelId': '模型ID',
+  'modelConfigDialog.enterModelId': '未填冩將自動生成模型ID',
   'modelConfigDialog.modelName': '模型名稱',
   'modelConfigDialog.enterModelName': '請輸入模型名稱',
   'modelConfigDialog.modelCode': '模型編碼',

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 || '/',

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"));