1
This commit is contained in:
parent
a62549e503
commit
6b90728831
15
cmd/app.go
15
cmd/app.go
@ -20,6 +20,7 @@ package main
|
|||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"fonchain-fiee/cmd/config"
|
"fonchain-fiee/cmd/config"
|
||||||
|
"fonchain-fiee/pkg/cache"
|
||||||
"fonchain-fiee/pkg/common"
|
"fonchain-fiee/pkg/common"
|
||||||
cronpkg "fonchain-fiee/pkg/cron"
|
cronpkg "fonchain-fiee/pkg/cron"
|
||||||
"fonchain-fiee/pkg/logger"
|
"fonchain-fiee/pkg/logger"
|
||||||
@ -49,14 +50,14 @@ func bootstrap() (err error) {
|
|||||||
|
|
||||||
logger.LogInit(config.AppConfig)
|
logger.LogInit(config.AppConfig)
|
||||||
////redis
|
////redis
|
||||||
//redisConfig := cache.RedisConfig{
|
redisConfig := cache.RedisConfig{
|
||||||
// RedisDB: configEnv.Redis.RedisDB,
|
RedisDB: configEnv.Redis.RedisDB,
|
||||||
// RedisAddr: configEnv.Redis.RedisAddr,
|
RedisAddr: configEnv.Redis.RedisAddr,
|
||||||
// RedisPw: configEnv.Redis.RedisPW,
|
RedisPw: configEnv.Redis.RedisPW,
|
||||||
// RedisDbName: configEnv.Redis.RedisDBNAme,
|
RedisDbName: configEnv.Redis.RedisDBNAme,
|
||||||
//}
|
}
|
||||||
|
|
||||||
//cache.LoadRedis(redisConfig)
|
cache.LoadRedis(redisConfig)
|
||||||
common.Init()
|
common.Init()
|
||||||
if configEnv.System.CronOpen {
|
if configEnv.System.CronOpen {
|
||||||
fmt.Println("启动定时任务管理器...")
|
fmt.Println("启动定时任务管理器...")
|
||||||
|
|||||||
@ -47,7 +47,7 @@ func NewChatHandler() ChatHandler {
|
|||||||
c := ChatHandler{
|
c := ChatHandler{
|
||||||
cache: chatCache.ChatCache{NewMessageStatExpireAfter: 10 * time.Minute},
|
cache: chatCache.ChatCache{NewMessageStatExpireAfter: 10 * time.Minute},
|
||||||
}
|
}
|
||||||
//c.robot = robot.NewRobot(&c.cache)
|
c.robot = robot.NewRobot(&c.cache)
|
||||||
return c
|
return c
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -39,18 +39,18 @@ var CronProvider = new(cron.CronClientImpl)
|
|||||||
var SupplierProvider = new(supplier.SupplierClientImpl)
|
var SupplierProvider = new(supplier.SupplierClientImpl)
|
||||||
|
|
||||||
func init() {
|
func init() {
|
||||||
//config.SetConsumerService(BundleProvider)
|
config.SetConsumerService(BundleProvider)
|
||||||
//config.SetConsumerService(OrderProvider)
|
config.SetConsumerService(OrderProvider)
|
||||||
config.SetConsumerService(AccountProvider)
|
config.SetConsumerService(AccountProvider)
|
||||||
//config.SetConsumerService(PaymentProvider)
|
config.SetConsumerService(PaymentProvider)
|
||||||
//config.SetConsumerService(AccountFieeProvider)
|
config.SetConsumerService(AccountFieeProvider)
|
||||||
//config.SetConsumerService(CastProvider)
|
config.SetConsumerService(CastProvider)
|
||||||
//config.SetConsumerService(FilesProvider)
|
config.SetConsumerService(FilesProvider)
|
||||||
//config.SetConsumerService(GovernanceProvider)
|
config.SetConsumerService(GovernanceProvider)
|
||||||
//config.SetConsumerService(PressReleasesProvider)
|
config.SetConsumerService(PressReleasesProvider)
|
||||||
//config.SetConsumerService(SecFilingProvider)
|
config.SetConsumerService(SecFilingProvider)
|
||||||
//config.SetConsumerService(AyrshareProvider)
|
config.SetConsumerService(AyrshareProvider)
|
||||||
//config.SetConsumerService(CronProvider)
|
config.SetConsumerService(CronProvider)
|
||||||
config.SetConsumerService(SupplierProvider)
|
config.SetConsumerService(SupplierProvider)
|
||||||
|
|
||||||
if err := config.Load(); err != nil {
|
if err := config.Load(); err != nil {
|
||||||
|
|||||||
@ -15,6 +15,7 @@ import (
|
|||||||
"io"
|
"io"
|
||||||
|
|
||||||
cmdConf "fonchain-fiee/cmd/config"
|
cmdConf "fonchain-fiee/cmd/config"
|
||||||
|
|
||||||
"github.com/disintegration/imaging"
|
"github.com/disintegration/imaging"
|
||||||
"github.com/fonchain_enterprise/utils/objstorage"
|
"github.com/fonchain_enterprise/utils/objstorage"
|
||||||
"github.com/gin-gonic/gin"
|
"github.com/gin-gonic/gin"
|
||||||
@ -269,8 +270,7 @@ func BaiduCheckImage(imageByte []byte) (err error) {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
func PutBos(filePath string, mediaType string, needRemove bool) (url string, err error) {
|
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(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 {
|
if err != nil {
|
||||||
fmt.Println("=== PutBos NewOss err ", err)
|
fmt.Println("=== PutBos NewOss err ", err)
|
||||||
//logger.Errorf("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)
|
filePath = strings.Replace(filePath, model.MediaPath, "", 1)
|
||||||
var objectName string = fmt.Sprintf("%s/%s%s", config.ConfigData.Oss.BaseDir, cmdConf.AppConfig.System.AppMode, filePath)
|
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(os.Getenv(config.ConfigData.Oss.BucketName), objectName, fileBytes)
|
||||||
_, err = BOSClient.PutObjectFromBytes(config.ConfigData.Oss.BucketName, objectName, fileBytes)
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
fmt.Println("=== PutBos PutObject err ", err)
|
fmt.Println("=== PutBos PutObject err ", err)
|
||||||
//logger.Errorf("PutBos PutObject err %+v", err.Error())
|
//logger.Errorf("PutBos PutObject err %+v", err.Error())
|
||||||
@ -304,8 +303,7 @@ func PutBos(filePath string, mediaType string, needRemove bool) (url string, err
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
//url = fmt.Sprintf("%s%s%s/%s", config.BosHttp, config.BosBucketName, config.BosUrl, objectName)
|
//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", os.Getenv(config.ConfigData.Oss.CdnHost), objectName)
|
||||||
url = fmt.Sprintf("%s/%s", config.ConfigData.Oss.CdnHost, objectName)
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
func GetSnapshot(videoPath, snapshotPath string, frameNum int) (snapshotName string, err error) {
|
func GetSnapshot(videoPath, snapshotPath string, frameNum int) (snapshotName string, err error) {
|
||||||
@ -354,8 +352,8 @@ func getEnvDir(cloudStoreSubPath string) (ep string) {
|
|||||||
return ep
|
return ep
|
||||||
}
|
}
|
||||||
func PutBosWithName(filePath string, needRemove bool, ossPath string) (url string, err error) {
|
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(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(config.ConfigData.Oss.AccessKeyId, config.ConfigData.Oss.AccessKeySecret, config.ConfigData.Oss.Endpoint)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
//logger.Errorf("PutBosWithName err1 ", err)
|
//logger.Errorf("PutBosWithName err1 ", err)
|
||||||
err = errors.New(e.GetMsg(e.ErrorUploadBos))
|
err = errors.New(e.GetMsg(e.ErrorUploadBos))
|
||||||
@ -365,8 +363,8 @@ func PutBosWithName(filePath string, needRemove bool, ossPath string) (url strin
|
|||||||
ossPath = filePath[1:]
|
ossPath = filePath[1:]
|
||||||
}
|
}
|
||||||
var objectName string = fmt.Sprintf("%s/%s%s", config.ConfigData.Oss.BaseDir, cmdConf.AppConfig.System.AppMode, ossPath)
|
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(os.Getenv(config.ConfigData.Oss.BucketName), objectName, filePath)
|
||||||
_, err = BOSClient.PutObject(config.ConfigData.Oss.BucketName, objectName, filePath)
|
//_, err = BOSClient.PutObject(config.ConfigData.Oss.BucketName, objectName, filePath)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
//logger.Errorf("PutBosWithName err2 ", err)
|
//logger.Errorf("PutBosWithName err2 ", err)
|
||||||
err = errors.New(e.GetMsg(e.ErrorUploadBos))
|
err = errors.New(e.GetMsg(e.ErrorUploadBos))
|
||||||
@ -376,7 +374,7 @@ func PutBosWithName(filePath string, needRemove bool, ossPath string) (url strin
|
|||||||
if needRemove {
|
if needRemove {
|
||||||
_ = os.Remove(filePath)
|
_ = os.Remove(filePath)
|
||||||
}
|
}
|
||||||
//url = fmt.Sprintf("%s/%s", os.Getenv(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)
|
//url = fmt.Sprintf("%s/%s", config.ConfigData.Oss.CdnHost, objectName)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user