updated.

auth/admin.go

@@ -26,11 +26,11 @@ func Initialize(ctx restlet.TaskContext, params ...interface{}) error {
 		log.Fatalln("Create SCHEMA on database failed:>", e)
 		return e
 	}
-	if e := postgres.Initialize_HSTORE(ctx.SQL(), ctx.Schema()); nil != e {
+	if e := postgres.InitializeHSTORE(ctx.SQL(), ctx.Schema()); nil != e {
 		log.Fatalln("Initialize hstore on database failed:>", e)
 		return e
 	}
-	if e := postgres.Initialize_UUID(ctx.SQL(), ctx.Schema()); nil != e {
+	if e := postgres.InitializeUUID(ctx.SQL(), ctx.Schema()); nil != e {
 		log.Fatalln("Initialize uuid on database failed:>", e)
 		return e
 	}

demo1/config.yaml

@@ -31,6 +31,15 @@ subscribe:
   address: "nsqd:4150"
   channel: default
 
+mqtt:
+  server: ""
+  servers:
+    - ""
+    - ""
+  clientId: ""
+  username: ""
+  password: ""
+
 logging:
   level: debug
   format: plain

demo1/models/models.go

@@ -25,11 +25,11 @@ func Initialize(ctx restlet.TaskContext, params ...interface{}) error {
 		log.Fatalln("> Create SCHEMA on database failed:>", e)
 		return e
 	}
-	if e := postgres.Initialize_HSTORE(ctx.SQL(), ctx.Schema()); nil != e {
+	if e := postgres.InitializeHSTORE(ctx.SQL(), ctx.Schema()); nil != e {
 		log.Fatalln("> Initialize hstore on database failed:>", e)
 		return e
 	}
-	if e := postgres.Initialize_UUID(ctx.SQL(), ctx.Schema()); nil != e {
+	if e := postgres.InitializeUUID(ctx.SQL(), ctx.Schema()); nil != e {
 		log.Fatalln("> Initialize uuid on database failed:>", e)
 		return e
 	}

demo2/models/models.go

@@ -25,11 +25,11 @@ func Initialize(ctx restlet.TaskContext, params ...interface{}) error {
 		log.Fatalln("> Create SCHEMA on database failed:>", e)
 		return e
 	}
-	if e := postgres.Initialize_HSTORE(ctx.SQL(), ctx.Schema()); nil != e {
+	if e := postgres.InitializeHSTORE(ctx.SQL(), ctx.Schema()); nil != e {
 		log.Fatalln("> Initialize hstore on database failed:>", e)
 		return e
 	}
-	if e := postgres.Initialize_UUID(ctx.SQL(), ctx.Schema()); nil != e {
+	if e := postgres.InitializeUUID(ctx.SQL(), ctx.Schema()); nil != e {
 		log.Fatalln("> Initialize uuid on database failed:>", e)
 		return e
 	}

go.mod

@@ -5,7 +5,7 @@ go 1.12
 require (
 	github.com/Sirupsen/logrus v1.0.3
 	github.com/archsh/go.uuid v1.1.1
-	github.com/archsh/go.xql v0.4.1
+	github.com/archsh/go.xql v0.5.1
 	github.com/bluele/gcache v0.0.0-20190518031135-bc40bd653833
 	github.com/dgrijalva/jwt-go v3.2.0+incompatible
 	github.com/eclipse/paho.mqtt.golang v1.2.0

mqtt/mqtt.go

@@ -1,6 +1,10 @@
 package mqtt
 
 import (
+	"fmt"
+	"net/url"
+	"time"
+
 	"github.com/eclipse/paho.mqtt.golang"
 
 	"cygnux.net/kepler/config"
@@ -15,6 +19,34 @@ type broker struct {
 }
 
 func SetupBroker(cfg config.Config) (Broker, error) {
-	client := mqtt.NewClient(mqtt.NewClientOptions())
+	var opts = mqtt.NewClientOptions()
+	if svr := cfg.GetString("server"); svr != "" {
+		if _, e := url.Parse(svr); nil != e {
+			return nil, e
+		} else {
+			opts.AddBroker(svr)
+		}
+	} else if svrs := cfg.GetStringSlice("servers"); len(svrs) > 0 {
+		for _, svr := range svrs {
+			if _, e := url.Parse(svr); nil != e {
+				return nil, e
+			} else {
+				opts.AddBroker(svr)
+			}
+		}
+	} else {
+		return nil, fmt.Errorf(" server or servers should be provided")
+	}
+	opts.SetClientID(cfg.GetString("clientId"))
+	if s := cfg.GetString("username"); s != "" {
+		opts.SetUsername(s)
+	}
+	if s := cfg.GetString("password"); s != "" {
+		opts.SetPassword(s)
+	}
+	if d := cfg.GetDuration("keepAlive"); d > time.Second {
+		opts.SetKeepAlive(d)
+	}
+	client := mqtt.NewClient(opts)
 	return broker{Client: client}, nil
 }

restlet/curd.go

@@ -416,7 +416,7 @@ func (h DefaultCURDHandler) update(ctx RequestContext, urlParams Parameters, que
 	for _, c := range h.table.GetColumns() {
 		if _, ok := entityMap[c.FieldName]; ok {
 
-		} else if _, ok := entityMap[c.Jtag]; ok {
+		} else if _, ok := entityMap[c.JTag]; ok {
 
 		} else if _, ok := entityMap[c.ElemName]; ok {
 

restlet/restlet.go

@@ -66,10 +66,10 @@ func BuildQueryControl(queries Parameters, table *xql.Table, qmaker QueryMaker,
 		delete(queries, QCtrlExcludes)
 	}
 	for k, v := range includeFields {
-		if ! v {
+		if !v {
 			continue
 		}
-		if c, ok := table.GetColumn(k); ! ok {
+		if c, ok := table.GetColumn(k); !ok {
 			return qc, errors.New("Invalid column:" + k)
 		} else {
 			qc.Includes = append(qc.Includes, c.FieldName)
@@ -97,7 +97,7 @@ func BuildQueryControl(queries Parameters, table *xql.Table, qmaker QueryMaker,
 			return qc, fmt.Errorf("invalid expression: %s", k)
 		}
 		c, ok := table.GetColumn(keys[0])
-		if ! ok {
+		if !ok {
 			//return nil, fmt.Errorf("unknow column: %s", keys[0])
 			qc.Params[k] = v
 			continue
@@ -160,9 +160,9 @@ func BuildQueryControl(queries Parameters, table *xql.Table, qmaker QueryMaker,
 		if len(keys) == 3 {
 			switch strings.ToUpper(keys[2]) {
 			case "AND":
-				f.Condition = xql.CONDITION_AND
+				f.Condition = xql.ConditionAnd
 			case "OR":
-				f.Condition = xql.CONDITION_OR
+				f.Condition = xql.ConditionOr
 			default:
 				return qc, fmt.Errorf("unknow condition: %s", keys[2])
 			}
@@ -239,7 +239,7 @@ func MakeRestletHandler(h RestletHandler, predictor RequestPredictor, ctxProvide
 			}
 		}
 
-		if ! MatchMethod(request.Method, methods) {
+		if !MatchMethod(request.Method, methods) {
 			if request.Method == "OPTIONS" {
 				if methods[0] == "*" {
 					methods = []string{"HEAD", "GET", "POST", "PUT", "PATCH", "DELETE", "OPTIONS"}