Merge pull request #3 from SugarMGP/main

fix: 修复命名空间冲突
zjutjh · Dec 17, 2024 · 60c74f1 · 60c74f1
2 parents b2e9fb3 + 8c30f0c
commit 60c74f1
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 140 deletions.
diff --git a/aes/aes.go → aesHelper/aes.go b/aes/aes.go → aesHelper/aes.go
@@ -1,4 +1,4 @@
-package aes
+package aesHelper
 
 import (
 	"bytes"

diff --git a/fetch.go b/fetch.go
diff --git a/minio/minio.go → minioHelper/minio.go b/minio/minio.go → minioHelper/minio.go
@@ -1,4 +1,4 @@
-package minio
+package minioHelper
 
 import (
 	"fmt"

diff --git a/minio/service.go → minioHelper/service.go b/minio/service.go → minioHelper/service.go
@@ -1,4 +1,4 @@
-package minio
+package minioHelper
 
 import (
 	"context"

diff --git a/redis/redis.go → redisHelper/redis.go b/redis/redis.go → redisHelper/redis.go
@@ -1,7 +1,7 @@
-package redis
+package redisHelper
 
 import (
-	Redis "github.com/go-redis/redis/v8"
+	"github.com/go-redis/redis/v8"
 )
 
 // InfoConfig Redis 配置
@@ -13,8 +13,8 @@ type InfoConfig struct {
 }
 
 // Init 初始化 Redis 客户端
-func Init(info *InfoConfig) *Redis.Client {
-	client := Redis.NewClient(&Redis.Options{
+func Init(info *InfoConfig) *redis.Client {
+	client := redis.NewClient(&redis.Options{
 		Addr:     info.Host + ":" + info.Port,
 		Password: info.Password,
 		DB:       info.DB,

diff --git a/session/session.go → sessionHelper/session.go b/session/session.go → sessionHelper/session.go
@@ -1,4 +1,4 @@
-package session
+package sessionHelper
 
 import (
 	"fmt"
@@ -7,14 +7,14 @@ import (
 	"github.com/gin-contrib/sessions"
 	sessionRedis "github.com/gin-contrib/sessions/redis"
 	"github.com/gin-gonic/gin"
-	"github.com/zjutjh/WeJH-SDK/redis"
+	"github.com/zjutjh/WeJH-SDK/redisHelper"
 )
 
 // InfoConfig 会话配置
 type InfoConfig struct {
 	Name        string
 	SecretKey   string
-	RedisConfig *redis.InfoConfig
+	RedisConfig *redisHelper.InfoConfig
 }
 
 // Init 使用 Redis 初始化会话管理

diff --git a/wechat/wechat.go → wechatHelper/wechat.go b/wechat/wechat.go → wechatHelper/wechat.go
@@ -1,4 +1,4 @@
-package wechat
+package wechatHelper
 
 import (
 	"context"
@@ -7,14 +7,14 @@ import (
 	"github.com/silenceper/wechat/v2/cache"
 	"github.com/silenceper/wechat/v2/miniprogram"
 	miniConfig "github.com/silenceper/wechat/v2/miniprogram/config"
-	"github.com/zjutjh/WeJH-SDK/redis"
+	"github.com/zjutjh/WeJH-SDK/redisHelper"
 )
 
 // InfoConfig 微信小程序配置
 type InfoConfig struct {
 	AppId       string
 	AppSecret   string
-	RedisConfig *redis.InfoConfig
+	RedisConfig *redisHelper.InfoConfig
 }
 
 // Init 使用 Redis 初始化微信小程序

diff --git a/zap/zap.go → zapHelper/zap.go b/zap/zap.go → zapHelper/zap.go
@@ -44,14 +44,28 @@ const (
 	WriterAll = "all"
 )
 
+// GetDefaultConfig 返回默认的日志配置
+func GetDefaultConfig() *InfoConfig {
+	return &InfoConfig{
+		ConsoleLevel:      "info",
+		DisableStacktrace: false,
+		LogCompress:       false,
+		LogMaxAge:         7,
+		LogMaxSize:        10,
+		LoggerDir:         "./logs",
+		Name:              "default",
+		StacktraceLevel:   "error",
+		Writer:            WriterAll,
+	}
+}
+
 // Init 初始化 Zap 日志记录器
-// 初始化后使用 zap.L() 或 zap.S() 使用全局日志记录器
-func Init(cfg *InfoConfig) error {
+func Init(cfg *InfoConfig) (*zap.Logger, error) {
 	cfg.LoggerDir = strings.TrimRight(cfg.LoggerDir, "/ ") // 去除尾部斜杠和空格
 
 	// 创建日志目录
 	if err := os.MkdirAll(cfg.LoggerDir, 0750); err != nil {
-		return err
+		return nil, err
 	}
 	encoder := createEncoder()
 
@@ -69,11 +83,8 @@ func Init(cfg *InfoConfig) error {
 		})))
 	}
 
-	logger := zap.New(combinedCore, options...) // 创建新的 zap 日志记录器
-	zap.ReplaceGlobals(logger)                  // 替换全局日志记录器
-
-	zap.L().Info("Logger initialized")
-	return nil
+	logger := zap.New(combinedCore, options...) // 创建新的日志记录器
+	return logger, nil
 }
 
 // GetZapLevel 返回日志级别