可以正常搜索了

dtu/channel.go

@@ -190,7 +190,7 @@ func (c *Client) receive(conn net.Conn) {
 			} else {
 				b = []byte(c.HeartBeatContent)
 			}
-			if bytes.Compare(b, buf) == 0 {
+			if bytes.Compare(b, buf[:n]) == 0 {
 				continue
 			}
 		}
@@ -284,7 +284,7 @@ func (c *Server) receive(conn net.Conn) {
 			return
 		}
 
-		serial, err := c.baseChannel.checkRegister(buf)
+		serial, err := c.baseChannel.checkRegister(buf[:n])
 		if err != nil {
 			_, _ = link.Send([]byte(err.Error()))
 			return
@@ -327,7 +327,7 @@ func (c *Server) receive(conn net.Conn) {
 
 		//处理剩余内容
 		if c.RegisterMax > 0 && n > c.RegisterMax {
-			link.onData(buf[c.RegisterMax:])
+			link.onData(buf[c.RegisterMax:n])
 		}
 	}
 
@@ -435,7 +435,7 @@ func (c *PacketServer) receive() {
 				} else {
 					b = []byte(c.HeartBeatContent)
 				}
-				if bytes.Compare(b, buf) == 0 {
+				if bytes.Compare(b, buf[:n]) == 0 {
 					continue
 				}
 			}
@@ -447,7 +447,7 @@ func (c *PacketServer) receive() {
 
 			//第一个包作为注册包
 			if c.RegisterEnable {
-				serial, err := c.baseChannel.checkRegister(buf)
+				serial, err := c.baseChannel.checkRegister(buf[:n])
 				if err != nil {
 					_, _ = link.Send([]byte(err.Error()))
 					return
@@ -489,7 +489,7 @@ func (c *PacketServer) receive() {
 
 				//处理剩余内容
 				if c.RegisterMax > 0 && n > c.RegisterMax {
-					link.onData(buf[c.RegisterMax:])
+					link.onData(buf[c.RegisterMax:n])
 				}
 			} else {
 				link.onData(buf[:n])

portal/src/app/main/channel/channel.component.ts

@@ -80,7 +80,7 @@ export class ChannelComponent implements OnInit {
       nzWidth: 500,
       nzContent: ChannelEditComponent,
       nzContentParams: {
-        channel: c || {net: 'tcp', addr: ':1843', is_server: true}
+        channel: c || {net: 'tcp', addr: ':1843', role: 'server'}
       }
     });
   }

web/api/channel.go

@@ -23,15 +23,22 @@ func channels(ctx *gin.Context) {
 	cond := make([]q.Matcher, 0)
 	//过滤条件
 	for _, filter := range body.Filters {
-		cond = append(cond, q.In(filter.Key, filter.Value))
+		if len(filter.Value) > 0 {
+			cond = append(cond, q.In(filter.Key, filter.Value))
+		}
 	}
 	//关键字
 	if body.Keyword != "" {
-		cond = append(cond, q.Re("name", body.Keyword), q.Re("addr", body.Keyword))
+		cond = append(cond, q.Or(
+			q.Re("Name", body.Keyword),
+			q.Re("Addr", body.Keyword),
+		))
 	}
 
 	query := db.DB("channel").Select(cond...)
-	cnt, err := query.Count(&cs)
+
+	//计算总数
+	cnt, err := query.Count(&model.Channel{})
 	if err != nil {
 		replyError(ctx, err)
 		return
@@ -48,7 +55,7 @@ func channels(ctx *gin.Context) {
 			query = query.OrderBy(body.SortKey)
 		}
 	} else {
-		query = query.OrderBy("id").Reverse()
+		query = query.OrderBy("Id").Reverse()
 	}
 
 	err = query.Find(&cs)
@@ -163,7 +170,7 @@ func getChannelFromUri(ctx *gin.Context) (*model.Channel, error) {
 	}
 
 	var channel model.Channel
-	err := db.DB("channel").One("id", pid.Id, &channel)
+	err := db.DB("channel").One("Id", pid.Id, &channel)
 	if err != nil {
 		return nil, err
 	}
@@ -177,7 +184,7 @@ func channelGet(ctx *gin.Context) {
 		return
 	}
 	var channel model.Channel
-	err := db.DB("channel").One("id", pid.Id, &channel)
+	err := db.DB("channel").One("Id", pid.Id, &channel)
 	if err != nil {
 		replyError(ctx, err)
 		return

web/api/link.go

@@ -25,17 +25,23 @@ func links(ctx *gin.Context) {
 	cond := make([]q.Matcher, 0)
 	//过滤条件
 	for _, filter := range body.Filters {
-		cond = append(cond, q.In(filter.Key, filter.Value))
+		if len(filter.Value) > 0 {
+			cond = append(cond, q.In(filter.Key, filter.Value))
+		}
 	}
 	//关键字
 	if body.Keyword != "" {
-		cond = append(cond, q.Re("name", body.Keyword), q.Re("serial", body.Keyword), q.Re("addr", body.Keyword))
+		cond = append(cond, q.Or(
+			q.Re("Name", body.Keyword),
+			q.Re("Serial", body.Keyword),
+			q.Re("Addr", body.Keyword),
+		))
 	}
 
-	query := db.DB("channel").Select(cond...)
+	query := db.DB("link").Select(cond...)
 
 	//计算总数
-	cnt, err := query.Count(&ls)
+	cnt, err := query.Count(&model.Link{})
 	if err != nil {
 		replyError(ctx, err)
 		return
@@ -52,7 +58,7 @@ func links(ctx *gin.Context) {
 			query = query.OrderBy(body.SortKey)
 		}
 	} else {
-		query = query.OrderBy("id").Reverse()
+		query = query.OrderBy("Id").Reverse()
 	}
 
 	err = query.Find(&ls)