upgrade to v4.0.4

2025-11-13 20:53:47 +08:00 · 2024-05-07 16:32:05 +08:00
parent 2f0215ac87
commit 5c4899df6e
96 changed files with 3315 additions and 625 deletions
--- a/web/src/views/admin/ApiKey.vue
+++ b/web/src/views/admin/ApiKey.vue
@@ -125,8 +125,8 @@
 import {onMounted, onUnmounted, reactive, ref} from "vue";
 import {httpGet, httpPost} from "@/utils/http";
 import {ElMessage} from "element-plus";
-import {dateFormat, disabledDate, removeArrayItem, substr} from "@/utils/libs";
-import {DocumentCopy, InfoFilled, Plus, ShoppingCart} from "@element-plus/icons-vue";
+import {dateFormat, removeArrayItem, substr} from "@/utils/libs";
+import {DocumentCopy, Plus, ShoppingCart} from "@element-plus/icons-vue";
 import ClipboardJS from "clipboard";

 // 变量定义
--- a/web/src/views/admin/ChatModel.vue
+++ b/web/src/views/admin/ChatModel.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="container list" v-loading="loading">
+  <div class="container model-list" v-loading="loading">

    <div class="handle-box">
      <el-button type="primary" :icon="Plus" @click="add">新增</el-button>
@@ -13,7 +13,14 @@
          </template>
        </el-table-column>
        <el-table-column prop="name" label="模型名称"/>
-        <el-table-column prop="value" label="模型值"/>
+        <el-table-column prop="value" label="模型值">
+          <template #default="scope">
+            <span>{{ scope.row.value }}</span>
+            <el-icon class="copy-model" :data-clipboard-text="scope.row.value">
+              <DocumentCopy/>
+            </el-icon>
+          </template>
+        </el-table-column>
        <el-table-column prop="power" label="费率"/>
        <el-table-column prop="max_tokens" label="最大响应长度"/>
        <el-table-column prop="max_context" label="最大上下文长度"/>
@@ -29,12 +36,12 @@
          </template>
        </el-table-column>

-        <el-table-column label="创建时间">
-          <template #default="scope">
-            <span>{{ dateFormat(scope.row['created_at']) }}</span>
-          </template>
-        </el-table-column>
-
+        <!--        <el-table-column label="创建时间">-->
+        <!--          <template #default="scope">-->
+        <!--            <span>{{ dateFormat(scope.row['created_at']) }}</span>-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
+        <el-table-column prop="key_name" label="绑定API-KEY"/>
        <el-table-column label="操作" width="180">
          <template #default="scope">
            <el-button size="small" type="primary" @click="edit(scope.row)">编辑</el-button>
@@ -75,7 +82,7 @@
        <el-form-item label="费率：" prop="weight">
          <template #default>
            <div class="tip-input">
-              <el-input-number :min="1" v-model="item.power" autocomplete="off"/>
+              <el-input-number :min="0" v-model="item.power" autocomplete="off"/>
              <div class="info">
                <el-tooltip
                    class="box-item"
@@ -144,6 +151,15 @@
          </div>
        </el-form-item>

+        <el-form-item label="绑定API-KEY：" prop="apikey">
+          <el-select v-model="item.key_id" placeholder="请选择 API KEY" clearable>
+            <el-option v-for="v in apiKeys" :value="v.id" :label="v.name" :key="v.id">
+              {{ v.name }}
+              <el-text type="info" size="small">{{ substr(v.api_url, 50) }}</el-text>
+            </el-option>
+          </el-select>
+        </el-form-item>
+
        <el-form-item label="启用状态：" prop="enable">
          <el-switch v-model="item.enabled"/>
        </el-form-item>
@@ -178,12 +194,13 @@
 </template>

 <script setup>
-import {onMounted, reactive, ref} from "vue";
+import {onMounted, onUnmounted, reactive, ref} from "vue";
 import {httpGet, httpPost} from "@/utils/http";
 import {ElMessage} from "element-plus";
