From 626bde7397634475f095676f58e99bfaf1a81391 Mon Sep 17 00:00:00 2001 From: "1213317725@qq.com" <1213317725@qq.com> Date: Wed, 5 Mar 2025 15:04:31 +0800 Subject: [PATCH 1/2] 1 --- admin/.env.development | 2 +- admin/.env.production | 4 ++-- admin/auto-imports.d.ts | 2 +- admin/components.d.ts | 22 ------------------- admin/src/app/views/campuses/list.vue | 15 +++++++++++++ niucloud/README.md | 4 +++- .../app/service/admin/sys/MenuService.php | 3 ++- 7 files changed, 24 insertions(+), 28 deletions(-) create mode 100644 admin/src/app/views/campuses/list.vue diff --git a/admin/.env.development b/admin/.env.development index 5f0c274d..8a72f388 100644 --- a/admin/.env.development +++ b/admin/.env.development @@ -1,5 +1,5 @@ # api请求地址 -VITE_APP_BASE_URL='/adminapi/' +VITE_APP_BASE_URL='http://146.56.228.75:20021/adminapi/' # 图片服务器地址 VITE_IMG_DOMAIN='' diff --git a/admin/.env.production b/admin/.env.production index 2d106965..d9530ac1 100644 --- a/admin/.env.production +++ b/admin/.env.production @@ -1,8 +1,8 @@ # api请求地址 -VITE_APP_BASE_URL='/adminapi/' +VITE_APP_BASE_URL='http://146.56.228.75:20021/adminapi/' # 图片服务器地址 -VITE_IMG_DOMAIN='' +VITE_IMG_DOMAIN='http://146.56.228.75:20021' # 请求时header中token的参数名 VITE_REQUEST_HEADER_TOKEN_KEY='token' diff --git a/admin/auto-imports.d.ts b/admin/auto-imports.d.ts index a51b7a66..08908edd 100644 --- a/admin/auto-imports.d.ts +++ b/admin/auto-imports.d.ts @@ -1,5 +1,5 @@ // Generated by 'unplugin-auto-import' export {} declare global { - const ElNotification: typeof import('element-plus/es')['ElNotification'] + } diff --git a/admin/components.d.ts b/admin/components.d.ts index d3104f82..cbb74b70 100644 --- a/admin/components.d.ts +++ b/admin/components.d.ts @@ -10,33 +10,22 @@ declare module '@vue/runtime-core' { Attachment: typeof import('./src/components/upload-attachment/attachment.vue')['default'] DiyLink: typeof import('./src/components/diy-link/index.vue')['default'] Editor: typeof import('./src/components/editor/index.vue')['default'] - ElAlert: typeof import('element-plus/es')['ElAlert'] ElAside: typeof import('element-plus/es')['ElAside'] ElAvatar: typeof import('element-plus/es')['ElAvatar'] ElBreadcrumb: typeof import('element-plus/es')['ElBreadcrumb'] ElBreadcrumbItem: typeof import('element-plus/es')['ElBreadcrumbItem'] ElButton: typeof import('element-plus/es')['ElButton'] ElCard: typeof import('element-plus/es')['ElCard'] - ElCarousel: typeof import('element-plus/es')['ElCarousel'] - ElCarouselItem: typeof import('element-plus/es')['ElCarouselItem'] - ElCascader: typeof import('element-plus/es')['ElCascader'] ElCheckbox: typeof import('element-plus/es')['ElCheckbox'] - ElCheckboxGroup: typeof import('element-plus/es')['ElCheckboxGroup'] ElCol: typeof import('element-plus/es')['ElCol'] - ElCollapse: typeof import('element-plus/es')['ElCollapse'] - ElCollapseItem: typeof import('element-plus/es')['ElCollapseItem'] ElColorPicker: typeof import('element-plus/es')['ElColorPicker'] ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider'] ElContainer: typeof import('element-plus/es')['ElContainer'] - ElDatePicker: typeof import('element-plus/es')['ElDatePicker'] - ElDescriptions: typeof import('element-plus/es')['ElDescriptions'] - ElDescriptionsItem: typeof import('element-plus/es')['ElDescriptionsItem'] ElDialog: typeof import('element-plus/es')['ElDialog'] ElDrawer: typeof import('element-plus/es')['ElDrawer'] ElDropdown: typeof import('element-plus/es')['ElDropdown'] ElDropdownItem: typeof import('element-plus/es')['ElDropdownItem'] ElDropdownMenu: typeof import('element-plus/es')['ElDropdownMenu'] - ElEmpty: typeof import('element-plus/es')['ElEmpty'] ElForm: typeof import('element-plus/es')['ElForm'] ElFormItem: typeof import('element-plus/es')['ElFormItem'] ElHeader: typeof import('element-plus/es')['ElHeader'] @@ -45,25 +34,17 @@ declare module '@vue/runtime-core' { ElImageViewer: typeof import('element-plus/es')['ElImageViewer'] ElInput: typeof import('element-plus/es')['ElInput'] ElInputNumber: typeof import('element-plus/es')['ElInputNumber'] - ElLink: typeof import('element-plus/es')['ElLink'] ElMain: typeof import('element-plus/es')['ElMain'] ElMenu: typeof import('element-plus/es')['ElMenu'] ElMenuItem: typeof import('element-plus/es')['ElMenuItem'] ElOption: typeof import('element-plus/es')['ElOption'] - ElOptionGroup: typeof import('element-plus/es')['ElOptionGroup'] - ElPageHeader: typeof import('element-plus/es')['ElPageHeader'] ElPagination: typeof import('element-plus/es')['ElPagination'] ElPopover: typeof import('element-plus/es')['ElPopover'] - ElProgress: typeof import('element-plus/es')['ElProgress'] ElRadio: typeof import('element-plus/es')['ElRadio'] - ElRadioButton: typeof import('element-plus/es')['ElRadioButton'] ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup'] - ElRate: typeof import('element-plus/es')['ElRate'] - ElResult: typeof import('element-plus/es')['ElResult'] ElRow: typeof import('element-plus/es')['ElRow'] ElScrollbar: typeof import('element-plus/es')['ElScrollbar'] ElSelect: typeof import('element-plus/es')['ElSelect'] - ElSlider: typeof import('element-plus/es')['ElSlider'] ElStatistic: typeof import('element-plus/es')['ElStatistic'] ElStep: typeof import('element-plus/es')['ElStep'] ElSteps: typeof import('element-plus/es')['ElSteps'] @@ -74,9 +55,6 @@ declare module '@vue/runtime-core' { ElTabPane: typeof import('element-plus/es')['ElTabPane'] ElTabs: typeof import('element-plus/es')['ElTabs'] ElTag: typeof import('element-plus/es')['ElTag'] - ElTimeline: typeof import('element-plus/es')['ElTimeline'] - ElTimelineItem: typeof import('element-plus/es')['ElTimelineItem'] - ElTimePicker: typeof import('element-plus/es')['ElTimePicker'] ElTooltip: typeof import('element-plus/es')['ElTooltip'] ElTree: typeof import('element-plus/es')['ElTree'] ElTreeSelect: typeof import('element-plus/es')['ElTreeSelect'] diff --git a/admin/src/app/views/campuses/list.vue b/admin/src/app/views/campuses/list.vue new file mode 100644 index 00000000..0bb1f891 --- /dev/null +++ b/admin/src/app/views/campuses/list.vue @@ -0,0 +1,15 @@ + + + + + diff --git a/niucloud/README.md b/niucloud/README.md index a8c4d1cd..3a5c4dc5 100644 --- a/niucloud/README.md +++ b/niucloud/README.md @@ -1,4 +1,6 @@ -ThinkPHP 6.0 +ThinkPHP 6.0 123 + + =============== > 运行环境要求PHP7.2+，兼容PHP8.1 diff --git a/niucloud/app/service/admin/sys/MenuService.php b/niucloud/app/service/admin/sys/MenuService.php index 7c4fd036..f53a97b1 100644 --- a/niucloud/app/service/admin/sys/MenuService.php +++ b/niucloud/app/service/admin/sys/MenuService.php @@ -186,7 +186,7 @@ class MenuService extends BaseAdminService */ public function getAllMenuList($status = 'all', $is_tree = 0, $is_button = 0) { - $cache_name = 'menu_api_' . $status . '_' . $is_tree . '_' . $is_button; + $cache_name = time().'menu_api_' . $status . '_' . $is_tree . '_' . $is_button; $menu_list = cache_remember( $cache_name, function() use ($status, $is_tree, $is_button) { @@ -196,6 +196,7 @@ class MenuService extends BaseAdminService if ($status != 'all') { $where[] = [ 'status', '=', $status ]; } + // 排除菜单 $delete_menu_addon = []; $addon_loader = new DictLoader("Menu"); From 6ffa08146b0c4e798fc0c7e815fe3f7dfe20e765 Mon Sep 17 00:00:00 2001 From: "1213317725@qq.com" <1213317725@qq.com> Date: Wed, 5 Mar 2025 16:04:13 +0800 Subject: [PATCH 2/2] 1 --- admin/components.d.ts | 5 +++++ admin/src/app/views/campuses/list.vue | 15 --------------- 2 files changed, 5 insertions(+), 15 deletions(-) delete mode 100644 admin/src/app/views/campuses/list.vue diff --git a/admin/components.d.ts b/admin/components.d.ts index cbb74b70..85639707 100644 --- a/admin/components.d.ts +++ b/admin/components.d.ts @@ -10,6 +10,7 @@ declare module '@vue/runtime-core' { Attachment: typeof import('./src/components/upload-attachment/attachment.vue')['default'] DiyLink: typeof import('./src/components/diy-link/index.vue')['default'] Editor: typeof import('./src/components/editor/index.vue')['default'] + ElAlert: typeof import('element-plus/es')['ElAlert'] ElAside: typeof import('element-plus/es')['ElAside'] ElAvatar: typeof import('element-plus/es')['ElAvatar'] ElBreadcrumb: typeof import('element-plus/es')['ElBreadcrumb'] @@ -26,6 +27,7 @@ declare module '@vue/runtime-core' { ElDropdown: typeof import('element-plus/es')['ElDropdown'] ElDropdownItem: typeof import('element-plus/es')['ElDropdownItem'] ElDropdownMenu: typeof import('element-plus/es')['ElDropdownMenu'] + ElEmpty: typeof import('element-plus/es')['ElEmpty'] ElForm: typeof import('element-plus/es')['ElForm'] ElFormItem: typeof import('element-plus/es')['ElFormItem'] ElHeader: typeof import('element-plus/es')['ElHeader'] @@ -34,14 +36,17 @@ declare module '@vue/runtime-core' { ElImageViewer: typeof import('element-plus/es')['ElImageViewer'] ElInput: typeof import('element-plus/es')['ElInput'] ElInputNumber: typeof import('element-plus/es')['ElInputNumber'] + ElLink: typeof import('element-plus/es')['ElLink'] ElMain: typeof import('element-plus/es')['ElMain'] ElMenu: typeof import('element-plus/es')['ElMenu'] ElMenuItem: typeof import('element-plus/es')['ElMenuItem'] ElOption: typeof import('element-plus/es')['ElOption'] + ElPageHeader: typeof import('element-plus/es')['ElPageHeader'] ElPagination: typeof import('element-plus/es')['ElPagination'] ElPopover: typeof import('element-plus/es')['ElPopover'] ElRadio: typeof import('element-plus/es')['ElRadio'] ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup'] + ElResult: typeof import('element-plus/es')['ElResult'] ElRow: typeof import('element-plus/es')['ElRow'] ElScrollbar: typeof import('element-plus/es')['ElScrollbar'] ElSelect: typeof import('element-plus/es')['ElSelect'] diff --git a/admin/src/app/views/campuses/list.vue b/admin/src/app/views/campuses/list.vue deleted file mode 100644 index 0bb1f891..00000000 --- a/admin/src/app/views/campuses/list.vue +++ /dev/null @@ -1,15 +0,0 @@ - - - - -