Skip to content

Commit ac10266

Browse files
committed
更新
1 parent 301939e commit ac10266

28 files changed

+1146
-121
lines changed

broker.conf

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
namesrvAddr=0.0.0.0:9876
1+
namesrvAddr=127.0.0.1:9876
22
brokerClusterName = DefaultCluster
33
brokerName = broker-a
44
brokerId = 0
55
deleteWhen = 04
66
fileReservedTime = 48
77
brokerRole = ASYNC_MASTER
88
flushDiskType = ASYNC_FLUSH
9-
brokerIP1=0.0.0.0
9+
brokerIP1=127.0.0.1
1010
storePathRootDir=/Volumes/sm/repos/rocketmq/data
11-
#storePathCommitLog=/Volumes/sm/repos/rocketmq/data/broker-a/commitlog
11+
storePathCommitLog=/Volumes/sm/repos/rocketmq/commitlog
1212
defaultTopicQueueNums=4
1313
autoCreateTopicEnable=true
1414
enablePropertyFilter=true

nginx/nginx.conf

+40-18
Original file line numberDiff line numberDiff line change
@@ -8,37 +8,55 @@
88
# https://nginx.org/en/docs/configure.html
99
#
1010
# ngx_cache_purge 模块下载地址: http://labs.frickle.com/nginx_ngx_cache_purge/
11-
#./configure --prefix=${NGINX_HOME} \
11+
# ./configure --prefix=${NGINX_HOME} \
1212
# --sbin-path=${NGINX_HOME}/nginx \
1313
# --conf-path=${NGINX_HOME}/nginx.conf \
1414
# --pid-path=${NGINX_HOME}/nginx.pid \
15-
# --with-threads \
16-
# --with-stream \
17-
# --with-http_v2_module \
18-
# --with-http_ssl_module \
19-
# --with-stream_ssl_module \
20-
# --with-pcre-jit \
21-
# --with-http_addition_module \
22-
# --with-http_auth_request_module \
2315
# --http-log-path=${NGINX_HOME}/access.log \
2416
# --error-log-path=${NGINX_HOME}/error.log \
2517
# --lock-path=${NGINX_HOME}/nginx.lock \
26-
# --with-http_stub_status_module \
27-
# --with-http_realip_module \
28-
# --with-http_auth_request_module \
2918
# --without-http_grpc_module \
19+
# --with-compat \
3020
# --with-debug \
21+
# --with-http_addition_module \
22+
# --with-http_auth_request_module \
23+
# --with-http_dav_module \
24+
# --with-http_degradation_module \
25+
# --with-http_flv_module \
26+
# --with-http_gunzip_module \
27+
# --with-http_gzip_static_module \
28+
# --with-http_mp4_module \
29+
# --with-http_random_index_module \
30+
# --with-http_realip_module \
31+
# --with-http_secure_link_module \
32+
# --with-http_slice_module \
33+
# --with-http_ssl_module \
34+
# --with-http_stub_status_module \
35+
# --with-http_sub_module \
36+
# --with-http_v2_module \
37+
# --with-http_v3_module \
38+
# --with-ipv6 \
39+
# --with-mail \
40+
# --with-mail_ssl_module \
41+
# --with-pcre \
42+
# --with-pcre-jit \
43+
# --with-threads \
44+
# --with-stream_ssl_module \
45+
# --with-stream \
46+
# --with-stream_realip_module \
47+
# --with-stream_ssl_module \
48+
# --with-stream_ssl_preread_module \
3149
# --with-pcre=../pcre2-10.42 \
3250
# --with-zlib=../zlib-1.2.13 \
33-
# --with-openssl=../libressl-3.7.2 && \
51+
# --with-openssl=../libressl-3.7.3 && \
3452
# make -j 12 && make install
3553
# # 开启 & 关闭
3654
# sudo nginx
3755
# sudo nginx -s stop
3856

3957
# make -j4 && make install
4058
#
41-
# user yakir;
59+
# user root;
4260
worker_processes 1;
4361

