merge v4.1.3

2025-11-13 04:33:42 +08:00 · 2024-12-16 10:07:52 +08:00
parent 296eabe09a cdaf6fb9dc
commit c2503e663a
134 changed files with 4804 additions and 1583 deletions
--- a/web/src/views/admin/Apps.vue
+++ b/web/src/views/admin/Apps.vue
@@ -17,7 +17,10 @@
        </el-table-column>
        <el-table-column label="应用名称" prop="name">
          <template #default="scope">
-            <span class="sort" :data-id="scope.row.id">{{ scope.row.name }}</span>
+            <span class="sort" :data-id="scope.row.id">
+              <i class="iconfont icon-drag"></i>
+              {{ scope.row.name }}
+            </span>
          </template>
        </el-table-column>
        <el-table-column label="应用标识" prop="key"/>
@@ -373,6 +376,14 @@ const uploadImg = (file) => {
    }
  }

+  .sort {
+    cursor move
+    .iconfont {
+      position relative
+      top 1px
+    }
+  }
+
  .pagination {
    padding 20px 0
    display flex
--- a/web/src/views/admin/ChatModel.vue
+++ b/web/src/views/admin/ChatModel.vue
@@ -13,7 +13,10 @@
        <el-table-column type="selection" width="38"></el-table-column>
        <el-table-column prop="name" label="模型名称">
          <template #default="scope">
-            <span class="sort" :data-id="scope.row.id">{{ scope.row.name }}</span>
+            <span class="sort" :data-id="scope.row.id">
+              <i class="iconfont icon-drag"></i>
+              {{ scope.row.name }}
+            </span>
          </template>
        </el-table-column>
        <el-table-column prop="value" label="模型值">
@@ -346,6 +349,14 @@ const remove = function (row) {
    width: 100%
  }

+  .sort {
+    cursor move
+    .iconfont {
+      position relative
+      top 1px
+    }
+  }
+
  .pagination {
    padding 20px 0
    display flex
--- a/web/src/views/admin/Login.vue
+++ b/web/src/views/admin/Login.vue
@@ -37,6 +37,8 @@
        </div>
      </div>

+      <captcha v-if="enableVerify" @success="doLogin" ref="captchaRef"/>
+
      <footer class="footer">
        <footer-bar/>
      </footer>
@@ -54,12 +56,15 @@ import {useRouter} from "vue-router";
 import FooterBar from "@/components/FooterBar.vue";
 import {setAdminToken} from "@/store/session";
 import {checkAdminSession, getSystemInfo} from "@/store/cache";
+import Captcha from "@/components/Captcha.vue";

 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("")
+const enableVerify = ref(false)
+const captchaRef = ref(null)

 checkAdminSession().then(() => {
  router.push("/admin")
@@ -70,6 +75,7 @@ checkAdminSession().then(() => {
 getSystemInfo().then(res => {
  title.value = res.data.admin_title
  logo.value = res.data.logo
+  enableVerify.value = res.data['enabled_verify']
 }).catch(e => {
  ElMessage.error("加载系统配置失败: " + e.message)
 })
@@ -87,8 +93,21 @@ const login = function () {
  if (password.value === '') {
    return ElMessage.error('请输入密码');
  }
+  if (enableVerify.value) {
+    captchaRef.value.loadCaptcha()
+  } else {
+    doLogin({})
+  }
+}

-  httpPost('/api/admin/login', {username: username.value.trim(), password: password.value.trim()}).then(res => {
+const doLogin = function (verifyData) {
+  httpPost('/api/admin/login', {
+    username: username.value.trim(),
+    password: password.value.trim(),
+    key: verifyData.key,
+    dots: verifyData.dots,
+    x: verifyData.x
+  }).then(res => {
    setAdminToken(res.data.token)
    router.push("/admin")
  }).catch((e) => {
@@ -126,6 +145,7 @@ const login = function () {
        .el-image {
          width 120px;
          cursor pointer
+          border-radius 50%
        }
      }

--- a/web/src/views/admin/Menu.vue
+++ b/web/src/views/admin/Menu.vue
@@ -9,7 +9,10 @@
      <el-table :data="items" :row-key="row => row.id" table-layout="auto">
        <el-table-column prop="name" label="菜单名称">
          <template #default="scope">
-            <span class="sort" :data-id="scope.row.id">{{ scope.row.name }}</span>
+            <span class="sort" :data-id="scope.row.id">
+              <i class="iconfont icon-drag"></i>
+              {{ scope.row.name }}
+            </span>
          </template>
        </el-table-column>
        <el-table-column prop="icon" label="菜单图标">
@@ -240,6 +243,14 @@ const uploadImg = (file) => {
    height 36px
  }

+  .sort {
+    cursor move
+    .iconfont {
+      position relative
+      top 1px
+    }
+  }
+
  .el-select {
    width: 100%
  }
--- a/web/src/views/admin/Product.vue
+++ b/web/src/views/admin/Product.vue
@@ -9,7 +9,10 @@
      <el-table :data="items" :row-key="row => row.id" table-layout="auto">
        <el-table-column prop="name" label="产品名称">
          <template #default="scope">
-            <span class="sort" :data-id="scope.row.id">{{ scope.row.name }}</span>
+            <span class="sort" :data-id="scope.row.id">
+              <i class="iconfont icon-drag"></i>
+              {{ scope.row.name }}
+            </span>
          </template>
        </el-table-column>
        <el-table-column prop="price" label="产品价格"/>
@@ -227,6 +230,14 @@ const remove = function (row) {
    }
  }

+  .sort {
+    cursor move
+    .iconfont {
+      position relative
+      top 1px
+    }
+  }
+
  .el-select {
    width: 100%
  }
--- a/web/src/views/admin/SysConfig.vue
+++ b/web/src/views/admin/SysConfig.vue
@@ -107,6 +107,24 @@
                  </div>
                </el-form-item>

+                <el-form-item label="启用验证码" prop="enabled_verify">
+                  <div class="tip-input">
+                    <el-switch v-model="system['enabled_verify']"/>
+                    <div class="info">
+                      <el-tooltip
+                          effect="dark"
+                          content="启用验证码之后，注册登录都会加载行为验证码，增加安全性。此功能需要购买验证码服务才会生效。"
+                          raw-content
+                          placement="right"
+                      >
+                        <el-icon>
+                          <InfoFilled/>
+                        </el-icon>
+                      </el-tooltip>
+                    </div>
+                  </div>
+                </el-form-item>
+
                <el-form-item label="注册方式" prop="register_ways">
                  <el-checkbox-group v-model="system['register_ways']">
                    <el-checkbox value="mobile">手机注册</el-checkbox>
@@ -284,6 +302,9 @@
                <el-form-item label="Suno 算力" prop="suno_power">
                  <el-input v-model.number="system['suno_power']" placeholder="使用 Suno 生成一首音乐消耗算力"/>
                </el-form-item>
+                <el-form-item label="Luma 算力" prop="luma_power">
+                  <el-input v-model.number="system['luma_power']" placeholder="使用 Luma 生成一段视频消耗算力"/>
+                </el-form-item>
              </el-tab-pane>
            </el-tabs>

@@ -358,6 +379,12 @@
            </el-descriptions-item>
          </el-descriptions>

+          <h3>激活后可获得以下权限：</h3>
+          <ol class="active-info">
+            <li>1、使用任意第三方中转 API KEY，而不用局限于 GeekAI 推荐的白名单列表</li>
+            <li>2、可以在相关页面去除 GeekAI 的版权信息，或者修改为自己的版权信息</li>
+          </ol>
+
          <el-form :model="system" label-width="150px" label-position="right">
            <el-form-item label="许可授权码" prop="license">
              <el-input v-model="licenseKey"/>
@@ -574,6 +601,11 @@ const onUploadImg = (files, callback) => {
        }
      }

+
+      .active-info {
+        line-height 1.5
+        padding 10px 0 30px 0
+      }
      .el-descriptions {
        margin-bottom 20px
        .el-icon {
--- a/web/src/views/admin/Users.vue
+++ b/web/src/views/admin/Users.vue
@@ -3,15 +3,16 @@
    <div class="handle-box">
      <el-input v-model="query.username" placeholder="账号" class="handle-input mr10"></el-input>
      <el-button type="primary" :icon="Search" @click="handleSearch">搜索</el-button>
-
      <el-button type="success" :icon="Plus" @click="addUser">新增用户</el-button>
+      <el-button type="danger" :icon="Delete" @click="multipleDelete">删除</el-button>
    </div>

    <el-row>
      <el-table :data="users.items" border class="table" :row-key="row => row.id"
                @selection-change="handleSelectionChange" table-layout="auto">
        <el-table-column type="selection" width="38"></el-table-column>
-        <el-table-column prop="mobile" label="账号">
+        <el-table-column prop="id" label="ID"/>
+        <el-table-column label="账号">
          <template #default="scope">
            <span>{{ scope.row.username }}</span>
            <el-image v-if="scope.row.vip" :src="vipImg" style="height: 20px;position: relative; top:5px; left: 5px"/>
@@ -169,8 +170,8 @@
 import {onMounted, reactive, ref} from "vue";
 import {httpGet, httpPost} from "@/utils/http";
 import {ElMessage, ElMessageBox} from "element-plus";
-import {dateFormat, disabledDate, removeArrayItem} from "@/utils/libs";
-import {Plus, Search} from "@element-plus/icons-vue";
+import {dateFormat, disabledDate} from "@/utils/libs";
+import {Delete, Plus, Search} from "@element-plus/icons-vue";

 // 变量定义
 const users = ref({page: 1, page_size: 15, items: []})
@@ -262,9 +263,7 @@ const removeUser = function (user) {
  ).then(() => {
    httpGet('/api/admin/user/remove', {id: user.id}).then(() => {
      ElMessage.success('操作成功！')
-      users.value.items = removeArrayItem(users.value.items, user, function (v1, v2) {
-        return v1.id === v2.id
-      })
+      fetchUserList(users.value.page, users.value.page_size)
    }).catch((e) => {
      ElMessage.error('操作失败，' + e.message)
    })
@@ -282,7 +281,7 @@ const userEdit = function (row) {
 }

 const addUser = () => {
-  user.value = {}
+  user.value = {chat_id: 0, chat_roles: [], chat_models: []}
  title.value = '添加用户'
  showUserEditDialog.value = true
  add.value = true
@@ -307,8 +306,36 @@ const saveUser = function () {
  })
 }

+const userIds = ref([])
 const handleSelectionChange = function (rows) {
-  // console.log(rows)
+  userIds.value = []
+  rows.forEach((row) => {
+    userIds.value.push(row.id)
+  })
+}
+
+const multipleDelete = function () {
+  ElMessageBox.confirm(
+      '此操作将会永久删除用户信息和聊天记录，确认操作吗?',
+      '警告',
+      {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      }
+  ).then(() => {
+    loading.value = true
+    httpGet('/api/admin/user/remove', {ids: userIds.value}).then(() => {
+      ElMessage.success('操作成功！')
+      fetchUserList(users.value.page, users.value.page_size)
+      loading.value = false
+    }).catch((e) => {
+      ElMessage.error('操作失败，' + e.message)
+      loading.value = false
+    })
+  }).catch(() => {
+    ElMessage.info('操作被取消')
+  })
 }

 const resetPass = (row) => {