From 23bae9efd577213cf9fb4cb7ae7a71aed93d14a7 Mon Sep 17 00:00:00 2001 From: paulGao Date: Thu, 16 Jun 2022 14:08:46 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BC=98=E5=8C=96k8s=E9=83=A8=E7=BD=B2?= =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- buyer/nginx.conf | 27 ++++++++----------- .../src/components/goodsDetail/ShowGoods.vue | 2 +- manager/nginx.conf | 26 ++++++++---------- seller/nginx.conf | 26 ++++++++---------- 4 files changed, 34 insertions(+), 47 deletions(-) diff --git a/buyer/nginx.conf b/buyer/nginx.conf index 0dba16b4..fd5d7cb1 100644 --- a/buyer/nginx.conf +++ b/buyer/nginx.conf @@ -1,51 +1,46 @@ #这个文件给docker用的 #user nobody; -worker_processes 1; +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; + worker_connections 1024; } - http { - include mime.types; - default_type application/octet-stream; + include mime.types; + default_type application/octet-stream; #log_format main '$remote_addr - $remote_user [$time_local] "$request" ' # '$status $body_bytes_sent "$http_referer" ' # '"$http_user_agent" "$http_x_forwarded_for"'; #access_log logs/access.log main; - - sendfile on; + sendfile on; #tcp_nopush on; #keepalive_timeout 0; - keepalive_timeout 65; + keepalive_timeout 65; client_max_body_size 10m; gzip on; - gzip_min_length 5k; - gzip_buffers 4 16k; + gzip_min_length 5k; + gzip_buffers 4 16k; gzip_http_version 1.0; gzip_comp_level 4; - gzip_types text/plain application/x-javascript application/javascript text/css application/xml text/javascript application/x-httpd-php image/jpeg image/gif image/png; + gzip_types text/plain application/x-javascript application/javascript text/css application/xml text/javascript application/x-httpd-php image/jpeg image/gif image/png; gzip_vary on; server { - listen 10000; - server_name localhost; + listen 10000; location / { root /app; try_files $uri $uri/ /index.html $uri/ =404; - index index.html index.htm; + index index.html index.htm; } } } diff --git a/buyer/src/components/goodsDetail/ShowGoods.vue b/buyer/src/components/goodsDetail/ShowGoods.vue index 37a2143c..cc916800 100644 --- a/buyer/src/components/goodsDetail/ShowGoods.vue +++ b/buyer/src/components/goodsDetail/ShowGoods.vue @@ -78,7 +78,7 @@
-
+
价     格 diff --git a/manager/nginx.conf b/manager/nginx.conf index 758710ff..32304ecf 100644 --- a/manager/nginx.conf +++ b/manager/nginx.conf @@ -1,51 +1,47 @@ #这个文件给docker用的 #user nobody; -worker_processes 1; +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; + worker_connections 1024; } http { - include mime.types; - default_type application/octet-stream; + include mime.types; + default_type application/octet-stream; #log_format main '$remote_addr - $remote_user [$time_local] "$request" ' # '$status $body_bytes_sent "$http_referer" ' # '"$http_user_agent" "$http_x_forwarded_for"'; #access_log logs/access.log main; - - sendfile on; + sendfile on; #tcp_nopush on; #keepalive_timeout 0; - keepalive_timeout 65; + keepalive_timeout 65; client_max_body_size 10m; gzip on; - gzip_min_length 5k; - gzip_buffers 4 16k; + gzip_min_length 5k; + gzip_buffers 4 16k; gzip_http_version 1.0; gzip_comp_level 4; - gzip_types text/plain application/x-javascript application/javascript text/css application/xml text/javascript application/x-httpd-php image/jpeg image/gif image/png; + gzip_types text/plain application/x-javascript application/javascript text/css application/xml text/javascript application/x-httpd-php image/jpeg image/gif image/png; gzip_vary on; server { - listen 10003; - server_name localhost; + listen 10003; location / { root /app; try_files $uri $uri/ /index.html $uri/ =404; - index index.html index.htm; + index index.html index.htm; } } } diff --git a/seller/nginx.conf b/seller/nginx.conf index ba020d10..34114167 100644 --- a/seller/nginx.conf +++ b/seller/nginx.conf @@ -1,51 +1,47 @@ #这个文件给docker用的 #user nobody; -worker_processes 1; +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; + worker_connections 1024; } http { - include mime.types; - default_type application/octet-stream; + include mime.types; + default_type application/octet-stream; #log_format main '$remote_addr - $remote_user [$time_local] "$request" ' # '$status $body_bytes_sent "$http_referer" ' # '"$http_user_agent" "$http_x_forwarded_for"'; #access_log logs/access.log main; - - sendfile on; + sendfile on; #tcp_nopush on; #keepalive_timeout 0; - keepalive_timeout 65; + keepalive_timeout 65; client_max_body_size 10m; gzip on; - gzip_min_length 5k; - gzip_buffers 4 16k; + gzip_min_length 5k; + gzip_buffers 4 16k; gzip_http_version 1.0; gzip_comp_level 4; - gzip_types text/plain application/x-javascript application/javascript text/css application/xml text/javascript application/x-httpd-php image/jpeg image/gif image/png; + gzip_types text/plain application/x-javascript application/javascript text/css application/xml text/javascript application/x-httpd-php image/jpeg image/gif image/png; gzip_vary on; server { - listen 10002; - server_name localhost; + listen 10002; location / { root /app; try_files $uri $uri/ /index.html $uri/ =404; - index index.html index.htm; + index index.html index.htm; } } } From 0a5563e5e22ac130916d97935a67b0fbf3a0ca76 Mon Sep 17 00:00:00 2001 From: paulGao Date: Wed, 22 Jun 2022 10:55:17 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E7=AB=AF=E4=BF=83=E9=94=80=E7=9B=B8=E5=85=B3=E6=96=87=E6=9C=AC?= =?UTF-8?q?=EF=BC=8C=E6=93=8D=E4=BD=9C=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manager/src/views/promotions/coupon/coupon.vue | 4 ++-- .../promotions/full-discount/full-discount.vue | 4 ++-- .../kanjia/kanjia-activity-goods.vue | 18 +++++++++--------- .../src/views/promotions/pintuan/pintuan.vue | 4 ++-- .../promotions/points-goods/points-goods.vue | 5 +++-- .../src/views/promotions/seckill/seckill.vue | 8 ++++---- 6 files changed, 22 insertions(+), 21 deletions(-) diff --git a/manager/src/views/promotions/coupon/coupon.vue b/manager/src/views/promotions/coupon/coupon.vue index bb281854..5970caa8 100644 --- a/manager/src/views/promotions/coupon/coupon.vue +++ b/manager/src/views/promotions/coupon/coupon.vue @@ -59,7 +59,7 @@ >