feat: 代码优化、机器计划任务完善

server/pkg/config/aes.go

@@ -2,8 +2,8 @@ package config
 
 import (
 	"fmt"
-	"mayfly-go/pkg/utils"
 	"mayfly-go/pkg/utils/assert"
+	"mayfly-go/pkg/utils/cryptox"
 )
 
 type Aes struct {
@@ -12,12 +12,12 @@ type Aes struct {
 
 // 编码并base64
 func (a *Aes) EncryptBase64(data []byte) (string, error) {
-	return utils.AesEncryptBase64(data, []byte(a.Key))
+	return cryptox.AesEncryptBase64(data, []byte(a.Key))
 }
 
 // base64解码后再aes解码
 func (a *Aes) DecryptBase64(data string) ([]byte, error) {
-	return utils.AesDecryptBase64(data, []byte(a.Key))
+	return cryptox.AesDecryptBase64(data, []byte(a.Key))
 }
 
 func (j *Aes) Valid() {

server/pkg/config/config.go

@@ -3,8 +3,8 @@ package config
 import (
 	"flag"
 	"fmt"
-	"mayfly-go/pkg/utils"
 	"mayfly-go/pkg/utils/assert"
+	"mayfly-go/pkg/utils/ymlx"
 	"os"
 	"path/filepath"
 )
@@ -20,7 +20,7 @@ func Init() {
 	startConfigParam := &CmdConfigParam{ConfigFilePath: path}
 	// 读取配置文件信息
 	yc := &Config{}
-	if err := utils.LoadYml(startConfigParam.ConfigFilePath, yc); err != nil {
+	if err := ymlx.LoadYml(startConfigParam.ConfigFilePath, yc); err != nil {
 		panic(fmt.Sprintf("读取配置文件[%s]失败: %s", startConfigParam.ConfigFilePath, err.Error()))
 	}
 	// 校验配置文件内容信息