Skip to content

Commit

Permalink
fix build script
Browse files Browse the repository at this point in the history
  • Loading branch information
miraclesu committed May 16, 2017
1 parent 74bbb3e commit 6add6a7
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ sh ./build.sh
1. 安装 [MongoDB](http://docs.mongodb.org/manual/installation/)
2. 安装 [etcd](https://github.com/coreos/etcd)
3. 修改 `conf` 相关的配置
4. 在任务结点启动 `./node -conf conf/base.json`,在管理结点启动 `./web -conf conf/base.json`
4. 在任务结点启动 `./cronnode -conf conf/base.json`,在管理结点启动 `./cronweb -conf conf/base.json`
5. 访问管理界面 `http://127.0.0.1:7079/ui/`

## Screenshot
Expand Down
6 changes: 4 additions & 2 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,13 @@ echo "build file to ./$out"

mkdir -p "$out/conf"

go build -o ./$out/node ./bin/node/server.go
go build -o ./$out/cronnode ./bin/node/server.go
check_code
go build -o ./$out/web ./bin/web/server.go
go build -o ./$out/cronweb ./bin/web/server.go
check_code

cp -r web/ui/dist "$out/ui"

sources=`find ./conf/files -name "*.json.sample"`
check_code
for source in $sources;do
Expand Down
2 changes: 1 addition & 1 deletion conf/files/db.json.sample
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
"Database": "cronsun",
"#Timeout": "connect timeout duration/second",
"Timeout": 15
}
}
4 changes: 1 addition & 3 deletions conf/files/etcd.json.sample
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
{
"Endpoints":[
"http://192.168.11.27:2389",
"http://192.168.11.28:2389",
"http://192.168.11.29:2389"
"http://127.0.0.1:2389"
],
"Username":"",
"Password":"",
Expand Down
2 changes: 1 addition & 1 deletion conf/files/mail.json.sample
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@
"Password": "nbhh",
"SSL": false,
"LocalName": "[email protected]"
}
}
2 changes: 1 addition & 1 deletion conf/files/security.json.sample
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@
"ext": [
".sh", ".py"
]
}
}
6 changes: 3 additions & 3 deletions conf/files/web.json.sample
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"BindAddr": ":7079",
"#UIDir": "为空使用默认的后台界面"
"UIDir": ""
}
"#UIDir": "为空使用默认的后台界面",
"UIDir": "ui"
}

0 comments on commit 6add6a7

Please sign in to comment.