From cb27d4b4906b2782eaceb0a95bbdc5d0534370d2 Mon Sep 17 00:00:00 2001 From: xiaojunnuo Date: Mon, 23 Dec 2024 23:33:13 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=9F=BA=E7=A1=80=E7=89=88=E4=B8=8D?= =?UTF-8?q?=E5=86=8D=E9=99=90=E5=88=B6=E6=B5=81=E6=B0=B4=E7=BA=BF=E6=95=B0?= =?UTF-8?q?=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 17 ++-- .../user/access/service/encrypt-service.ts | 2 +- .../src/components/vip-button/index.vue | 92 ++++++++++++------- .../src/router/source/modules/certd.ts | 4 - .../src/store/modules/settings.ts | 2 +- .../ui/certd-client/src/style/common.less | 12 ++- .../views/framework/home/dashboard/index.vue | 11 ++- .../framework/home/dashboard/suite-card.vue | 3 +- packages/ui/certd-server/package.json | 2 +- .../controller/sys/plus/plus-controller.ts | 1 + ...{auto-init-site.ts => auto-a-init-site.ts} | 2 +- ...gister-cron.ts => auto-c-register-cron.ts} | 2 +- .../modules/auto/auto-d-mitter-register.ts | 21 +++++ .../certd-server/src/modules/auto/auto-z.ts | 9 +- .../monitor/service/site-info-service.ts | 34 ++++++- .../pipeline/service/pipeline-service.ts | 6 +- 16 files changed, 158 insertions(+), 62 deletions(-) rename packages/ui/certd-server/src/modules/auto/{auto-init-site.ts => auto-a-init-site.ts} (98%) rename packages/ui/certd-server/src/modules/auto/{auto-register-cron.ts => auto-c-register-cron.ts} (98%) create mode 100644 packages/ui/certd-server/src/modules/auto/auto-d-mitter-register.ts diff --git a/README.md b/README.md index cecb6b14..42b6f4d1 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,9 @@ Certd 是一个免费全自动申请和自动部署更新SSL证书的管理系 * 支持SQLite，PostgreSQL、MySQL数据库 - +> +> 流水线数量现已调整为无限制，欢迎大家使用 +> ## 二、在线体验 @@ -202,13 +204,14 @@ https://afdian.com/a/greper 专业版特权对比 -| 功能 | 基础版 | 专业版 | -|---------|-----------------|-------------------| -| 免费证书申请 | 免费无限制 | 无限制 | +| 功能 | 基础版 | 专业版 | +|------|-----------------|-------------------| +| 免费证书申请 | 免费无限制 | 无限制 | +| 域名数量 | 免费无限制 | 无限制 | | 证书流水线条数 | 免费无限制 | 无限制 | -| 站点证书监控 | 1条 | 无限制 | -| 自动部署插件 | 阿里云、腾讯云、七牛云、SSH | 支持群晖、宝塔、1Panel等，持续开发中 | -| 通知 | 邮件、webhook | server酱、企微、anpush、钉钉等 | +| 站点证书监控 | 1条 | 无限制 | +| 自动部署插件 | 阿里云、腾讯云、七牛云、SSH | 支持群晖、宝塔、1Panel等，持续开发中 | +| 通知 | 邮件、webhook | server酱、企微、anpush等 | ************************ diff --git a/packages/libs/lib-server/src/user/access/service/encrypt-service.ts b/packages/libs/lib-server/src/user/access/service/encrypt-service.ts index 5cf0ec8b..5e787ec2 100644 --- a/packages/libs/lib-server/src/user/access/service/encrypt-service.ts +++ b/packages/libs/lib-server/src/user/access/service/encrypt-service.ts @@ -6,7 +6,7 @@ import { SysPrivateSettings, SysSettingsService } from '../../../system/index.js * 授权 */ @Provide() -@Scope(ScopeEnum.Request, { allowDowngrade: true }) +@Scope(ScopeEnum.Singleton) export class EncryptService { secretKey: Buffer; diff --git a/packages/ui/certd-client/src/components/vip-button/index.vue b/packages/ui/certd-client/src/components/vip-button/index.vue index 5ac458b3..75720d26 100644 --- a/packages/ui/certd-client/src/components/vip-button/index.vue +++ b/packages/ui/certd-client/src/components/vip-button/index.vue @@ -229,27 +229,41 @@ function openUpgrade() { const vipTypeDefine = { free: { title: "基础版", - desc: "免费使用", + desc: "社区免费版", type: "free", - privilege: ["证书申请功能无限制", "证书流水线数量无限制", "常用的主机、云平台、cdn等部署插件"] + privilege: ["证书申请无限制", "域名数量无限制", "证书流水线数量无限制", "常用的主机、云平台、cdn等部署插件", "邮件、webhook通知方式"] }, plus: { title: "专业版", - desc: "功能增强，适用于个人企业内部使用", + desc: "开源需要您的赞助支持", type: "plus", - privilege: ["可加VIP群，需求优先实现", "宝塔、群晖、1Panel、易盾等部署插件", "站点证书监控", "更多通知种类"], + privilege: ["可加VIP群，您需求将优先实现", "站点证书监控无限制", "更多通知方式", "更多强大部署插件，宝塔、群晖、1Panel等"], trial: { - title: "7天试用", + title: "点击获取7天试用", click: () => { openStarModal(); } + }, + price: 29.9, + get() { + return ( + + + 爱发电赞助后获取 + + + ); } }, comm: { title: "商业版", desc: "商业授权，可对外运营", type: "comm", - privilege: ["拥有专业版所有特权", "允许商用，可修改logo、标题", "数据统计", "插件管理", "多用户无限制", "支持用户支付（敬请期待）"] + privilege: ["拥有专业版所有特权", "允许商用，可修改logo、标题", "数据统计", "插件管理", "多用户无限制", "支持用户支付"], + price: 399, + get() { + return 请联系作者获取; + } } }; @@ -260,28 +274,16 @@ function openUpgrade() { }, maskClosable: true, okText: "激活", - width: 900, + width: 1000, content: () => { - let activationCodeGetWay: any = null; - if (settingStore.siteEnv.agent.enabled != null) { - const agent = settingStore.siteEnv.agent; - if (agent.enabled === false) { - activationCodeGetWay = ( - - - 爱发电赞助“VIP会员（¥29.9）”后获取一年期专业版激活码 - - 商业版请直接联系作者 - - ); - } else { - activationCodeGetWay = ( - - {agent.contactText} - - ); - } - } + let activationCodeGetWay = ( + + + 爱发电赞助“VIP会员”后获取一年期专业版激活码 + + 商业版请直接联系作者 + + ); const vipLabel = settingStore.vipLabel; const slots = []; for (const key in vipTypeDefine) { @@ -301,15 +303,31 @@ function openUpgrade() { )} -
{item.desc}
-