Merge branch 'master' into debug

# Conflicts:
#	controllers/user_login.go
#	routers/commentsRouter.go

services/data/cross_variety/chart.go

@@ -343,10 +343,10 @@ func GetChartData(chartInfoId int, config request.ChartConfigReq) (edbList []*da
 					}
 					if !date.Before(earliestDate) && !date.After(endDate) {
 						bigN += 1
-					}
-					dateVal := decimal.NewFromFloat(dataList[i].Value)
-					if dateVal.LessThanOrEqual(lastVal) {
-						tinyN += 1
+						dateVal := decimal.NewFromFloat(dataList[i].Value)
+						if dateVal.LessThanOrEqual(lastVal) {
+							tinyN += 1
+						}
 					}
 				}
 				// N=1时说明计算无效
@@ -355,7 +355,7 @@ func GetChartData(chartInfoId int, config request.ChartConfigReq) (edbList []*da
 				}
 				numerator := decimal.NewFromInt(int64(tinyN - 1))
 				denominator := decimal.NewFromInt(int64(bigN - 1))
-				percentVal, _ = numerator.Div(denominator).Round(4).Float64()
+				percentVal, _ = numerator.Div(denominator).Mul(decimal.NewFromFloat(100)).Round(4).Float64()
 			}
 
 			// key的生成（日期配置下标+指标id)

services/data/line_feature/chart_info.go

@@ -183,7 +183,7 @@ func GetPercentileData(chartInfoId int, startDate, endDate string, mappingInfo *
 			}
 			numerator := decimal.NewFromInt(int64(tinyN - 1))
 			denominator := decimal.NewFromInt(int64(bigN - 1))
-			percentVal, _ := numerator.Div(denominator).Round(4).Float64()
+			percentVal, _ := numerator.Div(denominator).Mul(decimal.NewFromFloat(100)).Round(4).Float64()
 
 			// 写进数组并判断指标最大最小值
 			newDataList = append(newDataList, data_manage.EdbDataList{

services/minio.go

@@ -356,7 +356,11 @@ func (m *MinioOss) UploadFile(fileName, filePath, savePath string) (string, erro
 	}
 
 	ctx := context.Background()
+	// 此处兼容一下前后端endpoint不一致的情况, 前端用minio_endpoint后端用minio_back_endpoint, minio_back_endpoint为空则都取前者
 	endpoint := utils.MinIoEndpoint
+	if utils.MinIoBackEndpoint != "" {
+		endpoint = utils.MinIoBackEndpoint
+	}
 	accessKeyID := utils.MinIoAccessKeyId
 	secretAccessKey := utils.MinIoAccessKeySecret
 	useSSL := false

utils/config.go

@@ -148,6 +148,7 @@ var BusinessCode string
 var (
 	MinIoBucketname       string
 	MinIoEndpoint         string
+	MinIoBackEndpoint     string
 	MinIoImghost          string
 	MinIoUploadDir        string
 	MinIoUpload_Audio_Dir string
@@ -374,6 +375,7 @@ func init() {
 	// MinIo相关
 	{
 		MinIoEndpoint = config["minio_endpoint"]
+		MinIoBackEndpoint = config["minio_back_endpoint"]
 		MinIoBucketname = config["minio_bucket_name"]
 		MinIoImghost = config["minio_img_host"]
 		MinIoUploadDir = config["minio_upload_dir"]