diff --git a/admin/src/app/api/addon.ts b/admin/src/app/api/addon.ts index 7feca2234..43c890434 100644 --- a/admin/src/app/api/addon.ts +++ b/admin/src/app/api/addon.ts @@ -39,7 +39,7 @@ export function installAddon(params: Record) { * @returns */ export function cloudInstallAddon(params: Record) { - return request.post(`addon/cloudinstall/${params.addon}`, params) + return request.post(`addon/cloudinstall/${params.addon}`, params, { timeout: 60 * 1000 }) } /** diff --git a/admin/src/app/api/auth.ts b/admin/src/app/api/auth.ts index 6a3087f30..85c62773c 100644 --- a/admin/src/app/api/auth.ts +++ b/admin/src/app/api/auth.ts @@ -37,4 +37,10 @@ export function getLoginConfig() { */ export function getAuthaddon() { return request.get(`auth/authaddon`) -} \ No newline at end of file +} +/** + * 获取当前版本信息 + */ +export function getVersions() { + return request.get(`sys/info`) +} diff --git a/admin/src/app/assets/images/tools/addon_develop.png b/admin/src/app/assets/images/tools/addon_develop.png new file mode 100644 index 000000000..88511a028 Binary files /dev/null and b/admin/src/app/assets/images/tools/addon_develop.png differ diff --git a/admin/src/app/assets/images/tools/app_auth.png b/admin/src/app/assets/images/tools/app_auth.png new file mode 100644 index 000000000..1de3c211d Binary files /dev/null and b/admin/src/app/assets/images/tools/app_auth.png differ diff --git a/admin/src/app/assets/images/tools/auth_menu.png b/admin/src/app/assets/images/tools/auth_menu.png new file mode 100644 index 000000000..6217800f4 Binary files /dev/null and b/admin/src/app/assets/images/tools/auth_menu.png differ diff --git a/admin/src/app/assets/images/tools/code.png b/admin/src/app/assets/images/tools/code.png new file mode 100644 index 000000000..aea7671e4 Binary files /dev/null and b/admin/src/app/assets/images/tools/code.png differ diff --git a/admin/src/app/assets/images/tools/official_market.png b/admin/src/app/assets/images/tools/official_market.png new file mode 100644 index 000000000..3f1b6bdc2 Binary files /dev/null and b/admin/src/app/assets/images/tools/official_market.png differ diff --git a/admin/src/app/assets/images/tools/sys_dict_list.png b/admin/src/app/assets/images/tools/sys_dict_list.png new file mode 100644 index 000000000..0a718a47b Binary files /dev/null and b/admin/src/app/assets/images/tools/sys_dict_list.png differ diff --git a/admin/src/app/assets/images/tools/tools_Update_cache.png b/admin/src/app/assets/images/tools/tools_Update_cache.png new file mode 100644 index 000000000..925c58ddf Binary files /dev/null and b/admin/src/app/assets/images/tools/tools_Update_cache.png differ diff --git a/admin/src/app/assets/images/tools/tools_check_environment.png b/admin/src/app/assets/images/tools/tools_check_environment.png new file mode 100644 index 000000000..0a240ed87 Binary files /dev/null and b/admin/src/app/assets/images/tools/tools_check_environment.png differ diff --git a/admin/src/app/assets/images/tools/tools_schedule.png b/admin/src/app/assets/images/tools/tools_schedule.png new file mode 100644 index 000000000..8c7995880 Binary files /dev/null and b/admin/src/app/assets/images/tools/tools_schedule.png differ diff --git a/admin/src/app/lang/zh-cn/index.app_manage.json b/admin/src/app/lang/zh-cn/index.app_manage.json index 0148ad75f..6297e54c2 100644 --- a/admin/src/app/lang/zh-cn/index.app_manage.json +++ b/admin/src/app/lang/zh-cn/index.app_manage.json @@ -1,8 +1,10 @@ { - "app": "应用管理", - "descriptionLeft": "暂未安装任何应用，请到", - "link": "插件管理", - "descriptionRight": "进行安装使用", + "app": "应用中心", + "descriptionLeft": "请点击", + "link": "安装应用", + "descriptionRight": "安装使用", "niucloud": "Niucloud官网", - "appStore": "插件管理" + "appStore": "安装应用", + "versionInfo":"版本信息:", + "currentVersion":"当前版本" } \ No newline at end of file diff --git a/admin/src/app/lang/zh-cn/index.store.json b/admin/src/app/lang/zh-cn/index.store.json index b242a2567..11c7c1c2b 100644 --- a/admin/src/app/lang/zh-cn/index.store.json +++ b/admin/src/app/lang/zh-cn/index.store.json @@ -1,4 +1,10 @@ { + "search":"搜索应用名称", + "appName":"应用名/版本信息", + "introduction":"简介", + "type":"类型", + "app":"应用", + "addon":"插件", "noPlug":"暂无应用", "install":"安装", "unload":"卸载", @@ -6,9 +12,10 @@ "uninstalledLabel":"未安装", "version":"版本", "title":"名称", - "desc":"描述", + "desc":"简介", "plugDetail": "插件信息", "author": "作者", + "detail":"详情", "addonInstall": "插件安装", "dirPermission": "目录读写权限", "path": "路径", @@ -56,5 +63,6 @@ "updateCode": "重新绑定", "notHaveAuth": "还没有授权？去购买", "authInfoTips": "授权码和授权秘钥可在Niucloud官网我的授权 授权详情中查看", - "addonUninstall": "插件卸载" + "addonUninstall": "插件卸载", + "noAddon":"暂无插件" } \ No newline at end of file diff --git a/admin/src/app/views/app/authorize.vue b/admin/src/app/views/app/authorize.vue index 36fd4c4c8..2e47576b5 100644 --- a/admin/src/app/views/app/authorize.vue +++ b/admin/src/app/views/app/authorize.vue @@ -9,7 +9,7 @@
当前版本 - 1.0.35 + {{versions}} (当前已是最新版本)
@@ -40,7 +40,7 @@
授权码认证 -

