add 'type' field for ChatModel, support Chat and Image model

web/src/views/admin/ApiKey.vue

@@ -7,7 +7,7 @@
 
       <el-button :icon="Search" @click="fetchData">搜索</el-button>
       <el-button type="primary" :icon="Plus" @click="add">新增</el-button>
-      <a href="https://api.chat-plus.net" target="_blank" style="margin-left: 10px">
+      <a href="https://api.geekai.pro" target="_blank" style="margin-left: 10px">
         <el-button type="success" :icon="ShoppingCart" @click="add" plain>购买API-KEY</el-button>
       </a>
     </div>
@@ -66,10 +66,21 @@
     <el-dialog v-model="showDialog" :close-on-click-modal="false" :title="title">
       <el-form :model="item" label-width="120px" ref="formRef" :rules="rules">
         <el-form-item label="名称：" prop="name">
-          <el-input v-model="item.name" autocomplete="off" />
+          <template #default>
+            <el-row :gutter="10" class="w-full">
+              <el-col :span="12">
+                <el-input v-model="item.name" autocomplete="off" />
+              </el-col>
+              <el-col :span="12">
+                <el-select v-model="preset" placeholder="请选择预设" @change="changePreset">
+                  <el-option v-for="item in presets" :value="item" :label="item.label" :key="item.value">{{ item.label }} </el-option>
+                </el-select>
+              </el-col>
+            </el-row>
+          </template>
         </el-form-item>
         <el-form-item label="类型：" prop="type">
-          <el-select v-model="item.type" placeholder="请选择类型" @change="changeType">
+          <el-select v-model="item.type" placeholder="请选择类型">
             <el-option v-for="item in types" :value="item.value" :label="item.label" :key="item.value">{{ item.label }} </el-option>
           </el-select>
         </el-form-item>
@@ -111,10 +122,7 @@ import ClipboardJS from "clipboard";
 // 变量定义
 const items = ref([]);
 const query = ref({ type: "" });
