Bläddra i källkod

添加server设置,更新xsd架构文件

zhangjq 6 år sedan
förälder
incheckning
b367f3c27e
2 ändrade filer med 15 tillägg och 12 borttagningar
  1. 14 12
      client/engineclient.go
  2. 1 0
      client/xsd.go

+ 14 - 12
client/engineclient.go

@@ -19,6 +19,7 @@ import (
 
 type EngineClient struct {
 	ProjectName string
+	ServerUrl string
 }
 
 type ResponeResult struct {
@@ -34,24 +35,19 @@ type GenerateResult struct {
 	Type    string `json:"type"`
 }
 
-func NewEngineClient(project_name string) *EngineClient {
-	return &EngineClient{project_name}
+func NewEngineClient(project_name string, server_url string) *EngineClient {
+	return &EngineClient{project_name, server_url}
 }
 
 func (c *EngineClient) InitDefalutFile(project_name string) {
 	c.ProjectName = project_name
-	//os.MkdirAll("controllers", os.ModePerm)
 	os.MkdirAll("controllers/gen", os.ModePerm)
 	os.MkdirAll("controllers/partial", os.ModePerm)
-	//os.MkdirAll("models", os.ModePerm)
-	os.MkdirAll("models/tables", os.ModePerm)
-	os.MkdirAll("models/beans", os.ModePerm)
-	//os.MkdirAll("models/sql", os.ModePerm)
-	os.MkdirAll("models/sql/conf", os.ModePerm)
-	os.MkdirAll("models/sql/vars", os.ModePerm)
+	os.MkdirAll("models", os.ModePerm)
 	os.MkdirAll("routers", os.ModePerm)
 	os.MkdirAll("conf", os.ModePerm)
 	os.MkdirAll("sqlconfig", os.ModePerm)
+	os.MkdirAll("sqlconfig/gen", os.ModePerm)
 	os.MkdirAll("doc", os.ModePerm)
 	os.MkdirAll("web", os.ModePerm)
 
@@ -102,7 +98,13 @@ func (c *EngineClient) GenerateCurrentProject() {
 
 func (c *EngineClient) Generate(xmlfile string) {
 	var result ResponeResult
-	bs := DoRequest(xmlfile)
+	server := "http://qianqiusoft.com:6166"
+	if c.ServerUrl != "" {
+		server = c.ServerUrl
+	}
+	server += "/api/v1/develop/generate"
+
+	bs := DoRequest(xmlfile, server)
 	if bs != nil {
 		err := json.Unmarshal(bs.Bytes(), &result)
 		if err != nil {
@@ -379,8 +381,8 @@ func unzipbytes(bs *bytes.Buffer) bytes.Buffer {
 	return b
 }
 
-func DoRequest(xmlfile string) *bytes.Buffer {
-	server := "http://qianqiusoft.com:6166/api/v1/develop/generate"
+func DoRequest(xmlfile string, server string) *bytes.Buffer {
+
 	request, err := newfileUploadRequest(server, nil, "xmlfile", xmlfile)
 	if err != nil {
 		fmt.Println(err)

+ 1 - 0
client/xsd.go

@@ -50,6 +50,7 @@ var XSD=`<?xml version="1.0" standalone="yes"?>
                   </xs:sequence>
                   <xs:attribute name="name" type="xs:string" />
                   <xs:attribute name="desc" type="xs:string" />
+                  <xs:attribute name="skip_login" type="xs:string" />
                 </xs:complexType>
               </xs:element>
             </xs:sequence>