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

decode request from http interface

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