-const item = ref({
-  enabled: true,
-  api_url: "",
-});
+const item = ref({});
 const showDialog = ref(false);
 const rules = reactive({
   name: [{ required: true, message: "请输入名称", trigger: "change" }],
@@ -136,6 +144,14 @@ const types = ref([
 ]);
 const isEdit = ref(false);
 const clipboard = ref(null);
+const presets = ref([
+  { label: "GiteeAI", value: "https://ai.gitee.com" },
+  { label: "中转01", value: "https://api.geekai.pro" },
+  { label: "中转03", value: "https://api.geekai.me" },
+  { label: "OpenAI", value: "https://api.openai.com" },
+]);
+const preset = ref(null);
+
 onMounted(() => {
   clipboard.value = new ClipboardJS(".copy-key");
   clipboard.value.on("success", () => {
@@ -153,18 +169,6 @@ onUnmounted(() => {
   clipboard.value.destroy();
 });
 
-const changeType = (event) => {
-  if (isEdit.value) {
-    return;
-  }
-
-  if (event === "realtime") {
-    item.value.api_url = "wss://api.geekai.pro";
-  } else {
-    item.value.api_url = "https://api.geekai.pro";
-  }
-};
-
 const getTypeName = (type) => {
   for (let v of types.value) {
     if (v.value === type) {
@@ -175,7 +179,6 @@ const getTypeName = (type) => {
 };
 
 // 获取数据
-
 const fetchData = () => {
   httpGet("/api/admin/apikey/list", query.value)
     .then((res) => {
@@ -198,6 +201,10 @@ const add = function () {
   showDialog.value = true;
   title.value = "新增 API KEY";
   isEdit.value = false;
+  item.value = {
+    enabled: true,
+    api_url: "",
+  };
 };
 
 const edit = function (row) {
@@ -251,6 +258,13 @@ const set = (filed, row) => {
       ElMessage.error("操作失败：" + e.message);
     });
 };
+
+const changePreset = (row) => {
+  item.value.api_url = row.value;
+  if (!item.value.name) {
+    item.value.name = row.label;
+  }
+};
 </script>
 
 <style lang="stylus" scoped>

web/src/views/admin/ChatModel.vue

@@ -1,6 +1,5 @@
 <template>
   <div class="container model-list" v-loading="loading">
-
     <div class="handle-box">
       <el-input v-model="query.name" placeholder="模型名称" class="handle-input" />
 
@@ -9,7 +8,7 @@
     </div>
 
     <el-row>
-      <el-table :data="items" :row-key="row => row.id" table-layout="auto">
+      <el-table :data="items" :row-key="(row) => row.id" table-layout="auto">
         <el-table-column type="selection" width="38"></el-table-column>
         <el-table-column prop="name" label="模型名称">
           <template #default="scope">
@@ -19,30 +18,36 @@
             </span>
           </template>
         </el-table-column>
+        <el-table-column prop="type" label="模型类型">
+          <template #default="scope">
+            <el-tag type="primary" v-if="scope.row.type === 'img'">绘图</el-tag>
+            <el-tag type="success" v-else>聊天</el-tag>
+          </template>
+        </el-table-column>
         <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/>
+              <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="最大上下文长度"/>
-        <el-table-column prop="temperature" label="创意度"/>
+        <el-table-column prop="power" label="费率" />
+        <el-table-column prop="max_tokens" label="最大响应长度" />
+        <el-table-column prop="max_context" label="最大上下文长度" />
+        <el-table-column prop="temperature" label="创意度" />
         <el-table-column prop="enabled" label="启用状态">
           <template #default="scope">
-            <el-switch v-model="scope.row['enabled']" @change="modelSet('enabled',scope.row)"/>
+            <el-switch v-model="scope.row['enabled']" @change="modelSet('enabled', scope.row)" />
           </template>
         </el-table-column>
         <el-table-column prop="enabled" label="开放状态">
           <template #default="scope">
-            <el-switch v-model="scope.row['open']" @change="modelSet('open',scope.row)"/>
+            <el-switch v-model="scope.row['open']" @change="modelSet('open', scope.row)" />
           </template>
         </el-table-column>
 
-        <el-table-column prop="key_name" label="绑定API-KEY"/>
+        <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>
@@ -56,81 +61,70 @@
       </el-table>
     </el-row>
 
-    <el-dialog
-        v-model="showDialog"
-        :title="title"
-        :close-on-click-modal="false"
-        style="width: 90%; max-width: 600px;"
-    >
+    <el-dialog v-model="showDialog" :title="title" :close-on-click-modal="false" style="width: 90%; max-width: 600px">
       <el-form :model="item" label-width="120px" ref="formRef" :rules="rules">
+        <el-form-item label="模型类型：" prop="type">
+          <el-select v-model="item.type" placeholder="请选择模型类型">
+            <el-option v-for="v in type" :value="v.value" :label="v.label" :key="v.value">
+              {{ v.label }}
+            </el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item label="模型名称：" prop="name">
-          <el-input v-model="item.name" autocomplete="off"/>
+          <el-input v-model="item.name" autocomplete="off" />
         </el-form-item>
 
         <el-form-item label="模型值：" prop="value">
-          <el-input v-model="item.value" autocomplete="off"/>
+          <el-input v-model="item.value" autocomplete="off" />
         </el-form-item>
 
-        <el-form-item label="消耗算力：" prop="weight">
-          <template #default>
-            <div class="tip-input">
-              <el-input-number :min="0" v-model="item.power" autocomplete="off"/>
-              <div class="info">
-                <el-tooltip
-                    class="box-item"
-                    effect="dark"
-                    content="每次对话扣减多少单位算力"
-                    placement="right"
-                >
+        <el-form-item label="消耗算力：" prop="power">
+          <template #label>
+            <div class="flex items-center">
+              <span class="mr-1">消耗算力</span>
+              <el-tooltip effect="dark" content="每日签到赠送算力" raw-content placement="right">
+                <el-icon>
+                  <InfoFilled />
+                </el-icon>
+              </el-tooltip>
+            </div>
+          </template>
+          <el-input v-model.number="item.power" autocomplete="off" placeholder="消耗算力" />
+        </el-form-item>
+
+        <div v-if="item.type === 'chat'">
+          <el-form-item label="最长响应：" prop="max_tokens">
+            <el-input v-model.number="item.max_tokens" autocomplete="off" placeholder="模型最大响应长度" />
+          </el-form-item>
+
+          <el-form-item>
+            <template #label>
+              <div class="flex items-center">
+                <span class="mr-1">最大上下文</span>
+                <el-tooltip effect="dark" content="去各大模型的官方 API 文档查询模型支持的最大上下文长度" raw-content placement="right">
                   <el-icon>
-                    <InfoFilled/>
+                    <InfoFilled />
                   </el-icon>
                 </el-tooltip>
               </div>
-            </div>
-          </template>
-        </el-form-item>
+            </template>
+            <el-input v-model.number="item.max_context" autocomplete="off" placeholder="模型最大上下文长度" />
+          </el-form-item>
 
-        <el-form-item label="最长响应：" prop="max_tokens">
-          <el-input v-model.number="item.max_tokens" autocomplete="off" placeholder="模型最大响应长度"/>
-        </el-form-item>
-
-        <el-form-item label="最大上下文：" prop="max_context">
-          <div class="tip-input">
-            <el-input v-model.number="item.max_context" autocomplete="off" placeholder="模型最大上下文长度"/>
-            <div class="info">
-              <el-tooltip
-                  class="box-item"
-                  effect="dark"
-                  raw-content
-                  content="去各大模型的官方 API 文档查询模型支持的最大上下文长度"
-                  placement="right"
-              >
-                <el-icon>
-                  <InfoFilled/>
-                </el-icon>
-              </el-tooltip>
-            </div>
-          </div>
-        </el-form-item>
-
-        <el-form-item label="创意度：" prop="temperature">
-          <div class="tip-input">
-            <el-input v-model="item.temperature" autocomplete="off" placeholder="模型创意度"/>
-            <div class="info">
-              <el-tooltip
-                  class="box-item"
-                  effect="dark"
-                  content="OpenAI 0-2，其他模型 0-1"
-                  placement="right"
-              >
-                <el-icon>
-                  <InfoFilled/>
-                </el-icon>
-              </el-tooltip>
-            </div>
-          </div>
-        </el-form-item>
+          <el-form-item label="创意度：" prop="temperature">
+            <template #label>
+              <div class="flex items-center">
+                <span class="mr-1">创意度</span>
+                <el-tooltip effect="dark" content="OpenAI 0-2，其他模型 0-1" raw-content placement="right">
+                  <el-icon>
+                    <InfoFilled />
+                  </el-icon>
+                </el-tooltip>
+              </div>
+            </template>
+            <el-input v-model="item.temperature" autocomplete="off" placeholder="模型创意度" />
+          </el-form-item>
+        </div>
 
         <el-form-item label="绑定API-KEY：" prop="apikey">
           <el-select v-model="item.key_id" placeholder="请选择 API KEY" filterable clearable>
@@ -142,181 +136,193 @@
         </el-form-item>
 
         <el-form-item label="启用状态：" prop="enable">
-          <el-switch v-model="item.enabled"/>
+          <el-switch v-model="item.enabled" />
         </el-form-item>
-        <el-form-item label="开放状态：" prop="open">
-          <div class="tip-input">
-            <el-switch v-model="item.open"/>
-            <div class="info">
-              <el-tooltip
-                  class="box-item"
-                  effect="dark"
-                  raw-content
-                  content="开放后，该模型将对所有用户可见。<br/> 如果模型没有启用，则当前设置无效。"
-                  placement="right"
-              >
+        <el-form-item>
+          <template #label>
+            <div class="flex items-center">
+              <span class="mr-1">开放状态</span>
+              <el-tooltip effect="dark" content="开放后，该模型将对所有用户可见。<br/> 如果模型没有启用，则当前设置无效。" raw-content placement="right">
                 <el-icon>
-                  <InfoFilled/>
+                  <InfoFilled />
                 </el-icon>
               </el-tooltip>
             </div>
-          </div>
+          </template>
+          <el-switch v-model="item.open" />
         </el-form-item>
       </el-form>
 
       <template #footer>
-            <span class="dialog-footer">
-              <el-button @click="showDialog = false">取消</el-button>
-              <el-button type="primary" @click="save">提交</el-button>
-            </span>
+        <span class="dialog-footer">
+          <el-button @click="showDialog = false">取消</el-button>
+          <el-button type="primary" @click="save">提交</el-button>
+        </span>
       </template>
     </el-dialog>
   </div>
 </template>
 
 <script setup>
-import {onMounted, onUnmounted, reactive, ref} from "vue";
-import {httpGet, httpPost} from "@/utils/http";
-import {ElMessage} from "element-plus";
-import {dateFormat, removeArrayItem, substr} from "@/utils/libs";
-import {DocumentCopy, InfoFilled, Plus,Search} from "@element-plus/icons-vue";
-import {Sortable} from "sortablejs";
+import { onMounted, onUnmounted, reactive, ref } from "vue";
+import { httpGet, httpPost } from "@/utils/http";
+import { ElMessage } from "element-plus";
+import { dateFormat, removeArrayItem, substr } from "@/utils/libs";
+import { DocumentCopy, InfoFilled, Plus, Search } from "@element-plus/icons-vue";
+import { Sortable } from "sortablejs";
 import ClipboardJS from "clipboard";
 import Default from "md-editor-v3";
 
 // 变量定义
-const items = ref([])
-const query = ref({name:''})
-const item = ref({})
-const showDialog = ref(false)
-const title = ref("")
+const items = ref([]);
+const query = ref({ name: "" });
+const item = ref({});
+const showDialog = ref(false);
+const title = ref("");
 const rules = reactive({
-  name: [{required: true, message: '请输入模型名称', trigger: 'change',}],
-  value: [{required: true, message: '请输入模型值', trigger: 'change',}]
-})
-const loading = ref(true)
-const formRef = ref(null)
+  type: [{ required: true, message: "请选择模型类型", trigger: "change" }],
+  name: [{ required: true, message: "请输入模型名称", trigger: "change" }],
+  value: [{ required: true, message: "请输入模型值", trigger: "change" }],
+  power: [{ required: true, message: "请输入消耗算力", trigger: "change" }],
+});
+const loading = ref(true);
+const formRef = ref(null);
+const type = ref([
+  { label: "聊天", value: "chat" },
+  { label: "绘图", value: "img" },
+]);
 
 // 获取 API KEY
-const apiKeys = ref([])
-httpGet('/api/admin/apikey/list?type=chat').then(res => {
-  apiKeys.value = res.data
-}).catch(e => {
-  ElMessage.error("获取 API KEY 失败：" + e.message)
-})
+const apiKeys = ref([]);
+httpGet("/api/admin/apikey/list?type=chat")
+  .then((res) => {
+    apiKeys.value = res.data;
+  })
+  .catch((e) => {
+    ElMessage.error("获取 API KEY 失败：" + e.message);
+  });
 
 // 获取数据
 const fetchData = () => {
-  httpGet('/api/admin/model/list', query.value).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)
+  httpGet("/api/admin/model/list", query.value)
+    .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;
       }
-      items.value = arr
-    }
-    loading.value = false
-  }).catch(() => {
-    ElMessage.error("获取数据失败");
-  })
-}
+      loading.value = false;
+    })
+    .catch(() => {
+      ElMessage.error("获取数据失败");
+    });
+};
 
-const clipboard = ref(null)
+const clipboard = ref(null);
 onMounted(() => {
-  fetchData()
-  const drawBodyWrapper = document.querySelector('.el-table__body tbody')
+  fetchData();
+  const drawBodyWrapper = document.querySelector(".el-table__body tbody");
 
   // 初始化拖动排序插件
   Sortable.create(drawBodyWrapper, {
     sort: true,
     animation: 500,
-    onEnd({newIndex, oldIndex, from}) {
+    onEnd({ newIndex, oldIndex, from }) {
       if (oldIndex === newIndex) {
-        return
+        return;
       }
 
-      const sortedData = Array.from(from.children).map(row => row.querySelector('.sort').getAttribute('data-id'));
-      const ids = []
-      const sorts = []
+      const sortedData = Array.from(from.children).map((row) => row.querySelector(".sort").getAttribute("data-id"));
+      const ids = [];
+      const sorts = [];
       sortedData.forEach((id, index) => {
-        ids.push(parseInt(id))
-        sorts.push(index + 1)
-        items.value[index].sort_num = index + 1
-      })
+        ids.push(parseInt(id));
+        sorts.push(index + 1);
+        items.value[index].sort_num = index + 1;
+      });
 
-      httpPost("/api/admin/model/sort", {ids: ids, sorts: sorts}).then(() => {
-      }).catch(e => {
-        ElMessage.error("排序失败：" + e.message)
-      })
-    }
-  })
+      httpPost("/api/admin/model/sort", { ids: ids, sorts: sorts })
+        .then(() => {})
+        .catch((e) => {
+          ElMessage.error("排序失败：" + e.message);
+        });
+    },
+  });
 
