diff --git a/.github/workflows/build-and-push.yml b/.github/workflows/build-and-push.yml index b1102252e..7c089d884 100644 --- a/.github/workflows/build-and-push.yml +++ b/.github/workflows/build-and-push.yml @@ -14,12 +14,12 @@ on: type: choice options: - linux/amd64 - - linux/arm64 - - linux/amd64,linux/arm64 + #- linux/arm64 + #- linux/amd64,linux/arm64 registry: description: 'Push To Registry' required: true - default: 'dockerhub, fit2cloud-registry' + default: 'dockerhub' type: choice options: - dockerhub diff --git a/README.md b/README.md index b2f308e76..ee7f6f5df 100644 --- a/README.md +++ b/README.md @@ -35,6 +35,9 @@ docker run -d --name=maxkb -p 8080:8080 -v ~/.maxkb:/var/lib/postgresql/data 1pa +## 在线文档 +[在线文档](https://github.com/1Panel-dev/MaxKB/wiki/1-%E5%AE%89%E8%A3%85%E9%83%A8%E7%BD%B2) + ## 社区交流 [论坛](https://bbs.fit2cloud.com/c/mk/11) diff --git a/installer/Dockerfile b/installer/Dockerfile index f95a4e814..0f3598878 100644 --- a/installer/Dockerfile +++ b/installer/Dockerfile @@ -29,7 +29,6 @@ RUN mv /opt/maxkb/app/model/* /opt/maxkb/model && \ pip3 cache purge && \ rm -rf /var/lib/apt/lists/* # 启动命令 -VOLUME /opt/maxkb/conf EXPOSE 8080 COPY installer/run-maxkb.sh /usr/bin/ RUN chmod 755 /usr/bin/run-maxkb.sh diff --git a/ui/src/api/email-setting.ts b/ui/src/api/email-setting.ts new file mode 100644 index 000000000..9fc8bf508 --- /dev/null +++ b/ui/src/api/email-setting.ts @@ -0,0 +1,38 @@ +import { Result } from '@/request/Result' +import { get, post, del, put } from '@/request/index' +import type { pageRequest } from '@/api/type/common' +import { type Ref } from 'vue' + +const prefix = '/email_setting' +/** + * 获取邮箱设置 + */ +const getEmailSetting: (loading?: Ref) => Promise> = (loading) => { + return get(`${prefix}`, undefined, loading) +} + +/** + * 邮箱测试 + */ +const postTestEmail: (data: any, loading?: Ref) => Promise> = ( + data, + loading +) => { + return post(`${prefix}`, data, undefined, loading) +} + +/** + * 修改邮箱设置 + */ +const putEmailSetting: (data: any, loading?: Ref) => Promise> = ( + data, + loading +) => { + return put(`${prefix}`, data, undefined, loading) +} + +export default { + getEmailSetting, + postTestEmail, + putEmailSetting +} diff --git a/ui/src/router/modules/setting.ts b/ui/src/router/modules/setting.ts index f8bcc4c4b..48404a017 100644 --- a/ui/src/router/modules/setting.ts +++ b/ui/src/router/modules/setting.ts @@ -33,7 +33,7 @@ const settingRouter = { meta: { icon: 'app-team', iconActive: 'app-team-active', - title: '团队管理', + title: '团队成员', activeMenu: '/setting', parentPath: '/setting', parentName: 'setting' @@ -46,12 +46,25 @@ const settingRouter = { meta: { icon: 'app-template', iconActive: 'app-template-active', - title: '模型管理', + title: '模型设置', activeMenu: '/setting', parentPath: '/setting', parentName: 'setting' }, component: () => import('@/views/template/index.vue') + }, + { + path: '/email', + name: 'email', + meta: { + icon: 'Message', + title: '邮箱设置', + activeMenu: '/setting', + parentPath: '/setting', + parentName: 'setting', + permission: new Role('ADMIN') + }, + component: () => import('@/views/email/index.vue') } ] } diff --git a/ui/src/views/email/index.vue b/ui/src/views/email/index.vue new file mode 100644 index 000000000..961e3243e --- /dev/null +++ b/ui/src/views/email/index.vue @@ -0,0 +1,124 @@ + + + diff --git a/ui/src/views/team/index.vue b/ui/src/views/team/index.vue index fd5529b9c..daa9c509e 100644 --- a/ui/src/views/team/index.vue +++ b/ui/src/views/team/index.vue @@ -1,5 +1,5 @@