修改事务提交调用问题

web/services/channel.go

@@ -251,7 +251,7 @@ func (s *channelService) CreateChannel(
 	}
 
 	var addr []*PortInfo
-	err := q.Q.Transaction(func(tx *q.Query) error {
+	err := q.Q.Transaction(func(q *q.Query) error {
 
 		// 查找套餐
 		step = time.Now()
@@ -285,7 +285,7 @@ func (s *channelService) CreateChannel(
 		// 申请节点
 		step = time.Now()
 
-		edgeAssigns, err := assignEdge(count, filter)
+		edgeAssigns, err := assignEdge(q, count, filter)
 		if err != nil {
 			return err
 		}
@@ -297,7 +297,7 @@ func (s *channelService) CreateChannel(
 
 		now := time.Now()
 		expiration := now.Add(time.Duration(resource.Live) * time.Second)
-		_addr, channels, err := assignPort(edgeAssigns, auth.Payload.Id, protocol, authType, expiration, filter)
+		_addr, channels, err := assignPort(q, edgeAssigns, auth.Payload.Id, protocol, authType, expiration, filter)
 		if err != nil {
 			return err
 		}
@@ -386,7 +386,7 @@ func checkUser(auth *AuthContext, resource *ResourceInfo, count int) error {
 }
 
 // assignEdge 分配边缘节点数量
-func assignEdge(count int, filter NodeFilterConfig) (*AssignEdgeResult, error) {
+func assignEdge(q *q.Query, count int, filter NodeFilterConfig) (*AssignEdgeResult, error) {
 
 	// 查询可以使用的网关
 	var step = time.Now()
@@ -539,6 +539,7 @@ type ProxyConfig struct {
 
 // assignPort 分配指定数量的端口
 func assignPort(
+	q *q.Query,
 	proxies *AssignEdgeResult,
 	userId int32,
 	protocol ChannelProtocol,
@@ -718,8 +719,7 @@ func genPassPair() (string, string) {
 		password[i] = letters[rand.N(len(letters))]
 	}
 
-	// return string(username), string(password)
-	return "123123", "123123"
+	return string(username), string(password)
 }
 
 func chKey(channel *models.Channel) string {