Browse Source

init: 更正引用文件

HeWang 2 months ago
parent
commit
dd1234df30

+ 5 - 3
aarch64/jili/common/config/c_cloud.go

@@ -30,10 +30,12 @@ type hostStruct struct {
 	Topics []string     `yaml:"topics"`
 	Rosbag rosbagStruct `yaml:"rosbag"`
 }
+
 type ros struct {
 	MasterAddress string   `yaml:"master-address"`
 	Nodes         []string `yaml:"nodes"`
 }
+
 type disk struct {
 	Name string   `yaml:"name"`
 	Used uint64   `yaml:"used"`
@@ -72,7 +74,7 @@ var (
 	CloudConfigMutex sync.RWMutex
 )
 
-// 初始化业务配置
+// InitCloudConfig 初始化业务配置
 func InitCloudConfig() {
 	c_log.GlobalLogger.Info("初始化OSS配置文件 - 开始。")
 	var content []byte // cloud.yaml 内容
@@ -162,7 +164,7 @@ func InitCloudConfig() {
 	}
 }
 
-// 刷新配置文件
+// refreshCloudConfig 刷新配置文件
 func refreshCloudConfig() {
 	// 获取文件的目录
 	_ = util.CreateParentDir(LocalConfig.CloudConfigLocalPath)
@@ -221,7 +223,7 @@ func RefreshCloudConfig() {
 	}
 }
 
-// CheckConfig 校验 cfg.yaml 文件
+// checkConfig 校验 cfg.yaml 文件
 func checkConfig(check CloudConfigStruct) bool {
 	if len(check.Hosts) != 2 {
 		c_log.GlobalLogger.Error("cloud-config.yaml中配置的hosts必须为2。")

+ 1 - 1
aarch64/jili/common/config/c_platform.go

@@ -41,7 +41,7 @@ var (
 	RecordTopics   []string
 )
 
-// 初始化数据闭环平台的配置
+// InitPlatformConfig 初始化数据闭环平台的配置
 func InitPlatformConfig() {
 	if !LocalConfig.Internet {
 		return

+ 2 - 2
aarch64/jili/common/service/disk_clean.go

@@ -1,8 +1,8 @@
 package service
 
 import (
-	commonConfig "cicv-data-closedloop/aarch64/pjisuv/common/config"
-	masterConfig "cicv-data-closedloop/aarch64/pjisuv/master/config"
+	commonConfig "cicv-data-closedloop/aarch64/jili/common/config"
+	masterConfig "cicv-data-closedloop/aarch64/jili/master/config"
 	"cicv-data-closedloop/common/config/c_log"
 	"cicv-data-closedloop/common/domain"
 	"cicv-data-closedloop/common/entity"

+ 1 - 1
aarch64/jili/common/service/kill_self.go

@@ -1,7 +1,7 @@
 package service
 
 import (
-	"cicv-data-closedloop/aarch64/pjisuv/common/config"
+	"cicv-data-closedloop/aarch64/jili/common/config"
 	"cicv-data-closedloop/common/config/c_log"
 	"cicv-data-closedloop/common/util"
 	"net/rpc"

+ 1 - 1
aarch64/jili/common/service/rosbag_clean.go

@@ -1,7 +1,7 @@
 package service
 
 import (
-	"cicv-data-closedloop/aarch64/pjisuv/common/config"
+	"cicv-data-closedloop/aarch64/jili/common/config"
 	"cicv-data-closedloop/common/config/c_log"
 	"cicv-data-closedloop/common/util"
 	"time"

+ 1 - 1
aarch64/jili/common/service/rosbag_record.go

@@ -1,7 +1,7 @@
 package service
 
 import (
-	"cicv-data-closedloop/aarch64/pjisuv/common/config"
+	"cicv-data-closedloop/aarch64/jili/common/config"
 	"cicv-data-closedloop/common/config/c_log"
 	"cicv-data-closedloop/common/util"
 	"github.com/bluenviron/goroslib/v2"

+ 2 - 2
aarch64/jili/common/service/rosbag_upload.go

@@ -1,8 +1,8 @@
 package service
 
 import (
-	commonConfig "cicv-data-closedloop/aarch64/pjisuv/common/config"
-	masterConfig "cicv-data-closedloop/aarch64/pjisuv/master/config"
+	commonConfig "cicv-data-closedloop/aarch64/jili/common/config"
+	masterConfig "cicv-data-closedloop/aarch64/jili/master/config"
 	"cicv-data-closedloop/common/config/c_log"
 	"cicv-data-closedloop/common/domain"
 	"cicv-data-closedloop/common/entity"

+ 2 - 2
aarch64/jili/control/main.go

@@ -1,8 +1,8 @@
 package main
 
 import (
-	commonConfig "cicv-data-closedloop/aarch64/pjisuv/common/config"
-	commonService "cicv-data-closedloop/aarch64/pjisuv/common/service"
+	commonConfig "cicv-data-closedloop/aarch64/jili/common/config"
+	commonService "cicv-data-closedloop/aarch64/jili/common/service"
 	"cicv-data-closedloop/common/config/c_log"
 	"cicv-data-closedloop/common/util"
 	"net/rpc"

+ 1 - 1
aarch64/jili/master/config/trigger_init.go

@@ -1,7 +1,7 @@
 package config
 
 import (
-	"cicv-data-closedloop/aarch64/pjisuv/common/config"
+	"cicv-data-closedloop/aarch64/jili/common/config"
 	"cicv-data-closedloop/common/config/c_log"
 	"cicv-data-closedloop/common/util"
 	"cicv-data-closedloop/pjisuv_msgs"

+ 4 - 4
aarch64/jili/master/main.go

@@ -1,10 +1,10 @@
 package main
 
 import (
-	commonConfig "cicv-data-closedloop/aarch64/pjisuv/common/config"
-	commonService "cicv-data-closedloop/aarch64/pjisuv/common/service"
-	masterConfig "cicv-data-closedloop/aarch64/pjisuv/master/config"
-	masterService "cicv-data-closedloop/aarch64/pjisuv/master/service"
+	commonConfig "cicv-data-closedloop/aarch64/jili/common/config"
+	commonService "cicv-data-closedloop/aarch64/jili/common/service"
+	masterConfig "cicv-data-closedloop/aarch64/jili/master/config"
+	masterService "cicv-data-closedloop/aarch64/jili/master/service"
 	"cicv-data-closedloop/common/config/c_log"
 )
 

+ 2 - 2
aarch64/jili/master/service/for_fault_log.go

@@ -1,8 +1,8 @@
 package service
 
 import (
-	commonConfig "cicv-data-closedloop/aarch64/pjisuv/common/config"
-	"cicv-data-closedloop/aarch64/pjisuv/master/config"
+	commonConfig "cicv-data-closedloop/aarch64/jili/common/config"
+	"cicv-data-closedloop/aarch64/jili/master/config"
 	"cicv-data-closedloop/common/config/c_log"
 	"cicv-data-closedloop/common/util"
 	"cicv-data-closedloop/pjisuv_msgs"

+ 2 - 2
aarch64/jili/master/service/move_bag_and_send_window.go

@@ -1,8 +1,8 @@
 package service
 
 import (
-	commonConfig "cicv-data-closedloop/aarch64/pjisuv/common/config"
-	commonService "cicv-data-closedloop/aarch64/pjisuv/common/service"
+	commonConfig "cicv-data-closedloop/aarch64/jili/common/config"
+	commonService "cicv-data-closedloop/aarch64/jili/common/service"
 	"cicv-data-closedloop/common/config/c_log"
 	"cicv-data-closedloop/common/domain"
 	"cicv-data-closedloop/common/entity"

+ 3 - 3
aarch64/jili/master/service/produce_window.go

@@ -1,9 +1,9 @@
 package service
 
 import (
-	commonConfig "cicv-data-closedloop/aarch64/pjisuv/common/config"
-	"cicv-data-closedloop/aarch64/pjisuv/common/service"
-	masterConfig "cicv-data-closedloop/aarch64/pjisuv/master/config"
+	commonConfig "cicv-data-closedloop/aarch64/jili/common/config"
+	"cicv-data-closedloop/aarch64/jili/common/service"
+	masterConfig "cicv-data-closedloop/aarch64/jili/master/config"
 	"cicv-data-closedloop/common/config/c_log"
 	commonEntity "cicv-data-closedloop/common/entity"
 	"cicv-data-closedloop/common/util"

+ 4 - 4
aarch64/jili/slave/main.go

@@ -1,10 +1,10 @@
 package main
 
 import (
-	commonConfig "cicv-data-closedloop/aarch64/pjisuv/common/config"
-	commonService "cicv-data-closedloop/aarch64/pjisuv/common/service"
-	slaveConfig "cicv-data-closedloop/aarch64/pjisuv/slave/package/config"
-	slaveService "cicv-data-closedloop/aarch64/pjisuv/slave/package/service"
+	commonConfig "cicv-data-closedloop/aarch64/jili/common/config"
+	commonService "cicv-data-closedloop/aarch64/jili/common/service"
+	slaveConfig "cicv-data-closedloop/aarch64/jili/slave/package/config"
+	slaveService "cicv-data-closedloop/aarch64/jili/slave/package/service"
 	"cicv-data-closedloop/common/config/c_log"
 )
 

+ 1 - 1
aarch64/jili/slave/package/config/slave_tcp_config.go

@@ -1,7 +1,7 @@
 package config
 
 import (
-	"cicv-data-closedloop/aarch64/pjisuv/common/config"
+	"cicv-data-closedloop/aarch64/jili/common/config"
 	"cicv-data-closedloop/common/config/c_log"
 	"net"
 	"os"

+ 2 - 2
aarch64/jili/slave/package/service/accept_window.go

@@ -1,8 +1,8 @@
 package service
 
 import (
-	"cicv-data-closedloop/aarch64/pjisuv/common/service"
-	"cicv-data-closedloop/aarch64/pjisuv/slave/package/config"
+	"cicv-data-closedloop/aarch64/jili/common/service"
+	"cicv-data-closedloop/aarch64/jili/slave/package/config"
 	"cicv-data-closedloop/common/config/c_log"
 	"cicv-data-closedloop/common/entity"
 	"context"

+ 2 - 2
aarch64/jili/slave/package/service/move_bag.go

@@ -1,8 +1,8 @@
 package service
 
 import (
-	commonConfig "cicv-data-closedloop/aarch64/pjisuv/common/config"
-	commonService "cicv-data-closedloop/aarch64/pjisuv/common/service"
+	commonConfig "cicv-data-closedloop/aarch64/jili/common/config"
+	commonService "cicv-data-closedloop/aarch64/jili/common/service"
 	"cicv-data-closedloop/common/config/c_log"
 	"cicv-data-closedloop/common/domain"
 	"cicv-data-closedloop/common/entity"

+ 5 - 3
aarch64/pjisuv/common/config/c_cloud.go

@@ -30,10 +30,12 @@ type hostStruct struct {
 	Topics []string     `yaml:"topics"`
 	Rosbag rosbagStruct `yaml:"rosbag"`
 }
+
 type ros struct {
 	MasterAddress string   `yaml:"master-address"`
 	Nodes         []string `yaml:"nodes"`
 }
+
 type disk struct {
 	Name string   `yaml:"name"`
 	Used uint64   `yaml:"used"`
@@ -72,7 +74,7 @@ var (
 	CloudConfigMutex sync.RWMutex
 )
 
-// 初始化业务配置
+// InitCloudConfig 初始化业务配置
 func InitCloudConfig() {
 	c_log.GlobalLogger.Info("初始化OSS配置文件 - 开始。")
 	var content []byte // cloud.yaml 内容
@@ -162,7 +164,7 @@ func InitCloudConfig() {
 	}
 }
 
-// 刷新配置文件
+// refreshCloudConfig 刷新配置文件
 func refreshCloudConfig() {
 	// 获取文件的目录
 	_ = util.CreateParentDir(LocalConfig.CloudConfigLocalPath)
@@ -221,7 +223,7 @@ func RefreshCloudConfig() {
 	}
 }
 
-// CheckConfig 校验 cfg.yaml 文件
+// checkConfig 校验 cfg.yaml 文件
 func checkConfig(check CloudConfigStruct) bool {
 	if len(check.Hosts) != 2 {
 		c_log.GlobalLogger.Error("cloud-config.yaml中配置的hosts必须为2。")

+ 1 - 1
aarch64/pjisuv/common/config/c_platform.go

@@ -41,7 +41,7 @@ var (
 	RecordTopics   []string
 )
 
-// 初始化数据闭环平台的配置
+// InitPlatformConfig 初始化数据闭环平台的配置
 func InitPlatformConfig() {
 	if !LocalConfig.Internet {
 		return

+ 33 - 0
common/util/u_http.go

@@ -2,13 +2,46 @@ package util
 
 import (
 	"bytes"
+	"crypto/md5"
+	"encoding/hex"
 	"encoding/json"
 	"fmt"
 	"io"
 	"net/http"
 	"net/url"
+	"sort"
+	"strings"
+	"time"
 )
 
+// GenerateSign 生成签名
+func GenerateSign(ak, sk string, params map[string]string) string {
+	// 1. 添加时间戳
+	params["timestamp"] = fmt.Sprintf("%d", time.Now().Unix())
+
+	// 2. 参数排序
+	keys := make([]string, 0, len(params))
+	for k := range params {
+		keys = append(keys, k)
+	}
+	sort.Strings(keys)
+
+	// 3. 拼接参数
+	var buffer strings.Builder
+	for _, k := range keys {
+		buffer.WriteString(k)
+		buffer.WriteByte('=')
+		buffer.WriteString(params[k])
+		buffer.WriteByte('&')
+	}
+	paramStr := buffer.String()[:len(buffer.String())-1]
+
+	// 4. 计算MD5
+	signStr := paramStr + sk
+	hash := md5.Sum([]byte(signStr))
+	return hex.EncodeToString(hash[:])
+}
+
 func HttpGet(url string) (string, error) {
 	// 创建一个HTTP客户端
 	client := &http.Client{}