4462
#error_log logs/error.log;
@@ -58,9 +76,9 @@ http {
5876

5977
log_format main '$remote_addr - $remote_user [$time_local] "$request" '
6078
'$status $body_bytes_sent "$http_referer" '
61-
'"$http_user_agent" "$http_x_forwarded_for" "$http_oio_tenant" "$http_oio-tenant" ';
79+
'"$http_user_agent" "$http_x_forwarded_for" "$http_oio_tenant"';
6280

63-
#access_log logs/access.log main;
81+
access_log logs/access.log main;
6482
sendfile on;
6583
#tcp_nopush on;
6684

@@ -122,9 +140,12 @@ http {
122140
# include vhosts/leo_shushi_merchant.conf;
123141
#include vhosts/libra.conf;
124142
# include vhosts/deli.conf;
125-
include vhosts/demo.conf;
143+
# include vhosts/demo.conf;
126144
include vhosts/gemini.conf;
127-
include vhosts/dev.conf;
145+
include vhosts/430.conf;
146+
include vhosts/nation.conf;
147+
# include vhosts/gemini_mini.conf;
148+
# include vhosts/dev.conf;
128149
#include vhosts/mpc.conf;
129150
#include vhosts/standard.conf;
130151
#include vhosts/bc.conf;
@@ -134,6 +155,7 @@ http {
134155
# include vhosts/paas.conf;
135156
#include vhosts/demo.conf;
136157
#include vhosts/guohe.conf;
158+
# include vhosts/hangtian.conf;
137159

138160
# HTTPS server
139161
#

nginx/vhosts/430.conf

+165
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,165 @@
1+
# upstream geminibe {
2+
#server 192.168.1.149:8881;
3+
# server pamirs.gemini.local:8881;
4+
#server pamirs.gemini.local:8091;
5+
# }
6+
7+
server {
8+
listen 9999;
9+
listen [::]:9999;
10+
# listen 192.168.0.113:9999;
11+
server_name pamirs.gemini.dev;
12+
13+
location / {
14+
# root /Volumes/sm/work/gemini_430/;
15+
root /Volumes/sm/work/shushi/锦江/pc;
16+
try_files $uri $uri/ /index.html;
17+
index index.html;
18+
}
19+
20+
location /pamirs/base {
21+
proxy_pass http://127.0.0.1:8090;
22+
proxy_set_header Host $host;
23+
proxy_set_header X-Real-IP $remote_addr;
24+
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
25+
}
26+
location /pamirs/common {
27+
proxy_pass http://127.0.0.1:8090;
28+
proxy_set_header Host $host;
29+
proxy_set_header X-Real-IP $remote_addr;
30+
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
31+
}
32+
location /pamirs/sequence {
33+
proxy_pass http://127.0.0.1:8090;
34+
proxy_set_header Host $host;
35+
proxy_set_header X-Real-IP $remote_addr;
36+
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
37+
}
38+
location /pamirs/trigger {
39+
proxy_pass http://127.0.0.1:8090;
40+
proxy_set_header Host $host;
41+
proxy_set_header X-Real-IP $remote_addr;
42+
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
43+
}
44+
location /pamirs/resource {
45+
proxy_pass http://127.0.0.1:8090;
46+
proxy_set_header Host $host;
47+
proxy_set_header X-Real-IP $remote_addr;
48+
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
49+
}
50+
location /pamirs/user {
51+
proxy_pass http://127.0.0.1:8090;
52+
proxy_set_header Host $host;
53+
proxy_set_header X-Real-IP $remote_addr;
54+
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
55+
}
56+
location /pamirs/auth {
57+
proxy_pass http://127.0.0.1:8090;
58+
proxy_set_header Host $host;
59+
proxy_set_header X-Real-IP $remote_addr;
60+
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
61+
}
62+
location /pamirs/data_audit {
63+
proxy_pass http://127.0.0.1:8090;
64+
proxy_set_header Host $host;
65+
proxy_set_header X-Real-IP $remote_addr;
66+
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
67+
}
68+
location /pamirs/file {
69+
proxy_pass http://127.0.0.1:8090;
70+
proxy_set_header Host $host;
71+
proxy_set_header X-Real-IP $remote_addr;
72+
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
73+
}
74+
location /pamirs/message {
75+
proxy_pass http://127.0.0.1:8090;
76+
proxy_set_header Host $host;
77+
proxy_set_header X-Real-IP $remote_addr;
78+
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
79+
}
80+
location /pamirs/international {
81+
proxy_pass http://127.0.0.1:8090;
82+
proxy_set_header Host $host;
83+
proxy_set_header X-Real-IP $remote_addr;
84+
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
85+
}
86+
location /pamirs/business {
87+
proxy_pass http://127.0.0.1:8090;
88+
proxy_set_header Host $host;
89+
proxy_set_header X-Real-IP $remote_addr;
90+
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
91+
}
92+
location /pamirs/apps {
93+
proxy_pass http://127.0.0.1:8090;
94+
proxy_set_header Host $host;
95+
proxy_set_header X-Real-IP $remote_addr;
96+
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
97+
}
98+
location /pamirs/JinjiangHr {
99+
proxy_pass http://127.0.0.1:8090;
100+
proxy_set_header Host $host;
101+
proxy_set_header X-Real-IP $remote_addr;
102+
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
103+
}
104+
location /pamirs/workbench {
105+
proxy_pass http://127.0.0.1:8091;
106+
proxy_set_header Host $host;
107+
proxy_set_header X-Real-IP $remote_addr;
108+
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
109+
}
110+
111+
112+
# location /pamirs/gfcadres {
113+
# proxy_pass http://127.0.0.1:8880;
114+
# proxy_set_header Host $host;
115+
# proxy_set_header X-Real-IP $remote_addr;
116+
# proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
117+
# }
118+
119+
# location /pamirs/gfnursingroom {
120+
# proxy_pass http://127.0.0.1:8880;
121+
# proxy_set_header Host $host;
122+
# proxy_set_header X-Real-IP $remote_addr;
123+
# proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
124+
# }
125+
126+
# location /pamirs/gfskillscompetition {
127+
# proxy_pass http://127.0.0.1:8880;
128+
# proxy_set_header Host $host;
129+
# proxy_set_header X-Real-IP $remote_addr;
130+
# proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
131+
# }
132+
# location /pamirs/gflegalaid {
133+
# proxy_pass http://127.0.0.1:8880;
134+
# proxy_set_header Host $host;
135+
# proxy_set_header X-Real-IP $remote_addr;
136+
# proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
137+
# }
138+
139+
# location /pamirs/gfbasic {
140+
# proxy_pass http://127.0.0.1:8880;
141+
# proxy_set_header Host $host;
142+
# proxy_set_header X-Real-IP $remote_addr;
143+
# proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
144+
# }
145+
146+
# location /pamirs/standTest {
147+
# proxy_pass http://127.0.0.1:8880;
148+
# proxy_set_header X-Real-IP $remote_addr;
149+
# proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
150+
# }
151+
152+
location /pamirs {
153+
# if ($http_module = 'gfnursingroom') {
154+
# proxy_pass http://127.0.0.1:8880;
155+
# }
156+
proxy_pass http://127.0.0.1:8091;
157+
proxy_set_header X-Real-IP $remote_addr;
158+
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
159+
}
160+
161+
#location /static {
162+
# alias /Volumes/sm/;
163+
# autoindex on;
164+
#}
165+
}

nginx/vhosts/demo.conf

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ server {
66
listen 88;
77

88
location / {
9-
root /Volumes/sm/work/gemini_old/;
9+
root /Volumes/sm/work/gemini_demo/;
1010
try_files $uri $uri/ /index.html;
1111
index index.html;
1212
}

nginx/vhosts/gemini.conf

+40
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,46 @@ server {
1414
index index.html;
1515
}
1616

17+
location /pamirs/gfcadres {
18+
proxy_pass http://127.0.0.1:8880;
19+
proxy_set_header Host $host;
20+
proxy_set_header X-Real-IP $remote_addr;
21+
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
22+
}
23+
24+
location /pamirs/gfnursingroom {
25+
proxy_pass http://127.0.0.1:8880;
26+
proxy_set_header Host $host;
27+
proxy_set_header X-Real-IP $remote_addr;
28+
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
29+
}
30+
31+
location /pamirs/gfskillscompetition {
32+
proxy_pass http://127.0.0.1:8880;
33+
proxy_set_header Host $host;
34+
proxy_set_header X-Real-IP $remote_addr;
35+
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
36+
}
37+
location /pamirs/gflegalaid {
38+
proxy_pass http://127.0.0.1:8880;
39+
proxy_set_header Host $host;
40+
proxy_set_header X-Real-IP $remote_addr;
41+
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
42+
}
43+
44+
location /pamirs/gfbasic {
45+
proxy_pass http://127.0.0.1:8880;
46+
proxy_set_header Host $host;
47+
proxy_set_header X-Real-IP $remote_addr;
48+
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
49+
}
50+
51+
location /pamirs/standTest {
52+
proxy_pass http://127.0.0.1:8880;
53+
proxy_set_header X-Real-IP $remote_addr;
54+
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
55+
}
56+
1757
location /pamirs {
1858
proxy_pass http://geminibe;
1959
proxy_set_header X-Real-IP $remote_addr;

nginx/vhosts/gemini_mini.conf

+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
server {
2+
listen 99;
3+
server_name pamirs.gemini.mini;
4+
5+
location /pamirs/standTest {
6+
proxy_pass http://127.0.0.1:8881;
7+
proxy_set_header X-Real-IP $remote_addr;
8+
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
9+
}
10+
11+
location /pamirs {
12+
#proxy_pass http://127.0.0.1:8881;
13+
proxy_pass http://127.0.0.1:18091;
14+
proxy_set_header X-Real-IP $remote_addr;
15+
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
16+
}
17+
18+
location / {
19+
root /Volumes/sm/work/gemini/;
20+
try_files $uri $uri/ /index.html;
21+
index index.html;
22+
}
23+
24+
#location /static {
25+
# alias /Volumes/sm/;
26+
# autoindex on;
27+
#}
28+
}

0 commit comments

Comments
 (0)