-import {dateFormat, removeArrayItem} from "@/utils/libs";
-import {InfoFilled, Plus} from "@element-plus/icons-vue";
+import {dateFormat, removeArrayItem, substr} from "@/utils/libs";
+import {DocumentCopy, InfoFilled, Plus} from "@element-plus/icons-vue";
 import {Sortable} from "sortablejs";
+import ClipboardJS from "clipboard";

 // 变量定义
 const items = ref([])
@@ -207,23 +224,34 @@ const platforms = ref([

 ])

-// 获取数据
-httpGet('/api/admin/model/list').then((res) => {
-  if (res.data) {
-    // 初始化数据
-    const arr = res.data;
-    for (let i = 0; i < arr.length; i++) {
-      arr[i].last_used_at = dateFormat(arr[i].last_used_at)
-    }
-    items.value = arr
-  }
-  loading.value = false
-}).catch(() => {
-  ElMessage.error("获取数据失败");
+// 获取 API KEY
+const apiKeys = ref([])
+httpGet('/api/admin/apikey/list?status=true&type=chat').then(res => {
+  apiKeys.value = res.data
+}).catch(e => {
+  ElMessage.error("获取 API KEY 失败：" + e.message)
 })

+// 获取数据
+const fetchData = () => {
+  httpGet('/api/admin/model/list').then((res) => {
+    if (res.data) {
+      // 初始化数据
+      const arr = res.data;
+      for (let i = 0; i < arr.length; i++) {
+        arr[i].last_used_at = dateFormat(arr[i].last_used_at)
+      }
+      items.value = arr
+    }
+    loading.value = false
+  }).catch(() => {
+    ElMessage.error("获取数据失败");
+  })
+}

+const clipboard = ref(null)
 onMounted(() => {
+  fetchData()
  const drawBodyWrapper = document.querySelector('.el-table__body tbody')

  // 初始化拖动排序插件
@@ -250,6 +278,19 @@ onMounted(() => {
      })
    }
  })
+
+  clipboard.value = new ClipboardJS('.copy-model');
+  clipboard.value.on('success', () => {
+    ElMessage.success('复制成功！');
+  })
+
+  clipboard.value.on('error', () => {
+    ElMessage.error('复制失败！');
+  })
+})
+
+onUnmounted(() => {
+  clipboard.value.destroy()
 })

 const add = function () {
@@ -267,14 +308,15 @@ const edit = function (row) {
 const save = function () {
  formRef.value.validate((valid) => {
    item.value.temperature = parseFloat(item.value.temperature)
+    if (!item.value.sort_num) {
+      item.value.sort_num = items.value.length
+    }
    if (valid) {
      showDialog.value = false
-      httpPost('/api/admin/model/save', item.value).then((res) => {
+      item.value.key_id = parseInt(item.value.key_id)
+      httpPost('/api/admin/model/save', item.value).then(() => {
        ElMessage.success('操作成功！')
-        if (!item.value['id']) {
-          const newItem = res.data
-          items.value.push(newItem)
-        }
+        fetchData()
      }).catch((e) => {
        ElMessage.error('操作失败，' + e.message)
      })
@@ -306,7 +348,7 @@ const remove = function (row) {

 <style lang="stylus" scoped>
@import "@/assets/css/admin/form.styl";
-.list {
+.model-list {

  .opt-box {
    padding-bottom: 10px;
@@ -318,6 +360,13 @@ const remove = function (row) {
    }
  }

+  .cell {
+    .copy-model {
+      margin-left 6px
+      cursor pointer
+    }
+  }
+
  .el-select {
    width: 100%
  }
--- a/web/src/views/admin/Login.vue
+++ b/web/src/views/admin/Login.vue
@@ -52,7 +52,7 @@ import {setAdminToken} from "@/store/session";
 import {checkAdminSession} from "@/action/session";

 const router = useRouter();
-const title = ref('Geek-AI 控制台登录');
+const title = ref('ChatGPT Plus Admin');
 const username = ref(process.env.VUE_APP_ADMIN_USER);
 const password = ref(process.env.VUE_APP_ADMIN_PASS);

--- a/web/src/views/admin/Roles.vue
+++ b/web/src/views/admin/Roles.vue
@@ -21,6 +21,7 @@
          </template>
        </el-table-column>
        <el-table-column label="角色标识" prop="key"/>
+        <el-table-column label="绑定模型" prop="model_name"/>
        <el-table-column label="启用状态">
          <template #default="scope">
            <el-switch v-model="scope.row['enable']" @change="roleSet('enable',scope.row)"/>
@@ -47,7 +48,7 @@

    <el-dialog
        v-model="showDialog"
-        title="编辑角色"
+        :title="optTitle"
        :close-on-click-modal="false"
        width="50%"
    >
@@ -67,10 +68,33 @@
        </el-form-item>

        <el-form-item label="角色图标：" prop="icon">
-          <el-input
-              v-model="role.icon"
-              autocomplete="off"
-          />
+          <el-input v-model="role.icon">
+            <template #append>
+              <el-upload
+                  :auto-upload="true"
+                  :show-file-list="false"
+                  :http-request="uploadImg"
+              >
+                上传
+              </el-upload>
+            </template>
+          </el-input>
+        </el-form-item>
+
+        <el-form-item label="绑定模型：" prop="model_id">
+          <el-select
+              v-model="role.model_id"
+              filterable
+              placeholder="请选择模型"
+              clearable
+          >
+            <el-option
+                v-for="item in models"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+            />
+          </el-select>
        </el-form-item>

        <el-form-item label="打招呼信息：" prop="hello_msg">
@@ -143,6 +167,7 @@ import {httpGet, httpPost} from "@/utils/http";
 import {ElMessage} from "element-plus";
 import {copyObj, removeArrayItem} from "@/utils/libs";
 import {Sortable} from "sortablejs"
+import Compressor from "compressorjs";

 const showDialog = ref(false)
 const parentBorder = ref(true)
@@ -151,7 +176,7 @@ const tableData = ref([])
 const sortedTableData = ref([])
 const role = ref({context: []})
 const formRef = ref(null)
-const editRow = ref({})
+const optTitle = ref({})
 const loading = ref(true)

 const rules = reactive({
@@ -165,18 +190,30 @@ const rules = reactive({
  hello_msg: [{required: true, message: '请输入打招呼信息', trigger: 'change',}]
 })

-// 获取角色列表
-httpGet('/api/admin/role/list').then((res) => {
-  tableData.value = res.data
-  sortedTableData.value = copyObj(tableData.value)
-  loading.value = false
-}).catch(() => {
-  ElMessage.error("获取聊天角色失败");
+const models = ref([])
+onMounted(() => {
+  fetchData()
+
+  // get chat models
+  httpGet('/api/admin/model/list?enable=1').then((res) => {
+    models.value = res.data
+  }).catch(() => {
+    ElMessage.error("获取AI模型数据失败");
+  })
+
 })

-onMounted(() => {
-  const drawBodyWrapper = document.querySelector('.el-table__body tbody')
+const fetchData = () => {
+  // 获取角色列表
+  httpGet('/api/admin/role/list').then((res) => {
+    tableData.value = res.data
+    sortedTableData.value = copyObj(tableData.value)
+    loading.value = false
+  }).catch(() => {
+    ElMessage.error("获取聊天角色失败");
+  })

+  const drawBodyWrapper = document.querySelector('.el-table__body tbody')
  // 初始化拖动排序插件
  Sortable.create(drawBodyWrapper, {
    sort: true,
@@ -199,7 +236,7 @@ onMounted(() => {
      })
    }
  })
-})
+}

 const roleSet = (filed, row) => {
  httpPost('/api/admin/role/set', {id: row.id, filed: filed, value: row[filed]}).then(() => {
@@ -212,12 +249,14 @@ const roleSet = (filed, row) => {
 // 编辑
 const curIndex = ref(0)
 const rowEdit = function (index, row) {
+  optTitle.value = "修改角色"
  curIndex.value = index
  role.value = copyObj(row)
  showDialog.value = true
 }

 const addRole = function () {
+  optTitle.value = "添加新角色"
  role.value = {context: []}
  showDialog.value = true
 }
@@ -226,14 +265,9 @@ const save = function () {
  formRef.value.validate((valid) => {
    if (valid) {
      showDialog.value = false
-      httpPost('/api/admin/role/save', role.value).then((res) => {
+      httpPost('/api/admin/role/save', role.value).then(() => {
        ElMessage.success('操作成功')
-        // 更新当前数据行
-        if (role.value.id) {
-          tableData.value[curIndex.value] = role.value
-        } else {
-          tableData.value.push(res.data)
-        }
+        fetchData()
      }).catch((e) => {
        ElMessage.error('操作失败，' + e.message)
      })
@@ -263,6 +297,27 @@ const removeContext = function (index) {
  role.value.context.splice(index, 1);
 }

+// 图片上传
+const uploadImg = (file) => {
+  // 压缩图片并上传
+  new Compressor(file.file, {
+    quality: 0.6,
+    success(result) {
+      const formData = new FormData();
+      formData.append('file', result, result.name);
+      // 执行上传操作
+      httpPost('/api/admin/upload', formData).then((res) => {
+        role.value.icon = res.data.url
+        ElMessage.success('上传成功')
+      }).catch((e) => {
+        ElMessage.error('上传失败:' + e.message)
+      })
+    },
+    error(e) {
+      ElMessage.error('上传失败:' + e.message)
+    },
+  });
+};
 </script>

 <style lang="stylus" scoped>
--- a/web/src/views/admin/SysConfig.vue
+++ b/web/src/views/admin/SysConfig.vue
@@ -257,6 +257,20 @@
      <el-tab-pane label="菜单配置" name="menu">
        <Menu/>
      </el-tab-pane>
+
+      <el-tab-pane label="授权激活" name="license">
+        <div class="container">
+          <el-form :model="system" label-width="150px" label-position="right">
+            <el-form-item label="许可授权码" prop="license">
+              <el-input v-model="license"/>
+            </el-form-item>
+
+            <el-form-item>
+              <el-button type="primary" @click="active">立即激活</el-button>
+            </el-form-item>
+          </el-form>
+        </div>
+      </el-tab-pane>
    </el-tabs>
  </div>
 </template>
@@ -275,8 +289,8 @@ const activeName = ref('basic')
 const system = ref({models: []})
 const loading = ref(true)
 const systemFormRef = ref(null)
-const chatFormRef = ref(null)
 const models = ref([])
+const openAIModels = ref([])
 const notice = ref("")

 onMounted(() => {
@@ -295,6 +309,7 @@ onMounted(() => {

  httpGet('/api/admin/model/list').then(res => {
    models.value = res.data
+    openAIModels.value = models.value.filter(v => v.platform === "OpenAI")
    loading.value = false
  }).catch(e => {
    ElMessage.error("获取模型失败：" + e.message)
@@ -320,19 +335,6 @@ const save = function (key) {
        })
      }
    })
-  } else if (key === 'chat') {
-    if (chat.value.context_deep % 2 !== 0) {
-      return ElMessage.error("会话上下文深度必须为偶数！")
-    }
-    chatFormRef.value.validate((valid) => {
-      if (valid) {
-        httpPost('/api/admin/config/update', {key: key, config: chat.value}).then(() => {
-          ElMessage.success("操作成功！")
-        }).catch(e => {
-          ElMessage.error("操作失败：" + e.message)
-        })
-      }
-    })
  } else if (key === 'notice') {
    httpPost('/api/admin/config/update', {key: key, config: {content: notice.value, updated: true}}).then(() => {
      ElMessage.success("操作成功！")
@@ -342,6 +344,19 @@ const save = function (key) {
  }
 }

+// 激活授权
+const license = ref("")
+const active = () => {
+  if (license.value === "") {
+    return ElMessage.error("请输入授权码")
+  }
+  httpPost("/api/admin/active", {license: license.value}).then(res => {
+    ElMessage.success("授权成功，机器编码为：" + res.data)
+  }).catch(e => {
+    ElMessage.error(e.message)
+  })
+}
+
 const configKey = ref("")
 const beforeUpload = (key) => {
  configKey.value = key