@dazhicheng/common 1.0.35 → 1.0.37
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.development +2 -2
- package/.gitattributes +4 -3
- package/.gitlab-ci.yml +19 -19
- package/package.json +1 -1
package/.env.development
CHANGED
|
@@ -10,8 +10,8 @@ VITE_MOCK_ENABLED = true
|
|
|
10
10
|
# 代理目标地址（开发环境通过 Vite 代理转发请求到此地址，解决跨域问题）
|
|
11
11
|
|
|
12
12
|
# 域名
|
|
13
|
-
|
|
14
|
-
|
|
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
15
|
|
|
16
16
|
|
|
17
17
|
<<<VITE_API_PROXY_URL>>>
|
package/.gitattributes
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
-
* text=auto
|
|
2
|
-
*.html linguist-detectable=false
|
|
3
|
-
*.vue linguist-detectable=true
|
|
1
|
+
* text=auto
|
|
2
|
+
*.html linguist-detectable=false
|
|
3
|
+
*.vue linguist-detectable=true
|
|
4
|
+
docker-entrypoint.sh text eol=lf
|
package/.gitlab-ci.yml
CHANGED
|
@@ -90,15 +90,15 @@ MR 构建验证:
|
|
|
90
90
|
<<<开发环境发版>>>
|
|
91
91
|
only: [develop]
|
|
92
92
|
|
|
93
|
-
开发环境发版_107:
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
93
|
+
# 开发环境发版_107:
|
|
94
|
+
# <<: *deploy_template
|
|
95
|
+
# needs: [构建_dev]
|
|
96
|
+
# tags: [develop_107]
|
|
97
|
+
# resource_group: deploy-develop_107
|
|
98
|
+
# variables:
|
|
99
|
+
# NODE_ENV: dev
|
|
100
|
+
# <<<开发环境发版_107>>>
|
|
101
|
+
# only: [develop]
|
|
102
102
|
|
|
103
103
|
测试环境发版:
|
|
104
104
|
<<: *deploy_template
|
|
@@ -108,15 +108,15 @@ MR 构建验证:
|
|
|
108
108
|
variables:
|
|
109
109
|
NODE_ENV: test
|
|
110
110
|
<<<测试环境发版>>>
|
|
111
|
-
only: [test]
|
|
111
|
+
only: [test, develop]
|
|
112
112
|
|
|
113
|
-
测试环境发版_107:
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
113
|
+
# 测试环境发版_107:
|
|
114
|
+
# <<: *deploy_template
|
|
115
|
+
# needs: [构建_test]
|
|
116
|
+
# tags: [test_107]
|
|
117
|
+
# resource_group: deploy-test_107
|
|
118
|
+
# variables:
|
|
119
|
+
# NODE_ENV: test
|
|
120
|
+
# <<<测试环境发版_107>>>
|
|
121
|
+
# only: [test]
|
|
122
122
|
<<<deploy_jobs>>>
|