提交 315edbcb 编写于 作者: aaronchen2k2k's avatar aaronchen2k2k

decode request from http interface

上级 67d0a866
......@@ -3,6 +3,7 @@ package gen
import (
"encoding/json"
"github.com/easysoft/zendata/src/model"
constant "github.com/easysoft/zendata/src/utils/const"
fileUtils "github.com/easysoft/zendata/src/utils/file"
i118Utils "github.com/easysoft/zendata/src/utils/i118"
logUtils "github.com/easysoft/zendata/src/utils/log"
......@@ -29,10 +30,12 @@ func Decode(defaultFile, configFile, fieldsToExportStr, input, output string) {
ret := []map[string]interface{}{}
LinesToMap(data, fieldsToExport, &ret)
jsonObj, _ := json.Marshal(ret)
respJson := string(jsonObj)
vari.JsonResp = string(jsonObj)
fileUtils.WriteFile(output, respJson)
logUtils.Screen(i118Utils.I118Prt.Sprintf("analyse_success", output ))
if vari.RunMode != constant.RunModeServerRequest {
fileUtils.WriteFile(output, vari.JsonResp)
}
}
func LinesToMap(str string, fieldsToExport []string, ret *[]map[string]interface{}) {
......
......@@ -9,8 +9,8 @@ import (
"strconv"
)
func ParseRequestParams(req *http.Request) (root, defaultFile, yamlFile string, count int,
fields, human string, format, table string) {
func ParseRequestParams(req *http.Request) (root, defaultFile, yamlFile, fields string, count int,
human string, format, table string, decode bool, input, output string) {
query := req.URL.Query()
root = GetRequestParams(query,"root", "R")
......
......@@ -194,17 +194,17 @@ func StartServer() {
}
func DataHandler(w http.ResponseWriter, req *http.Request) {
root, defaultFile, configFile, count, fields, vari.HeadSep,
format, table = service.ParseRequestParams(req)
if defaultFile == "" && configFile == "" {
return
root, defaultFile, configFile, fields, count, vari.HeadSep,
format, table, decode, input, output = service.ParseRequestParams(req)
if decode {
gen.Decode(defaultFile, configFile, fields, input, output)
fmt.Fprintln(w, vari.JsonResp)
} else if defaultFile != "" || configFile != "" {
vari.RunMode = constant.RunModeServerRequest
toGen()
fmt.Fprintln(w, vari.JsonResp)
}
vari.RunMode = constant.RunModeServerRequest
output = ""
toGen()
fmt.Fprintln(w, vari.JsonResp)
}
func init() {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册