From 70bf1a48d037f993021ddf4ee2ee6da3bbce351e Mon Sep 17 00:00:00 2001
From: 司猫子 <songshuang@qq.com>
Date: 星期日, 04 二月 2024 09:51:52 +0800
Subject: [PATCH] !481 单元格合并可以基于注解选择哪些其他字段需要同时相等方可进行该单元格合并 * excel插件 原有的合并策略写死了根据前一字段是否一致来判断后一字段的合并 感觉这样不灵活 如有特殊需求 字段排序不规整 于是扩充了注解的…
---
script/docker/nginx/conf/nginx.conf | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/script/docker/nginx/conf/nginx.conf b/script/docker/nginx/conf/nginx.conf
index e9630aa..0e9856a 100644
--- a/script/docker/nginx/conf/nginx.conf
+++ b/script/docker/nginx/conf/nginx.conf
@@ -31,8 +31,8 @@
server 127.0.0.1:9090;
}
- upstream xxljob-admin {
- server 127.0.0.1:9100;
+ upstream powerjob-server {
+ server 127.0.0.1:7700;
}
server {
@@ -68,7 +68,7 @@
}
location / {
- root /usr/share/nginx/html;
+ root /usr/share/nginx/html; # docker鏄犲皠璺緞 涓嶅厑璁告洿鏀�
try_files $uri $uri/ /index.html;
index index.html index.htm;
}
@@ -78,6 +78,10 @@
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header REMOTE-HOST $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+ # websocket鍙傛暟
+ proxy_http_version 1.1;
+ proxy_set_header Upgrade $http_upgrade;
+ proxy_set_header Connection "upgrade";
proxy_pass http://server/;
}
@@ -93,14 +97,19 @@
}
# https 浼氭嫤鎴唴閾炬墍鏈夌殑 http 璇锋眰 閫犳垚鍔熻兘鏃犳硶浣跨敤
- # 瑙ｅ喅鏂规1 灏� xxljob 鏈嶅姟 涔熼厤缃垚 https
+ # 瑙ｅ喅鏂规1 灏� powerjob 鏈嶅姟 涔熼厤缃垚 https
# 瑙ｅ喅鏂规2 灏嗚彍鍗曢厤缃负澶栭摼璁块棶 璧扮嫭绔嬮〉闈� http 璁块棶
- location /xxl-job-admin/ {
+ location /powerjob/ {
proxy_set_header Host $http_host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header REMOTE-HOST $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
- proxy_pass http://xxljob-admin/xxl-job-admin/;
+ proxy_pass http://powerjob-server/;
+ }
+
+ # 瑙ｅ喅 powerjob 浠ｇ悊涔嬪悗闈欐�佹枃浠舵棤娉曡闂殑闂 璇峰嬁淇敼涔卞姩
+ location ~ ^/(js|img|fonts)/ {
+ proxy_pass http://powerjob-server;
}
error_page 500 502 503 504 /50x.html;
--
Gitblit v1.9.3