From 6b9072883133c1f893af28f2d29f44dba41af7e5 Mon Sep 17 00:00:00 2001 From: JNG <365252428@qq.com> Date: Wed, 14 Jan 2026 09:45:42 +0800 Subject: [PATCH] 1 --- cmd/app.go | 15 ++++++++------- pkg/service/asChat/handler.go | 2 +- pkg/service/init.go | 22 +++++++++++----------- pkg/service/upload/upload.go | 22 ++++++++++------------ 4 files changed, 30 insertions(+), 31 deletions(-) diff --git a/cmd/app.go b/cmd/app.go index ac88aa3..96456f0 100644 --- a/cmd/app.go +++ b/cmd/app.go @@ -20,6 +20,7 @@ package main import ( "fmt" "fonchain-fiee/cmd/config" + "fonchain-fiee/pkg/cache" "fonchain-fiee/pkg/common" cronpkg "fonchain-fiee/pkg/cron" "fonchain-fiee/pkg/logger" @@ -49,14 +50,14 @@ func bootstrap() (err error) { logger.LogInit(config.AppConfig) ////redis - //redisConfig := cache.RedisConfig{ - // RedisDB: configEnv.Redis.RedisDB, - // RedisAddr: configEnv.Redis.RedisAddr, - // RedisPw: configEnv.Redis.RedisPW, - // RedisDbName: configEnv.Redis.RedisDBNAme, - //} + redisConfig := cache.RedisConfig{ + RedisDB: configEnv.Redis.RedisDB, + RedisAddr: configEnv.Redis.RedisAddr, + RedisPw: configEnv.Redis.RedisPW, + RedisDbName: configEnv.Redis.RedisDBNAme, + } - //cache.LoadRedis(redisConfig) + cache.LoadRedis(redisConfig) common.Init() if configEnv.System.CronOpen { fmt.Println("启动定时任务管理器...") diff --git a/pkg/service/asChat/handler.go b/pkg/service/asChat/handler.go index 1bdf042..ee0ba9d 100644 --- a/pkg/service/asChat/handler.go +++ b/pkg/service/asChat/handler.go @@ -47,7 +47,7 @@ func NewChatHandler() ChatHandler { c := ChatHandler{ cache: chatCache.ChatCache{NewMessageStatExpireAfter: 10 * time.Minute}, } - //c.robot = robot.NewRobot(&c.cache) + c.robot = robot.NewRobot(&c.cache) return c } diff --git a/pkg/service/init.go b/pkg/service/init.go index da1b23b..0554bb2 100644 --- a/pkg/service/init.go +++ b/pkg/service/init.go @@ -39,18 +39,18 @@ var CronProvider = new(cron.CronClientImpl) var SupplierProvider = new(supplier.SupplierClientImpl) func init() { - //config.SetConsumerService(BundleProvider) - //config.SetConsumerService(OrderProvider) + config.SetConsumerService(BundleProvider) + config.SetConsumerService(OrderProvider) config.SetConsumerService(AccountProvider) - //config.SetConsumerService(PaymentProvider) - //config.SetConsumerService(AccountFieeProvider) - //config.SetConsumerService(CastProvider) - //config.SetConsumerService(FilesProvider) - //config.SetConsumerService(GovernanceProvider) - //config.SetConsumerService(PressReleasesProvider) - //config.SetConsumerService(SecFilingProvider) - //config.SetConsumerService(AyrshareProvider) - //config.SetConsumerService(CronProvider) + config.SetConsumerService(PaymentProvider) + config.SetConsumerService(AccountFieeProvider) + config.SetConsumerService(CastProvider) + config.SetConsumerService(FilesProvider) + config.SetConsumerService(GovernanceProvider) + config.SetConsumerService(PressReleasesProvider) + config.SetConsumerService(SecFilingProvider) + config.SetConsumerService(AyrshareProvider) + config.SetConsumerService(CronProvider) config.SetConsumerService(SupplierProvider) if err := config.Load(); err != nil { diff --git a/pkg/service/upload/upload.go b/pkg/service/upload/upload.go index 2117072..a9002fe 100644 --- a/pkg/service/upload/upload.go +++ b/pkg/service/upload/upload.go @@ -15,6 +15,7 @@ import ( "io" cmdConf "fonchain-fiee/cmd/config" + "github.com/disintegration/imaging" "github.com/fonchain_enterprise/utils/objstorage" "github.com/gin-gonic/gin" @@ -269,8 +270,7 @@ func BaiduCheckImage(imageByte []byte) (err error) { return nil } func PutBos(filePath string, mediaType string, needRemove bool) (url string, err error) { - //BOSClient, err := objstorage.NewOSS(os.Getenv(config.ConfigData.Oss.AccessKeyId), os.Getenv(config.ConfigData.Oss.AccessKeySecret), os.Getenv(config.ConfigData.Oss.Endpoint)) - BOSClient, err := objstorage.NewOSS(config.ConfigData.Oss.AccessKeyId, config.ConfigData.Oss.AccessKeySecret, config.ConfigData.Oss.Endpoint) + BOSClient, err := objstorage.NewOSS(os.Getenv(config.ConfigData.Oss.AccessKeyId), os.Getenv(config.ConfigData.Oss.AccessKeySecret), os.Getenv(config.ConfigData.Oss.Endpoint)) if err != nil { fmt.Println("=== PutBos NewOss err ", err) //logger.Errorf("PutBos NewOss err ", err) @@ -295,8 +295,7 @@ func PutBos(filePath string, mediaType string, needRemove bool) (url string, err } filePath = strings.Replace(filePath, model.MediaPath, "", 1) var objectName string = fmt.Sprintf("%s/%s%s", config.ConfigData.Oss.BaseDir, cmdConf.AppConfig.System.AppMode, filePath) - //_, err = BOSClient.PutObjectFromBytes(os.Getenv(config.ConfigData.Oss.BucketName), objectName, fileBytes) - _, err = BOSClient.PutObjectFromBytes(config.ConfigData.Oss.BucketName, objectName, fileBytes) + _, err = BOSClient.PutObjectFromBytes(os.Getenv(config.ConfigData.Oss.BucketName), objectName, fileBytes) if err != nil { fmt.Println("=== PutBos PutObject err ", err) //logger.Errorf("PutBos PutObject err %+v", err.Error()) @@ -304,8 +303,7 @@ func PutBos(filePath string, mediaType string, needRemove bool) (url string, err return } //url = fmt.Sprintf("%s%s%s/%s", config.BosHttp, config.BosBucketName, config.BosUrl, objectName) - //url = fmt.Sprintf("%s/%s", os.Getenv(config.ConfigData.Oss.CdnHost), objectName) - url = fmt.Sprintf("%s/%s", config.ConfigData.Oss.CdnHost, objectName) + url = fmt.Sprintf("%s/%s", os.Getenv(config.ConfigData.Oss.CdnHost), objectName) return } func GetSnapshot(videoPath, snapshotPath string, frameNum int) (snapshotName string, err error) { @@ -354,8 +352,8 @@ func getEnvDir(cloudStoreSubPath string) (ep string) { return ep } func PutBosWithName(filePath string, needRemove bool, ossPath string) (url string, err error) { - //BOSClient, err := objstorage.NewOSS(os.Getenv(config.ConfigData.Oss.AccessKeyId), os.Getenv(config.ConfigData.Oss.AccessKeySecret), os.Getenv(config.ConfigData.Oss.Endpoint)) - BOSClient, err := objstorage.NewOSS(config.ConfigData.Oss.AccessKeyId, config.ConfigData.Oss.AccessKeySecret, config.ConfigData.Oss.Endpoint) + BOSClient, err := objstorage.NewOSS(os.Getenv(config.ConfigData.Oss.AccessKeyId), os.Getenv(config.ConfigData.Oss.AccessKeySecret), os.Getenv(config.ConfigData.Oss.Endpoint)) + //BOSClient, err := objstorage.NewOSS(config.ConfigData.Oss.AccessKeyId, config.ConfigData.Oss.AccessKeySecret, config.ConfigData.Oss.Endpoint) if err != nil { //logger.Errorf("PutBosWithName err1 ", err) err = errors.New(e.GetMsg(e.ErrorUploadBos)) @@ -365,8 +363,8 @@ func PutBosWithName(filePath string, needRemove bool, ossPath string) (url strin ossPath = filePath[1:] } var objectName string = fmt.Sprintf("%s/%s%s", config.ConfigData.Oss.BaseDir, cmdConf.AppConfig.System.AppMode, ossPath) - //_, err = BOSClient.PutObject(os.Getenv(config.ConfigData.Oss.BucketName), objectName, filePath) - _, err = BOSClient.PutObject(config.ConfigData.Oss.BucketName, objectName, filePath) + _, err = BOSClient.PutObject(os.Getenv(config.ConfigData.Oss.BucketName), objectName, filePath) + //_, err = BOSClient.PutObject(config.ConfigData.Oss.BucketName, objectName, filePath) if err != nil { //logger.Errorf("PutBosWithName err2 ", err) err = errors.New(e.GetMsg(e.ErrorUploadBos)) @@ -376,7 +374,7 @@ func PutBosWithName(filePath string, needRemove bool, ossPath string) (url strin if needRemove { _ = os.Remove(filePath) } - //url = fmt.Sprintf("%s/%s", os.Getenv(config.ConfigData.Oss.CdnHost), objectName) - url = fmt.Sprintf("%s/%s", config.ConfigData.Oss.CdnHost, objectName) + url = fmt.Sprintf("%s/%s", os.Getenv(config.ConfigData.Oss.CdnHost), objectName) + //url = fmt.Sprintf("%s/%s", config.ConfigData.Oss.CdnHost, objectName) return }