public/PandaX
1
0
Fork 0
mirror of https://gitee.com/XM-GO/PandaX.git synced 2026-04-23 02:48:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

[优化]

Browse Source
This commit is contained in:
PandaX-Go
2024-08-29 21:58:27 +08:00
parent 5b2b068e40
commit 315c0a6c27
6 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
config.yml
View File

@@ -5,11 +5,11 @@ app:
server:
# debug release test
model: release
port: 7799
port: 7788
# iothub服务端口 使用的rpc端口 9000 9001 可能与minio端口冲突
grpc-port: 7701
http-port: 7702
tcp-port: 7703
grpc-port: 9001
http-port: 9002
tcp-port: 9003
cors: true
# 接口限流
rate:
@@ -34,7 +34,7 @@ queue:
ch-num: 3000 #并发执行数,同时处理多少条数据
redis:
host: 192.168.10.242
host: 127.0.0.1
password: 123456
port: 6379
@@ -42,7 +42,7 @@ mysql:
host: 127.0.0.1:3306
username: root
password: 123456
db-name: pandax_iot
db-name: pandax
config: charset=utf8&loc=Local&parseTime=true
postgresql:
@@ -65,7 +65,7 @@ oss:
taos:
username: "root"
password: "taosdata"
host: "192.168.10.242:6041"
host: "127.0.0.1:6041"
database: "iot"
config: ""

4
pkg/rule_engine/nodes/action_create_alarm_node.go
View File

@@ -3,9 +3,9 @@ package nodes
import (
"encoding/json"
"errors"
"github.com/PandaXGO/PandaKit/utils"
"pandax/apps/device/entity"
"pandax/apps/device/services"
"pandax/kit/utils"
"pandax/pkg/global"
"pandax/pkg/rule_engine/message"
"time"
@@ -55,7 +55,7 @@ func (n *createAlarmNode) Handle(msg *message.Message) error {
}
} else {
alarm = &entity.DeviceAlarm{}
alarm.Id = utils.GenerateID()
alarm.Id = utils.GenerateID("")
alarm.DeviceId = msg.Metadata.GetStringValue("deviceId")
alarm.ProductId = msg.Metadata.GetStringValue("productId")
alarm.Name = msg.Metadata.GetStringValue("deviceName")

4
pkg/rule_engine/nodes/action_rpc_request_from_device_node.go
View File

@@ -2,11 +2,11 @@ package nodes
import (
"errors"
"github.com/PandaXGO/PandaKit/utils"
"pandax/apps/device/services"
"pandax/iothub/client/mqttclient"
"pandax/iothub/client/tcpclient"
"pandax/iothub/client/udpclient"
"pandax/kit/utils"
devicerpc "pandax/pkg/device_rpc"
"pandax/pkg/global"
"pandax/pkg/rule_engine/message"
@@ -80,7 +80,7 @@ func (n *rpcRequestFromDeviceNode) Handle(msg *message.Message) error {
rpc := &mqttclient.RpcRequest{}
if n.RequestId == "" {
if msg.Metadata.GetStringValue("requestId") == "" {
rpc.RequestId = utils.GenerateID()
rpc.RequestId = utils.GenerateID("")
} else {
rpc.RequestId = msg.Metadata.GetStringValue("requestId")
}

4
pkg/rule_engine/nodes/action_rpc_request_to_device_node.go
View File

@@ -3,12 +3,12 @@ package nodes
import (
"encoding/json"
"errors"
"github.com/PandaXGO/PandaKit/utils"
"pandax/apps/device/entity"
"pandax/apps/device/services"
"pandax/iothub/client/mqttclient"
"pandax/iothub/client/tcpclient"
"pandax/iothub/client/udpclient"
"pandax/kit/utils"
"pandax/pkg/global"
"pandax/pkg/global/model"
"pandax/pkg/rule_engine/message"
@@ -60,7 +60,7 @@ func (n *rpcRequestToDeviceNode) Handle(msg *message.Message) error {
// 构建指令记录
var data entity.DeviceCmdLog
data.Id = utils.GenerateID()
data.Id = utils.GenerateID("")
data.DeviceId = deviceId
data.CmdName = datas.Method
data.CmdContent = kgo.KConv.ToStr(datas.Params)

2
pkg/rule_engine/nodes/external_ding_node.go
View File

@@ -6,8 +6,8 @@ import (
"encoding/base64"
"encoding/json"
"fmt"
"github.com/PandaXGO/PandaKit/httpclient"
"net/url"
"pandax/kit/httpclient"
"pandax/pkg/rule_engine/message"
"time"
)

1
pkg/transport/http_server.go
View File

@@ -35,7 +35,6 @@ func (s *HttpServer) Type() Type {
}
func (s *HttpServer) Start(ctx context.Context) error {
global.Log.Infof("HTTP Server listen: %s", s.Addr)
go func() {
if global.Conf.Server.Tls.Enable {
global.Log.Infof("HTTPS Server listen: %s", s.Addr)