From 71ab2c8dea4a7594186cd72bb0d1c97c79d55d2d Mon Sep 17 00:00:00 2001
From: scarqin <scarqin@gmail.com>
Date: Fri, 3 Jan 2025 09:06:36 +0800
Subject: [PATCH] fix: api key timestamp error

---
 .../pages/aiApis/components/ApiKeyContent.tsx | 111 ------------------
 .../pages/aiApis/components/StatusFilter.tsx  |  40 -------
 .../packages/core/src/pages/aiApis/types.ts   |  16 ---
 .../keySettings/components/ApiKeyContent.tsx  |   4 +-
 4 files changed, 2 insertions(+), 169 deletions(-)
 delete mode 100644 frontend/packages/core/src/pages/aiApis/components/ApiKeyContent.tsx
 delete mode 100644 frontend/packages/core/src/pages/aiApis/components/StatusFilter.tsx

diff --git a/frontend/packages/core/src/pages/aiApis/components/ApiKeyContent.tsx b/frontend/packages/core/src/pages/aiApis/components/ApiKeyContent.tsx
deleted file mode 100644
index 0ce3c4a4..00000000
--- a/frontend/packages/core/src/pages/aiApis/components/ApiKeyContent.tsx
+++ /dev/null
@@ -1,111 +0,0 @@
-import { Codebox } from '@common/components/postcat/api/Codebox'
-import { BasicResponse, RESPONSE_TIPS, STATUS_CODE } from '@common/const/const'
-import { useFetch } from '@common/hooks/http'
-import { $t } from '@common/locales'
-import { AIProvider } from '@core/components/AIProviderSelect'
-import { App, DatePicker, Form, Input, Switch } from 'antd'
-import dayjs from 'dayjs'
-import React, { forwardRef, useEffect, useImperativeHandle, useState } from 'react'
-import { EditAPIKey } from '../types'
-
-interface ApiKeyContentProps {
-  provider?: AIProvider
-  entity: EditAPIKey
-}
-
-const ApiKeyContent: React.FC<ApiKeyContentProps> = forwardRef(({ provider, entity }, ref) => {
-  const [form] = Form.useForm()
-  const [neverExpire, setNeverExpire] = useState(true)
-  const { fetchData } = useFetch()
-  const { message } = App.useApp()
-
-  useEffect(() => {
-    try {
-      const isNeverExpire = entity.expire_time === 0
-      setNeverExpire(isNeverExpire)
-      form.setFieldsValue({
-        name: entity.name,
-        expire_time: isNeverExpire ? undefined : dayjs(entity.expire_time),
-        config: entity.config
-      })
-    } catch (e) {
-      form.setFieldsValue({
-        name: entity.name,
-        expire_time: undefined,
-        config: ''
-      })
-    }
-  }, [])
-
-  const handleOk = async () => {
-    try {
-      const values = await form.validateFields()
-      const { expire_time, ...restValues } = values
-      const expireTime = neverExpire ? 0 : expire_time.valueOf()
-
-      const response = await fetchData<BasicResponse<null>>('ai/resource/key', {
-        method: entity.id ? 'PUT' : 'POST',
-        eoParams: { provider: provider?.id, id: entity.id },
-        eoBody: { ...restValues, expire_time: expireTime },
-        eoTransformKeys: ['config']
-      })
-
-      const { code, msg } = response
-      if (code === STATUS_CODE.SUCCESS) {
-        message.success(msg || $t(RESPONSE_TIPS.success))
-        return true
-      } else {
-        message.error(msg || $t(RESPONSE_TIPS.error))
-        return false
-      }
-    } catch (error) {
-      console.error('Validation failed:', error)
-    }
-  }
-  useImperativeHandle(ref, () => ({
-    handleOk
-  }))
-  const handleNeverExpireChange = (checked: boolean) => {
-    setNeverExpire(checked)
-    if (!checked) {
-      form.setFieldsValue({
-        expire_time: dayjs().add(7, 'days')
-      })
-    }
-  }
-
-  return (
-    <Form form={form} layout="vertical">
-      <Form.Item name="name" label={$t('名称')} rules={[{ required: true, message: $t('请输入 APIKey') }]}>
-        <Input />
-      </Form.Item>
-      <Form.Item label={$t('API Key')} name="config" rules={[{ required: true, message: $t('请填写 APIKey') }]}>
-        <Codebox
-          editorTheme="vs-dark"
-          readOnly={false}
-          width="100%"
-          height="150px"
-          language="json"
-          enableToolbar={false}
-        />
-      </Form.Item>
-      <Form.Item label={$t('过期时间')} name="neverExpire" valuePropName="checked">
-        <div className="flex items-center">
-          <Switch onChange={handleNeverExpireChange} checked={neverExpire} />
-          <span className="ml-2">{neverExpire ? $t('永不过期') : $t('设置过期时间')}</span>
-        </div>
-      </Form.Item>
-      {!neverExpire && (
-        <Form.Item
-          name="expire_time"
-          label={$t('过期时间')}
-          rules={[{ required: true, message: $t('请选择过期时间') }]}
-        >
-          <DatePicker style={{ width: '100%' }} showTime />
-        </Form.Item>
-      )}
-    </Form>
-  )
-})
-
-export default ApiKeyContent
diff --git a/frontend/packages/core/src/pages/aiApis/components/StatusFilter.tsx b/frontend/packages/core/src/pages/aiApis/components/StatusFilter.tsx
deleted file mode 100644
index 64cc18e9..00000000
--- a/frontend/packages/core/src/pages/aiApis/components/StatusFilter.tsx
+++ /dev/null
@@ -1,40 +0,0 @@
-import { $t } from '@common/locales'
-import { Select, Space, theme } from 'antd'
-import React from 'react'
-
-interface StatusFilterProps {
-  value: string[]
-  onChange: (value: string[]) => void
-}
-
-const StatusFilter: React.FC<StatusFilterProps> = ({ value, onChange }) => {
-  const { token } = theme.useToken()
-
-  const options = [
-    { label: $t('Normal'), value: 'normal', color: token.colorSuccess },
-    { label: $t('Exceeded'), value: 'exceeded', color: token.colorError },
-    { label: $t('Expired'), value: 'expired', color: token.colorWarning },
-    { label: $t('Disabled'), value: 'disabled', color: token.colorTextDisabled },
-    { label: $t('Error'), value: 'error', color: token.colorError }
-  ]
-
-  return (
-    <Space>
-      <span>{$t('Status')}:</span>
-      <Select
-        mode="multiple"
-        value={value}
-        onChange={onChange}
-        style={{ width: 300 }}
-        placeholder={$t('Filter by status')}
-        allowClear
-        options={options.map((option) => ({
-          ...option,
-          label: <span style={{ color: option.color }}>{option.label}</span>
-        }))}
-      />
-    </Space>
-  )
-}
-
-export default StatusFilter
diff --git a/frontend/packages/core/src/pages/aiApis/types.ts b/frontend/packages/core/src/pages/aiApis/types.ts
index a03bb2b1..e69de29b 100644
--- a/frontend/packages/core/src/pages/aiApis/types.ts
+++ b/frontend/packages/core/src/pages/aiApis/types.ts
@@ -1,16 +0,0 @@
-
-
-export interface APIKey extends EditAPIKey {
-  status: 'normal' | 'exceeded' | 'expired' | 'disabled' | 'error'
-  use_token: number
-  update_time: string
-  can_delete: boolean
-  priority: number
-}
-
-export interface EditAPIKey {
-  id?: string
-  name: string
-  config: string
-  expire_time: number
-}
diff --git a/frontend/packages/core/src/pages/keySettings/components/ApiKeyContent.tsx b/frontend/packages/core/src/pages/keySettings/components/ApiKeyContent.tsx
index 0ce3c4a4..a303ce36 100644
--- a/frontend/packages/core/src/pages/keySettings/components/ApiKeyContent.tsx
+++ b/frontend/packages/core/src/pages/keySettings/components/ApiKeyContent.tsx
@@ -25,7 +25,7 @@ const ApiKeyContent: React.FC<ApiKeyContentProps> = forwardRef(({ provider, enti
       setNeverExpire(isNeverExpire)
       form.setFieldsValue({
         name: entity.name,
-        expire_time: isNeverExpire ? undefined : dayjs(entity.expire_time),
+        expire_time: isNeverExpire ? undefined : dayjs(entity.expire_time * 1000),
         config: entity.config
       })
     } catch (e) {
@@ -41,7 +41,7 @@ const ApiKeyContent: React.FC<ApiKeyContentProps> = forwardRef(({ provider, enti
     try {
       const values = await form.validateFields()
       const { expire_time, ...restValues } = values
-      const expireTime = neverExpire ? 0 : expire_time.valueOf()
+      const expireTime = neverExpire ? 0 : Math.trunc(expire_time.valueOf() / 1000)
 
       const response = await fetchData<BasicResponse<null>>('ai/resource/key', {
         method: entity.id ? 'PUT' : 'POST',