fiee/fonchain-fiee
8
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: fiee:69bbc5a090b5373059335f14e4ab5c4410bfa81b
Branches Tags
fiee:main
fiee:gy
fiee:dev
fiee:feat-hjj-pkManage#A116
fiee:feat-cjy-taskBench
fiee:feature-tiktok-daiyb
fiee:jng
fiee:feat-sxy-import
fiee:sxy-sec
fiee:feat-zjy-fixbug-006
fiee:feat-zjy-issue-013
fiee:dev-lzh
fiee:feat-zjy-fixbug-003
fiee:sxy-fix
fiee:sxy
fiee:feat-zjy-issue-008
fiee:chat
fiee:main-out
fiee:feat-zjy-copy-employee
fiee:feat-zjy-fix-paymentcent-proto
fiee:feat-antom-pay-zjy
fiee:sc
fiee:1.1.0
fiee:1.0.9
fiee:1.0.8
fiee:1.0.7
fiee:1.0.6
fiee:1.0.5
fiee:1.0.4
fiee:1.0.3
fiee:10.2
fiee:1.01
..
compare: fiee:db0c06482865b78919f43617563e1a075b105ca8
Branches Tags
fiee:gy
fiee:main
fiee:dev
fiee:feat-hjj-pkManage#A116
fiee:feat-cjy-taskBench
fiee:feature-tiktok-daiyb
fiee:jng
fiee:feat-sxy-import
fiee:sxy-sec
fiee:feat-zjy-fixbug-006
fiee:feat-zjy-issue-013
fiee:dev-lzh
fiee:feat-zjy-fixbug-003
fiee:sxy-fix
fiee:sxy
fiee:feat-zjy-issue-008
fiee:chat
fiee:main-out
fiee:feat-zjy-copy-employee
fiee:feat-zjy-fix-paymentcent-proto
fiee:feat-antom-pay-zjy
fiee:sc
fiee:1.1.0
fiee:1.0.9
fiee:1.0.8
fiee:1.0.7
fiee:1.0.6
fiee:1.0.5
fiee:1.0.4
fiee:1.0.3
fiee:10.2
fiee:1.01

No commits in common. "69bbc5a090b5373059335f14e4ab5c4410bfa81b" and "db0c06482865b78919f43617563e1a075b105ca8" have entirely different histories.
69bbc5a090 ... db0c064828

5 changed files with 27 additions and 27 deletions
Show Stats Expand all files Collapse all files

10
docs/dev/conf.ini
View File

@ -15,12 +15,12 @@ BosBaseDir = "fiee"
BosHttp = "https://" BosHttp = "https://"
BosDomain = "cdns.fontree.cn" BosDomain = "cdns.fontree.cn"
[oss] [oss]
AccessKeyId = "OSS_AK" AccessKeyId = "${OSS_AK}"
AccessKeySecret = "OSS_SK" AccessKeySecret = "${OSS_SK}"
Endpoint = "OSS_ENDPOINTT" Endpoint = "${OSS_ENDPOINTT}"
BucketName = "OSS_BUCKETNAME" BucketName = "${OSS_BUCKETNAME}"
BaseDir = "fontree-fiee-test" BaseDir = "fontree-fiee-test"
CdnHost = "OSS_CDN" CdnHost = "${OSS_CDN}"
[redis] [redis]
RedisDB = "2" RedisDB = "2"

10
docs/prod/conf.ini
View File

@ -26,12 +26,12 @@ TelNum = "18021272627"
Password = "Gy.123456" Password = "Gy.123456"
[oss] [oss]
AccessKeyId = "OSS_AK" AccessKeyId = "${OSS_AK}"
AccessKeySecret = "OSS_SK" AccessKeySecret = "${OSS_SK}"
Endpoint = "OSS_ENDPOINTT" Endpoint = "${OSS_ENDPOINTT}"
BucketName = "OSS_BUCKETNAME" BucketName = "${OSS_BUCKETNAME}"
BaseDir = "fontree-fiee" BaseDir = "fontree-fiee"
CdnHost = "OSS_CDN" CdnHost = "${OSS_CDN}"
[stripe] [stripe]
Webhookkey = "whsec_Mol32WD1KcKHUdYsSwap0LR03q2g9qNY" Webhookkey = "whsec_Mol32WD1KcKHUdYsSwap0LR03q2g9qNY"

10
docs/test/conf.ini
View File

@ -16,12 +16,12 @@ BosHttp = "https://"
BosDomain = "cdns.fontree.cn" BosDomain = "cdns.fontree.cn"
[oss] [oss]
AccessKeyId = "OSS_AK" AccessKeyId = "${OSS_AK}"
AccessKeySecret = "OSS_SK" AccessKeySecret = "${OSS_SK}"
Endpoint = "OSS_ENDPOINTT" Endpoint = "${OSS_ENDPOINTT}"
BucketName = "OSS_BUCKETNAME" BucketName = "${OSS_BUCKETNAME}"
BaseDir = "fontree-fiee-test" BaseDir = "fontree-fiee-test"
CdnHost = "OSS_CDN" CdnHost = "${OSS_CDN}"
[redis] [redis]
RedisDB = "2" RedisDB = "2"

6
pkg/logic/upload.go
View File

