diff --git a/Dockerfile b/Dockerfile index 6b94d70..6a1499f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -30,4 +30,4 @@ WORKDIR /app VOLUME /app/templates -CMD ["./go-wkhtmltox"] \ No newline at end of file +CMD ["./go-wkhtmltox", "run"] diff --git a/README.md b/README.md index b795153..afa5253 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ go-wkhtmltox ```bash docker pull idocking/go-wkhtmltox:latest - docker run -it -d -p 8080:8080 idocking/go-wkhtmltox:latest ./go-wkhtmltox run + docker run -it -d -p 8080:8080 idocking/go-wkhtmltox:latest ``` or @@ -26,7 +26,7 @@ or ``` > then you could access the 8080 port -> in osx, you could get the docker ip by command `docker-machine ip`, +> in osx, you could get the docker ip by command `docker-machine ip`, > and the access service by IP:8080 ## Config @@ -38,7 +38,7 @@ or service { path = "/v1" - + cors { allowed-origins = ["*"] } @@ -213,7 +213,7 @@ curl -X POST \ ### Template -The defualt template is +The default template is ``` {"code":{{.Code}},"message":"{{.Message}}"{{if .Result}},"result":{{.Result|Jsonify}}{{end}}} @@ -240,17 +240,17 @@ we could add `template` to render as different response, we have another example } ``` -the response is +the response is ```html - + ``` -So, the template will render at brower directly. you could add more your templates +So, the template will render at browser directly. you could add more your templates #### Template funcs @@ -287,7 +287,7 @@ type ConvertResponse struct { Name|Usage :--|:-- - |default template, retrun `code`,`message`, `result` + |default template, return `code`,`message`, `result` render-html|render data to html binary|you cloud use curl to download directly @@ -328,7 +328,7 @@ curl -X POST \ ### Fetcher -fetcher is an external source input, sometimes we could not fetch data by url, or the wkthmltox could not access the url because of some auth options +fetcher is an external source input, sometimes we could not fetch data by url, or the wkhtmltox could not access the url because of some auth options ##### Data fetcher @@ -430,7 +430,7 @@ func NewDataFetcher(conf config.Configuration) (dataFetcher fetcher.Fetcher, err ``` -step 2: Reigister your driver +step 2: Register your driver ```go func init() { @@ -455,7 +455,7 @@ import ( -# Use this package as libary +# Use this package as library Just import `github.com/gogap/go-wkhtmltox/wkhtmltox` @@ -464,4 +464,4 @@ htmlToX, err := wkhtmltox.New(wkHtmlToXConf) //... //... convData, err := htmlToX.Convert(fetcherOpts, convertOpts) -``` \ No newline at end of file +```