@dazhicheng/common 1.0.30 → 1.0.32
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.env.dev +1 -1
- package/.env.development +4 -12
- package/Dockerfile +1 -1
- package/nginx_dev.conf +7 -2
- package/nginx_test.conf +6 -2
- package/package.json +1 -1
package/.env.dev
CHANGED
package/.env.development
CHANGED
|
@@ -8,19 +8,11 @@ VITE_API_URL = dev
|
|
|
8
8
|
VITE_MOCK_ENABLED = true
|
|
9
9
|
|
|
10
10
|
# 代理目标地址（开发环境通过 Vite 代理转发请求到此地址，解决跨域问题）
|
|
11
|
-
VITE_API_PROXY_URL = https://m1.apifoxmock.com/m1/6400575-6097373-default
|
|
12
|
-
|
|
13
|
-
VITE_API_PROXY_URL_dev = http://192.168.128.215:11000
|
|
14
|
-
VITE_API_MOCK = http://192.168.129.158:9998/mock/
|
|
15
|
-
VITE_API_PROXY_URL_test = http://192.168.127.72:11000/
|
|
16
|
-
|
|
17
|
-
# 公网
|
|
18
|
-
VITE_API_PROXY_URL_DEV_DOMAIN = http://14.220.235.21:11000/
|
|
19
|
-
VITE_API_PROXY_URL_TEST_GW = http://116.6.49.180:11001/
|
|
20
11
|
|
|
21
12
|
# 域名
|
|
22
|
-
|
|
23
|
-
|
|
13
|
+
VITE_API_PROXY_URL_DEV = http://fulfillment-dev.tiantai-jp.com:11000/
|
|
14
|
+
VITE_API_PROXY_URL_TEST = http://fulfillment-test.tiantai-jp.com:11000/
|
|
15
|
+
|
|
24
16
|
|
|
25
17
|
<<<VITE_API_PROXY_URL>>>
|
|
26
18
|
|
|
@@ -31,4 +23,4 @@ VITE_DROP_CONSOLE = false
|
|
|
31
23
|
# VITE_FEISHU_REDIRECT_URI = http://120.76.61.203:13006/feishuOAuth
|
|
32
24
|
|
|
33
25
|
# webSocket地址
|
|
34
|
-
VITE_WEBSOCKET_URL = ws://
|
|
26
|
+
VITE_WEBSOCKET_URL = ws://fulfillment-dev.tiantai-jp.com:11000
|
package/Dockerfile
CHANGED
package/nginx_dev.conf
CHANGED
|
@@ -7,8 +7,11 @@ log_format proxy_log
|
|
|
7
7
|
|
|
8
8
|
# 根据请求IP分配后端地址（公网IP走公网，默认走内网）
|
|
9
9
|
map $host $dev_backend_addr {
|
|
10
|
-
|
|
11
|
-
|
|
10
|
+
# fulfillment-dev.tiantai-jp.com -> 192.168.128.215
|
|
11
|
+
default fulfillment-dev.tiantai-jp.com:11000; # 默认走内网
|
|
12
|
+
# ly-dev.tiantai-jp.com -> 14.127.204.225
|
|
13
|
+
#
|
|
14
|
+
120.76.61.203 ly-dev.tiantai-jp.com:11000; # 公网IP走公网
|
|
12
15
|
}
|
|
13
16
|
|
|
14
17
|
# HTTP 服务器 - 保持原有配置
|
|
@@ -17,6 +20,8 @@ server {
|
|
|
17
20
|
server_name localhost;
|
|
18
21
|
charset utf-8;
|
|
19
22
|
|
|
23
|
+
resolver 8.8.8.8 1.1.1.1 ipv6=off;
|
|
24
|
+
|
|
20
25
|
# 使用自定义日志格式，记录后端转发地址
|
|
21
26
|
access_log /var/log/nginx/access.log proxy_log;
|
|
22
27
|
|
package/nginx_test.conf
CHANGED
|
@@ -7,8 +7,10 @@ log_format proxy_log
|
|
|
7
7
|
|
|
8
8
|
# 根据请求IP分配后端地址（公网IP走公网，默认走内网）
|
|
9
9
|
map $host $test_backend_addr {
|
|
10
|
-
|
|
11
|
-
|
|
10
|
+
# fulfillment-test.tiantai-jp.com -> 192.168.127.73
|
|
11
|
+
default fulfillment-test.tiantai-jp.com:11000; # 默认走内网
|
|
12
|
+
# ly-test.tiantai-jp.com -> 116.6.49.180
|
|
13
|
+
120.76.61.203 ly-test.tiantai-jp.com:11000; # 公网IP走公网
|
|
12
14
|
}
|
|
13
15
|
|
|
14
16
|
# HTTP 服务器 - 保持原有配置
|
|
@@ -17,6 +19,8 @@ server {
|
|
|
17
19
|
server_name localhost;
|
|
18
20
|
charset utf-8;
|
|
19
21
|
|
|
22
|
+
resolver 8.8.8.8 1.1.1.1 ipv6=off;
|
|
23
|
+
|
|
20
24
|
# 使用自定义日志格式，记录后端转发地址
|
|
21
25
|
access_log /var/log/nginx/access.log proxy_log;
|
|
22
26
|
|