commit

pji/common/cfg/cloud_cfg.go → aarch64/pji/common/config/cloud_config.go

@@ -1,8 +1,8 @@
-package cfg
+package config
 
 import (
 	"cicv-data-closedloop/common/config/c_log"
-	"cicv-data-closedloop/pji/common/cutil"
+	"cicv-data-closedloop/common/util"
 	"gopkg.in/yaml.v3"
 	"os"
 	"sync"
@@ -55,7 +55,7 @@ var (
 func InitCloudConfig() {
 	c_log.GlobalLogger.Info("初始化OSS配置文件 - 开始。")
 	// 获取文件的目录
-	cutil.CreateParentDir(LocalConfig.CloudConfigLocalPath)
+	util.CreateParentDir(LocalConfig.CloudConfigLocalPath)
 	// 3 ------- 获取 yaml 字符串 -------
 	var content []byte
 	cloudConfigObjectKey := LocalConfig.OssBasePrefix + LocalConfig.EquipmentNo + "/" + LocalConfig.CloudConfigFilename
@@ -89,14 +89,14 @@ func InitCloudConfig() {
 		os.Exit(-1)
 	}
 	c_log.GlobalLogger.Info("初始化OSS配置文件 - 成功。")
-	cutil.CreateDir(CloudConfig.BagDataDir)
-	cutil.CreateDir(CloudConfig.BagCopyDir)
+	util.CreateDir(CloudConfig.BagDataDir)
+	util.CreateDir(CloudConfig.BagCopyDir)
 }
 
 // refreshCloudConfig 更新业务配置
 func refreshCloudConfig() {
 	// 获取文件的目录
-	cutil.CreateParentDir(LocalConfig.CloudConfigLocalPath)
+	util.CreateParentDir(LocalConfig.CloudConfigLocalPath)
 	// 3 ------- 获取 yaml 字符串 -------
 	var content []byte
 	cloudConfigObjectKey := LocalConfig.OssBasePrefix + LocalConfig.EquipmentNo + "/" + LocalConfig.CloudConfigFilename
@@ -129,8 +129,8 @@ func refreshCloudConfig() {
 		c_log.GlobalLogger.Error("配置文件格式错误：", newCloudConfig)
 		os.Exit(-1)
 	}
-	cutil.CreateDir(CloudConfig.BagDataDir)
-	cutil.CreateDir(CloudConfig.BagCopyDir)
+	util.CreateDir(CloudConfig.BagDataDir)
+	util.CreateDir(CloudConfig.BagCopyDir)
 }
 
 // RefreshCloudConfig 轮询oss上的配置文件更新到本地

pji/common/cfg/kill_rpc_server_cfg.go → aarch64/pji/common/config/kill_rpc_server_config.go

@@ -1,4 +1,4 @@
-package cfg
+package config
 
 import (
 	"cicv-data-closedloop/common/config/c_log"

pji/common/cfg/local_cfg.go → aarch64/pji/common/config/local_config.go

@@ -1,4 +1,4 @@
-package cfg
+package config
 
 import (
 	"cicv-data-closedloop/common/config/c_log"

pji/common/cfg/oss_cfg.go → aarch64/pji/common/config/oss_config.go

@@ -1,8 +1,8 @@
-package cfg
+package config
 
 import (
 	"cicv-data-closedloop/common/config/c_log"
-	"cicv-data-closedloop/pji/common/cutil"
+	"cicv-data-closedloop/common/util"
 	"encoding/json"
 	"github.com/aliyun/aliyun-oss-go-sdk/oss"
 	"os"
@@ -21,7 +21,7 @@ var OssBucket *oss.Bucket
 func InitOssConfig() {
 	c_log.GlobalLogger.Info("初始化OSS客户端对象 - 开始。")
 	// 1 访问 HTTP 服务获取 OSS 配置
-	get, err := cutil.HttpGet(LocalConfig.UrlGetOssConfig)
+	get, err := util.HttpGet(LocalConfig.UrlGetOssConfig)
 	if err != nil {
 		c_log.GlobalLogger.Error("http获取oss配置时出错:", err)
 		os.Exit(-1)

pji/common/cfg/platform_cfg.go → aarch64/pji/common/config/platform_config.go

@@ -1,9 +1,9 @@
-package cfg
+package config
 
 import (
 	"cicv-data-closedloop/common/config/c_log"
+	"cicv-data-closedloop/common/util"
 	"cicv-data-closedloop/kinglong/common/log"
-	"cicv-data-closedloop/pji/common/cutil"
 	"encoding/json"
 	"strings"
 	"time"
@@ -83,7 +83,7 @@ func InitPlatformConfig() {
 */
 // GetAccessToken 认证接口，获取access_token
 func GetAccessToken() (string, error) {
-	respJson, err := cutil.HttpPostJsonResponseString(
+	respJson, err := util.HttpPostJsonResponseString(
 		CloudConfig.Platform.UrlDeviceAuth,
 		map[string]string{
 			"equipmentNo": LocalConfig.EquipmentNo,
@@ -93,7 +93,7 @@ func GetAccessToken() (string, error) {
 	if err != nil {
 		return "", nil
 	}
-	respMap, err := cutil.JsonStringToMap(respJson)
+	respMap, err := util.JsonStringToMap(respJson)
 	if err != nil {
 		c_log.GlobalLogger.Error("解析返回结果", respJson, "失败：", err)
 		return "", nil
@@ -125,7 +125,7 @@ func GetStatus(taskConfigId string) (string, error) {
 	if err != nil {
 		return "", err
 	}
-	resp, err := cutil.HttpGetStringAddHeadersResponseString(
+	resp, err := util.HttpGetStringAddHeadersResponseString(
 		CloudConfig.Platform.UrlTaskPoll,
 		map[string]string{
 			"authorization": token,
@@ -140,7 +140,7 @@ func GetStatus(taskConfigId string) (string, error) {
 		c_log.GlobalLogger.Error("访问接口", CloudConfig.Platform.UrlTask, "失败：", err)
 		return "", err
 	}
-	respMap, err := cutil.JsonStringToMap(resp)
+	respMap, err := util.JsonStringToMap(resp)
 	if err != nil {
 		c_log.GlobalLogger.Error("解析【返回结果1】", resp, "失败：", err)
 		return "", err
@@ -160,7 +160,7 @@ func getConfig() (platformConfig, error) {
 	}
 	// 下载插件和获取配置
 	// 2 访问配置获取接口
-	resp, err := cutil.HttpGetStringAddHeadersResponseString(
+	resp, err := util.HttpGetStringAddHeadersResponseString(
 		CloudConfig.Platform.UrlTask,
 		map[string]string{
 			"authorization": token,

pji/common/cfg/ros_cfg.go → aarch64/pji/common/config/ros_config.go

@@ -1,4 +1,4 @@
-package cfg
+package config
 
 import (
 	"cicv-data-closedloop/common/config/c_log"

pji/common/init/common_init.go → aarch64/pji/common/init/common_init.go

@@ -1,33 +1,33 @@
 package init
 
 import (
-	"cicv-data-closedloop/pji/common/cfg"
-	"cicv-data-closedloop/pji/common/svc"
+	"cicv-data-closedloop/aarch64/pji/common/config"
+	"cicv-data-closedloop/aarch64/pji/common/service"
 )
 
 func Init() {
 
 	// 初始化本地配置文件（第1处配置，在本地文件）
-	cfg.InitLocalConfig()
+	config.InitLocalConfig()
 
 	// 初始化Oss连接信息
-	cfg.InitOssConfig()
+	config.InitOssConfig()
 
 	// 初始化业务逻辑配置信息，配置文件在oss上（第2处配置，在oss文件）
-	cfg.InitCloudConfig()
+	config.InitCloudConfig()
 
-	go cfg.RefreshCloudConfig()
+	go config.RefreshCloudConfig()
 
 	// 初始化数据闭环平台的配置（第3处配置，在数据闭环平台接口）
-	cfg.InitPlatformConfig()
+	config.InitPlatformConfig()
 
 	// 初始化ros节点
-	cfg.InitRosConfig()
+	config.InitRosConfig()
 
 	// 维护data目录缓存的包数量
-	go svc.BagCacheClean()
+	go service.BagCacheClean()
 
 	// 磁盘占用过高时根据缓存策略处理copy目录
-	go svc.DiskClean()
+	go service.DiskClean()
 
 }

pji/common/svc/disk_clean.go → aarch64/pji/common/service/disk_clean.go

@@ -1,13 +1,13 @@
-package svc
+package service
 
 import (
+	commonConfig "cicv-data-closedloop/aarch64/pji/common/config"
+	masterConfig "cicv-data-closedloop/aarch64/pji/master/package/config"
 	"cicv-data-closedloop/common/config/c_log"
 	"cicv-data-closedloop/common/domain"
 	"cicv-data-closedloop/common/entity"
 	"cicv-data-closedloop/common/util"
 	"cicv-data-closedloop/kinglong/common/cfg"
-	commonConfig "cicv-data-closedloop/pji/common/cfg"
-	masterConfig "cicv-data-closedloop/pji/master/package/cfg"
 	"time"
 )
 

pji/common/svc/kill_self.go → aarch64/pji/common/service/kill_self.go

@@ -1,9 +1,9 @@
-package svc
+package service
 
 import (
+	commonConfig "cicv-data-closedloop/aarch64/pji/common/config"
 	"cicv-data-closedloop/common/config/c_log"
 	"cicv-data-closedloop/common/util"
-	commonConfig "cicv-data-closedloop/pji/common/cfg"
 	"net/rpc"
 	"os"
 	"sync"

pji/common/svc/rosbag_clean.go → aarch64/pji/common/service/rosbag_clean.go

@@ -1,15 +1,15 @@
-package svc
+package service
 
 import (
+	"cicv-data-closedloop/aarch64/pji/common/config"
 	"cicv-data-closedloop/common/config/c_log"
 	"cicv-data-closedloop/common/util"
-	"cicv-data-closedloop/pji/common/cfg"
 	"time"
 )
 
 // BagCacheClean 保证本地缓存的包数量不超过设定值
 func BagCacheClean() {
-	c_log.GlobalLogger.Info("启动清理缓存的 goroutine 维护目录【", cfg.CloudConfig.BagDataDir, "】的 bag 包数量：", cfg.CloudConfig.BagNumber)
+	c_log.GlobalLogger.Info("启动清理缓存的 goroutine 维护目录【", config.CloudConfig.BagDataDir, "】的 bag 包数量：", config.CloudConfig.BagNumber)
 	for {
 		// 收到自杀信号
 		select {
@@ -24,10 +24,10 @@ func BagCacheClean() {
 		// 1 ------- 每10秒清理一次 -------
 		time.Sleep(time.Duration(10) * time.Second)
 		// 2 ------- 获取目录下所有bag包 -------
-		bags, _ := util.ListAbsolutePathWithSuffixAndSort(cfg.CloudConfig.BagDataDir, ".bag")
+		bags, _ := util.ListAbsolutePathWithSuffixAndSort(config.CloudConfig.BagDataDir, ".bag")
 		// 3 如果打包数量超过n个，删除最旧的包{
-		if len(bags) > cfg.CloudConfig.BagNumber {
-			diff := len(bags) - cfg.CloudConfig.BagNumber
+		if len(bags) > config.CloudConfig.BagNumber {
+			diff := len(bags) - config.CloudConfig.BagNumber
 			for i := 0; i < diff; i++ {
 				_ = util.DeleteFile(bags[i])
 			}

pji/common/svc/rosbag_record.go → aarch64/pji/common/service/rosbag_record.go

@@ -1,10 +1,9 @@
-package svc
+package service
 
 import (
+	"cicv-data-closedloop/aarch64/pji/common/config"
 	"cicv-data-closedloop/common/config/c_log"
 	"cicv-data-closedloop/common/util"
-	"cicv-data-closedloop/pji/common/cfg"
-	"cicv-data-closedloop/pji/common/cutil"
 	"github.com/bluenviron/goroslib/v2"
 	"os"
 	"os/exec"
@@ -20,7 +19,7 @@ func BagRecord(nodeName string) {
 		canRecord := false
 		for !canRecord {
 			time.Sleep(time.Duration(2) * time.Second)
-			canRecord = isCanRecord(cfg.RosNode)
+			canRecord = isCanRecord(config.RosNode)
 		}
 		c_log.GlobalLogger.Info("rosnode 启动完成，正在启动 rosbag record 命令。")
 
@@ -28,7 +27,7 @@ func BagRecord(nodeName string) {
 		command = append(command, "record")
 		command = append(command, "--split")
 		command = append(command, "--duration=1")
-		for _, host := range cfg.CloudConfig.Hosts {
+		for _, host := range config.CloudConfig.Hosts {
 			if host.Name == nodeName {
 				for _, topic := range host.Topics {
 					command = append(command, topic)
@@ -39,18 +38,18 @@ func BagRecord(nodeName string) {
 		// 2 ------- 调用 rosbag 打包命令，该命令自动阻塞 -------
 		// 不在此处压缩，因为 rosbag filter 时会报错。在上传到oss之前压缩即可。
 		// 包名格式：2023-11-15-17-35-20_0.bag
-		_ = cutil.CreateParentDir(cfg.CloudConfig.BagDataDir)
+		_ = util.CreateParentDir(config.CloudConfig.BagDataDir)
 		var recordProcessPid int
 		var recordSubProcessPid int
 		var cmd *exec.Cmd
 	parent:
 		for {
-			cmd, err = util.ExecuteWithDirAsync(cfg.CloudConfig.BagDataDir, "/opt/ros/melodic/bin/rosbag", command...)
+			cmd, err = util.ExecuteWithDirAsync(config.CloudConfig.BagDataDir, "/opt/ros/melodic/bin/rosbag", command...)
 			if err != nil {
 				c_log.GlobalLogger.Error("执行record命令", command, "出错：", err)
 				continue
 			}
-			//cmd, output, err := util.ExecuteWithDirSync(cfg.CloudConfig.BagDataDir, "/opt/ros/melodic/bin/rosbag", command...)
+			//cmd, output, err := util.ExecuteWithDirSync(config.CloudConfig.BagDataDir, "/opt/ros/melodic/bin/rosbag", command...)
 			//if err != nil {
 			//	c_log.GlobalLogger.Error("执行record命令", command, "出错：【output】=", output, "【err】=", err)
 			//	continue
@@ -122,7 +121,7 @@ func isCanRecord(n *goroslib.Node) bool {
 	// 创建一个示例的map
 	myMap := nodes
 	// 创建一个切片，包含要检查的元素
-	mySlice := cfg.CloudConfig.Ros.Nodes
+	mySlice := config.CloudConfig.Ros.Nodes
 
 	// 判断map的键是否包含切片中的所有元素
 	for _, element := range mySlice {

pji/common/svc/rosbag_upload.go → aarch64/pji/common/service/rosbag_upload.go

@@ -1,12 +1,12 @@
-package svc
+package service
 
 import (
+	commonConfig "cicv-data-closedloop/aarch64/pji/common/config"
+	masterConfig "cicv-data-closedloop/aarch64/pji/master/package/config"
 	"cicv-data-closedloop/common/config/c_log"
 	"cicv-data-closedloop/common/domain"
 	"cicv-data-closedloop/common/entity"
 	"cicv-data-closedloop/common/util"
-	commonConfig "cicv-data-closedloop/pji/common/cfg"
-	masterConfig "cicv-data-closedloop/pji/master/package/cfg"
 	"fmt"
 	"os"
 	"strings"

pji/control/main/control.go → aarch64/pji/control/main/control.go

@@ -1,11 +1,11 @@
 package main
 
 import (
+	commonConfig "cicv-data-closedloop/aarch64/pji/common/config"
+	commonService "cicv-data-closedloop/aarch64/pji/common/service"
+	controlConfig "cicv-data-closedloop/aarch64/pji/control/package/config"
 	"cicv-data-closedloop/common/config/c_log"
 	"cicv-data-closedloop/common/util"
-	commonConfig "cicv-data-closedloop/pji/common/cfg"
-	commonService "cicv-data-closedloop/pji/common/svc"
-	controlConfig "cicv-data-closedloop/pji/control/package/cfg"
 	"net/rpc"
 	"os"
 	"runtime"

pji/control/package/cfg/nacos_config.go → aarch64/pji/control/package/config/nacos_config.go

@@ -1,4 +1,4 @@
-package cfg
+package config
 
 import (
 	"cicv-data-closedloop/common/config/c_log"

pji/master/main/master.go → aarch64/pji/master/main/master.go

@@ -1,12 +1,12 @@
 package main
 
 import (
+	commonConfig "cicv-data-closedloop/aarch64/pji/common/config"
+	commonInit "cicv-data-closedloop/aarch64/pji/common/init"
+	commonService "cicv-data-closedloop/aarch64/pji/common/service"
+	masterConfig "cicv-data-closedloop/aarch64/pji/master/package/config"
+	masterService "cicv-data-closedloop/aarch64/pji/master/package/service"
 	"cicv-data-closedloop/common/config/c_log"
-	commonConfig "cicv-data-closedloop/pji/common/cfg"
-	commonInit "cicv-data-closedloop/pji/common/init"
-	commonService "cicv-data-closedloop/pji/common/svc"
-	masterConfig "cicv-data-closedloop/pji/master/package/cfg"
-	masterService "cicv-data-closedloop/pji/master/package/svc"
 	"runtime"
 	"time"
 )

pji/master/package/cfg/master_trigger_cfg.go → aarch64/pji/master/package/config/master_trigger_cfg.go

@@ -1,9 +1,9 @@
-package cfg
+package config
 
 import (
+	"cicv-data-closedloop/aarch64/pji/common/config"
 	"cicv-data-closedloop/common/config/c_log"
 	"cicv-data-closedloop/common/util"
-	"cicv-data-closedloop/pji/common/cfg"
 	"github.com/bluenviron/goroslib/v2/pkg/msgs/std_msgs"
 	"plugin"
 	"strconv"
@@ -18,15 +18,15 @@ var (
 
 func InitTriggerConfig() {
 	// 下载所有触发器的文件
-	for _, trigger := range cfg.PlatformConfig.TaskTriggers {
+	for _, trigger := range config.PlatformConfig.TaskTriggers {
 		// 获取文件名
 		slice := strings.Split(trigger.TriggerScriptPath, "/")
 		fileName := slice[len(slice)-1]
 		// 下载
-		triggerLocalPath := cfg.CloudConfig.TriggersDir + fileName
+		triggerLocalPath := config.CloudConfig.TriggersDir + fileName
 		_ = util.CreateParentDir(triggerLocalPath)
 		c_log.GlobalLogger.Info("下载触发器插件从", trigger.TriggerScriptPath, "到", triggerLocalPath)
-		err := cfg.OssBucket.GetObjectToFile(trigger.TriggerScriptPath, triggerLocalPath)
+		err := config.OssBucket.GetObjectToFile(trigger.TriggerScriptPath, triggerLocalPath)
 		if err != nil {
 			c_log.GlobalLogger.Error("下载oss上的触发器插件失败：", err)
 			continue
@@ -102,15 +102,15 @@ func InitTriggerConfig() {
 //
 //func InitTriggerConfig() {
 //	// 下载所有触发器的文件
-//	for _, trigger := range cfg.PlatformConfig.TaskTriggers {
+//	for _, trigger := range config.PlatformConfig.TaskTriggers {
 //		// 获取文件名
 //		slice := strings.Split(trigger.TriggerScriptPath, "/")
 //		fileName := slice[len(slice)-1]
 //		// 下载
-//		triggerLocalPath := cfg.CloudConfig.TriggersDir + fileName
+//		triggerLocalPath := config.CloudConfig.TriggersDir + fileName
 //		cutil.CreateParentDir(triggerLocalPath)
 //		c_log.GlobalLogger.Info("下载触发器插件从", trigger.TriggerScriptPath, "到", triggerLocalPath)
-//		err := cfg.OssBucket.GetObjectToFile(trigger.TriggerScriptPath, triggerLocalPath)
+//		err := config.OssBucket.GetObjectToFile(trigger.TriggerScriptPath, triggerLocalPath)
 //		if err != nil {
 //			c_log.GlobalLogger.Error("下载oss上的触发器插件失败：", err)
 //			continue

pji/master/package/cfg/nacos_config.go → aarch64/pji/master/package/config/nacos_config.go

@@ -1,4 +1,4 @@
-package cfg
+package config
 
 import (
 	"cicv-data-closedloop/common/config/c_log"

pji/master/package/svc/move_bag_and_send_window.go → aarch64/pji/master/package/service/move_bag_and_send_window.go

@@ -1,12 +1,12 @@
-package svc
+package service
 
 import (
+	commonConfig "cicv-data-closedloop/aarch64/pji/common/config"
+	commonService "cicv-data-closedloop/aarch64/pji/common/service"
 	"cicv-data-closedloop/common/config/c_log"
 	"cicv-data-closedloop/common/domain"
 	"cicv-data-closedloop/common/entity"
 	"cicv-data-closedloop/common/util"
-	commonConfig "cicv-data-closedloop/pji/common/cfg"
-	commonService "cicv-data-closedloop/pji/common/svc"
 	"time"
 )
 

pji/master/package/svc/produce_window.go → aarch64/pji/master/package/service/produce_window.go

@@ -1,12 +1,12 @@
-package svc
+package service
 
 import (
+	commonConfig "cicv-data-closedloop/aarch64/pji/common/config"
+	commonService "cicv-data-closedloop/aarch64/pji/common/service"
+	masterConfig "cicv-data-closedloop/aarch64/pji/master/package/config"
 	"cicv-data-closedloop/common/config/c_log"
 	"cicv-data-closedloop/common/entity"
 	commonUtil "cicv-data-closedloop/common/util"
-	commonConfig "cicv-data-closedloop/pji/common/cfg"
-	commonService "cicv-data-closedloop/pji/common/svc"
-	masterConfig "cicv-data-closedloop/pji/master/package/cfg"
 	"github.com/bluenviron/goroslib/v2"
 	"github.com/bluenviron/goroslib/v2/pkg/msgs/std_msgs"
 	"sync"

pji/common/cutil/u_http.go

@@ -1,101 +0,0 @@
-package cutil
-
-import (
-	"bytes"
-	"encoding/json"
-	"io"
-	"net/http"
-	"net/url"
-)
-
-func HttpGet(url string) (string, error) {
-	// 创建一个HTTP客户端
-	client := &http.Client{}
-
-	// 创建一个GET请求
-	req, err := http.NewRequest("GET", url, nil)
-	if err != nil {
-		return "", err
-	}
-
-	// 发送请求并获取响应
-	resp, err := client.Do(req)
-	if err != nil {
-		return "", err
-	}
-	defer func(Body io.ReadCloser) {
-		err := Body.Close()
-		if err != nil {
-
-		}
-	}(resp.Body)
-
-	// 读取响应的内容
-	body, err := io.ReadAll(resp.Body)
-	if err != nil {
-		return "", err
-	}
-	return string(body), nil
-}
-func HttpPostJsonResponseString(url string, params map[string]string) (string, error) {
-	jsonData, err := json.Marshal(params)
-	if err != nil {
-		return "", err
-	}
-	resp, err := http.Post(url, "application/json", bytes.NewBuffer(jsonData))
-	if err != nil {
-		return "", err
-	}
-	defer func(Body io.ReadCloser) {
-		err := Body.Close()
-		if err != nil {
-		}
-	}(resp.Body)
-	body, err := io.ReadAll(resp.Body)
-	if err != nil {
-		return "", err
-	}
-	return string(body), nil
-}
-
-func HttpGetStringAddHeadersResponseString(baseUrl string, headers map[string]string, params map[string]string) (string, error) {
-
-	// 将参数编码到URL中
-	u, _ := url.Parse(baseUrl)
-	q := u.Query()
-	for key, value := range params {
-		q.Add(key, value)
-	}
-	u.RawQuery = q.Encode()
-
-	// 创建请求
-	req, err := http.NewRequest("GET", u.String(), nil)
-	if err != nil {
-		return "", err
-	}
-
-	// 设置请求头
-	for key, value := range headers {
-		req.Header.Set(key, value)
-	}
-
-	// 发送请求
-	client := &http.Client{}
-	resp, err := client.Do(req)
-	if err != nil {
-		return "", err
-	}
-
-	// 读取响应体
-	body, err := io.ReadAll(resp.Body)
-	if err != nil {
-		return "", err
-	}
-	err = resp.Body.Close()
-	if err != nil {
-		return "", err
-	}
-	result := string(body)
-	//log.GlobalLogger.Info("发送http请求，请求路径=", baseUrl, "，请求头=", headers, "请求参数=", params, "请求结果=", result)
-	return result, nil
-}

pji/common/cutil/u_io.go

@@ -1,34 +0,0 @@
-package cutil
-
-import (
-	"os"
-	"path/filepath"
-)
-
-func CreateParentDir(filePath string) error {
-
-	// 获取文件的父目录路径
-	directory := filepath.Dir(filePath)
-
-	// 检查目录是否存在
-	if _, err := os.Stat(directory); os.IsNotExist(err) {
-		// 如果目录不存在，创建父目录
-		err := os.MkdirAll(directory, os.ModePerm)
-		if err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func CreateDir(directory string) error {
-	// 检查目录是否存在
-	if _, err := os.Stat(directory); os.IsNotExist(err) {
-		// 如果目录不存在，创建父目录
-		err := os.MkdirAll(directory, os.ModePerm)
-		if err != nil {
-			return err
-		}
-	}
-	return nil
-}

pji/common/cutil/u_json.go

@@ -1,13 +0,0 @@
-package cutil
-
-import "encoding/json"
-
-func JsonStringToMap(source string) (map[string]interface{}, error) {
-	var dataMap map[string]interface{}
-	err := json.Unmarshal([]byte(source), &dataMap)
-	if err != nil {
-		return nil, err
-	} else {
-		return dataMap, nil
-	}
-}

pji/common/cutil/u_time.go

@@ -1,9 +0,0 @@
-package cutil
-
-import "time"
-
-func GetNowTimeCustom() string {
-	currentTime := time.Now()
-	formattedTime := currentTime.Format("2006-01-02-15-04-05")
-	return formattedTime
-}