From 5cb4af04980f237c4ba6fce16e2e91a1b154b7e2 Mon Sep 17 00:00:00 2001 From: Chopper Date: Thu, 13 May 2021 15:49:20 +0800 Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E9=95=9C=E5=83=8F=E7=8E=AF?= =?UTF-8?q?=E5=A2=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- buyer/docker.sh | 2 +- buyer/nginx.conf | 2 +- buyer/src/config/index.js | 20 ++++++++------------ docker-push.sh | 8 ++++---- manager/docker.sh | 2 +- manager/nginx.conf | 2 +- manager/src/config/index.js | 21 ++++++++------------- seller/docker.sh | 2 +- seller/nginx.conf | 2 +- seller/src/config/index.js | 19 ++++++++----------- 10 files changed, 34 insertions(+), 46 deletions(-) diff --git a/buyer/docker.sh b/buyer/docker.sh index 0b919466..e5bdb92f 100644 --- a/buyer/docker.sh +++ b/buyer/docker.sh @@ -1 +1 @@ -docker build -t registry.cn-beijing.aliyuncs.com/lili-images/buyer-ui-1.0.1:0.0.1 . +docker build -t registry.cn-beijing.aliyuncs.com/lili-images/buyer-ui-1.0.1:0.0.4 . diff --git a/buyer/nginx.conf b/buyer/nginx.conf index c1d6be04..0dba16b4 100644 --- a/buyer/nginx.conf +++ b/buyer/nginx.conf @@ -39,7 +39,7 @@ http { gzip_vary on; server { - listen 80; + listen 10000; server_name localhost; location / { diff --git a/buyer/src/config/index.js b/buyer/src/config/index.js index 895a8bbe..1da73626 100644 --- a/buyer/src/config/index.js +++ b/buyer/src/config/index.js @@ -17,20 +17,16 @@ export default { * @description api请求基础路径 */ api_dev: { - common: 'https://common-api.pickmall.cn', - buyer: 'https://buyer-api.pickmall.cn', - seller: 'https://store-api.pickmall.cn', - manager: 'https://admin-api.pickmall.cn' - // common: 'http://192.168.0.111:9000', - // buyer: 'http://192.168.0.103:8888', - // seller: 'https://store-api.pickmall.cn', - // manager: 'https://admin-api.pickmall.cn' + common: 'http://127.0.0.1:8890', + buyer: 'http://127.0.0.1:8888', + seller: 'http://127.0.0.1:8889', + manager: 'http://127.0.0.1:8887' }, api_prod: { - common: 'https://common-api.pickmall.cn', - buyer: 'https://buyer-api.pickmall.cn', - seller: 'https://store-api.pickmall.cn', - manager: 'https://admin-api.pickmall.cn' + common: 'http://127.0.0.1:8890', + buyer: 'http://127.0.0.1:8888', + seller: 'http://127.0.0.1:8889', + manager: 'http://127.0.0.1:8887' }, /** * @description api请求基础路径前缀 diff --git a/docker-push.sh b/docker-push.sh index 3cbe52b2..3eb4f674 100644 --- a/docker-push.sh +++ b/docker-push.sh @@ -1,5 +1,5 @@ -docker push registry.cn-beijing.aliyuncs.com/lili-images/buyer-ui-1.0.1:0.0.1 -docker push registry.cn-beijing.aliyuncs.com/lili-images/wap-ui-1.0.1:0.0.1 -docker push registry.cn-beijing.aliyuncs.com/lili-images/seller-ui-1.0.1:0.0.1 -docker push registry.cn-beijing.aliyuncs.com/lili-images/manager-ui-1.0.1:0.0.1 +docker push registry.cn-beijing.aliyuncs.com/lili-images/buyer-ui-1.0.1:0.0.4 +docker push registry.cn-beijing.aliyuncs.com/lili-images/wap-ui-1.0.1:0.0.4 +docker push registry.cn-beijing.aliyuncs.com/lili-images/seller-ui-1.0.1:0.0.4 +docker push registry.cn-beijing.aliyuncs.com/lili-images/manager-ui-1.0.1:0.0.4 diff --git a/manager/docker.sh b/manager/docker.sh index 698e963b..5fec3b61 100644 --- a/manager/docker.sh +++ b/manager/docker.sh @@ -1 +1 @@ -docker build -t registry.cn-beijing.aliyuncs.com/lili-images/manager-ui-1.0.1:0.0.1 . +docker build -t registry.cn-beijing.aliyuncs.com/lili-images/manager-ui-1.0.1:0.0.4 . diff --git a/manager/nginx.conf b/manager/nginx.conf index c1d6be04..758710ff 100644 --- a/manager/nginx.conf +++ b/manager/nginx.conf @@ -39,7 +39,7 @@ http { gzip_vary on; server { - listen 80; + listen 10003; server_name localhost; location / { diff --git a/manager/src/config/index.js b/manager/src/config/index.js index 99ab1e11..111c90d7 100644 --- a/manager/src/config/index.js +++ b/manager/src/config/index.js @@ -17,21 +17,16 @@ export default { * @description api请求基础路径 */ api_dev: { - // common: 'http://192.168.0.111:9000', - // buyer: 'http://buyer-api.pickmall.cn', - // seller: 'http://store-api.pickmall.cn', - // manager: 'http://192.168.0.111:8887' - - common: 'https://common-api.pickmall.cn', - buyer: 'https://buyer-api.pickmall.cn', - seller: 'https://store-api.pickmall.cn', - manager: 'https://admin-api.pickmall.cn' + common: 'http://127.0.0.1:8890', + buyer: 'http://127.0.0.1:8888', + seller: 'http://127.0.0.1:8889', + manager: 'http://127.0.0.1:8887' }, api_prod: { - common: 'https://common-api.pickmall.cn', - buyer: 'https://buyer-api.pickmall.cn', - seller: 'https://store-api.pickmall.cn', - manager: 'https://admin-api.pickmall.cn' + common: 'http://127.0.0.1:8890', + buyer: 'http://127.0.0.1:8888', + seller: 'http://127.0.0.1:8889', + manager: 'http://127.0.0.1:8887' }, /** * @description api请求基础路径前缀 diff --git a/seller/docker.sh b/seller/docker.sh index 6b059866..0ea021cd 100644 --- a/seller/docker.sh +++ b/seller/docker.sh @@ -1 +1 @@ -docker build -t registry.cn-beijing.aliyuncs.com/lili-images/seller-ui-1.0.1:0.0.1 . +docker build -t registry.cn-beijing.aliyuncs.com/lili-images/seller-ui-1.0.1:0.0.4 . diff --git a/seller/nginx.conf b/seller/nginx.conf index c1d6be04..ba020d10 100644 --- a/seller/nginx.conf +++ b/seller/nginx.conf @@ -39,7 +39,7 @@ http { gzip_vary on; server { - listen 80; + listen 10002; server_name localhost; location / { diff --git a/seller/src/config/index.js b/seller/src/config/index.js index 23c53700..0d51af68 100644 --- a/seller/src/config/index.js +++ b/seller/src/config/index.js @@ -18,19 +18,16 @@ export default { * @description api请求基础路径 */ api_dev: { - common: 'https://common-api.pickmall.cn', - buyer: 'https://buyer-api.pickmall.cn', - seller: 'https://store-api.pickmall.cn', - manager: 'https://admin-api.pickmall.cn', - // common: 'http://192.168.0.103:9000', - - // seller: 'http://192.168.0.103:8889', + common: 'http://127.0.0.1:8890', + buyer: 'http://127.0.0.1:8888', + seller: 'http://127.0.0.1:8889', + manager: 'http://127.0.0.1:8887' }, api_prod: { - common: 'https://common-api.pickmall.cn', - buyer: 'https://buyer-api.pickmall.cn', - seller: 'https://store-api.pickmall.cn', - manager: 'https://admin-api.pickmall.cn' + common: 'http://127.0.0.1:8890', + buyer: 'http://127.0.0.1:8888', + seller: 'http://127.0.0.1:8889', + manager: 'http://127.0.0.1:8887' }, /** * @description api请求基础路径前缀