您在官方应用市场购买任意一款应用，即可获得授权码。输入正确授权码认证通过后，即可支持在线升级和其它相关服务 @@ -95,6 +95,7 @@ diff --git a/admin/src/app/views/setting/system.vue b/admin/src/app/views/setting/system.vue index 21190c758..09a971faf 100644 --- a/admin/src/app/views/setting/system.vue +++ b/admin/src/app/views/setting/system.vue @@ -43,7 +43,7 @@ --> - +

{{ t('serviceInformation') }}

@@ -95,9 +95,9 @@ const formData = reactive>({ front_end_name: '', front_end_logo: '', icon: '', - wechat_code: '', - enterprise_wechat: '', - tel: '' + tel: '', + wechat_code: '', + enterprise_wechat: '' }) const setFormData = async (id: number = 0) => { diff --git a/admin/src/app/views/tools/index.vue b/admin/src/app/views/tools/index.vue index b7503aa51..a1020c73e 100644 --- a/admin/src/app/views/tools/index.vue +++ b/admin/src/app/views/tools/index.vue @@ -1,33 +1,70 @@ @@ -41,60 +78,29 @@ import storage from '@/utils/storage' import {findFirstValidRoute} from '@/router/routers' import {UserFilled} from '@element-plus/icons-vue' - const router = useRouter() - import useUserStore from '@/stores/modules/user' - const userStore = useUserStore() - const loading = ref(true) - const detail = reactive({ - appList: [] - }) - const appLink: any = ref({}) - - const menus = computed(() => { - let obj = [] - loading.value = true; - userStore.routers.forEach((item, index) => { - if (item.meta.key == 'tool' && item.children && item.children.length) { - item.children.forEach((childItem,childIndex) => { - if(childItem.meta.show == 1){ - obj.push(childItem); - } - }); - } - }) - loading.value = false; - return obj - }) - - const toLink = (data)=>{ - router.push({ name: data.name }) + const toLink = (link)=>{ + router.push(link) } - const goRouter = () => { window.open('https://www.niucloud.com/product') } - + diff --git a/admin/src/components/upload-attachment/attachment.vue b/admin/src/components/upload-attachment/attachment.vue index da37ae637..c5b20cccc 100644 --- a/admin/src/components/upload-attachment/attachment.vue +++ b/admin/src/components/upload-attachment/attachment.vue @@ -1,11 +1,11 @@ diff --git a/admin/src/styles/icon/iconfont.css b/admin/src/styles/icon/iconfont.css index 350219a53..b2f23601a 100644 --- a/admin/src/styles/icon/iconfont.css +++ b/admin/src/styles/icon/iconfont.css @@ -1,8 +1,8 @@ @font-face { font-family: "iconfont"; /* Project id 3883393 */ - src: url('//at.alicdn.com/t/c/font_3883393_t7tf6zkctc.woff2?t=1697534072773') format('woff2'), - url('//at.alicdn.com/t/c/font_3883393_t7tf6zkctc.woff?t=1697534072773') format('woff'), - url('//at.alicdn.com/t/c/font_3883393_t7tf6zkctc.ttf?t=1697534072773') format('truetype'); + src: url('//at.alicdn.com/t/c/font_3883393_zbqffn9fec.woff2?t=1698204164945') format('woff2'), + url('//at.alicdn.com/t/c/font_3883393_zbqffn9fec.woff?t=1698204164945') format('woff'), + url('//at.alicdn.com/t/c/font_3883393_zbqffn9fec.ttf?t=1698204164945') format('truetype'); } .iconfont { @@ -13,6 +13,18 @@ -moz-osx-font-smoothing: grayscale; } +.iconxiazai01:before { + content: "\ea38"; +} + +.iconjingdiandingdan:before { + content: "\e6ea"; +} + +.iconluxiandingdan:before { + content: "\e6eb"; +} + .iconfapiaoguanli:before { content: "\e683"; }