|
@@ -62,7 +62,6 @@ func (c * EngineClient)Generate(xmlfile string) {
|
|
|
var result ResponeResult
|
|
var result ResponeResult
|
|
|
bs := DoRequest(xmlfile)
|
|
bs := DoRequest(xmlfile)
|
|
|
if bs !=nil {
|
|
if bs !=nil {
|
|
|
- fmt.Println(string(bs.Bytes()))
|
|
|
|
|
err:=json.Unmarshal(bs.Bytes(), &result)
|
|
err:=json.Unmarshal(bs.Bytes(), &result)
|
|
|
if err!=nil{
|
|
if err!=nil{
|
|
|
fmt.Println(err.Error())
|
|
fmt.Println(err.Error())
|
|
@@ -70,28 +69,28 @@ func (c * EngineClient)Generate(xmlfile string) {
|
|
|
for i := 0; i < len(result.Data); i++ {
|
|
for i := 0; i < len(result.Data); i++ {
|
|
|
var b bytes.Buffer
|
|
var b bytes.Buffer
|
|
|
b.Write(result.Data[i].Content)
|
|
b.Write(result.Data[i].Content)
|
|
|
- fmt.Println(b.Bytes())
|
|
|
|
|
unzip := unzipbytes(&b)
|
|
unzip := unzipbytes(&b)
|
|
|
result.Data[i].Content = unzip.Bytes()
|
|
result.Data[i].Content = unzip.Bytes()
|
|
|
}
|
|
}
|
|
|
for i := 0; i < len(result.Data); i++ {
|
|
for i := 0; i < len(result.Data); i++ {
|
|
|
- fmt.Println(string(result.Data[i].Content))
|
|
|
|
|
path:= result.Data[i].Name
|
|
path:= result.Data[i].Name
|
|
|
- path = strings.TrimLeft(path, c.ProjectName+"/")
|
|
|
|
|
|
|
+ //fmt.Println(path)
|
|
|
|
|
+ path = path[len(c.ProjectName)+1:]
|
|
|
|
|
+ fmt.Println(path)
|
|
|
ft:=result.Data[i].Type
|
|
ft:=result.Data[i].Type
|
|
|
if result.Data[i].Type == "main" {
|
|
if result.Data[i].Type == "main" {
|
|
|
}else if ft == "config"{
|
|
}else if ft == "config"{
|
|
|
- _,err := os.Stat("conf/app.conf")
|
|
|
|
|
|
|
+ _,err := os.Stat(path)
|
|
|
if err == nil{
|
|
if err == nil{
|
|
|
fmt.Println("配置文件已经存在,忽略...")
|
|
fmt.Println("配置文件已经存在,忽略...")
|
|
|
}else {
|
|
}else {
|
|
|
ioutil.WriteFile(path, result.Data[i].Content,os.ModePerm)
|
|
ioutil.WriteFile(path, result.Data[i].Content,os.ModePerm)
|
|
|
}
|
|
}
|
|
|
}else if ft =="controllers"{
|
|
}else if ft =="controllers"{
|
|
|
- if strings.Index(result.Data[i].Name, "_gen.go")>0 {
|
|
|
|
|
|
|
+ if strings.Index(path, "_gen.go")>0 {
|
|
|
ioutil.WriteFile(path, result.Data[i].Content,os.ModePerm)
|
|
ioutil.WriteFile(path, result.Data[i].Content,os.ModePerm)
|
|
|
}else {
|
|
}else {
|
|
|
- _, err := os.Stat(result.Data[i].Name)
|
|
|
|
|
|
|
+ _, err := os.Stat(path)
|
|
|
if err==nil{
|
|
if err==nil{
|
|
|
ioutil.WriteFile(path+"_new", result.Data[i].Content,os.ModePerm)
|
|
ioutil.WriteFile(path+"_new", result.Data[i].Content,os.ModePerm)
|
|
|
}else if os.IsNotExist(err){
|
|
}else if os.IsNotExist(err){
|
|
@@ -120,7 +119,7 @@ func unzipbytes(bs *bytes.Buffer) bytes.Buffer{
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
func DoRequest(xmlfile string) *bytes.Buffer{
|
|
func DoRequest(xmlfile string) *bytes.Buffer{
|
|
|
- server:="http://ccbeetech.com:6166/api/v1/develop/generate"
|
|
|
|
|
|
|
+ server:="http://qianqiusoft.com:6166/api/v1/develop/generate"
|
|
|
request, err := newfileUploadRequest(server, nil, "xmlfile", xmlfile)
|
|
request, err := newfileUploadRequest(server, nil, "xmlfile", xmlfile)
|
|
|
if err != nil {
|
|
if err != nil {
|
|
|
fmt.Println(err)
|
|
fmt.Println(err)
|