From a353b6d69a2b1588a51e755ff8567907cf7a8cf7 Mon Sep 17 00:00:00 2001 From: qida Date: Tue, 18 Apr 2017 14:34:22 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=85=B3=E8=81=94?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- generate/g_appcode.go | 4 ++-- generate/g_hproseappcode.go | 4 ++-- generate/g_model.go | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/generate/g_appcode.go b/generate/g_appcode.go index c774689..2dd9079 100644 --- a/generate/g_appcode.go +++ b/generate/g_appcode.go @@ -1026,7 +1026,7 @@ func Add{{modelName}}(m *{{modelName}}) (id int64, err error) { func Get{{modelName}}ById(id int) (v *{{modelName}}, err error) { o := orm.NewOrm() v = &{{modelName}}{Id: id} - if err = o.Read(v); err == nil { + if err = o.QueryTable(new({{modelName}})).Filter("Id", id).RelatedSel().One(v); err == nil { return v, nil } return nil, err @@ -1089,7 +1089,7 @@ func GetAll{{modelName}}(query map[string]string, fields []string, sortby []stri var l []{{modelName}} qs = qs.OrderBy(sortFields...) - if _, err = qs.Limit(limit, offset).All(&l, fields...); err == nil { + if _, err = qs.Limit(limit, offset).RelatedSel().All(&l, fields...); err == nil { if len(fields) == 0 { for _, v := range l { ml = append(ml, v) diff --git a/generate/g_hproseappcode.go b/generate/g_hproseappcode.go index f73d6ff..21ef793 100644 --- a/generate/g_hproseappcode.go +++ b/generate/g_hproseappcode.go @@ -441,7 +441,7 @@ func Add{{modelName}}(m *{{modelName}}) (id int64, err error) { func Get{{modelName}}ById(id int) (v *{{modelName}}, err error) { o := orm.NewOrm() v = &{{modelName}}{Id: id} - if err = o.Read(v); err == nil { + if err = o.QueryTable(new({{modelName}})).Filter("Id", id).RelatedSel().One(v); err == nil { return v, nil } return nil, err @@ -500,7 +500,7 @@ func GetAll{{modelName}}(query map[string]string, fields []string, sortby []stri var l []{{modelName}} qs = qs.OrderBy(sortFields...) - if _, err = qs.Limit(limit, offset).All(&l, fields...); err == nil { + if _, err = qs.Limit(limit, offset).RelatedSel().All(&l, fields...); err == nil { if len(fields) == 0 { for _, v := range l { ml = append(ml, v) diff --git a/generate/g_model.go b/generate/g_model.go index e9b917c..2c6fabc 100644 --- a/generate/g_model.go +++ b/generate/g_model.go @@ -167,7 +167,7 @@ func Add{{modelName}}(m *{{modelName}}) (id int64, err error) { func Get{{modelName}}ById(id int64) (v *{{modelName}}, err error) { o := orm.NewOrm() v = &{{modelName}}{Id: id} - if err = o.Read(v); err == nil { + if err = o.QueryTable(new({{modelName}})).Filter("Id", id).RelatedSel().One(v); err == nil { return v, nil } return nil, err @@ -226,7 +226,7 @@ func GetAll{{modelName}}(query map[string]string, fields []string, sortby []stri var l []{{modelName}} qs = qs.OrderBy(sortFields...) - if _, err = qs.Limit(limit, offset).All(&l, fields...); err == nil { + if _, err = qs.Limit(limit, offset).RelatedSel().All(&l, fields...); err == nil { if len(fields) == 0 { for _, v := range l { ml = append(ml, v) From 3b0dd10302713fb2f13e45e6bd3dd8adf432c547 Mon Sep 17 00:00:00 2001 From: qida Date: Tue, 18 Apr 2017 14:35:59 +0800 Subject: [PATCH 2/2] =?UTF-8?q?windows=E4=B8=8B=E8=B7=AF=E5=BE=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- generate/g_appcode.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generate/g_appcode.go b/generate/g_appcode.go index 2dd9079..26a11ec 100644 --- a/generate/g_appcode.go +++ b/generate/g_appcode.go @@ -967,7 +967,7 @@ func getPackagePath(curpath string) (packpath string) { for _, wg := range wgopath { wg, _ = filepath.EvalSymlinks(path.Join(wg, "src")) - if strings.HasPrefix(strings.ToLower(curpath), strings.ToLower(wg)) { + if strings.HasPrefix(strings.ToLower(strings.Replace(curpath, "/", "\\", -1)), strings.ToLower(wg)) { haspath = true appsrcpath = wg break