Skip to content

Commit

Permalink
update install, changelist
Browse files Browse the repository at this point in the history
support tarsnode list, tarsnode install online
  • Loading branch information
ruanshudong committed Dec 16, 2019
1 parent 468e9ab commit f6d5b6d
Show file tree
Hide file tree
Showing 8 changed files with 28 additions and 10 deletions.
10 changes: 9 additions & 1 deletion ChangeList.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
- 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
10 changes: 9 additions & 1 deletion ChangeList.zh.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,12 @@
- web: 服务扩容时, 可以绑定域名
- web: 调整发布界面, 操作更易于理解
- web: 服务管理界面增加刷新
- web: 发布错误的提示, 跳转到服务管理页面
- 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目录下
2 changes: 2 additions & 0 deletions Install.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
```
Expand All @@ -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**
Expand Down
3 changes: 2 additions & 1 deletion Install.zh.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
```
Expand All @@ -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 ...即可, 注意参数设置!**
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
5 changes: 2 additions & 3 deletions README.zh.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)。

## 性能数据

Expand Down
2 changes: 1 addition & 1 deletion framework
2 changes: 1 addition & 1 deletion web
Submodule web updated 50 files
+27 −0 ChangeList.zh.md
+9 −5 README.md
+1 −1 app.js
+32 −7 app/controller/resource/ResourceController.js
+24 −1 app/dao/NodeInfoDao.js
+10 −0 app/dao/ResourceDao.js
+4 −2 app/router/routerConf.js
+194 −86 app/service/resource/ResourceService.js
+23 −0 app/service/resource/tarsnode_connect.sh
+80 −34 app/service/resource/tarsnode_install.sh
+1 −1 client/build/webpack.base.conf.js
+1 −1 client/dist/dcache.html
+2 −2 client/dist/index.html
+5 −0 client/dist/static/css/app.b279c.css
+5 −0 client/dist/static/css/dcache.70e78.css
+1 −0 client/dist/static/js/app.cf98c.js
+8 −0 client/dist/static/js/dcache.2cabe.js
+31 −0 client/dist/static/js/vendor.b389d.js
+0 −30 client/dist/static/js/vendor.cc40b.js
+176 −339 client/package-lock.json
+2 −2 client/package.json
+1 −0 client/src/App.vue
+0 −0 client/src/assets/icon-font/demo.css
+0 −0 client/src/assets/icon-font/demo_index.html
+5 −5 client/src/assets/icon-font/iconfont.css
+ client/src/assets/icon-font/iconfont.eot
+0 −0 client/src/assets/icon-font/iconfont.js
+0 −0 client/src/assets/icon-font/iconfont.json
+0 −0 client/src/assets/icon-font/iconfont.svg
+ client/src/assets/icon-font/iconfont.ttf
+ client/src/assets/icon-font/iconfont.woff
+ client/src/assets/icon-font/iconfont.woff2
+1 −0 client/src/main.js
+1 −0 client/src/pages/operation/index.vue
+345 −0 client/src/pages/operation/nodes.vue
+1 −1 client/src/pages/server/manage.vue
+5 −0 client/src/router/index.js
+0 −539 client/static/icon-font/demo.css
+0 −6,334 client/static/icon-font/demo_index.html
+0 −1,089 client/static/icon-font/iconfont.css
+ client/static/icon-font/iconfont.eot
+0 −1 client/static/icon-font/iconfont.js
+0 −1,885 client/static/icon-font/iconfont.json
+0 −830 client/static/icon-font/iconfont.svg
+ client/static/icon-font/iconfont.ttf
+ client/static/icon-font/iconfont.woff
+ client/static/icon-font/iconfont.woff2
+65 −1 locale/cn.json
+65 −1 locale/en.json
+1 −1 package.json

0 comments on commit f6d5b6d

Please sign in to comment.