From 4a99df6416bca5c6b9104cfa5ed2d12e5a1cb116 Mon Sep 17 00:00:00 2001 From: maxbad <26058031@qq.com> Date: Tue, 30 May 2023 17:51:34 +0800 Subject: [PATCH 1/3] =?UTF-8?q?logic=E8=BF=94=E5=9B=9E=E6=9C=89=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E4=BB=A3=E7=A0=81=E6=97=B6,=E6=A0=87=E8=AE=B0?= =?UTF-8?q?=E4=B8=BA=E9=94=99=E8=AF=AF=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/internal/logic/middleware/response.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/server/internal/logic/middleware/response.go b/server/internal/logic/middleware/response.go index 149030a..c02fb09 100644 --- a/server/internal/logic/middleware/response.go +++ b/server/internal/logic/middleware/response.go @@ -101,10 +101,14 @@ func responseJson(r *ghttp.Request) { if err = r.GetError(); err != nil { // 记录到自定义错误日志文件 - g.Log().Stdout(false).Printf(ctx, "exception:%v", err) - code = gerror.Code(err).Code() + if code == gcode.CodeNil.Code() { + g.Log().Stdout(false).Printf(ctx, "exception:%v", err) + } else { + g.Log().Errorf(ctx, "exception:%v", err) + } + // 是否输出错误到页面 if g.Cfg().MustGet(ctx, "hotgo.debug", true).Bool() { message = gerror.Current(err).Error() From 11ac753d806dcbd2d30c2a606c605e5831a8adc6 Mon Sep 17 00:00:00 2001 From: maxbad <26058031@qq.com> Date: Wed, 31 May 2023 10:49:22 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=85=B3=E8=81=94=E8=A1=A8=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E8=BF=94=E5=9B=9E=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/internal/library/hggen/views/curd_generate_logic.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/internal/library/hggen/views/curd_generate_logic.go b/server/internal/library/hggen/views/curd_generate_logic.go index 6d53a85..359dbc6 100644 --- a/server/internal/library/hggen/views/curd_generate_logic.go +++ b/server/internal/library/hggen/views/curd_generate_logic.go @@ -19,7 +19,7 @@ const ( LogicWhereComments = "\n\t// 查询%s\n" LogicWhereNoSupport = "\t// TODO 暂不支持生成[ %s ]查询方式，请自行补充此处代码！" LogicListSimpleSelect = "\tfields, err := hgorm.GenSelect(ctx, sysin.%sListModel{}, dao.%s)\n\tif err != nil {\n\t\treturn\n\t}" - LogicListJoinSelect = "\t//关联表select\n\tfields, err := hgorm.GenJoinSelect(ctx, %sin.%sListModel{}, dao.%s, []*hgorm.Join{\n%v\t})\n\n\tif err != nil {\n\t\treturn\n\t}" + LogicListJoinSelect = "\t//关联表select\n\tfields, err := hgorm.GenJoinSelect(ctx, %sin.%sListModel{}, dao.%s, []*hgorm.Join{\n%v\t})\n\n\tif err != nil {\n\t\terr = gerror.Wrap(err, \"获取%s关联字段失败，请稍后重试！\")\n\t\treturn\n\t}" LogicListJoinOnRelation = "\t// 关联表%s\n\tmod = mod.%s(hgorm.GenJoinOnRelation(\n\t\tdao.%s.Table(), dao.%s.Columns().%s, // 主表表名,关联字段\n\t\tdao.%s.Table(), \"%s\", dao.%s.Columns().%s, // 关联表表名,别名,关联字段\n\t)...)\n\n" LogicEditUpdate = "\tif _, err = s.Model(ctx%s).\n\t\t\tFields(%sin.%sUpdateFields{}).\n\t\t\tWherePri(in.%s).Data(in).Update(); err != nil {\n\t\t\terr = gerror.Wrap(err, \"修改%s失败，请稍后重试！\")\n\t\t}\n\t\treturn" LogicEditInsert = "\tif _, err = s.Model(ctx, &handler.Option{FilterAuth: false}).\n\t\tFields(%sin.%sInsertFields{}).\n\t\tData(in).Insert(); err != nil {\n\t\terr = gerror.Wrap(err, \"新增%s失败，请稍后重试！\")\n\t}" @@ -138,7 +138,7 @@ func (l *gCurd) generateLogicListJoin(ctx context.Context, in *CurdPreviewInput) } } - selectBuffer.WriteString(fmt.Sprintf(LogicListJoinSelect, in.options.TemplateGroup, in.In.VarName, in.In.DaoName, joinSelectRows)) + selectBuffer.WriteString(fmt.Sprintf(LogicListJoinSelect, in.options.TemplateGroup, in.In.VarName, in.In.DaoName, joinSelectRows, in.In.TableComment)) data["select"] = selectBuffer.String() data["fields"] = "fields" From ed1dc9cf10555e5e541db24a63ab011e57ff32f2 Mon Sep 17 00:00:00 2001 From: maxbad <26058031@qq.com> Date: Wed, 31 May 2023 16:36:21 +0800 Subject: [PATCH 3/3] Update cmd.go --- server/internal/cmd/cmd.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/internal/cmd/cmd.go b/server/internal/cmd/cmd.go index 916defb..426aaad 100644 --- a/server/internal/cmd/cmd.go +++ b/server/internal/cmd/cmd.go @@ -59,7 +59,7 @@ var ( var cmd = server simple.SafeGo(ctx, func(ctx context.Context) { if err := cmd.Func(ctx, parser); err != nil { - g.Log().Fatal(ctx, "%v start fail:", cmd.Name, err) + g.Log().Fatalf(ctx, "%v start fail:%v", cmd.Name, err) } }) }