-  clipboard.value = new ClipboardJS('.copy-model');
-  clipboard.value.on('success', () => {
-    ElMessage.success('复制成功！');
-  })
+  clipboard.value = new ClipboardJS(".copy-model");
+  clipboard.value.on("success", () => {
+    ElMessage.success("复制成功！");
+  });
 
-  clipboard.value.on('error', () => {
-    ElMessage.error('复制失败！');
-  })
-})
+  clipboard.value.on("error", () => {
+    ElMessage.error("复制失败！");
+  });
+});
 
 onUnmounted(() => {
-  clipboard.value.destroy()
-})
+  clipboard.value.destroy();
+});
 
 const add = function () {
-  title.value = "新增模型"
-  showDialog.value = true
-  item.value = {enabled: true, power: 1, open: true,max_tokens: 1024,max_context: 8192, temperature: 0.9,}
-}
+  title.value = "新增模型";
+  showDialog.value = true;
+  item.value = { enabled: true, power: 1, open: true, max_tokens: 1024, max_context: 8192, temperature: 0.9 };
+};
 
 const edit = function (row) {
-  title.value = "修改模型"
-  showDialog.value = true
-  item.value = row
-}
+  title.value = "修改模型";
+  showDialog.value = true;
+  item.value = row;
+};
 
 const save = function () {
   formRef.value.validate((valid) => {
-    item.value.temperature = parseFloat(item.value.temperature)
+    item.value.temperature = parseFloat(item.value.temperature);
     if (!item.value.sort_num) {
-      item.value.sort_num = items.value.length
+      item.value.sort_num = items.value.length;
     }
     if (valid) {
-      showDialog.value = false
-      item.value.key_id = parseInt(item.value.key_id)
-      httpPost('/api/admin/model/save', item.value).then(() => {
-        ElMessage.success('操作成功！')
-        fetchData()
-      }).catch((e) => {
-        ElMessage.error('操作失败，' + e.message)
-      })
+      showDialog.value = false;
+      item.value.key_id = parseInt(item.value.key_id);
+      httpPost("/api/admin/model/save", item.value)
+        .then(() => {
+          ElMessage.success("操作成功！");
+          fetchData();
+        })
+        .catch((e) => {
+          ElMessage.error("操作失败，" + e.message);
+        });
     } else {
-      return false
+      return false;
     }
-  })
-}
+  });
+};
 
 const modelSet = (filed, row) => {
-  httpPost('/api/admin/model/set', {id: row.id, filed: filed, value: row[filed]}).then(() => {
-    ElMessage.success("操作成功！")
-  }).catch(e => {
-    ElMessage.error("操作失败：" + e.message)
-  })
-}
+  httpPost("/api/admin/model/set", { id: row.id, filed: filed, value: row[filed] })
+    .then(() => {
+      ElMessage.success("操作成功！");
+    })
+    .catch((e) => {
+      ElMessage.error("操作失败：" + e.message);
+    });
+};
 
 const remove = function (row) {
-  httpGet('/api/admin/model/remove?id=' + row.id).then(() => {
-    ElMessage.success("删除成功！")
-    items.value = removeArrayItem(items.value, row, (v1, v2) => {
-      return v1.id === v2.id
+  httpGet("/api/admin/model/remove?id=" + row.id)
+    .then(() => {
+      ElMessage.success("删除成功！");
+      items.value = removeArrayItem(items.value, row, (v1, v2) => {
+        return v1.id === v2.id;
+      });
     })
-  }).catch((e) => {
-    ElMessage.error("删除失败：" + e.message)
-  })
-}
+    .catch((e) => {
+      ElMessage.error("删除失败：" + e.message);
+    });
+};
 </script>
 
 <style lang="stylus" scoped>
@@ -357,4 +363,4 @@ const remove = function (row) {
   }
 
 }
