From 5772a6fcb48271ef74df27448b51502390af70f2 Mon Sep 17 00:00:00 2001 From: gonghao Date: Thu, 23 May 2019 21:09:25 +0800 Subject: [PATCH 1/2] update readme --- README.md | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 36f18ee0..8213385d 100755 --- a/README.md +++ b/README.md @@ -56,36 +56,42 @@ nginx安装请参考附录 ``` sed -i "s/3002/8080/g" nginx.conf 你修改的服务端口是8080 ``` +2、 修改mgr服务ip和端口 +``` +sed -i "s/127.0.0.1:8083/${your_mgrServer_ipPort}/g" nginx.conf +```` -2、 修改服务ip +3、 修改web服务监听ip ``` - sed -i "s/ 10.0.0.1 /${your_server_ip}/g" nginx.conf + sed -i "s/127.0.0.1/${your_server_ip}/g" nginx.conf ``` 例如： ``` - sed -i "s/ 10.0.0.1 /192.168.0.1/g" nginx.conf + sed -i "s/127.0.0.1/192.168.0.1/g" nginx.conf ``` 你修改的服务ip是192.168.0.1,也可以修改成域名 -3、 修改静态文件路径(文件需要有权限访问) +4、 修改静态文件路径(文件需要有权限访问) ``` - sed -i "s/\/data\/webase-web\/dist /${your_file_route}/g" nginx.conf + sed -i "s:/data/webase-web/dist:${your_file_path}:g" nginx.conf ``` +例如： -4、 修改mgr服务ip和端口 ``` -sed -i "s/10.0.0.1:8083 /${your_mgrServer_ipPort}/g" nginx.conf -```` + sed -i "s:/data/webase-web/dist:/data/app/webase/code/webase-web/dist:g" nginx.conf +``` + + 服务器已有nginx可按照以下修改， ```Nginx upstream node_mgr_server{ - server 10.0.0.1:8083; #步骤三 节点管理服务地址及端口 + server 127.0.0.1:8083; #步骤三 节点管理服务地址及端口 } server { listen 3002 default_server; #步骤一 前端端口（端口需要开通策略且不能被占用） - server_name 10.0.0.1; #步骤一 前端地址，可配置为域名 + server_name 127.0.0.1; #步骤一 前端地址，可配置为域名 location / { root /data/webase-web/dist; #步骤二 前端文件路径(文件需要有权限访问) index index.html index.htm; @@ -137,7 +143,7 @@ sed -i "s/10.0.0.1:8083 /${your_mgrServer_ipPort}/g" nginx.conf nginx下载地址：https://nginx.org/download/（下载最新稳定版本即可） 或者使用命令： - wget http://nginx.org/download/nginx-1.10.2.tar.gz (版本号可换) + wget http://nginx.org/download/nginx-1.9.9.tar.gz (版本号可换) 将下载的包移动到/usr/local/下 #### 3.1.3 安装nginx ##### 3.1.3.1解压 From b5a7b6a025c85d9f9b4c5107821c08562bac979e Mon Sep 17 00:00:00 2001 From: gonghao Date: Fri, 24 May 2019 09:27:12 +0800 Subject: [PATCH 2/2] update pagination bug --- dist/index.html | 2 +- .../static/img/{iconfont.604f8ad.svg => iconfont.68c6fc6.svg} | 0 ...{19.4e0e007098300907b024.js => 19.7a24e6e3cd399b7760e1.js} | 2 +- dist/static/js/3.683a4ec40d00cfa23bf7.js | 1 + dist/static/js/3.caba8ffa946008c271e9.js | 1 - ...ead3a67886adcb1afcd.js => runtime.071ed8b407830ca09444.js} | 2 +- src/views/unusualUser/unusualUser.vue | 4 ++-- 7 files changed, 6 insertions(+), 6 deletions(-) rename dist/static/img/{iconfont.604f8ad.svg => iconfont.68c6fc6.svg} (100%) rename dist/static/js/{19.4e0e007098300907b024.js => 19.7a24e6e3cd399b7760e1.js} (82%) create mode 100644 dist/static/js/3.683a4ec40d00cfa23bf7.js delete mode 100644 dist/static/js/3.caba8ffa946008c271e9.js rename dist/static/js/{runtime.6ead3a67886adcb1afcd.js => runtime.071ed8b407830ca09444.js} (97%) diff --git a/dist/index.html b/dist/index.html index 1143abd5..0381baa4 100755 --- a/dist/index.html +++ b/dist/index.html @@ -11,7 +11,7 @@ vertical-align: -0.15em; fill: currentColor; overflow: hidden; - }