merge v4.1.5

web/src/views/admin/ApiKey.vue

@@ -194,7 +194,7 @@ const fetchData = () => {
 const add = function () {
   showDialog.value = true
   title.value = "新增 API KEY"
-  item.value = {enabled: true,api_url:"https://api.geekai.pro"}
+  item.value = {enabled: true,api_url: "https://api.geekai.pro"}
 }
 
 const edit = function (row) {

web/src/views/admin/AppType.vue

@@ -0,0 +1,214 @@
+<template>
+  <div class="container app-type" v-loading="loading">
+    <div class="handle-box">
+      <el-button type="primary" :icon="Plus" @click="add">新增</el-button>
+    </div>
+
+    <el-row>
+      <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">
+            <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="icon">
+          <template #default="scope">
+            <el-image v-if="scope.row.icon" :src="scope.row.icon" style="width: 45px; height: 45px; border-radius: 50%"/>
+            <el-tag type="info" v-else>无图标</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column prop="enabled" label="启用状态">
+          <template #default="scope">
+            <el-switch v-model="scope.row['enabled']" @change="enableSet(scope.row)"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" width="180">
+          <template #default="scope">
+            <el-button size="small" type="primary" @click="edit(scope.row)">编辑</el-button>
+            <el-popconfirm title="确定要删除当前记录吗?" @confirm="remove(scope.row)" :width="200">
+              <template #reference>
+                <el-button size="small" type="danger">删除</el-button>
+              </template>
+            </el-popconfirm>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-row>
+
+    <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="name">
+          <el-input v-model="item.name" autocomplete="off"/>
+        </el-form-item>
+        <el-form-item label="应用图标：" prop="icon">
+          <el-input v-model="item.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="enable">
+          <el-switch v-model="item.enabled" />
+        </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>
+      </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 {removeArrayItem} from "@/utils/libs";
+import {Sortable} from "sortablejs";
+import Compressor from "compressorjs";
+
+// 变量定义
+const items = ref([])
+const item = ref({})
+const showDialog = ref(false)
+const title = ref("")
+const rules = reactive({
+  name: [{required: true, message: '请输入分类名称', trigger: 'change',}],
+})
+const loading = ref(true)
+const formRef = ref(null)
+
+// 获取数据
+const fetchData = () => {
+  httpGet('/api/admin/app/type/list').then((res) => {
+    if (res.data) {
+      items.value = res.data
+    }
+    loading.value = false
+  }).catch(() => {
+    ElMessage.error("获取数据失败");
+  })
+}
+
+onMounted(() => {
+  fetchData()
+  const drawBodyWrapper = document.querySelector('.el-table__body tbody')
+
+  // 初始化拖动排序插件
+  Sortable.create(drawBodyWrapper, {
+    sort: true,
+    animation: 500,
+    onEnd({newIndex, oldIndex, from}) {
+      if (oldIndex === newIndex) {
+        return
+      }
+
+      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
+      })
+
+      httpPost("/api/admin/app/type/sort", {ids: ids, sorts: sorts}).then(() => {
+      }).catch(e => {
+        ElMessage.error("排序失败：" + e.message)
+      })
+    }
+  })
+})
+
+const add = function () {
+  title.value = "新增分类"
+  showDialog.value = true
+  item.value = { enabled: true, }
+}
+
+const edit = function (row) {
+  title.value = "修改分类"
+  showDialog.value = true
+  item.value = row
+}
+
+const save = function () {
+  formRef.value.validate((valid) => {
+    if (!item.value.sort_num) {
+      item.value.sort_num = items.value.length
+    }
+    if (valid) {
+      showDialog.value = false
+      httpPost('/api/admin/app/type/save', item.value).then(() => {
+        ElMessage.success('操作成功！')
+        fetchData()
+      }).catch((e) => {
+        ElMessage.error('操作失败，' + e.message)
+      })
+    } else {
+      return false
+    }
+  })
+}
+
+// 设置启用状态
+const enableSet = (row) => {
+  httpPost('/api/admin/app/type/enable', {id: row.id, enabled: row.enabled}).then(() => {
+    ElMessage.success("操作成功！")
+  }).catch(e => {
+    ElMessage.error("操作失败：" + e.message)
+  })
+}
+
+// 删除数据
+const remove = function (row) {
+  httpGet('/api/admin/app/type/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)
+  })
+}
+
+// 图片上传
+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) => {
+        item.value.icon = res.data.url
+        ElMessage.success('上传成功')
+      }).catch((e) => {
+        ElMessage.error('上传失败:' + e.message)
+      })
+    },
+    error(e) {
+      ElMessage.error('上传失败:' + e.message)
+    },
+  });
+};
+</script>

