From f6d5b6d6d5f07a5b99b1b91372bf360ee29b2008 Mon Sep 17 00:00:00 2001 From: ruanshudong Date: Mon, 16 Dec 2019 18:38:44 +0800 Subject: [PATCH] update install, changelist support tarsnode list, tarsnode install online --- ChangeList.md | 10 +++++++++- ChangeList.zh.md | 10 +++++++++- Install.md | 2 ++ Install.zh.md | 3 ++- README.md | 4 ++-- README.zh.md | 5 ++--- framework | 2 +- web | 2 +- 8 files changed, 28 insertions(+), 10 deletions(-) diff --git a/ChangeList.md b/ChangeList.md index 540fe0748..6e6934cab 100755 --- a/ChangeList.md +++ b/ChangeList.md @@ -26,4 +26,12 @@ - web: expand server can bind dns - web: fix deploy page - web: manage page add refresh -- web: deploy message, goto manage page \ No newline at end of file +- web: deploy message, goto manage page + +## 20191214 +- web(1.3.0): add tarsnode list +- fix web 1.2.0 bug + +## 20191216 +- web(1.3.1): add tarsnode install online +- framework(1.3.0): fix deploy script, during deploy , copy tarsnode.tgz to web/dist/static \ No newline at end of file diff --git a/ChangeList.zh.md b/ChangeList.zh.md index 6bf772822..68cd8817b 100755 --- a/ChangeList.zh.md +++ b/ChangeList.zh.md @@ -27,4 +27,12 @@ - web: 服务扩容时, 可以绑定域名 - web: 调整发布界面, 操作更易于理解 - web: 服务管理界面增加刷新 -- web: 发布错误的提示, 跳转到服务管理页面 \ No newline at end of file +- web: 发布错误的提示, 跳转到服务管理页面 + +## 20191214 +- web(1.3.0): 运维管理界面增加tarsnode列表 +- fix web 1.2.0的bug + +## 20191216 +- web(1.3.1): 运维管理界面增加tarsnode安装逻 +- framework(1.3.0): 修改部署脚本, 安装时将tarsnode.tgz copy 到web目录下 \ No newline at end of file diff --git a/Install.md b/Install.md index 2c70e9fd5..b7390964b 100755 --- a/Install.md +++ b/Install.md @@ -413,6 +413,7 @@ docker run -d --net=host -e MYSQL_HOST=xxxxx -e MYSQL_ROOT_PASSWORD=xxxxx \ -v/data/log/app_log:/usr/local/app/tars/app_log \ -v/data/log/web_log:/usr/local/app/web/log \ -v/data/patchs:/usr/local/app/patchs \ + -v/etc/localtime:/etc/localtime \ tars-docker:v1 sh /root/tars-install/docker-init.sh ``` @@ -430,6 +431,7 @@ Map three directories to the host: - -v/data/log/app_log:/usr/local/app/tars/app_log, tars application logs - -v/data/log/web_log:/usr/local/app/web/log, web log +- -v/data/log/web_log/auth:/usr/local/app/web/demo/log, web auth log - -v/data/patchs:/usr/local/app/patchs, Publish package path **If you want to deploy multiple nodes, just execute docker run... On different machines. Pay attention to the parameter settings** diff --git a/Install.zh.md b/Install.zh.md index e6e72b97f..2d64560a3 100755 --- a/Install.zh.md +++ b/Install.zh.md @@ -411,6 +411,7 @@ docker run -d --net=host -e MYSQL_HOST=xxxxx -e MYSQL_ROOT_PASSWORD=xxxxx \ -v/data/log/web/web_log:/usr/local/app/web/log \ -v/data/log/auth/web_log:/usr/local/app/web/demo/log \ -v/data/patchs:/usr/local/app/patchs \ + -v/etc/localtime:/etc/localtime \ tars-docker:v1 sh /root/tars-install/docker-init.sh ``` @@ -427,7 +428,7 @@ SLAVE: 是否是从节点 映射三个目录到宿主机 - -v/data/log/app_log:/usr/local/app/tars/app_log, tars应用日志 - -v/data/log/web_log/web:/usr/local/app/web/log, web log -- -v/data/log/web_log/auth:/usr/local/app/web/emo/log, web auth log +- -v/data/log/web_log/auth:/usr/local/app/web/demo/log, web auth log - -v/data/patchs:/usr/local/app/patchs 发布包路径 **如果希望多节点部署, 则在不同机器上执行docker run ...即可, 注意参数设置!** diff --git a/README.md b/README.md index 5aee6e634..9b4de4068 100644 --- a/README.md +++ b/README.md @@ -28,8 +28,8 @@ For now it supports following languages: ## Installation -If you are new to Tars, please read documentation [Install.md](Install.md). -If you are familar to Tars, refer to scripts in directory [build](build), may some modification needed. +1. If you are new to Tars, please read documentation [Install.md](Install.md). +2. Install by docker, detail information: [TarsDocker](https://github.com/TarsCloud/TarsDocker)。 ## Performance diff --git a/README.zh.md b/README.zh.md index 948c2ff93..75ed2cd65 100755 --- a/README.zh.md +++ b/README.zh.md @@ -29,9 +29,8 @@ Tars详细介绍参见[Introduction.md](Introduction.md)。 ## 安装说明 -1. 初次接触时，建议参考安装说明文档手工[Install.md](Install.md)进行安装。 -2. 对安装比较熟后，可以参考[framework/deploy](../../../TarsFramework/tree/master/deploy)目录下的脚本进行安装（必要时需要修改）。 -3. 也可以选择采用Docker镜像安装的方式进行快捷安装，详细安装说明见[TarsDocker仓库](https://github.com/TarsCloud/TarsDocker)。 +1. 初次接触时，建议参考安装说明文档手工[Install.md](Install.zh.md)进行安装。 +2. 直接使用制作好的Docker安装，详细安装说明见[TarsDocker仓库](https://github.com/TarsCloud/TarsDocker)。 ## 性能数据 diff --git a/framework b/framework index 7d093472b..58fa4d740 160000 --- a/framework +++ b/framework @@ -1 +1 @@ -Subproject commit 7d093472be7b673fde51fa4d08cab56691e5711f +Subproject commit 58fa4d740ff713f3857fa9b6e4b5f928247d58a1 diff --git a/web b/web index 4725f0b54..87e7c23e2 160000 --- a/web +++ b/web @@ -1 +1 @@ -Subproject commit 4725f0b5456b35017a457ced90681cadc6515c58 +Subproject commit 87e7c23e23441ed6460883762db1aa7caa220fee