merge v4.1.1 and fixed conflicts

web/src/views/admin/ApiKey.vue

@@ -2,19 +2,11 @@
   <div class="container list" v-loading="loading">
 
     <div class="handle-box">
-      <el-select v-model="query.platform" placeholder="平台" class="handle-input">
-        <el-option
-            v-for="item in platforms"
-            :key="item.value"
-            :label="item.name"
-            :value="item.value"
-        />
-      </el-select>
       <el-select v-model="query.type" placeholder="类型" class="handle-input">
         <el-option
             v-for="item in types"
             :key="item.value"
-            :label="item.name"
+            :label="item.label"
             :value="item.value"
         />
       </el-select>
@@ -28,7 +20,6 @@
 
     <el-row>
       <el-table :data="items" :row-key="row => row.id" table-layout="auto">
-        <el-table-column prop="platform" label="所属平台"/>
         <el-table-column prop="name" label="名称"/>
         <el-table-column prop="value" label="API KEY">
           <template #default="scope">
@@ -46,10 +37,9 @@
             </el-icon>
           </template>
         </el-table-column>
-        <el-table-column prop="type" label="用途">
+        <el-table-column prop="type" label="类型">
           <template #default="scope">
-            <el-tag v-if="scope.row.type === 'chat'">聊天</el-tag>
-            <el-tag v-else-if="scope.row.type === 'img'" type="success">绘图</el-tag>
+            {{getTypeName(scope.row.type)}}
           </template>
         </el-table-column>
         <el-table-column prop="proxy_url" label="代理地址"/>
@@ -84,30 +74,14 @@
         :close-on-click-modal="false"
         :title="title"
     >
-      <el-alert
-          type="warning"
-          :closable="false"
-          show-icon
-          style="margin-bottom: 10px; font-size:14px;">
-        <p><b>注意：</b>如果是百度文心一言平台，API-KEY 为 APIKey|SecretKey，中间用竖线（|）连接</p>
-        <p><b>注意：</b>如果是讯飞星火大模型，API-KEY 为 AppId|APIKey|APISecret，中间用竖线（|）连接</p>
-      </el-alert>
       <el-form :model="item" label-width="120px" ref="formRef" :rules="rules">
-        <el-form-item label="所属平台：" prop="platform">
-          <el-select v-model="item.platform" placeholder="请选择平台" @change="changePlatform">
-            <el-option v-for="item in platforms" :value="item.value" :label="item.name" :key="item.value">{{
-                item.name
-              }}
-            </el-option>
-          </el-select>
-        </el-form-item>
         <el-form-item label="名称：" prop="name">
           <el-input v-model="item.name" autocomplete="off"/>
         </el-form-item>
-        <el-form-item label="用途：" prop="type">
-          <el-select v-model="item.type" placeholder="请选择用途" @change="changeType">
-            <el-option v-for="item in types" :value="item.value" :label="item.name" :key="item.value">{{
-                item.name
+        <el-form-item label="类型：" prop="type">
+          <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>
@@ -117,12 +91,12 @@
         </el-form-item>
         <el-form-item label="API URL：" prop="api_url">
           <el-input v-model="item.api_url" autocomplete="off"
-                    placeholder="必须填土完整的 Chat API URL，如：https://api.openai.com/v1/chat/completions"/>
-          <div class="info">如果你使用了第三方中转，这里就填写中转地址</div>
+                    placeholder="只填 BASE URL 即可，如：https://api.openai.com"/>
         </el-form-item>
 
         <el-form-item label="代理地址：" prop="proxy_url">
           <el-input v-model="item.proxy_url" autocomplete="off"/>
+          <div class="info">如果想要通过代理来访问 API，请填写代理地址，如：http://127.0.0.1:7890</div>
         </el-form-item>
 
         <el-form-item label="启用状态：" prop="enable">
@@ -150,22 +124,24 @@ import ClipboardJS from "clipboard";
 
 // 变量定义
 const items = ref([])
-const query = ref({type: '',platform:''})
+const query = ref({type: ''})
 const item = ref({})
 const showDialog = ref(false)
 const rules = reactive({
-  platform: [{required: true, message: '请选择平台', trigger: 'change',}],
   name: [{required: true, message: '请输入名称', trigger: 'change',}],
   type: [{required: true, message: '请选择用途', trigger: 'change',}],
   value: [{required: true, message: '请输入 API KEY 值', trigger: 'change',}]
 })
+
 const loading = ref(true)
 const formRef = ref(null)
 const title = ref("")
-const platforms = ref([])
 const types = ref([
-  {name: "聊天", value: "chat"},
-  {name: "绘画", value: "img"},
+  {label: "对话", value:"chat"},
+  {label: "Midjourney", value:"mj"},
+  {label: "DALL-E", value:"dalle"},
+  {label: "Suno文生歌", value:"suno"},
+  {label: "Luma视频", value:"luma"},
 ])
 
 
@@ -180,12 +156,6 @@ onMounted(() => {
     ElMessage.error('复制失败！');
   })
 
-  httpGet("/api/admin/config/get/app").then(res => {
-    platforms.value = res.data.platforms
-  }).catch(e =>{
-    ElMessage.error("获取配置失败："+e.message)
-  })
-
   fetchData()
 })
 
