refactor: simplify SysConfig retrieval logic, enhance ConfigManager form handling, and improve error messaging in request service

Author: joey-zhou

src/main/java/com/xiaozhi/controller/ConfigController.java

@@ -8,14 +8,11 @@
 import com.xiaozhi.common.web.PageFilter;
 import com.xiaozhi.dialogue.stt.factory.SttServiceFactory;
 import com.xiaozhi.dialogue.tts.factory.TtsServiceFactory;
-import com.xiaozhi.entity.SysAgent;
 import com.xiaozhi.entity.SysConfig;
 import com.xiaozhi.service.SysConfigService;
 import com.xiaozhi.utils.CmsUtils;
 
 import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.media.Content;
-import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.annotation.Resource;
 import jakarta.servlet.http.HttpServletRequest;

src/main/java/com/xiaozhi/service/impl/SysConfigServiceImpl.java

@@ -115,13 +115,7 @@ public List<SysConfig> query(SysConfig config, PageFilter pageFilter) {
         if(pageFilter != null){
             PageHelper.startPage(pageFilter.getStart(), pageFilter.getLimit());
         }
-        // 这里为了适配阿里云的 Token 刷新，返回的结果会有重复
-        List<SysConfig> configs = configMapper.query(config);
-        Map<Integer, SysConfig> uniqueConfigs = new LinkedHashMap<>();
-        for (SysConfig c : configs) {
-            uniqueConfigs.put(c.getConfigId(), c); // 利用 Map 的键唯一特性去重
-        }
-        return new ArrayList<>(uniqueConfigs.values());
+        return configMapper.query(config);
     }
 
     /**

vue3/src/components/ConfigManager.vue

@@ -36,21 +36,19 @@ const {
 } = useConfigManager(props.configType)
 
 // 表单
-interface FormData extends Record<string, any> {
-  provider?: string
-  configName?: string
-  configDesc?: string
-  modelType?: ModelType
-  isDefault?: boolean | number
-}
-
 const formRef = ref<FormInstance>()
-const formData = ref<FormData>({
+const formData = ref<Partial<Config>>({
   provider: undefined,
   configName: undefined,
   configDesc: undefined,
   modelType: 'chat',
-  isDefault: false,
+  isDefault: '0',
+  apiKey: undefined,
+  apiUrl: undefined,
+  appId: undefined,
+  apiSecret: undefined,
+  ak: undefined,
+  sk: undefined,
 })
 
 // 表格列配置
@@ -174,7 +172,7 @@ function handleEdit(record: Config) {
   // 设置表单值
   formData.value = { 
     ...record,
-    isDefault: props.configType !== 'tts' ? record.isDefault === '1' : false
+    isDefault: props.configType != 'tts' ? record.isDefault : '0'
   }
 
   // LLM 更新模型选项
@@ -194,17 +192,14 @@ async function handleSubmit() {
     
     // 准备提交数据
     const submitData: Partial<Config> = {
+      ...formData.value,
       configId: editingConfigId.value,
       configType: props.configType,
-      provider: formData.value.provider,
-      configName: formData.value.configName,
-      configDesc: formData.value.configDesc,
-      modelType: formData.value.modelType
     }
 
     // 处理 isDefault
     if (props.configType !== 'tts') {
-      submitData.isDefault = formData.value.isDefault ? '1' : '0'
+      submitData.isDefault = formData.value.isDefault == '1' ? '1' : '0'
     }
 
     // LLM 特殊验证
@@ -266,7 +261,13 @@ function resetForm() {
     configName: undefined,
     configDesc: undefined,
     modelType: 'chat',
-    isDefault: false,
+    isDefault: '0',
+    apiKey: undefined,
+    apiUrl: undefined,
+    appId: undefined,
+    apiSecret: undefined,
+    ak: undefined,
+    sk: undefined,
   }
 }
 

vue3/src/composables/useConfigManager.ts

@@ -16,7 +16,7 @@ export function useConfigManager(configType: ConfigType) {
     data: configItems,
     pagination,
     handleTableChange,
-    loadData: loadTableData,
+    loadData,
     resetPagination
   } = useTable<Config>()
 
@@ -153,24 +153,13 @@ export function useConfigManager(configType: ConfigType) {
    * 获取配置列表
    */
   async function getData() {
-    await loadTableData(async ({ start, limit }) => {
-      const res = await queryConfigs({
-        start,
-        limit,
+    await loadData((params) => {
+      return queryConfigs({
+        start: params.start,
+        limit: params.limit,
         configType,
         ...queryForm.value,
       })
-      // 转换数据格式以匹配 useTable 的期望
-      return {
-        code: res.code,
-        data: res.data ? {
-          list: res.data.list,
-          total: res.data.total,
-          pageNum: Math.ceil(res.data.total / limit),
-          pageSize: limit
-        } : undefined,
-        message: res.message
-      }
     })
   }
 
@@ -187,10 +176,10 @@ export function useConfigManager(configType: ConfigType) {
       })
 
       if (res.code === 200) {
-        message.success(t('config.deleteSuccess'))
+        message.success(t('common.delete'))
         getData()
       } else {
-        message.error(res.message || t('config.deleteFailed'))
+        message.error(res.message)
       }
     } catch (error) {
       console.error('删除配置失败:', error)

vue3/src/services/request.ts

@@ -101,6 +101,11 @@ request.interceptors.response.use(
 
     // 处理业务错误码
     if (data.code === 403 || data.code === 401) {
+      // 清空用户信息和token
+      const userStore = useUserStore()
+      userStore.clearUserInfo()
+      userStore.clearToken()
+      
       message.error({
         content: '登录过期，请重新登录！',
         key: 'auth-error',
@@ -126,6 +131,12 @@ request.interceptors.response.use(
     if (error.response) {
       const { status } = error.response
       if (status === 401 || status === 403) {
+        // 清空用户信息和token
+        const userStore = useUserStore()
+        userStore.clearUserInfo()
+        userStore.clearToken()
+        
+        // 使用相同的key避免重复显示
         message.error({
           content: '登录过期，请重新登录！',
           key: 'auth-error',
@@ -135,7 +146,7 @@ request.interceptors.response.use(
         })
       } else {
         message.error({
-          content: error.response.data?.message || '请求失败',
+          content: error.response.data?.message || `请求失败 (${status})`,
           key: 'request-error',
         })
       }
@@ -144,6 +155,12 @@ request.interceptors.response.use(
         content: '网络错误，请检查网络连接',
         key: 'network-error',
       })
+    } else {
+      // 其他错误（如请求配置错误等）
+      message.error({
+        content: error.message || '请求失败',
+        key: 'unknown-error',
+      })
     }
     return Promise.reject(error)
   },

vue3/src/types/config.ts

@@ -8,7 +8,7 @@ export type ModelType = 'chat' | 'vision' | 'intent' | 'embedding'
  * 配置信息接口
  */
 export interface Config {
-  configId: number
+  configId?: number
   configType: ConfigType
   provider: string
   configName: string
@@ -17,7 +17,14 @@ export interface Config {
   isDefault?: string // 1-默认 0-非默认
   state?: string
   createTime?: string
-  // 动态参数
+  // API相关字段
+  appId?: string
+  apiKey?: string
+  apiSecret?: string
+  ak?: string
+  sk?: string
+  apiUrl?: string
+  // 支持动态字段
   [key: string]: any
 }
 
@@ -39,6 +46,22 @@ export interface ConfigQueryParams {
 export interface ConfigListResponse {
   list: Config[]
   total: number
+  pageNum: number
+  pageSize: number
+  size: number
+  startRow: number
+  endRow: number
+  pages: number
+  prePage: number
+  nextPage: number
+  isFirstPage: boolean
+  isLastPage: boolean
+  hasPreviousPage: boolean
+  hasNextPage: boolean
+  navigatePages: number
+  navigatepageNums: number[]
+  navigateFirstPage: number
+  navigateLastPage: number
 }
 
 /**