web/src/views/admin/Apps.vue

@@ -23,6 +23,7 @@
             </span>
           </template>
         </el-table-column>
+        <el-table-column label="应用类型" prop="type_name"/>
         <el-table-column label="应用标识" prop="key"/>
         <el-table-column label="绑定模型" prop="model_name"/>
         <el-table-column label="启用状态">
@@ -62,6 +63,21 @@
               autocomplete="off"
           />
         </el-form-item>
+        <el-form-item label="应用分类：" prop="tid">
+          <el-select
+              v-model="role.tid"
+              filterable
+              placeholder="请选择分类"
+              clearable
+          >
+            <el-option
+                v-for="item in appTypes"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+            />
+          </el-select>
+        </el-form-item>
 
         <el-form-item label="应用标志：" prop="key">
           <el-input
@@ -195,6 +211,7 @@ const rules = reactive({
   hello_msg: [{required: true, message: '请输入打招呼信息', trigger: 'change',}]
 })
 
+const appTypes = ref([])
 const models = ref([])
 onMounted(() => {
   fetchData()
@@ -206,11 +223,25 @@ onMounted(() => {
     ElMessage.error("获取AI模型数据失败");
   })
 
+  // get app type
+  httpGet('/api/admin/app/type/list?enable=1').then((res) => {
+    appTypes.value = res.data
+  }).catch(() => {
+    ElMessage.error("获取应用分类数据失败");
+  })
+
 })
 
 const fetchData = () => {
   // 获取应用列表
   httpGet('/api/admin/role/list').then((res) => {
+    // 初始化数据
+    // const arr = res.data;
+    // for (let i = 0; i < arr.length; i++) {
+    //   if(arr[i].model_id == 0){
+    //     arr[i].model_id = ''
+    //   }
+    // }
     tableData.value = res.data
     sortedTableData.value = copyObj(tableData.value)
     loading.value = false

web/src/views/admin/Home.vue

@@ -1,9 +1,9 @@
 <template>
   <div class="admin-home" v-if="isLogin">
-    <admin-sidebar v-model:theme="theme"/>
+    <admin-sidebar/>
     <div class="content-box" :class="{ 'content-collapse': sidebar.collapse }">
-      <admin-header v-model:theme="theme" @changeTheme="changeTheme"/>
-      <admin-tags v-model:theme="theme"/>
+      <admin-header/>
+      <admin-tags/>
       <div :class="'content '+theme" :style="{height:contentHeight+'px'}">
         <router-view v-slot="{ Component }">
           <transition name="move" mode="out-in">
@@ -24,14 +24,15 @@ import AdminSidebar from "@/components/admin/AdminSidebar.vue";
 import AdminTags from "@/components/admin/AdminTags.vue";
 import {useRouter} from "vue-router";
 import {checkAdminSession} from "@/store/cache";
-import {ref} from "vue";
-import {getAdminTheme, setAdminTheme} from "@/store/system";
+import {ref, watch} from "vue";
+import {useSharedStore} from "@/store/sharedata";
 
 const sidebar = useSidebarStore();
 const tags = useTagsStore();
 const isLogin = ref(false)
 const contentHeight = window.innerHeight - 80
-const theme = ref(getAdminTheme())
+const store = useSharedStore()
+const theme = ref(store.adminTheme)
 
 // 获取会话信息
 const router = useRouter();
@@ -41,14 +42,10 @@ checkAdminSession().then(() => {
   router.replace('/admin/login')
 })
 
-const changeTheme = (value) => {
-  if (value) {
-    theme.value = 'dark'
-  } else {
-    theme.value = 'light'
-  }
-  setAdminTheme(theme.value)
-}
+watch(() => store.adminTheme, (val) => {
+  theme.value = val
+})
+
 
 </script>
 

web/src/views/admin/Login.vue

@@ -2,46 +2,38 @@
   <div class="admin-login">
     <div class="main">
       <div class="contain">
-        <div class="logo">
-          <el-image :src="logo" fit="cover" @click="router.push('/')"/>
+        <div class="logo" @click="router.push('/')">
+          <el-image :src="logo" fit="cover"/>
         </div>
 
-        <div class="header">{{ title }}</div>
+        <h1 class="header">{{ title }}</h1>
         <div class="content">
-          <div class="block">
-            <el-input placeholder="请输入用户名" size="large" v-model="username" autocomplete="off" autofocus
-                      @keyup="keyupHandle">
-              <template #prefix>
-                <el-icon>
-                  <UserFilled/>
-                </el-icon>
-              </template>
-            </el-input>
-          </div>
+          <el-input v-model="username" placeholder="请输入用户名" size="large"
+                    autocomplete="off" autofocus @keyup.enter="login">
+            <template #prefix>
+              <el-icon>
+                <UserFilled/>
+              </el-icon>
+            </template>
+          </el-input>
 
-          <div class="block">
-            <el-input placeholder="请输入密码" size="large" v-model="password" show-password autocomplete="off"
-                      @keyup="keyupHandle">
-              <template #prefix>
-                <el-icon>
-                  <Lock/>
-                </el-icon>
-              </template>
-            </el-input>
-          </div>
+          <el-input v-model="password" placeholder="请输入密码" size="large"
+                    show-password autocomplete="off" @keyup.enter="login">
+            <template #prefix>
+              <el-icon>
+                <Lock/>
+              </el-icon>
+            </template>
+          </el-input>
 
           <el-row class="btn-row">
             <el-button class="login-btn" size="large" type="primary" @click="login">登录</el-button>
           </el-row>
-
         </div>
       </div>
 
       <captcha v-if="enableVerify" @success="doLogin" ref="captchaRef"/>
-
-      <footer class="footer">
-        <footer-bar/>
-      </footer>
+      <footer-bar class="footer"/>
     </div>
   </div>
 </template>
@@ -80,12 +72,6 @@ getSystemInfo().then(res => {
   ElMessage.error("加载系统配置失败: " + e.message)
 })
 
-const keyupHandle = (e) => {
-  if (e.key === 'Enter') {
-    login();
-  }
-}
-
 const login = function () {
   if (username.value === '') {
     return ElMessage.error('请输入用户名');

web/src/views/admin/Order.vue

@@ -26,6 +26,7 @@
     <el-row>
       <el-table :data="items" :row-key="row => row.id" table-layout="auto">
         <el-table-column prop="order_no" label="订单号"/>
+        <el-table-column prop="trade_no" label="交易号"/>
         <el-table-column prop="username" label="下单用户"/>
         <el-table-column prop="subject" label="产品名称"/>
         <el-table-column prop="amount" label="订单金额"/>
@@ -47,7 +48,8 @@
             <el-tag v-else>未支付</el-tag>
           </template>
         </el-table-column>
-        <el-table-column prop="pay_way" label="支付方式"/>
+        <el-table-column prop="pay_method" label="支付渠道"/>
+        <el-table-column prop="pay_name" label="支付名称"/>
 
         <el-table-column label="操作" width="180">
           <template #default="scope">

web/src/views/admin/SysConfig.vue

@@ -133,6 +133,10 @@
                   </el-checkbox-group>
                 </el-form-item>
 
+                <el-form-item label="邮件域名白名单" prop="register_ways">
+                  <items-input v-model:value="system['email_white_list']"/>
+                </el-form-item>
+
                 <el-form-item label="微信客服二维码" prop="wechat_card_url">
                   <el-input v-model="system['wechat_card_url']" placeholder="微信客服二维码">
                     <template #append>
@@ -396,6 +400,18 @@
           </el-form>
         </div>
       </el-tab-pane>
+
+      <el-tab-pane label="修复数据" name="fixData">
+        <div class="container">
+          <p class="text">有些版本升级的时候更新了数据库的结构，比如字段名字改了，需要把之前的字段的值转移到其他字段，这些无法通过简单的 SQL 语句可以实现的，需要手动写程序修正数据。</p>
+
+          <p class="text">当前版本 v4.1.4 需要修正用户数据，增加了 mobile 和 email 字段，需要把之前用手机号或者邮箱注册的用户的 username 字段数据初始化到 mobile 或者 email 字段。另外，需要把订单的支付渠道从名字称修正为 key。</p>
+
+          <el-text type="danger">请注意：在修复数据前，请先备份好数据库，以免数据丢失！</el-text>
+
+          <p><el-button type="primary" @click="fixData">立即修复</el-button></p>
+        </div>
+      </el-tab-pane>
     </el-tabs>
   </div>
 </template>
@@ -404,12 +420,13 @@
 import {onMounted, reactive, ref} from "vue";
 import {httpGet, httpPost} from "@/utils/http";
 import Compressor from "compressorjs";
-import {ElMessage} from "element-plus";
+import {ElMessage, ElMessageBox} from "element-plus";
 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 {copyObj, dateFormat} from "@/utils/libs";
+import ItemsInput from "@/components/ui/ItemsInput.vue";
 
 const activeName = ref('basic')
 const system = ref({models: []})
@@ -458,7 +475,7 @@ onMounted(() => {
 })
 
 const fetchLicense = () => {
-  httpGet("/api/admin/config/get/license").then(res => {
+  httpGet("/api/admin/config/license").then(res => {
     license.value = res.data
   }).catch(e => {
     ElMessage.error("获取 License 失败：" + e.message)
@@ -475,7 +492,6 @@ const save = function (key) {
   if (key === 'system') {
     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, config_bak: configBak.value}).then(() => {
           ElMessage.success("操作成功！")
         }).catch(e => {
@@ -498,7 +514,7 @@ const active = () => {
   if (licenseKey.value === "") {
     return ElMessage.error("请输入授权码")
   }
-  httpPost("/api/admin/active", {license: licenseKey.value}).then(res => {
+  httpPost("/api/admin/config/active", {license: licenseKey.value}).then(res => {
     ElMessage.success("授权成功，机器编码为：" + res.data)
     fetchLicense()
   }).catch(e => {
@@ -552,6 +568,28 @@ const onUploadImg = (files, callback) => {
   })
 };
 
+const fixData = () => {
+
+  ElMessageBox.confirm(
+      '在修复数据前，请先备份好数据库，以免数据丢失！是否继续操作?',
+      '警告',
+      {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      }
+  ).then(() => {
+    loading.value = true
+    httpGet("/api/admin/config/fixData").then(() => {
+      ElMessage.success("数据修复成功")
+      loading.value = false
+    }).catch(e => {
+      loading.value = false
+      ElMessage.error("数据修复失败：" + e.message)
+    })
+  })
+}
+
 
 </script>
 
@@ -602,6 +640,10 @@ const onUploadImg = (files, callback) => {
       }
 
 
+      .text {
+        font-size 14px
+      }
+
       .active-info {
         line-height 1.5
         padding 10px 0 30px 0

web/src/views/admin/Users.vue

@@ -18,6 +18,8 @@
             <el-image v-if="scope.row.vip" :src="vipImg" style="height: 20px;position: relative; top:5px; left: 5px"/>
           </template>
         </el-table-column>
+        <el-table-column prop="mobile" label="手机"/>
+        <el-table-column prop="email" label="邮箱"/>
         <el-table-column prop="nickname" label="昵称"/>
         <el-table-column prop="power" label="剩余算力"/>
         <el-table-column label="状态" width="80">
@@ -73,6 +75,12 @@
         <el-form-item label="账号：" prop="username">
           <el-input v-model="user.username" autocomplete="off"/>
         </el-form-item>
+        <el-form-item label="手机：" prop="mobile">
+          <el-input v-model="user.mobile" autocomplete="off"/>
+        </el-form-item>
+        <el-form-item label="邮箱：" prop="email">
+          <el-input v-model="user.email" autocomplete="off"/>
+        </el-form-item>
         <el-form-item v-if="add" label="密码：" prop="password">
           <el-input v-model="user.password" autocomplete="off" placeholder="8-16位"/>
         </el-form-item>