@ -129,7 +129,7 @@ func MakeThumbnail(imagePath, savePath string) error {
} }
func (u *Upload) PutBos(filePath string, mediaType string, needRemove bool) (url string, err error) { func (u *Upload) 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)
if err != nil { if err != nil {
logger.Errorf("PutBos NewOOS err ", err) logger.Errorf("PutBos NewOOS err ", err)
err = errors.New(e.GetMsg(e.ErrorUploadBos)) err = errors.New(e.GetMsg(e.ErrorUploadBos))
@ -148,14 +148,14 @@ func (u *Upload) PutBos(filePath string, mediaType string, needRemove bool) (url
} }
filePath = strings.Replace(filePath, "./runtime", "", 1) filePath = strings.Replace(filePath, "./runtime", "", 1)
var objectName string = fmt.Sprintf("%s/%s%s", config.ConfigData.Oss.BaseDir, config.Env, filePath) var objectName string = fmt.Sprintf("%s/%s%s", config.ConfigData.Oss.BaseDir, config.Env, filePath)
_, 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 {
logger.Errorf("PutBos PutObject err %+v", err.Error()) logger.Errorf("PutBos PutObject err %+v", err.Error())
err = errors.New(e.GetMsg(e.ErrorUploadBos)) err = errors.New(e.GetMsg(e.ErrorUploadBos))
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", config.ConfigData.Oss.CdnHost, objectName)
return return
} }

18
pkg/service/upload/upload.go
View File

@ -217,14 +217,14 @@ func quickBos(file *multipart.FileHeader, mediaType string, mask string, source
} }
} }
var objectName string = fmt.Sprintf("%s/%s/%s", config.ConfigData.Oss.BaseDir, config.Env, filePath) var objectName string = fmt.Sprintf("%s/%s/%s", config.ConfigData.Oss.BaseDir, config.Env, filePath)
BOSClient, _ := objstorage.NewOSS(os.Getenv(config.ConfigData.Oss.AccessKeyId), os.Getenv(config.ConfigData.Oss.AccessKeySecret), os.Getenv(config.ConfigData.Oss.Endpoint)) BOSClient, _ := objstorage.NewOSS(config.ConfigData.Oss.AccessKeyId, config.ConfigData.Oss.AccessKeySecret, config.ConfigData.Oss.Endpoint)
_, 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 {
//logger.Errorf("quickOss err", err) //logger.Errorf("quickOss err", 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", config.ConfigData.Oss.CdnHost, objectName)
return return
} }
@ -266,7 +266,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(config.ConfigData.Oss.AccessKeyId, config.ConfigData.Oss.AccessKeySecret, config.ConfigData.Oss.Endpoint)
if err != nil { if err != nil {
//logger.Errorf("PutBos NewOss err ", err) //logger.Errorf("PutBos NewOss err ", err)
err = errors.New(e.GetMsg(e.ErrorUploadBos)) err = errors.New(e.GetMsg(e.ErrorUploadBos))
@ -290,14 +290,14 @@ 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, config.Env, filePath) var objectName string = fmt.Sprintf("%s/%s%s", config.ConfigData.Oss.BaseDir, config.Env, filePath)
_, 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 {
//logger.Errorf("PutBos PutObject err %+v", err.Error()) //logger.Errorf("PutBos PutObject err %+v", err.Error())
err = errors.New(e.GetMsg(e.ErrorUploadBos)) err = errors.New(e.GetMsg(e.ErrorUploadBos))
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", 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) {
@ -331,14 +331,14 @@ func GetSnapshot(videoPath, snapshotPath string, frameNum int) (snapshotName str
} }
func UploadWithBuffer(fileBuffer *bytes.Buffer, cloudStoreSubPath string) (url string, err error) { func UploadWithBuffer(fileBuffer *bytes.Buffer, cloudStoreSubPath string) (url string, err error) {
Client, err := objstorage.NewOSS(os.Getenv(config.ConfigData.Oss.AccessKeyId), os.Getenv(config.ConfigData.Oss.AccessKeySecret), os.Getenv(config.ConfigData.Oss.Endpoint)) Client, err := objstorage.NewOSS(config.ConfigData.Oss.AccessKeyId, config.ConfigData.Oss.AccessKeySecret, config.ConfigData.Oss.Endpoint)
if err != nil { if err != nil {
err = errors.New(fmt.Sprintf("云存储初始化失败：%s", err.Error())) err = errors.New(fmt.Sprintf("云存储初始化失败：%s", err.Error()))
return return
} }
cloudStoreSubPath = getEnvDir(cloudStoreSubPath) cloudStoreSubPath = getEnvDir(cloudStoreSubPath)
_, err = Client.PutObjectFromBytes(os.Getenv(config.ConfigData.Oss.BucketName), cloudStoreSubPath, fileBuffer.Bytes()) _, err = Client.PutObjectFromBytes(config.ConfigData.Oss.BucketName, cloudStoreSubPath, fileBuffer.Bytes())
url = os.Getenv(config.ConfigData.Oss.CdnHost) + "/" + cloudStoreSubPath url = config.ConfigData.Oss.CdnHost + "/" + cloudStoreSubPath
return return
} }
func getEnvDir(cloudStoreSubPath string) (ep string) { func getEnvDir(cloudStoreSubPath string) (ep string) {