-</style>
+</style>

web/src/views/admin/SysConfig.vue

@@ -203,12 +203,18 @@
                 <el-form-item label="VIP每月赠送算力" prop="vip_month_power">
                   <el-input v-model.number="system['vip_month_power']" placeholder="VIP用户每月赠送算力" />
                 </el-form-item>
-                <el-form-item label="每日赠送算力" prop="daily_power">
+                <el-form-item>
+                  <template #label>
+                    <div class="label-title">
+                      签到赠送算力
+                      <el-tooltip effect="dark" content="每日签到赠送算力" raw-content placement="right">
+                        <el-icon>
+                          <InfoFilled/>
+                        </el-icon>
+                      </el-tooltip>
+                    </div>
+                  </template>
                   <el-input v-model.number="system['daily_power']" placeholder="默认值0" />
-
-                  <el-text type="info">
-                    如果设置0表示不赠送，用户享受完免费算力额度之后就不能再发起对话了。如果设置为N，则系统每天将算力值小于N的用户自动补充到N。注意，此功能要配合XXL-JOB启用。
-                  </el-text>
                 </el-form-item>
                 <el-form-item>
                   <template #label>
@@ -240,6 +246,17 @@
                   <el-input v-model.number="system['sd_power']" placeholder="使用Stable-Diffusion画一张图消耗算力" />
                 </el-form-item>
                 <el-form-item label="DALL-E-3算力" prop="dall_power">
