Merge pull request '解决文件中出现以\r结尾的字符串问题。' (#3518) from zouap into V20221228

Reviewed-on: https://openi.pcl.ac.cn/OpenI/aiforge/pulls/3518
Reviewed-by: ychao_1983 <ychao_1983@sina.com>

models/user_business_analysis.go

@@ -887,23 +887,28 @@ func getBonusWeekDataMap() map[int64][]int {
 	if err == nil {
 		filenames := strings.Split(content, "\n")
 		for i := 0; i < len(filenames); i++ {
+			if strings.HasSuffix(filenames[i], "\r") {
+				filenames[i] = filenames[i][0 : len(filenames[i])-len("\r")]
+			}
 			url = setting.RecommentRepoAddr + "bonus/weekdata/" + filenames[i]
 			csvContent, err1 := GetContentFromPromote(url)
 			if err1 == nil {
 				//read csv
 				lines := strings.Split(csvContent, "\n")
 				for j := 1; j < len(lines); j++ {
+					if strings.HasSuffix(lines[j], "\r") {
+						lines[j] = lines[j][0 : len(lines[j])-len("\r")]
+					}
+					log.Info("aLine=" + lines[j])
 					aLine := strings.Split(lines[j], ",")
 					if len(aLine) < 4 {
 						continue
 					}
-					log.Info("aLine=" + lines[j])
-
 					userId := getInt64Value(aLine[0])
 					order := getIntValue(aLine[2])
 					money := getIntValue(aLine[3])
 					week, num := getWeekAndNum(filenames[i])
-					log.Info("userId=" + fmt.Sprint(userId) + " order=" + fmt.Sprint(order) + " money=" + fmt.Sprint(money) + " week=" + fmt.Sprint(week) + " num=" + fmt.Sprint(num))
+					//log.Info("userId=" + fmt.Sprint(userId) + " order=" + fmt.Sprint(order) + " money=" + fmt.Sprint(money) + " week=" + fmt.Sprint(week) + " num=" + fmt.Sprint(num))
 					//email := lines[2]
 					record, ok := bonusMap[userId]
 					if !ok {
@@ -952,12 +957,18 @@ func getBonusMap() map[string]map[string]int {
 	if err == nil {
 		filenames := strings.Split(content, "\n")
 		for i := 0; i < len(filenames); i++ {
+			if strings.HasSuffix(filenames[i], "\r") {
+				filenames[i] = filenames[i][0 : len(filenames[i])-len("\r")]
+			}
 			url = setting.RecommentRepoAddr + "bonus/" + filenames[i]
 			csvContent, err1 := GetContentFromPromote(url)
 			if err1 == nil {
 				//read csv
 				lines := strings.Split(csvContent, "\n")
 				for j := 1; j < len(lines); j++ {
+					if strings.HasSuffix(lines[j], "\r") {
+						lines[j] = lines[j][0 : len(lines[j])-len("\r")]
+					}
 					aLine := strings.Split(lines[j], ",")
 					if len(aLine) < 7 {
 						continue