update:更新固件下载源码路径 (#923 )

update:增加dashscope依赖 (#920 )
* update:增加腾讯TTS、腾讯ASR供应器 * update:增加dashscope依赖 --------- Co-authored-by: 欣南科技 <huangrongzhuang@xin-nan.com>
2026-07-23 07:33:53 +08:00 · 2025-04-21 21:08:15 +08:00 · 2025-04-21 17:55:27 +08:00 · 2025-04-21 17:41:04 +08:00 · 2025-04-21 17:35:10 +08:00 · 2025-04-21 14:24:47 +08:00
25 changed files with 508 additions and 152 deletions
@@ -4,7 +4,16 @@
 先按照这个教程配置项目环境[《Windows搭建 ESP IDF 5.3.2开发环境以及编译小智》](https://icnynnzcwou8.feishu.cn/wiki/JEYDwTTALi5s2zkGlFGcDiRknXf)

 ## 第2步 打开配置文件
-配置好编译环境后，下载虾哥[xiaozhi-esp32](https://github.com/78/xiaozhi-esp32)项目源码，进入虾哥项目，打开`xiaozhi-esp32/main/Kconfig.projbuild`文件。
+配置好编译环境后，下载虾哥iaozhi-esp32项目源码，
+
+从这里下载虾哥[xiaozhi-esp32项目源码](https://github.com/78/xiaozhi-esp32/archive/refs/tags/v1.6.0.zip)。
+
+从这里下载虾哥[xiaozhi-esp32项目源码](https://github.com/78/xiaozhi-esp32/archive/refs/tags/v1.6.0.zip)。
+
+从这里下载虾哥[xiaozhi-esp32项目源码](https://github.com/78/xiaozhi-esp32/archive/refs/tags/v1.6.0.zip)。
+
+下载后，解压缩包，打开`xiaozhi-esp32/main/Kconfig.projbuild`文件。
+

 ## 第3步 修改WEBSOCKET地址
 找到`WEBSOCKET_URL`的`default`的内容，把`wss://api.tenclass.net/xiaozhi/v1/`
@@ -167,5 +167,5 @@ public interface Constant {
    /**
     * 版本号
     */
-    public static final String VERSION = "0.3.8";
+    public static final String VERSION = "0.3.9";
 }
@@ -291,7 +291,7 @@ public class ConfigServiceImpl implements ConfigService {

        result.put("selected_module", selectedModule);
        if (StringUtils.isNotBlank(prompt)) {
-            prompt = prompt.replace("{{assistant_name}}", "小智");
+            prompt = prompt.replace("{{assistant_name}}", StringUtils.isBlank(assistantName) ? "小智" : assistantName);
        }
        result.put("prompt", prompt);
    }
@@ -15,25 +15,29 @@ import org.springframework.web.bind.annotation.RestController;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.databind.ObjectMapper;

+import io.swagger.v3.oas.annotations.Hidden;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.enums.ParameterIn;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
+import lombok.extern.slf4j.Slf4j;
 import xiaozhi.modules.device.dto.DeviceReportReqDTO;
 import xiaozhi.modules.device.dto.DeviceReportRespDTO;
+import xiaozhi.modules.device.entity.DeviceEntity;
 import xiaozhi.modules.device.service.DeviceService;
 import xiaozhi.modules.device.utils.NetworkUtil;

@Tag(name = "设备管理", description = "OTA 相关接口")
+@Slf4j
@RestController
@RequiredArgsConstructor
@RequestMapping("/ota/")
 public class OTAController {
    private final DeviceService deviceService;

-    @Operation(summary = "检查 OTA 版本和设备激活状态")
+    @Operation(summary = "OTA版本和设备激活状态检查")
    @PostMapping
    public ResponseEntity<String> checkOTAVersion(
            @RequestBody DeviceReportReqDTO deviceReportReqDTO,
@@ -54,9 +58,25 @@ public class OTAController {
        return createResponse(deviceService.checkDeviceActive(macAddress, clientId, deviceReportReqDTO));
    }

+    @Operation(summary = "设备快速检查激活状态")
+    @PostMapping("activate")
+    public ResponseEntity<String> activateDevice(
+            @Parameter(name = "Device-Id", description = "设备唯一标识", required = true, in = ParameterIn.HEADER) @RequestHeader("Device-Id") String deviceId,
+            @Parameter(name = "Client-Id", description = "客户端标识", required = false, in = ParameterIn.HEADER) @RequestHeader(value = "Client-Id", required = false) String clientId) {
+        if (StringUtils.isBlank(deviceId)) {
+            return ResponseEntity.status(202).build();
+        }
+        DeviceEntity device = deviceService.getDeviceByMacAddress(deviceId);
+        if (device == null) {
+            return ResponseEntity.status(202).build();
+        }
+        return ResponseEntity.ok("success");
+    }
+
    @GetMapping
-    public ResponseEntity<String> getOTAPrompt() {
-        return createResponse(DeviceReportRespDTO.createError("请提交正确的ota参数"));
+    @Hidden
+    public ResponseEntity<String> getOTA() {
+        return ResponseEntity.ok("OTA接口运行正常");
    }

    @SneakyThrows
@@ -44,6 +44,8 @@ public class DeviceReportRespDTO {
        @Schema(description = "激活码信息: 激活地址")
        private String message;

+        @Schema(description = "挑战码")
+        private String challenge;
    }

    @Getter
@@ -251,10 +251,12 @@ public class DeviceServiceImpl extends BaseServiceImpl<DeviceDao, DeviceEntity>
        if (StringUtils.isNotBlank(cachedCode)) {
            code.setCode(cachedCode);
            code.setMessage(frontedUrl + "\n" + cachedCode);
+            code.setChallenge(deviceId);
        } else {
            String newCode = RandomUtil.randomNumbers(6);
            code.setCode(newCode);
            code.setMessage(frontedUrl + "\n" + newCode);
+            code.setChallenge(deviceId);

            Map<String, Object> dataMap = new HashMap<>();
            dataMap.put("id", deviceId);
@@ -0,0 +1,19 @@
+-- 删除无用模型供应器
+delete from `ai_model_provider` where id = 'SYSTEM_LLM_doubao';
+delete from `ai_model_provider` where id = 'SYSTEM_LLM_chatglm';
+delete from `ai_model_provider` where id = 'SYSTEM_TTS_302ai';
+delete from `ai_model_provider` where id = 'SYSTEM_TTS_gizwits';
+
+-- 添加模型供应器
+delete from `ai_model_provider` where id = 'SYSTEM_ASR_TencentASR';
+INSERT INTO `ai_model_provider` (`id`, `model_type`, `provider_code`, `name`, `fields`, `sort`, `creator`, `create_date`, `updater`, `update_date`) VALUES
+('SYSTEM_ASR_TencentASR', 'ASR', 'tencent', '腾讯语音识别', '[{"key":"appid","label":"应用ID","type":"string"},{"key":"secret_id","label":"Secret ID","type":"string"},{"key":"secret_key","label":"Secret Key","type":"string"},{"key":"output_dir","label":"输出目录","type":"string"}]', 4, 1, NOW(), 1, NOW());
+
+-- 添加腾讯语音合成模型供应器
+delete from `ai_model_provider` where id = 'SYSTEM_TTS_TencentTTS';
+INSERT INTO `ai_model_provider` (`id`, `model_type`, `provider_code`, `name`, `fields`, `sort`, `creator`, `create_date`, `updater`, `update_date`) VALUES
+('SYSTEM_TTS_TencentTTS', 'TTS', 'tencent', '腾讯语音合成', '[{"key":"appid","label":"应用ID","type":"string"},{"key":"secret_id","label":"Secret ID","type":"string"},{"key":"secret_key","label":"Secret Key","type":"string"},{"key":"output_dir","label":"输出目录","type":"string"},{"key":"region","label":"区域","type":"string"},{"key":"voice","label":"音色ID","type":"string"}]', 5, 1, NOW(), 1, NOW());
+
+-- 添加腾讯语音合成音色
+delete from `ai_tts_voice` where id = 'TTS_TencentTTS0001';
+INSERT INTO `ai_tts_voice` VALUES ('TTS_TencentTTS0001', 'TTS_TencentTTS', '智瑜', '101001', '中文', NULL, NULL, 1, NULL, NULL, NULL, NULL);
@@ -65,3 +65,10 @@ databaseChangeLog:
        - sqlFile:
            encoding: utf8
            path: classpath:db/changelog/202504181536.sql
+  - changeSet:
+      id: 202504211118
+      author: John
+      changes:
+        - sqlFile:
+            encoding: utf8
+            path: classpath:db/changelog/202504211118.sql
@@ -77,7 +77,12 @@
    </div>

    <div style="display: flex;justify-content: center;">
-      <el-button type="primary" @click="confirm" class="save-btn">
+      <el-button
+        type="primary"
+        @click="confirm"
+        class="save-btn"
+        :loading="saving"
+        :disabled="saving">
        保存
      </el-button>
    </div>
@@ -94,6 +99,7 @@ export default {
  },
  data() {
    return {
+      saving: false,
      providers: [],
      dialogVisible: false,
      providersLoaded: false,
@@ -175,6 +181,7 @@ export default {
    },

    handleClose() {
+      this.saving = false;
      this.$emit('update:visible', false);
    },
    initDynamicConfig() {
@@ -185,8 +192,11 @@ export default {
      this.formData.configJson = newConfig;
    },
    confirm() {
+      this.saving = true;
+
      if (!this.formData.supplier) {
        this.$message.error('请选择供应器');
+        this.saving = false;
        return;
      }

@@ -206,11 +216,18 @@ export default {
        }
      };

-      this.$emit('confirm', submitData);
-      this.$emit('update:visible', false);
-      this.resetForm();
+      try {
+        this.$emit('confirm', submitData);
+        this.$emit('update:visible', false);
+        this.resetForm();
+      } catch (e) {
+        console.error(e);
+      } finally {
+        this.saving = false;
+      }
    },
    resetForm() {
+      this.saving = false;
      this.formData = {
        modelName: '',
        modelCode: '',
@@ -23,12 +23,6 @@
      <div class="settings-btn" @click="handleConfigure">
        配置角色
      </div>
-      <!--      <div class="settings-btn">-->
-      <!--        声纹识别-->
-      <!--      </div>-->
-      <!--      <div class="settings-btn">-->
-      <!--        历史对话-->
-      <!--      </div>-->
      <div class="settings-btn" @click="handleDeviceManage">
        设备管理({{ device.deviceCount }})
      </div>
@@ -80,7 +74,7 @@ export default {

 .settings-btn {
  font-weight: 500;
-  font-size: 10px;
+  font-size: 12px;
  color: #5778ff;
  background: #e6ebff;
  width: auto;
@@ -95,7 +89,7 @@ export default {
  display: flex;
  justify-content: space-between;
  margin-top: 15px;
-  font-size: 10px;
+  font-size: 12px;
  color: #979db1;
  font-weight: 400;
 }
@@ -170,7 +170,7 @@ export default {
 .header {
  background: #f6fcfe66;
  border: 1px solid #fff;
-  height: 53px !important;
+  height: 63px !important;
  min-width: 900px;
  /* 设置最小宽度防止过度压缩 */
  overflow: hidden;
@@ -197,7 +197,7 @@ export default {
 }

 .brand-img {
-  height: 18px;
+  height: 20px;
 }

 .header-center {
@@ -219,13 +219,13 @@ export default {

 .equipment-management {
  padding: 0 9px;
-  width: 82px;
-  height: 24px;
-  border-radius: 12px;
+  width: px;
+  height: 30px;
+  border-radius: 15px;
  background: #deeafe;
  display: flex;
  justify-content: center;
-  font-size: 10px;
+  font-size: 14px;
  font-weight: 500;
  gap: 7px;
  color: #3d4566;
@@ -235,6 +235,7 @@ export default {
  cursor: pointer;
  flex-shrink: 0;
  /* 防止导航按钮被压缩 */
+  padding: 0px 15px;
 }

 .equipment-management.active-tab {
@@ -76,7 +76,12 @@
    </div>

    <div style="display: flex;justify-content: center;">
-      <el-button type="primary" @click="handleSave" class="save-btn">
+      <el-button
+        type="primary"
+        @click="handleSave"
+        class="save-btn"
+        :loading="saving"
+        :disabled="saving">
        保存
      </el-button>
    </div>
@@ -102,6 +107,7 @@ export default {
      dialogVisible: this.visible,
      providers: [],
      providersLoaded: false,
+      saving: false,
      allProvidersData: null,
      pendingProviderType: null,
      pendingModelData: null,
@@ -195,6 +201,8 @@ export default {
      }
    },
    handleSave() {
+      this.saving = true; // 开始保存加载
+
      const provideCode = this.form.configJson.type;
      const formData = {
        id: this.modelData.id,
@@ -209,8 +217,19 @@ export default {
          ...this.form.configJson,
        }
      };
-      this.$emit("save", { provideCode, formData });
-      this.dialogVisible = false;
+
+      this.$emit("save", {
+        provideCode,
+        formData,
+        done: () => {
+          this.saving = false; // 保存完成后回调
+        }
+      });
+
+      // 如果父组件不处理done回调，3秒后自动关闭加载状态
+      setTimeout(() => {
+        this.saving = false;
+      }, 3000);
    },
    loadProviders() {
      if (this.providersLoaded) return;
@@ -40,7 +40,12 @@
      </el-form>

      <div class="dialog-footer">
-        <el-button type="primary" @click="submit" class="save-btn">
+        <el-button
+          type="primary"
+          @click="submit"
+          class="save-btn"
+          :loading="saving"
+          :disabled="saving">
          保存
        </el-button>
        <el-button @click="cancel" class="cancel-btn">
@@ -76,6 +81,7 @@ export default {
  data() {
    return {
      dialogKey: Date.now(),
+      saving: false,
      valueTypeOptions: [
        { value: 'string', label: '字符串(string)' },
        { value: 'number', label: '数字(number)' },
@@ -100,11 +106,22 @@ export default {
    submit() {
      this.$refs.form.validate((valid) => {
        if (valid) {
-          this.$emit('submit', this.form);
+          this.saving = true; // 开始加载
+          this.$emit('submit', {
+            form: this.form,
+            done: () => {
+              this.saving = false; // 加载完成
+            }
+          });
+
+          setTimeout(() => {
+            this.saving = false;
+          }, 3000);
        }
      });
    },
    cancel() {
+      this.saving = false; // 取消时重置状态
      this.$emit('cancel');
    }
  },
@@ -44,12 +44,22 @@
        <!-- 右侧内容 -->
        <div class="content-area">
          <el-card class="model-card" shadow="never">
-            <el-table ref="modelTable" style="width: 100%" :header-cell-style="{ background: 'transparent' }"
-              :data="modelList" class="data-table" header-row-class-name="table-header"
-              :header-cell-class-name="headerCellClassName" @selection-change="handleSelectionChange">
+              <el-table
+                ref="modelTable"
+                style="width: 100%"
+                v-loading="loading"
+                element-loading-text="拼命加载中"
+                element-loading-spinner="el-icon-loading"
+                element-loading-background="rgba(255, 255, 255, 0.7)"
+                :header-cell-style="{ background: 'transparent' }"
+                :data="modelList"
+                class="data-table"
+                header-row-class-name="table-header"
+                :header-cell-class-name="headerCellClassName"
+                @selection-change="handleSelectionChange">
              <el-table-column type="selection" width="55" align="center"></el-table-column>
+              <el-table-column label="模型ID" prop="id" align="center"></el-table-column>
              <el-table-column label="模型名称" prop="modelName" align="center"></el-table-column>
-              <el-table-column label="模型编码" prop="modelCode" align="center"></el-table-column>
              <el-table-column label="提供商" align="center">
                <template slot-scope="scope">
                  {{ scope.row.configJson.type || '未知' }}
@@ -86,41 +96,37 @@
              </el-table-column>
            </el-table>
            <div class="table-footer">
-            <div class="batch-actions">
-              <el-button size="mini" type="primary" @click="selectAll">
-                {{ isAllSelected ?
-                  '取消全选' : '全选' }}
-              </el-button>
-              <el-button type="success" size="mini" @click="addModel" class="add-btn">
-                新增
-              </el-button>
-              <el-button size="mini" type="danger" icon="el-icon-delete" @click="batchDelete">
-                删除
-              </el-button>
-            </div>
-            <div class="custom-pagination">
+              <div class="batch-actions">
+                <el-button size="mini" type="primary" @click="selectAll">
+                  {{ isAllSelected ?
+                    '取消全选' : '全选' }}
+                </el-button>
+                <el-button type="success" size="mini" @click="addModel" class="add-btn">
+                  新增
+                </el-button>
+                <el-button size="mini" type="danger" icon="el-icon-delete" @click="batchDelete">
+                  删除
+                </el-button>
+              </div>
+              <div class="custom-pagination">

-              <el-select v-model="pageSize" @change="handlePageSizeChange" class="page-size-select">
-                  <el-option
-                    v-for="item in pageSizeOptions"
-                    :key="item"
-                    :label="`${item}条/页`"
-                    :value="item">
+                <el-select v-model="pageSize" @change="handlePageSizeChange" class="page-size-select">
+                  <el-option v-for="item in pageSizeOptions" :key="item" :label="`${item}条/页`" :value="item">
                  </el-option>
-              </el-select>
+                </el-select>

-              <button class="pagination-btn" :disabled="currentPage === 1" @click="goFirst">首页</button>
-              <button class="pagination-btn" :disabled="currentPage === 1" @click="goPrev">上一页</button>
+                <button class="pagination-btn" :disabled="currentPage === 1" @click="goFirst">首页</button>
+                <button class="pagination-btn" :disabled="currentPage === 1" @click="goPrev">上一页</button>

-              <button v-for="page in visiblePages" :key="page" class="pagination-btn"
-                :class="{ active: page === currentPage }" @click="goToPage(page)">
-                {{ page }}
-              </button>
+                <button v-for="page in visiblePages" :key="page" class="pagination-btn"
+                  :class="{ active: page === currentPage }" @click="goToPage(page)">
+                  {{ page }}
+                </button>

-              <button class="pagination-btn" :disabled="currentPage === pageCount" @click="goNext">下一页</button>
-              <span class="total-text">共{{ total }}条记录</span>
+                <button class="pagination-btn" :disabled="currentPage === pageCount" @click="goNext">下一页</button>
+                <span class="total-text">共{{ total }}条记录</span>
+              </div>
            </div>
-          </div>
          </el-card>
        </div>
      </div>
@@ -157,7 +163,8 @@ export default {
      pageSize: 10,
      total: 0,
      selectedModels: [],
-      isAllSelected: false
+      isAllSelected: false,
+      loading: false
    };
  },

@@ -301,9 +308,10 @@ export default {
      this.currentPage = page;
      this.$refs.modelTable.clearSelection();
    },
-    handleModelSave({ provideCode, formData }) {
+    handleModelSave({ provideCode, formData, done }) {
      const modelType = this.activeTab;
      const id = formData.id;
+
      Api.model.updateModel(
        { modelType, provideCode, id, formData },
        ({ data }) => {
@@ -314,6 +322,7 @@ export default {
          } else {
            this.$message.error(data.msg || '保存失败');
          }
+          done && done(); // 调用done回调关闭加载状态
        }
      );
    },
@@ -385,6 +394,7 @@ export default {

    // 获取模型配置列表
    loadData() {
+      this.loading = true; // 开始加载
      const params = {
        modelType: this.activeTab,
        modelName: this.search,
@@ -393,6 +403,7 @@ export default {
      };

      Api.model.getModelList(params, ({ data }) => {
+        this.loading = false; // 结束加载
        if (data.code === 0) {
          this.modelList = data.data.list;
          this.total = data.data.total;
@@ -592,12 +603,12 @@ export default {
  transition: border-color 0.2s;
 }

-::v-deep .page-size-select{
+::v-deep .page-size-select {
  width: 100px;
  margin-right: 8px;
 }

-::v-deep .page-size-select .el-input__inner{
+::v-deep .page-size-select .el-input__inner {
  height: 32px;
  line-height: 32px;
  border-radius: 4px;
@@ -606,7 +617,8 @@ export default {
  color: #606266;
  font-size: 14px;
 }
-::v-deep .page-size-select .el-input__suffix{
+
+::v-deep .page-size-select .el-input__suffix {
  right: 6px;
  width: 15px;
  height: 20px;
@@ -617,13 +629,14 @@ export default {
  border-radius: 4px;
 }

-::v-deep .page-size-select .el-input__suffix-inner{
+::v-deep .page-size-select .el-input__suffix-inner {
  display: flex;
  align-items: center;
  justify-content: center;
  width: 100%;
 }
-::v-deep .page-size-select .el-icon-arrow-up:before{
+
+::v-deep .page-size-select .el-icon-arrow-up:before {
  content: "";
  display: inline-block;
  border-left: 6px solid transparent;
@@ -884,7 +897,7 @@ export default {
  }
 }

-.model-card{
+.model-card {
  background: white;
  flex: 1;
  display: flex;
@@ -894,7 +907,7 @@ export default {
  overflow: hidden;
 }

-.model-card ::v-deep .el-card__body{
+.model-card ::v-deep .el-card__body {
  padding: 0;
  display: flex;
  flex-direction: column;
@@ -912,4 +925,21 @@ export default {
  overflow-y: auto;
 }

+::v-deep .el-loading-mask {
+  background-color: rgba(255, 255, 255, 0.6) !important;
+  backdrop-filter: blur(2px);
+}
+::v-deep .el-loading-spinner .circular {
+  width: 28px;
+  height: 28px;
+}
+::v-deep .el-loading-spinner .path {
+  stroke: #6b8cff;
+}
+::v-deep .el-loading-text {
+  color: #6b8cff !important;
+  font-size: 14px;
+  margin-top: 8px;
+}
+
 </style>
@@ -15,8 +15,15 @@
            <div class="content-panel">
                <div class="content-area">
                    <el-card class="params-card" shadow="never">
-                        <el-table ref="paramsTable" :data="paramsList" class="transparent-table"
-                            :header-cell-class-name="headerCellClassName">
+                            <el-table
+                              ref="paramsTable"
+                              :data="paramsList"
+                              class="transparent-table"
+                              v-loading="loading"
+                              element-loading-text="拼命加载中"
+                              element-loading-spinner="el-icon-loading"
+                              element-loading-background="rgba(255, 255, 255, 0.7)"
+                              :header-cell-class-name="headerCellClassName">
                            <el-table-column label="选择" align="center" width="120">
                                <template slot-scope="scope">
                                    <el-checkbox v-model="scope.row.selected"></el-checkbox>
@@ -92,6 +99,7 @@ export default {
            searchCode: "",
            paramsList: [],
            currentPage: 1,
+            loading: false,
            pageSize: 10,
            pageSizeOptions: [10, 20, 50, 100],
            total: 0,
@@ -138,27 +146,29 @@ export default {
            this.fetchParams();
        },
        fetchParams() {
-            Api.admin.getParamsList(
-                {
-                    page: this.currentPage,
-                    limit: this.pageSize,
-                    paramCode: this.searchCode,
-                },
-                ({ data }) => {
-                    if (data.code === 0) {
-                        this.paramsList = data.data.list.map(item => ({
-                            ...item,
-                            selected: false
-                        }));
-                        this.total = data.data.total;
-                    } else {
-                        this.$message.error({
-                            message: data.msg || '获取参数列表失败',
-                            showClose: true
-                        });
-                    }
-                }
-            );
+          this.loading = true;
+          Api.admin.getParamsList(
+            {
+              page: this.currentPage,
+              limit: this.pageSize,
+              paramCode: this.searchCode,
+            },
+            ({ data }) => {
+              this.loading = false;
+              if (data.code === 0) {
+                this.paramsList = data.data.list.map(item => ({
+                  ...item,
+                  selected: false
+                }));
+                this.total = data.data.total;
+              } else {
+                this.$message.error({
+                  message: data.msg || '获取参数列表失败',
+                  showClose: true
+                });
+              }
+            }
+          );
        },
        handleSearch() {
            this.currentPage = 1;
@@ -185,32 +195,35 @@ export default {
            this.paramForm = { ...row };
            this.dialogVisible = true;
        },
-        handleSubmit(form) {
-            if (form.id) {
-                // 编辑
-                Api.admin.updateParam(form, ({ data }) => {
-                    if (data.code === 0) {
-                        this.$message.success({
-                          message:"修改成功",
-                          showClose:true
-                        });
-                        this.dialogVisible = false;
-                        this.fetchParams();
-                    }
+
+        handleSubmit({ form, done }) {
+          if (form.id) {
+            // 编辑
+            Api.admin.updateParam(form, ({ data }) => {
+              if (data.code === 0) {
+                this.$message.success({
+                  message:"修改成功",
+                  showClose:true
                });
-            } else {
-                // 新增
-                Api.admin.addParam(form, ({ data }) => {
-                    if (data.code === 0) {
-                        this.$message.success({
-                          message:"新增成功",
-                          showClose:true
-                        });
-                        this.dialogVisible = false;
-                        this.fetchParams();
-                    }
+                this.dialogVisible = false;
+                this.fetchParams();
+              }
+              done && done();
+            });
+          } else {
+            // 新增
+            Api.admin.addParam(form, ({ data }) => {
+              if (data.code === 0) {
+                this.$message.success({
+                  message:"新增成功",
+                  showClose:true
                });
-            }
+                this.dialogVisible = false;
+                this.fetchParams();
+              }
+              done && done();
+            });
+          }
        },

        deleteSelectedParams() {
@@ -656,4 +669,25 @@ export default {
    max-height: calc(var(--table-max-height) - 40px);
  }
 }
+
+:deep(.el-loading-mask) {
+  background-color: rgba(255, 255, 255, 0.6) !important;
+  backdrop-filter: blur(2px);
+}
+
+:deep(.el-loading-spinner .circular) {
+  width: 28px;
+  height: 28px;
+}
+
+:deep(.el-loading-spinner .path) {
+  stroke: #6b8cff;
+}
+
+:deep(.el-loading-text) {
+  color: #6b8cff !important;
+  font-size: 14px;
+  margin-top: 8px;
+}
+
 </style>
@@ -15,7 +15,14 @@
      <div class="content-panel">
        <div class="content-area">
          <el-card class="user-card" shadow="never">
-            <el-table ref="userTable" :data="userList" class="transparent-table">
+            <el-table
+                ref="userTable"
+                :data="userList"
+                class="transparent-table"
+                v-loading="loading"
+                element-loading-text="拼命加载中"
+                element-loading-spinner="el-icon-loading"
+                element-loading-background="rgba(255, 255, 255, 0.7)">
              <el-table-column label="选择" align="center" width="120">
                  <template slot-scope="scope">
                      <el-checkbox v-model="scope.row.selected"></el-checkbox>
@@ -103,7 +110,8 @@ export default {
      currentPage: 1,
      pageSize: 10,
      total: 0,
-      isAllSelected: false
+      isAllSelected: false,
+      loading: false,
    };
  },
  created() {
@@ -137,22 +145,24 @@ export default {
    },

    fetchUsers() {
-        Api.admin.getUserList(
-            {
-                page: this.currentPage,
-                limit: this.pageSize,
-                mobile: this.searchPhone,
-            },
-            ({ data }) => {
-                if (data.code === 0) {
-                    this.userList = data.data.list.map(item => ({
-                        ...item,
-                        selected: false
-                    }));
-                    this.total = data.data.total;
-                }
-            }
-        );
+      this.loading = true;
+      Api.admin.getUserList(
+        {
+          page: this.currentPage,
+          limit: this.pageSize,
+          mobile: this.searchPhone,
+        },
+        ({ data }) => {
+          this.loading = false; // 结束加载
+          if (data.code === 0) {
+            this.userList = data.data.list.map(item => ({
+              ...item,
+              selected: false
+            }));
+            this.total = data.data.total;
+          }
+        }
+      );
    },
    handleSearch() {
      this.currentPage = 1;
@@ -682,5 +692,21 @@ export default {
  }
 }

+:deep(.el-loading-mask) {
+  background-color: rgba(255, 255, 255, 0.6) !important;
+  backdrop-filter: blur(2px);
+}
+:deep(.el-loading-spinner .circular) {
+  width: 28px;
+  height: 28px;
+}
+:deep(.el-loading-spinner .path) {
+  stroke: #6b8cff;
+}
+:deep(.el-loading-text) {
+  color: #6b8cff !important;
+  font-size: 14px;
+  margin-top: 8px;
+}

 </style>
@@ -31,8 +31,30 @@
          </div>
        </div>
        <div class="device-list-container">
-          <DeviceItem v-for="(item, index) in devices" :key="index" :device="item" @configure="goToRoleConfig"
-            @deviceManage="handleDeviceManage" @delete="handleDeleteAgent" />
+          <template v-if="isLoading">
+            <div
+              v-for="i in skeletonCount"
+              :key="'skeleton-'+i"
+              class="skeleton-item"
+            >
+              <div class="skeleton-image"></div>
+              <div class="skeleton-content">
+                <div class="skeleton-line"></div>
+                <div class="skeleton-line-short"></div>
+              </div>
+            </div>
+          </template>
+
+          <template v-else>
+            <DeviceItem
+              v-for="(item, index) in devices"
+              :key="index"
+              :device="item"
+              @configure="goToRoleConfig"
+              @deviceManage="handleDeviceManage"
+              @delete="handleDeleteAgent"
+            />
+          </template>
        </div>
      </div>
      <AddWisdomBodyDialog :visible.sync="addDeviceDialogVisible" @confirm="handleWisdomBodyAdded" />
@@ -60,7 +82,9 @@ export default {
      devices: [],
      originalDevices: [],
      isSearching: false,
-      searchRegex: null
+      searchRegex: null,
+      isLoading: true,
+      skeletonCount: localStorage.getItem('skeletonCount') || 8,
    }
  },

@@ -109,12 +133,26 @@ export default {
    },
    // 获取智能体列表
    fetchAgentList() {
+      this.isLoading = true;
      Api.agent.getAgentList(({ data }) => {
-        this.originalDevices = data.data.map(item => ({
-          ...item,
-          agentId: item.id // 字段映射
-        }));
-        this.handleSearchReset(); // 重置搜索状态
+        if (data?.data) {
+          this.originalDevices = data.data.map(item => ({
+            ...item,
+            agentId: item.id
+          }));
+
+          // 动态设置骨架屏数量（可选）
+          this.skeletonCount = Math.min(
+            Math.max(this.originalDevices.length, 3), // 最少3个
+            10 // 最多10个
+          );
+
+          this.handleSearchReset();
+        }
+        this.isLoading = false;
+      }, (error) => {
+        console.error('Failed to fetch agent list:', error);
+        this.isLoading = false;
      });
    },
    // 删除智能体
@@ -199,7 +237,7 @@ export default {

  .hi-hint {
    font-weight: 400;
-    font-size: 10px;
+    font-size: 12px;
    text-align: left;
    color: #818cae;
    margin-left: 75px;
@@ -220,7 +258,7 @@ export default {
    border-radius: 17px;
    background: #5778ff;
    color: #fff;
-    font-size: 10px;
+    font-size: 14px;
    font-weight: 500;
    text-align: center;
    line-height: 34px;
@@ -262,6 +300,65 @@ export default {
  /* 居中显示 */
 }

+/* 骨架屏动画 */
+@keyframes shimmer {
+  100% { transform: translateX(100%); }
+}

+.skeleton-item {
+  background: #fff;
+  border-radius: 8px;
+  padding: 20px;
+  height: 120px;
+  position: relative;
+  overflow: hidden;
+  margin-bottom: 20px;
+}

+.skeleton-image {
+  width: 80px;
+  height: 80px;
+  background: #f0f2f5;
+  border-radius: 4px;
+  float: left;
+  position: relative;
+  overflow: hidden;
+}
+
+.skeleton-content {
+  margin-left: 100px;
+}
+
+.skeleton-line {
+  height: 16px;
+  background: #f0f2f5;
+  border-radius: 4px;
+  margin-bottom: 12px;
+  width: 70%;
+  position: relative;
+  overflow: hidden;
+}
+
+.skeleton-line-short {
+  height: 12px;
+  background: #f0f2f5;
+  border-radius: 4px;
+  width: 50%;
+}
+
+.skeleton-item::after {
+  content: '';
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 50%;
+  height: 100%;
+  background: linear-gradient(
+    90deg,
+    rgba(255,255,255,0),
+    rgba(255,255,255,0.3),
+    rgba(255,255,255,0)
+  );
+  animation: shimmer 1.5s infinite;
+}
 </style>
@@ -15,6 +15,9 @@
                <img loading="lazy" src="@/assets/home/setting-user.png" alt="">
              </div>
              <span class="header-title">{{ form.agentName }}</span>
+              <button class="custom-close-btn" @click="goToHome">
+                ×
+              </button>
            </div>
            <div class="divider"></div>

@@ -165,6 +168,9 @@ export default {
    }
  },
  methods: {
+    goToHome() {
+      this.$router.push('/home');
+    },
    saveConfig() {
      const configData = {
        agentCode: this.form.agentCode,
@@ -423,6 +429,7 @@ export default {
 }

 .config-header {
+  position: relative;
  display: flex;
  align-items: center;
  gap: 13px;
@@ -560,8 +567,35 @@ export default {
  background: none;
  position: absolute;
  font-size: 12px;
-  bottom: -10px;
-  right: 21px;
+  bottom: -10%;
+  right: 3%;
+}
+
+.custom-close-btn {
+  position: absolute;
+  top: 25%;
+  right: 0;
+  transform: translateY(-50%);
+  width: 35px;
+  height: 35px;
+  border-radius: 50%;
+  border: 2px solid #cfcfcf;
+  background: none;
+  font-size: 30px;
+  font-weight: lighter;
+  color: #cfcfcf;
+  cursor: pointer;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  z-index: 1;
+  padding: 0;
+  outline: none;
+}
+
+.custom-close-btn:hover {
+  color: #409EFF;
+  border-color: #409EFF;
 }

 </style>
@@ -3,7 +3,7 @@ import sys
 from loguru import logger
 from config.config_loader import load_config

-SERVER_VERSION = "0.3.8"
+SERVER_VERSION = "0.3.9"


 def get_module_abbreviation(module_name, module_dict):
@@ -43,6 +43,14 @@ def check_config_file():
    missing_keys = find_missing_keys(new_config, old_config)
    read_config_from_api = old_config.get("read_config_from_api", False)
    if read_config_from_api:
+        old_config_origin = read_config(old_config_file)
+        if old_config_origin.get("selected_module") is not None:
+            missing_keys_str = "\n".join(f"- {key}" for key in missing_keys)
+            error_msg = "您的配置文件好像既包含智控台的配置又包含本地配置：\n"
+            error_msg += "\n建议您：\n"
+            error_msg += "1、将根目录的config_from_api.yaml文件复制到data下，重命名为.config.yaml\n"
+            error_msg += "2、按教程配置好接口地址和密钥\n"
+            raise ValueError(error_msg)
        return

    if missing_keys:
@@ -1,4 +1,5 @@
 import openai
+from openai.types import CompletionUsage
 from config.logger import setup_logging
 from core.utils.util import check_model_key
 from core.providers.llm.base import LLMProviderBase
@@ -70,7 +71,17 @@ class LLMProvider(LLMProviderBase):
            )

            for chunk in stream:
-                yield chunk.choices[0].delta.content, chunk.choices[0].delta.tool_calls
+                # 检查是否存在有效的choice且content不为空
+                if getattr(chunk, "choices", None):
+                    yield chunk.choices[0].delta.content, chunk.choices[0].delta.tool_calls
+                # 存在 CompletionUsage 消息时，生成 Token 消耗 log
+                elif isinstance(getattr(chunk, 'usage', None), CompletionUsage):
+                    usage_info = getattr(chunk, 'usage', None)
+                    logger.bind(tag=TAG).info(
+                        f"Token 消耗：输入 {getattr(usage_info, 'prompt_tokens', '未知')}，" 
+                        f"输出 {getattr(usage_info, 'completion_tokens', '未知')}，"
+                        f"共计 {getattr(usage_info, 'total_tokens', '未知')}"
+                    )

        except Exception as e:
            logger.bind(tag=TAG).error(f"Error in function call streaming: {e}")
@@ -15,7 +15,10 @@ logger = setup_logging()
 class TTSProvider(TTSProviderBase):
    def __init__(self, config, delete_audio_file):
        super().__init__(config, delete_audio_file)
-        self.appid = config.get("appid")
+        if config.get("appid"):
+            self.appid = int(config.get("appid"))
+        else:
+            self.appid = ""
        self.access_token = config.get("access_token")
        self.cluster = config.get("cluster")

@@ -5,6 +5,10 @@ import requests
 import shutil
 from datetime import datetime
 from core.providers.tts.base import TTSProviderBase
+from config.logger import setup_logging
+
+TAG = __name__
+logger = setup_logging()


 class TTSProvider(TTSProviderBase):
@@ -54,6 +58,7 @@ class TTSProvider(TTSProviderBase):

        resp = requests.request("POST", url, data=payload)
        if resp.status_code != 200:
+            logger.bind(tag=TAG).error(f"TTS请求失败: {resp.text}")
            return None
        resp_json = resp.json()
        try:
@@ -59,7 +59,7 @@ services:
    networks:
      - default
    expose:
-      - "3306:3306"
+      - "3306"
    volumes:
      - ./mysql/data:/var/lib/mysql
    environment:
@@ -25,3 +25,4 @@ sherpa_onnx==1.11.0
 mcp==1.4.1
 cnlunar==0.2.0
 PySocks==1.7.1
+dashscope==1.23.1
Author	SHA1	Message	Date
hrzandGitHub	83f86406b5	update:更新固件下载源码路径 (#923 )	2025-04-21 21:08:15 +08:00
hrz GitHub 欣南科技	dde237ff0d	update:增加dashscope依赖 (#920 ) * update:增加腾讯TTS、腾讯ASR供应器 * update:增加dashscope依赖 --------- Co-authored-by: 欣南科技 <huangrongzhuang@xin-nan.com>	2025-04-21 17:55:27 +08:00
hrzandGitHub	6a4887e252	Merge pull request #916 from laride/fix/empty-chunk 处理 OpenAI 格式响应中 `choices` 为空的 chunk	2025-04-21 17:41:04 +08:00
hrz GitHub 欣南科技	d945b94910	update:增加腾讯TTS、腾讯ASR供应器 (#918 ) Co-authored-by: 欣南科技 <huangrongzhuang@xin-nan.com>	2025-04-21 17:35:10 +08:00
larideandGitHub	16a7aeec3b	fix: handle empty `choices` in some chunk of OpenAI streaming response	2025-04-21 14:24:47 +08:00
Sakura-RanChenandGitHub	94605345e5	Merge pull request #914 from xinnan-tech/web-table-loading Web table loading	2025-04-21 11:40:47 +08:00
CGD	ec9fa32c81	update:添加多个组件"保存"时的loading状态	2025-04-21 11:36:10 +08:00
CGDandGitHub	264aa15281	Merge pull request #913 from xinnan-tech/web-role-exit 增加“角色配置”页面返回按钮，智能体管理骨架屏加载显示	2025-04-21 11:26:39 +08:00
Ran_Chen	180a6ff824	增加“角色配置”页面返回按钮，智能体管理骨架屏加载显示	2025-04-21 10:24:04 +08:00
CGD	5904ee1571	update:添加“模型配置”、“用户管理”、“参数管理”页面“获取列表”时的加载状态	2025-04-21 10:02:50 +08:00
hrzandGitHub	bc99341f85	Merge pull request #909 from xinnan-tech/ota-activate update:输入验证码后设备端快速刷新结果	2025-04-20 21:15:00 +08:00