Merge pull request #38 from lazygophers/luoxin

修复部分 bug

cli/gen/gen_add_rpc.go

@@ -26,7 +26,11 @@ var addRpcCmd = &cobra.Command{
 		}
 
 		var msg *codegen.PbMessage
-		if v, err := cmd.Flags().GetString("model"); err == nil && v != "" {
+		if v, err := cmd.Flags().GetString("model"); err == nil && (v != "" || opt.GenTo != "") {
+			if v == "" {
+				v = opt.GenTo
+			}
+
 			// 先看一下加了 Model 的 时候存在
 			{
 				model := stringx.ToSnake(v)

codegen/generate_add_rpc.go

@@ -29,13 +29,15 @@ type AddRpcOption struct {
 func (p *AddRpcOption) ParseActions(s string) {
 	candy.Each(strings.Split(s, ";"), func(item string) {
 		idx := strings.Index(item, ":")
-		if idx < 0 {
+		if idx < 0 && p.Action[item] != nil {
 			p.Action[item] = &AddRpcOptionAction{}
 			return
 		}
 
 		action := item[:idx]
-		p.Action[action] = &AddRpcOptionAction{}
+		if p.Action[action] == nil {
+			p.Action[action] = &AddRpcOptionAction{}
+		}
 
 		candy.Each(strings.Split(item[idx+1:], ","), func(item string) {
 			// TODO: 更多的格式解析
@@ -58,6 +60,8 @@ func (p *AddRpcOption) ParseActions(s string) {
 
 		action.Roles = candy.Unique(action.Roles)
 	}
+
+	log.Info()
 }
 
 func (p *AddRpcOption) ParseListOption(s string, msg *PbMessage) {
@@ -154,7 +158,7 @@ func GenerateAddRpc(pb *PbPackage, msg *PbMessage, opt *AddRpcOption) (err error
 
 	// NOTE: 寻找主键
 	pkField := msg.PrimaryField()
-	
+
 	var rpcBlock string
 
 	for action, actionOpt := range opt.Action {

codegen/pbparse.go

@@ -127,6 +127,10 @@ type PbEnum struct {
 	fields []*PbEnumField
 }
 
+func (p *PbEnum) FieldList() []*PbEnumField {
+	return p.fields
+}
+
 func (p *PbEnum) Enum() *proto.Enum {
 	return p.enum
 }
@@ -212,6 +216,22 @@ func (p *PbRPC) ResponsePackage() string {
 	return p.responsePackage
 }
 
+func (p *PbRPC) Method() string {
+	if p.genOption.Method != "" {
+		return p.genOption.Method
+	}
+
+	return "POST"
+}
+
+func (p *PbRPC) Path() string {
+	if p.genOption.Path != "" {
+		return p.genOption.Path
+	}
+
+	return "/" + p.Name
+}
+
 func (p *PbRPC) walk() {
 	for _, option := range p.rpc.Options {
 		p.options[option.Name] = make(map[string]string, len(option.AggregatedConstants))
@@ -269,7 +289,7 @@ func (p *PbRPC) walk() {
 		}
 
 		if gen.Path != nil {
-			p.genOption.Path = *gen.Path
+			p.genOption.Path = "/" + strings.TrimPrefix(*gen.Path, "/")
 		}
 	}
 
@@ -308,24 +328,21 @@ func (p *PbRPC) walk() {
 		}
 		if idx := strings.LastIndex(text, "."); idx > 0 {
 			p.requestPackage = text[idx+1:]
-		} else {
-			p.requestPackage = text
+			text = text[:idx]
 		}
 	}
 
 	if strings.Contains(p.rpc.ReturnsType, ".") {
 		text := p.rpc.ReturnsType
 		if idx := strings.LastIndex(text, "."); idx > 0 {
-			p.responsePackage = text[idx+1:]
+			p.returnsType = text[idx+1:]
 			text = text[:idx]
 		}
 		if idx := strings.LastIndex(text, "."); idx > 0 {
 			p.responsePackage = text[idx+1:]
-		} else {
-			p.responsePackage = text
+			text = text[:idx]
 		}
 	}
-
 }
 
 func NewPbRPC(rpc *proto.RPC) *PbRPC {
@@ -475,6 +492,32 @@ type PbEnumField struct {
 	field    *proto.EnumField
 	comment  *PbComment
 	FullName string
+	Value    int32
+}
+
+func (p *PbEnumField) Desc() string {
+	// 先尝试找 @desc 标记
+	if p.comment != nil {
+		value, ok := p.comment.tags["desc"]
+		if ok && len(value.Lines()) > 0 {
+			return strings.Join(value.Lines(), "")
+		}
+	}
+
+	// 尝试找后面接着的注释
+	if p.field.InlineComment != nil && len(p.field.InlineComment.Lines) > 0 {
+		return strings.Join(p.field.InlineComment.Lines, "")
+	}
+
+	// 找空行标记
+	if p.comment != nil {
+		value, ok := p.comment.tags[""]
+		if ok && len(value.Lines()) > 0 {
+			return strings.Join(value.Lines(), "")
+		}
+	}
+
+	return ""
 }
 
 func (p *PbEnumField) FieldName() string {
@@ -496,6 +539,8 @@ func (p *PbEnumField) walk() {
 	if p.field.Comment != nil {
 		p.comment = NewPbComment(p.field.Comment)
 	}
+
+	p.Value = int32(p.field.Integer)
 }
 
 func NewPbEnumField(f *proto.EnumField) *PbEnumField {

codegen/template/client.call.gtpl

@@ -1,5 +1,5 @@
-func {{ .RPC.RpcName }}(ctx *lrpc.Ctx, req *{{ .RequestType }}) (*{{ .ResponseType }}, error) {
-	var rsp {{ .ResponseType }}
+func {{ .RPC.RpcName }}(ctx *lrpc.Ctx, req *{{ .RequestPackage }}.{{ .RequestType }}) (*{{ .ResponsePackage }}.{{ .ResponseType }}, error) {
+	var rsp {{ .ResponsePackage }}.{{ .ResponseType }}
 	return &rsp, lrpc.Call(ctx, &core.ServiceDiscoveryClient{
 		ServiceName: ServerName,
 		ServicePath: RpcPath{{ .RPC.RpcName }},

state/config.go

@@ -435,7 +435,7 @@ func (p *Cfg) apply() (err error) {
 		addStringType := func(typ string) {
 			typ = "@" + typ
 			if _, ok := p.DefaultTag["gorm"][typ]; !p.Tables.DisableFieldId && !ok {
-				p.DefaultTag["gorm"][typ] = "type:varchar(255);not null"
+				p.DefaultTag["gorm"][typ] = "type:varchar(255);not null;default:''"
 			} else if p.Tables.DisableFieldType && ok {
 				delete(p.DefaultTag["gorm"], typ)
 			}