@@ -193,6 +163,15 @@ onUnmounted(() => {
   clipboard.value.destroy()
 })
 
+const getTypeName = (type) => {
+  for (let v of types.value) {
+    if (v.value === type) {
+      return v.label
+    }
+  }
+  return ""
+}
+
 // 获取数据
 
 const fetchData = () => {
@@ -262,26 +241,6 @@ const set = (filed, row) => {
   })
 }
 
-const selectedPlatform = ref(null)
-const changePlatform = (value) => {
-  console.log(value)
-  for (let v of platforms.value) {
-    if (v.value === value) {
-      selectedPlatform.value = v
-      item.value.api_url = v.chat_url
-    }
-  }
-}
-
-const changeType = (value) => {
-  if (selectedPlatform.value) {
-    if(value === 'img') {
-      item.value.api_url = selectedPlatform.value.img_url
-    } else {
-      item.value.api_url = selectedPlatform.value.chat_url
-    }
-  }
-}
 </script>
 
 <style lang="stylus" scoped>

web/src/views/admin/ChatModel.vue

@@ -2,14 +2,7 @@
   <div class="container model-list" v-loading="loading">
 
     <div class="handle-box">
-      <el-select v-model="query.platform" placeholder="平台" class="handle-input">
-        <el-option
-            v-for="item in platforms"
-            :key="item.value"
-            :label="item.name"
-            :value="item.value"
-        />
-      </el-select>
+      <el-input v-model="query.name" placeholder="模型名称" class="handle-input" />
 
       <el-button :icon="Search" @click="fetchData">搜索</el-button>
       <el-button type="primary" :icon="Plus" @click="add">新增</el-button>
@@ -17,11 +10,6 @@
 
     <el-row>
       <el-table :data="items" :row-key="row => row.id" table-layout="auto">
-        <el-table-column prop="platform" label="所属平台">
-          <template #default="scope">
-            <span class="sort" :data-id="scope.row.id">{{ scope.row.platform }}</span>
-          </template>
-        </el-table-column>
         <el-table-column prop="name" label="模型名称"/>
         <el-table-column prop="value" label="模型值">
           <template #default="scope">
@@ -46,11 +34,6 @@
           </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">
@@ -72,15 +55,6 @@
         style="width: 90%; max-width: 600px;"
     >
       <el-form :model="item" label-width="120px" ref="formRef" :rules="rules">
-        <el-form-item label="所属平台：" prop="platform">
-          <el-select v-model="item.platform" placeholder="请选择平台">
-            <el-option v-for="item in platforms" :value="item.value" :label="item.name" :key="item.value">{{
-                item.name
-              }}
-            </el-option>
-          </el-select>
-        </el-form-item>
-
         <el-form-item label="模型名称：" prop="name">
           <el-input v-model="item.name" autocomplete="off"/>
         </el-form-item>
@@ -89,7 +63,7 @@
           <el-input v-model="item.value" autocomplete="off"/>
         </el-form-item>
 
-        <el-form-item label="费率：" prop="weight">
+        <el-form-item label="消耗算力：" prop="weight">
           <template #default>
             <div class="tip-input">
               <el-input-number :min="0" v-model="item.power" autocomplete="off"/>
@@ -121,18 +95,7 @@
                   class="box-item"
                   effect="dark"
                   raw-content
-                  content="gpt-3.5-turbo:4096 <br/>
-              gpt-3.5-turbo-16k: 16384 <br/>
-              gpt-4:             8192 <br/>
-              gpt-4-32k:         32768 <br/>
-              chatglm_pro:       32768 <br/>
-              chatglm_std:       16384 <br/>
-              chatglm_lite:      4096 <br/>
-              qwen-turbo:        8192 <br/>
-              qwen-plus:         32768 <br/>
-              文心一言:            8192 <br/>
-              星火1.0:            4096 <br/>
-              星火2.0-星火3.5:     8192"
+                  content="去各大模型的官方 API 文档查询模型支持的最大上下文长度"
                   placement="right"
               >
                 <el-icon>
@@ -214,18 +177,16 @@ import ClipboardJS from "clipboard";
 
 // 变量定义
 const items = ref([])
-const query = ref({platform:''})
+const query = ref({name:''})
 const item = ref({})
 const showDialog = ref(false)
 const title = ref("")
 const rules = reactive({
-  platform: [{required: true, message: '请选择平台', trigger: 'change',}],
   name: [{required: true, message: '请输入模型名称', trigger: 'change',}],
   value: [{required: true, message: '请输入模型值', trigger: 'change',}]
 })
 const loading = ref(true)
 const formRef = ref(null)
-const platforms = ref([])
 
 // 获取 API KEY
 const apiKeys = ref([])
