From d980398b7f669f505f4ebbaec496d826a7e9eb06 Mon Sep 17 00:00:00 2001 From: Bunny <1319900154@qq.com> Date: Sun, 27 Oct 2024 22:31:52 +0800 Subject: [PATCH] =?UTF-8?q?optimize:=20=E2=99=BB=EF=B8=8F=20=E8=A7=92?= =?UTF-8?q?=E8=89=B2=E5=88=86=E9=85=8D=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker/Dockerfile | 5 ++- docker/nginx.conf | 40 +++++++++---------- src/layout/index.vue | 9 +++-- .../system/menu/assign-router-to-role.vue | 2 +- src/views/system/menu/utils/columns.tsx | 2 +- src/views/system/menu/utils/hooks.tsx | 4 +- 6 files changed, 33 insertions(+), 29 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 821028c..349fcba 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -6,6 +6,10 @@ RUN rm /etc/nginx/conf.d/default.conf # 将自定义的 Nginx 配置文件复制到容器中 COPY nginx.conf /etc/nginx/conf.d/default.conf +#COPY bunny-web.site.csr /etc/nginx/bunny-web.site.csr +#COPY bunny-web.site.key /etc/nginx/bunny-web.site.key +#COPY bunny-web.site_bundle.crt /etc/nginx/bunny-web.site_bundle.crt +#COPY bunny-web.site_bundle.pem /etc/nginx/bunny-web.site_bundle.pem # 设置时区，构建镜像时执行的命令 RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime @@ -24,4 +28,3 @@ EXPOSE 80 # 自动启动 Nginx CMD ["nginx", "-g", "daemon off;"] - diff --git a/docker/nginx.conf b/docker/nginx.conf index 90008b3..fca77a4 100644 --- a/docker/nginx.conf +++ b/docker/nginx.conf @@ -4,28 +4,28 @@ map $http_upgrade $connection_upgrade { } server { - listen 80; - listen [::]:80; - server_name localhost; + listen 80 ; + listen [::]:80; + server_name localhost; - location / { - root /etc/nginx/html; - index index.html index.htm; - try_files $uri /index.html; - } + location / { + root /etc/nginx/html; + index index.html index.htm; + try_files $uri /index.html; + } - # 后端跨域请求 - location ~/admin/ { - proxy_pass http://172.17.0.1:8000; - proxy_set_header Host $http_host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - } + # 后端跨域请求 + location ~/admin/ { + proxy_pass http://172.17.0.1:8000; + proxy_set_header Host $http_host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + } - error_page 404 404.html; + error_page 404 404.html; - location = /50x.html { - root html; - } + location = /50x.html { + root html; + } } diff --git a/src/layout/index.vue b/src/layout/index.vue index d8f2eca..0f010a2 100644 --- a/src/layout/index.vue +++ b/src/layout/index.vue @@ -10,7 +10,6 @@ import { computed, defineComponent, h, onBeforeMount, onMounted, reactive, ref } import { useI18n } from 'vue-i18n'; import { useLayout } from './hooks/useLayout'; import { setType } from './types'; - import BackTopIcon from '@/assets/svg/back_top.svg?component'; import LayContent from './components/lay-content/index.vue'; import LayNavbar from './components/lay-navbar/index.vue'; @@ -18,6 +17,7 @@ import LaySetting from './components/lay-setting/index.vue'; import NavHorizontal from './components/lay-sidebar/NavHorizontal.vue'; import NavVertical from './components/lay-sidebar/NavVertical.vue'; import LayTag from './components/lay-tag/index.vue'; +import { useUserStore } from '@/store/system/user'; const { t } = useI18n(); const appWrapperRef = ref(); @@ -26,6 +26,7 @@ const { layout } = useLayout(); const isMobile = deviceDetection(); const pureSetting = useSettingStoreHook(); const { $storage } = useGlobal(); +const userStore = useUserStore(); const set: setType = reactive({ sidebar: computed(() => { @@ -104,9 +105,9 @@ useResizeObserver(appWrapperRef, entries => { }); onMounted(() => { - if (isMobile) { - toggle('mobile', false); - } + if (isMobile) toggle('mobile', false); + // 获取用户信息 + userStore.getUserinfo(); }); onBeforeMount(() => { diff --git a/src/views/system/menu/assign-router-to-role.vue b/src/views/system/menu/assign-router-to-role.vue index a9f5072..287fc28 100644 --- a/src/views/system/menu/assign-router-to-role.vue +++ b/src/views/system/menu/assign-router-to-role.vue @@ -38,7 +38,7 @@ defineExpose({ assignRoles });