+                  <template #label>
+                    <div class="label-title">
+                      MJ操作算力
+                      <el-tooltip effect="dark" content="主要用户函数调用 DALL-E-3 进行绘画" raw-content
+                                  placement="right">
+                        <el-icon>
+                          <InfoFilled/>
+                        </el-icon>
+                      </el-tooltip>
+                    </div>
+                  </template>
                   <el-input v-model.number="system['dall_power']" placeholder="使用DALL-E-3画一张图消耗算力" />
                 </el-form-item>
                 <el-form-item label="Suno 算力" prop="suno_power">
@@ -379,17 +396,17 @@
 </template>
 
 <script setup>
-import { onMounted, reactive, ref } from "vue";
-import { httpGet, httpPost } from "@/utils/http";
+import {onMounted, reactive, ref} from "vue";
+import {httpGet, httpPost} from "@/utils/http";
 import Compressor from "compressorjs";
-import { ElMessage, ElMessageBox } from "element-plus";
-import { CloseBold, InfoFilled, Select, UploadFilled } from "@element-plus/icons-vue";
+import {ElMessage, ElMessageBox} from "element-plus";
+import {CloseBold, InfoFilled, Select, UploadFilled} from "@element-plus/icons-vue";
 import MdEditor from "md-editor-v3";
 import "md-editor-v3/lib/style.css";
 import Menu from "@/views/admin/Menu.vue";
-import { copyObj, dateFormat } from "@/utils/libs";
+import {copyObj, dateFormat} from "@/utils/libs";
 import ItemsInput from "@/components/ui/ItemsInput.vue";
-import { useSharedStore } from "@/store/sharedata";
+import {useSharedStore} from "@/store/sharedata";
 
 const activeName = ref("basic");
 const system = ref({ models: [] });