fix

controllers/banner.go

@@ -52,7 +52,7 @@ func (this *BannerController) Upload() {
 	}
 	resourceUrl := ``
 	//上传到阿里云 和 minio
-	if utils.Object_Storage_Client == "minio" {
+	if utils.ObjectStorageClient == "minio" {
 		resourceUrl, err = services.UploadImgToMinIo(fileName, fpath)
 		if err != nil {
 			br.Msg = "文件上传失败"

controllers/cloud_disk.go

@@ -584,7 +584,7 @@ func (this *CloudDiskController) ResourceUpload() {
 
 	resourceUrl := ``
 	//上传到阿里云 和 minio
-	if utils.Object_Storage_Client == "minio" {
+	if utils.ObjectStorageClient == "minio" {
 		resourceUrl, e = services.UploadMinIoToDir(ossFileName, filePath, ossDir, "")
 		if e != nil {
 			br.Msg = "文件上传失败"

controllers/data_manage/chart_info.go

@@ -2230,7 +2230,7 @@ func (this *ChartInfoController) ChartInfoBase64Upload() {
 	saveToOssPath += outFileName
 
 	//上传到阿里云 和 minio
-	if utils.Object_Storage_Client == "minio" {
+	if utils.ObjectStorageClient == "minio" {
 		err = services.UploadFileToMinIo("", outFileName, saveToOssPath)
 		if err != nil {
 			br.Msg = "文件上传失败"

controllers/data_manage/excel_info.go

@@ -1143,7 +1143,7 @@ func UpdateExcelInfoFileUrl(excelInfo *data_manage.ExcelInfo) {
 
 	resourceUrl := ``
 	//上传到阿里云 和 minio
-	if utils.Object_Storage_Client == "minio" {
+	if utils.ObjectStorageClient == "minio" {
 		resourceUrl, err = services.UploadImgToMinIo(fileName, downloadFilePath)
 		if err != nil {
 			return

controllers/data_manage/future_good/future_good_chart_info.go

@@ -2218,7 +2218,7 @@ func (this *FutureGoodChartInfoController) ChartInfoBase64Upload() {
 	saveToOssPath = uploadDir + time.Now().Format("200601/20060102/")
 	saveToOssPath += outFileName
 	//上传到阿里云 和 minio
-	if utils.Object_Storage_Client == "minio" {
+	if utils.ObjectStorageClient == "minio" {
 		err = services.UploadFileToMinIo("", outFileName, saveToOssPath)
 		if err != nil {
 			br.Msg = "文件上传失败"

controllers/ppt_english.go

@@ -517,7 +517,7 @@ func (this *PptEnglishController) PptUpload() {
 	savePptxToOssPath += pptName + ".pptx"
 
 	//上传到阿里云 和 minio
-	if utils.Object_Storage_Client == "minio" {
+	if utils.ObjectStorageClient == "minio" {
 		err = services.UploadFileToMinIo("", fpath, savePptxToOssPath)
 		if err != nil {
 			br.Msg = "文件上传失败"

controllers/ppt_v2.go

@@ -518,7 +518,7 @@ func (this *PptV2Controller) PptUpload() {
 	savePptxToOssPath += pptName + ".pptx"
 
 	//上传到阿里云 和 minio
-	if utils.Object_Storage_Client == "minio" {
+	if utils.ObjectStorageClient == "minio" {
 		err = services.UploadFileToMinIo("", fpath, savePptxToOssPath)
 		if err != nil {
 			br.Msg = "文件上传失败"

controllers/report.go

@@ -813,7 +813,7 @@ func (this *ReportController) Upload() {
 
 	resourceUrl := ``
 	//上传到阿里云 和 minio
-	if utils.Object_Storage_Client == "minio" {
+	if utils.ObjectStorageClient == "minio" {
 		resourceUrl, err = services.UploadImgToMinIo(fileName, fpath)
 		if err != nil {
 			br.Msg = "文件上传失败"
@@ -1127,7 +1127,7 @@ func (this *ReportUploadCommonController) UploadImg() {
 	}
 	resourceUrl := ``
 	//上传到阿里云 和 minio
-	if utils.Object_Storage_Client == "minio" {
+	if utils.ObjectStorageClient == "minio" {
 		resourceUrl, err = services.UploadImgToMinIo(fileName, fpath)
 		if err != nil {
 			return

controllers/resource.go

@@ -60,7 +60,7 @@ func (this *ResourceController) Upload() {
 	}
 	resourceUrl := ``
 	//上传到阿里云 和 minio
-	if utils.Object_Storage_Client == "minio" {
+	if utils.ObjectStorageClient == "minio" {
 		resourceUrl, err = services.UploadImgToMinIo(fileName, fpath)
 		if err != nil {
 			br.Msg = "文件上传失败"
@@ -241,7 +241,7 @@ func (this *ResourceController) VideoUpload() {
 	savePath += fileName
 
 	//上传到阿里云 和 minio
-	if utils.Object_Storage_Client == "minio" {
+	if utils.ObjectStorageClient == "minio" {
 		err = services.UploadVideoToMinIo(fileName, fpath, savePath)
 		if err != nil {
 			br.Msg = "文件上传失败"
@@ -415,7 +415,7 @@ func (this *ResourceController) VoiceUpload() {
 	savePath := utils.Upload_Audio_Dir + time.Now().Format("200601/20060102/")
 	savePath += fileName
 	//上传到阿里云 和 minio
-	if utils.Object_Storage_Client == "minio" {
+	if utils.ObjectStorageClient == "minio" {
 		err = services.UploadVideoToMinIo(fileName, fpath, savePath)
 		if err != nil {
 			br.Msg = "文件上传失败"
@@ -577,7 +577,7 @@ func (this *ResourceController) UploadImageBase64() {
 	savePath += fileName
 
 	//上传到阿里云 和 minio
-	if utils.Object_Storage_Client == "minio" {
+	if utils.ObjectStorageClient == "minio" {
 		err = services.UploadFileToMinIo(fileName, fpath, savePath)
 		if err != nil {
 			br.Msg = "文件上传失败"
@@ -718,7 +718,7 @@ func (this *ResourceController) UploadV2() {
 	}
 	resourceUrl := ``
 	//上传到阿里云 和 minio
-	if utils.Object_Storage_Client == "minio" {
+	if utils.ObjectStorageClient == "minio" {
 		resourceUrl, err = services.UploadImgToMinIo(fileName, fpath)
 		if err != nil {
 			br.Msg = "文件上传失败"

controllers/sys_role.go

@@ -705,11 +705,17 @@ func (this *SysRoleController) SystemConfig() {
 	}, system.BusinessConf{
 		ConfKey: "ChartViewUrl",
 		ConfVal: conf["ChartViewUrl"],
-	}, system.BusinessConf{
-		ConfKey: "ObjectStorageClient",
-		ConfVal: utils.Object_Storage_Client,
 	})
 
+	osc := system.BusinessConf{
+		ConfKey: "ObjectStorageClient",
+		ConfVal: utils.ObjectStorageClient,
+	}
+	if osc.ConfVal == "" {
+		osc.ConfVal = "oss"
+	}
+	list = append(list, osc)
+
 	br.Data = list
 	br.Ret = 200
 	br.Success = true

controllers/voice.go

@@ -75,7 +75,7 @@ func (this *VoiceController) Upload() {
 
 	resourceUrl := ``
 	//上传到阿里云 和 minio
-	if utils.Object_Storage_Client == "minio" {
+	if utils.ObjectStorageClient == "minio" {
 		resourceUrl, err = services.UploadAudioToMinIo(fileName, fpath)
 		if err != nil {
 			br.Msg = "文件上传失败"

services/file.go

@@ -29,7 +29,7 @@ func UploadToOssAndFileName(fileMulti multipart.File, newFileName string) (resou
 	}
 
 	//上传到阿里云 和 minio
-	if utils.Object_Storage_Client == "minio" {
+	if utils.ObjectStorageClient == "minio" {
 		resourceUrl, err = UploadImgToMinIo(newFileName, fpath)
 		if err != nil {
 			err = errors.New("文件上传失败，Err:" + err.Error())

services/report.go

@@ -638,7 +638,7 @@ func reportBase64ToImg(imageBase64 string) (resourceUrl string, err error) {
 	savePath += fileName
 
 	//上传到阿里云 和 minio
-	if utils.Object_Storage_Client == "minio" {
+	if utils.ObjectStorageClient == "minio" {
 		err = UploadFileToMinIo(fileName, fpath, savePath)
 		if err != nil {
 			err = errors.New("文件上传失败" + err.Error())
@@ -874,7 +874,7 @@ func PcCreateAndUploadSunCode(scene, page string) (imgUrl string, err error) {
 	fileDir := "yb/suncode/"
 
 	//上传到阿里云 和 minio
-	if utils.Object_Storage_Client == "minio" {
+	if utils.ObjectStorageClient == "minio" {
 		imgUrl, err = UploadMinIoToDir(fileName, fpath, "", fileDir)
 		if err != nil {
 			return

services/video.go

@@ -100,7 +100,7 @@ func CreateVideo(report *models.ReportDetail) (err error) {
 
 	uploadUrl := ``
 	//上传到阿里云 和 minio
-	if utils.Object_Storage_Client == "minio" {
+	if utils.ObjectStorageClient == "minio" {
 		uploadUrl, err = UploadAudioToMinIo(saveName, savePath)
 		if err != nil {
 			err = errors.New("UploadAudioAliyun Err:" + err.Error())
@@ -302,7 +302,7 @@ func CreateReportVideo(reportTitle, reportContent, reportTime string) (uploadUrl
 
 
 	//上传到阿里云 和 minio
-	if utils.Object_Storage_Client == "minio" {
+	if utils.ObjectStorageClient == "minio" {
 		uploadUrl, err = UploadAudioToMinIo(saveName, savePath)
 		if err != nil {
 			err = errors.New("UploadAudioAliyun Err:" + err.Error())

utils/config.go

@@ -124,7 +124,7 @@ var (
 
 // 对象存储客户端
 var (
-	Object_Storage_Client string       // 目前有oss minio，默认oss
+	ObjectStorageClient string       // 目前有oss minio，默认oss
 )
 // 阿里云配置
 var (
@@ -335,7 +335,7 @@ func init() {
 	}
 
 	// 对象存储客户端
-	MYSQL_WEEKLY_URL = config["mysql_url_weekly"]
+	ObjectStorageClient = config["object_storage_client"]
 
 	// OSS相关
 	{