diff --git a/build-local-docker-image.sh b/build-local-docker-image.sh index 8db617a1a75..d33bd7c6434 100755 --- a/build-local-docker-image.sh +++ b/build-local-docker-image.sh @@ -3,7 +3,7 @@ SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) LOG_FILE=${SCRIPT_DIR}/build-local-docker-image.log ERROR="" -IMAGE_NAME="vben-admin-pro-local" +IMAGE_NAME="vben-admin-local" function stop_and_remove_container() { # Stop and remove the existing container diff --git a/deploy/nginx.conf b/deploy/nginx.conf new file mode 100644 index 00000000000..a36247d0daa --- /dev/null +++ b/deploy/nginx.conf @@ -0,0 +1,87 @@ + +#user nobody; +worker_processes 1; + +#error_log logs/error.log; +#error_log logs/error.log notice; +#error_log logs/error.log info; + +#pid logs/nginx.pid; + + +events { + worker_connections 1024; +} + + +http { + include mime.types; + default_type application/octet-stream; + + types { + application/javascript js mjs; + text/css css; + text/html html; + } + + sendfile on; + # tcp_nopush on; + + #keepalive_timeout 0; + # keepalive_timeout 65; + + # gzip on; + # gzip_buffers 32 16k; + # gzip_comp_level 6; + # gzip_min_length 1k; + # gzip_static on; + # gzip_types text/plain + # text/css + # application/javascript + # application/json + # application/x-javascript + # text/xml + # application/xml + # application/xml+rss + # text/javascript; #设置压缩的文件类型 + # gzip_vary on; + + server { + listen 8080; + server_name localhost; + + location / { + root /usr/share/nginx/html; + try_files $uri $uri/ /index.html; + index index.html; + # Enable CORS + add_header 'Access-Control-Allow-Origin' '*'; + add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS'; + add_header 'Access-Control-Allow-Headers' 'DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type'; + if ($request_method = 'OPTIONS') { + add_header 'Access-Control-Max-Age' 1728000; + add_header 'Content-Type' 'text/plain charset=UTF-8'; + add_header 'Content-Length' 0; + return 204; + } + } + + error_page 500 502 503 504 /50x.html; + + location = /50x.html { + root /usr/share/nginx/html; + } + } +} + +# stream { # stream 模块配置和 http 模块在相同级别 +# upstream redis { +# server 127.0.0.1:6379 max_fails=3 fail_timeout=30s; +# } +# server { +# listen 16379; +# proxy_connect_timeout 1s; +# proxy_timeout 3s; +# proxy_pass redis; +# } +# } diff --git a/internal/lint-configs/commitlint-config/index.mjs b/internal/lint-configs/commitlint-config/index.mjs index 8f8092d12ee..05ceb76147a 100644 --- a/internal/lint-configs/commitlint-config/index.mjs +++ b/internal/lint-configs/commitlint-config/index.mjs @@ -121,7 +121,7 @@ const userConfig = { 'header-max-length': [2, 'always', 108], 'scope-enum': [0], - 'subject-case': [2, 'always', 'lower-case'], + 'subject-case': [0], 'subject-empty': [2, 'never'], 'type-empty': [2, 'never'], /** diff --git a/packages/effects/layouts/src/widgets/user-dropdown/user-dropdown.vue b/packages/effects/layouts/src/widgets/user-dropdown/user-dropdown.vue index 5d3ffa31906..173681181ba 100644 --- a/packages/effects/layouts/src/widgets/user-dropdown/user-dropdown.vue +++ b/packages/effects/layouts/src/widgets/user-dropdown/user-dropdown.vue @@ -206,6 +206,7 @@ if (enableShortcutKey.value) {