@@ -290,12 +251,6 @@ onMounted(() => {
   clipboard.value.on('error', () => {
     ElMessage.error('复制失败！');
   })
-
-  httpGet("/api/admin/config/get/app").then(res => {
-    platforms.value = res.data.platforms
-  }).catch(e =>{
-    ElMessage.error("获取配置失败："+e.message)
-  })
 })
 
 onUnmounted(() => {
@@ -305,7 +260,7 @@ onUnmounted(() => {
 const add = function () {
   title.value = "新增模型"
   showDialog.value = true
-  item.value = {enabled: true, weight: 1, open: true}
+  item.value = {enabled: true, power: 1, open: true,max_tokens: 1024,max_context: 8192, temperature: 0.9,}
 }
 
 const edit = function (row) {

web/src/views/admin/Login.vue

@@ -59,7 +59,7 @@ const router = useRouter();
 const title = ref('Geek-AI Console');
 const username = ref(process.env.VUE_APP_ADMIN_USER);
 const password = ref(process.env.VUE_APP_ADMIN_PASS);
-const logo = ref("/images/logo.png")
+const logo = ref("")
 
 checkAdminSession().then(() => {
   router.push("/admin")

web/src/views/admin/SysConfig.vue

@@ -50,9 +50,45 @@
                       </template>
                     </el-input>
                     <el-button type="primary" @click="system.index_bg_url = 'https://api.dujin.org/bing/1920.php'">使用动态背景</el-button>
+                    <el-button @click="system.index_bg_url = 'color'">使用纯色背景</el-button>
                   </div>
                 </el-form-item>
 
+                <el-form-item label="首页导航菜单" prop="index_navs">
+                  <div class="tip-input">
+                    <el-select
+                        v-model="system['index_navs']"
+                        multiple
+                        :filterable="true"
+                        placeholder="请选择菜单，多选"
+                        style="width: 100%"
+                    >
+                      <el-option
+                          v-for="item in menus"
+                          :key="item.id"
+                          :label="item.name"
+                          :value="item.id"
+                      />
+                    </el-select>
+                    <div class="info">
+                      <el-tooltip
+                          class="box-item"
+                          effect="dark"
+                          content="被选中的菜单将会在首页导航栏显示"
+                          placement="right"
+                      >
+                        <el-icon>
+                          <InfoFilled/>
+                        </el-icon>
+                      </el-tooltip>
+                    </div>
+                  </div>
+                </el-form-item>
+
+                <el-form-item label="版权信息" prop="copyright">
+                  <el-input v-model="system['copyright']" placeholder="更改此选项需要获取 License 授权"/>
+                </el-form-item>
+
                 <el-form-item label="开放注册" prop="enabled_register">
                   <div class="tip-input">
                     <el-switch v-model="system['enabled_register']"/>
@@ -218,6 +254,9 @@
                 <el-form-item label="DALL-E-3算力" prop="dall_power">
                   <el-input v-model.number="system['dall_power']" placeholder="使用DALL-E-3画一张图消耗算力"/>
                 </el-form-item>
+                <el-form-item label="Suno 算力" prop="suno_power">
+                  <el-input v-model.number="system['suno_power']" placeholder="使用 Suno 生成一首音乐消耗算力"/>
+                </el-form-item>
               </el-tab-pane>
               <el-tab-pane label="众筹支付">
                 <el-form-item label="启用众筹功能" prop="enabled_reward">
@@ -391,22 +430,25 @@ import {InfoFilled, UploadFilled,Select,CloseBold} 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 {dateFormat} from "@/utils/libs";
+import {copyObj, dateFormat} from "@/utils/libs";
 import AIDrawing from "@/views/admin/AIDrawing.vue";
 
 const activeName = ref('basic')
 const system = ref({models: []})
+const configBak = ref({})
 const loading = ref(true)
 const systemFormRef = ref(null)
 const models = ref([])
 const openAIModels = ref([])
 const notice = ref("")
 const license = ref({is_active: false})
+const menus = ref([])
 
 onMounted(() => {
   // 加载系统配置
   httpGet('/api/admin/config/get?key=system').then(res => {
     system.value = res.data
+    configBak.value = copyObj(system.value)
   }).catch(e => {
     ElMessage.error("加载系统配置失败: " + e.message)
   })
@@ -425,6 +467,12 @@ onMounted(() => {
     ElMessage.error("获取模型失败：" + e.message)
   })
 
+  httpGet('/api/admin/menu/list').then(res => {
+    menus.value = res.data
+  }).catch(e => {
+    ElMessage.error("获取模型失败：" + e.message)
+  })
+
   fetchLicense()
 })
 
@@ -447,7 +495,7 @@ const save = function (key) {
     systemFormRef.value.validate((valid) => {
       if (valid) {
         system.value['power_price'] = parseFloat(system.value['power_price']) ?? 0
-        httpPost('/api/admin/config/update', {key: key, config: system.value}).then(() => {
+        httpPost('/api/admin/config/update', {key: key, config: system.value, config_bak: configBak.value}).then(() => {
           ElMessage.success("操作成功！")
         }).catch(e => {
           ElMessage.error("操作失败：" + e.message)