diff --git a/admin/src/app/api/addon.ts b/admin/src/app/api/addon.ts index 5e09bdfe3..a73896391 100644 --- a/admin/src/app/api/addon.ts +++ b/admin/src/app/api/addon.ts @@ -98,3 +98,7 @@ export function getInstalledAddonList() { export function getShowApp() { return request.get('addon/list/showapp') } + +export function getAddonInit() { + return request.get('addon/init') +} diff --git a/admin/src/app/api/notice.ts b/admin/src/app/api/notice.ts index 6104b721c..c30f2dcba 100644 --- a/admin/src/app/api/notice.ts +++ b/admin/src/app/api/notice.ts @@ -78,3 +78,220 @@ export function editSms(params: Record) { export function getSmsLog(params: Record) { return request.get(`notice/sms/log`, { params }) } + +/** + * 获取当前登录子账号 + * @param params + */ +export function getAccountIsLogin() { + return request.get(`notice/niusms/config`) +} + +/** + * 登录子账号 + * @param params + */ +export function loginAccount(params: Record) { + return request.post(`notice/niusms/account/login`,params,{ showSuccessMessage: true }) +} + +/** + * 注册子账号 + * @param params + */ +export function registerAccount(params: Record) { + return request.post(`notice/niusms/account/register`,params,{ showSuccessMessage: true }) +} + +/** + * 获取当前登录子账号信息 + * @param params + */ +export function getAccountInfo(username: string) { + return request.get(`notice/niusms/account/info/${username}`) +} + +/** + * 获取模版列表 + * @param params + */ +export function getTemplateList(params: Record) { + return request.get(`notice/niusms/template/list/${params.sms_type}/${params.username}`,{}) +} + +/** + * 获取签名列表 + * @param params + */ +export function getSignList(username: string, params: Record) { + return request.get(`notice/niusms/sign/list/${username}`,{params}) +} + +/** + * 添加签名 + * @param params + */ +export function addSign(username: string, params: Record) { + return request.post(`notice/niusms/sign/report/${username}`, params, { showSuccessMessage: true }); +} + +/** + * 删除签名 + * @param params + */ +export function deleteSign(username: string, params: Record) { + return request.post(`notice/niusms/sign/delete/${username}`, params, { showSuccessMessage: true }); +} + +/** + * 更新子账号信息 + * @param params + */ +export function editAccount(username: string,params: Record) { + return request.post(`notice/niusms/account/edit/${username}`, params, { showSuccessMessage: true }); +} + +/** + * 获取短信发送记录 + * @param params + */ +export function getSmsSendList(username: string, params: Record) { + return request.get(`notice/niusms/account/send_list/${username}`,{params}) +} + +/** + * 获取充值列表 + * @param params + */ +export function getSmsOrdersList(username: string, params: Record) { + return request.get(`notice/niusms/order/list/${username}`,{params}) +} + +/** + * 获取套餐列表 + * @param params + */ +export function getSmsPackagesList() { + return request.get(`notice/niusms/packages`) +} + +/** + * 获取图像验证码 + * @param params + */ +export function getSmsCaptcha() { + return request.get(`notice/niusms/captcha`) +} + +/** + * 发送验证码 + * @param params + */ +export function getSmsSend(params: Record) { + return request.post(`notice/niusms/send`,params,{ showSuccessMessage: true }) +} + +/** + * 添加签名配置项 + * @param params + */ +export function getSmsSignConfig() { + return request.get(`notice/niusms/sign/report/config`) +} + +/** + * 模版报备配置项 + * @param params + */ +export function getTemplateReportConfig() { + return request.get(`notice/niusms/template/report/config`) +} + +/** + * 模版报备 + * @param params + */ +export function reportTemplate(sms_type: string, username: string, params: Record) { + return request.post(`notice/niusms/template/report/${sms_type}/${username}`,params,{ showSuccessMessage: true }) +} + +/** + * 模版详情 + * @param params + */ +export function getreportTemplateInfo(sms_type: string, username: string,params: Record) { + return request.get(`notice/niusms/template/info/${sms_type}/${username}`,{params}) +} + + +/** + * 充值下单 + * @param params + */ +export function smsOrderCreate(username: string, params: Record) { + return request.post(`notice/niusms/order/create/${username}`, params) +} + +/** + * 获取支付信息 + * @param params + */ +export function getOrderPayInfo(username: string, params: Record) { + return request.get(`notice/niusms/order/pay/${username}`, {params}) +} + +/** + * 获取订单详情 + * @param params + */ +export function getOrderInfo(username: string, params: Record) { + return request.get(`notice/niusms/order/info/${username}`, {params}) +} + +/** + * 获取支付状态 + * @param params + */ +export function getOrderPayStatus(username: string, params: Record) { + return request.get(`notice/niusms/order/status/${username}`, {params}) +} + +/** + * 计算金额 + * @param params + */ +export function calculateOrderPay(username: string, params: Record) { + return request.post(`notice/niusms/order/calculate/${username}`, params) +} + +/** + * 启用牛云短信 + * @param params + */ +export function enableNiusms(params: Record) { + return request.put(`notice/niusms/enable`,params,{ showSuccessMessage: true }) +} + +/** + * 同步模版状态 + * @param params + */ +export function templateSync(sms_type: string, username: string) { + return request.get(`notice/niusms/template/sync/${sms_type}/${username}`) +} + +/** + * 重置密码 + * @param params + */ +export function resetPassword(username: string,params: Record) { + return request.post(`notice/niusms/account/reset/password/${username}`,params,{ showSuccessMessage: true}) +} + +/** + * 清除模版报备 + * @param params + */ +export function clearTemplate(username: string,template_id: string) { + return request.delete(`notice/niusms/template/${username}/${template_id}`) +} diff --git a/admin/src/app/api/sys.ts b/admin/src/app/api/sys.ts index 671496520..1a4007847 100644 --- a/admin/src/app/api/sys.ts +++ b/admin/src/app/api/sys.ts @@ -258,24 +258,6 @@ export function moveAttachment(params: Record) { return request.put(`sys/attachment/batchmove`, params) } -/** - * 获取图标库分类列表 - * @param params - * @returns - */ -export function getIconCategoryList(params: Record) { - return request.get(`sys/attachment/icon_category`, { params }) -} - -/** - * 获取图标库列表 - * @param params - * @returns - */ -export function getIconList(params: Record) { - return request.get(`sys/attachment/icon`, { params }) -} - /** * 获取evn * @returns diff --git a/admin/src/app/api/user.ts b/admin/src/app/api/user.ts index 1fc36a534..9119b3476 100644 --- a/admin/src/app/api/user.ts +++ b/admin/src/app/api/user.ts @@ -62,6 +62,15 @@ export function unlockUser(uid: number) { return request.put(`user/unlock/${ uid }`, {}, { showSuccessMessage: true }) } +/** + * 删除用户 + * + * @param uid + */ +export function deleteUser(uid: number) { + return request.delete(`user/${ uid }`) +} + /***************************************************** 操作日志 **************************************************/ /** @@ -80,3 +89,11 @@ export function getLogList(params: Record) { export function getLogInfo(id: number) { return request.get(`user/userlog/${ id }`) } + +/** + * 清空操作日志列表 + * @returns + */ +export function logDestroy() { + return request.delete(`user/userlog/destroy`) +} diff --git a/admin/src/app/assets/images/error_icon.png b/admin/src/app/assets/images/error_icon.png new file mode 100644 index 000000000..7db470c6f Binary files /dev/null and b/admin/src/app/assets/images/error_icon.png differ diff --git a/admin/src/app/assets/images/success_icon.png b/admin/src/app/assets/images/success_icon.png new file mode 100644 index 000000000..4df038a82 Binary files /dev/null and b/admin/src/app/assets/images/success_icon.png differ diff --git a/admin/src/app/assets/images/tools/authorize.png b/admin/src/app/assets/images/tools/authorize.png new file mode 100644 index 000000000..020a5b8b5 Binary files /dev/null and b/admin/src/app/assets/images/tools/authorize.png differ diff --git a/admin/src/app/assets/images/tools/upgrade.png b/admin/src/app/assets/images/tools/upgrade.png new file mode 100644 index 000000000..6547604ec Binary files /dev/null and b/admin/src/app/assets/images/tools/upgrade.png differ diff --git a/admin/src/app/components/cloud-build/index.vue b/admin/src/app/components/cloud-build/index.vue index 46c805bae..dd1c2cb46 100644 --- a/admin/src/app/components/cloud-build/index.vue +++ b/admin/src/app/components/cloud-build/index.vue @@ -1,68 +1,108 @@ @@ -270,4 +408,30 @@ defineExpose({ :deep(.terminal .t-log-box span) { white-space: pre-wrap; } +:deep(.el-result__icon) { + color: unset !important; // 清除默认颜色 +} +:deep(.el-dialog__title){ + font-size: 20px; + font-weight: bold; +} +:deep(.el-result__title p){ + font-size: 25px; + color: #1D1F3A; + font-weight: 500; +} +:deep(.el-result__subtitle p){ + font-size: 15px; + color: #4F516D; + font-weight: 500; + word-break: break-all; + text-overflow: ellipsis; + overflow: hidden; + display: -webkit-box; + -webkit-line-clamp: 5; + -webkit-box-orient: vertical; +} +:deep(.el-result){ + margin-top: -80px !important; +} diff --git a/admin/src/app/components/upgrade-log/index.vue b/admin/src/app/components/upgrade-log/index.vue index 96a49b184..53a4fe8ca 100644 --- a/admin/src/app/components/upgrade-log/index.vue +++ b/admin/src/app/components/upgrade-log/index.vue @@ -60,6 +60,12 @@ const getAppVersionListFn = () => { }) frameworkVersionList.value = data + if(frameworkVersionList.value.length == 0){ + ElMessage.warning('暂无版本更新信息') + return + }else{ + dialogVisible.value = true + } }) } const getFrameworkVersionListFn = () => { @@ -73,6 +79,7 @@ const getFrameworkVersionListFn = () => { } }) frameworkVersionList.value = data + dialogVisible.value = true }) } @@ -90,7 +97,6 @@ const open = async () => { } else { getFrameworkVersionListFn() } - dialogVisible.value = true }) } diff --git a/admin/src/app/components/upgrade/index.vue b/admin/src/app/components/upgrade/index.vue index 636c48ca1..13618990d 100644 --- a/admin/src/app/components/upgrade/index.vue +++ b/admin/src/app/components/upgrade/index.vue @@ -35,9 +35,9 @@
- + - + @@ -72,26 +72,26 @@
- + {{ t("upgrade.path") }} - + {{ t("upgrade.demand") }} - + {{ t("status") }}
- + {{ item.dir }} - + {{ t("upgrade.readable") }} - + @@ -129,7 +129,7 @@
-
+
@@ -137,40 +137,50 @@
- -
- - - 功能操作 - - - 状态 - - - - - {{ item.name }} - - - - -