From 4908fbc193cab93cb529830855bb9114010c3900 Mon Sep 17 00:00:00 2001 From: zouap Date: Tue, 10 Jan 2023 11:38:52 +0800 Subject: [PATCH 01/18] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=EF=BC=8C=E8=A7=A3=E5=86=B3=E4=B8=80=E4=B8=8B=E4=BA=91=E8=84=91?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=BB=9F=E8=AE=A1=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- models/user_business_analysis.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/models/user_business_analysis.go b/models/user_business_analysis.go index c18e1f51a..edcbdaa57 100644 --- a/models/user_business_analysis.go +++ b/models/user_business_analysis.go @@ -2519,7 +2519,7 @@ func queryCloudBrainTask(start_unix int64, end_unix int64) (map[int64]int, map[s } else { setMapKey("GpuDebugJob", cloudTaskRecord.UserID, 1, resultItemMap) } - } else if cloudTaskRecord.Type == 2 { + } else if cloudTaskRecord.Type == 2 || cloudTaskRecord.Type == 3 { setMapKey("C2Net", cloudTaskRecord.UserID, 1, resultItemMap) if cloudTaskRecord.ComputeResource == NPUResource { if cloudTaskRecord.JobType == "TRAIN" { @@ -2529,6 +2529,9 @@ func queryCloudBrainTask(start_unix int64, end_unix int64) (map[int64]int, map[s } } else if cloudTaskRecord.ComputeResource == GPUResource { if cloudTaskRecord.JobType == "TRAIN" { + if cloudTaskRecord.UserID == 247 { + log.Info("test_2022 user has train task 1") + } setMapKey("GpuTrainJob", cloudTaskRecord.UserID, 1, resultItemMap) } else { setMapKey("GpuDebugJob", cloudTaskRecord.UserID, 1, resultItemMap) From 4bf61de4110ede62a0e1b1727bdda67b02d2d84d Mon Sep 17 00:00:00 2001 From: zouap Date: Tue, 10 Jan 2023 11:47:55 +0800 Subject: [PATCH 02/18] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=BA=91=E8=84=91?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=85=B7=E4=BD=93=E6=95=B0=E9=87=8F=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- models/user_business_analysis.go | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/models/user_business_analysis.go b/models/user_business_analysis.go index edcbdaa57..693d9861b 100644 --- a/models/user_business_analysis.go +++ b/models/user_business_analysis.go @@ -2486,7 +2486,7 @@ func queryCloudBrainTask(start_unix int64, end_unix int64) (map[int64]int, map[s var indexTotal int64 indexTotal = 0 for { - sess.Select("id,job_type,user_id,duration,train_job_duration,type").Table("cloudbrain").Unscoped().Where(cond).OrderBy("id asc").Limit(PAGE_SIZE, int(indexTotal)) + sess.Select("id,job_type,user_id,duration,train_job_duration,type,compute_resource").Table("cloudbrain").Unscoped().Where(cond).OrderBy("id asc").Limit(PAGE_SIZE, int(indexTotal)) cloudTaskList := make([]*Cloudbrain, 0) sess.Find(&cloudTaskList) log.Info("query cloudbrain size=" + fmt.Sprint(len(cloudTaskList))) @@ -2529,9 +2529,6 @@ func queryCloudBrainTask(start_unix int64, end_unix int64) (map[int64]int, map[s } } else if cloudTaskRecord.ComputeResource == GPUResource { if cloudTaskRecord.JobType == "TRAIN" { - if cloudTaskRecord.UserID == 247 { - log.Info("test_2022 user has train task 1") - } setMapKey("GpuTrainJob", cloudTaskRecord.UserID, 1, resultItemMap) } else { setMapKey("GpuDebugJob", cloudTaskRecord.UserID, 1, resultItemMap) From 784fff22eb140b559ec64c795e9c1640eda170bc Mon Sep 17 00:00:00 2001 From: zouap Date: Tue, 10 Jan 2023 14:56:21 +0800 Subject: [PATCH 03/18] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- routers/user/auth.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/routers/user/auth.go b/routers/user/auth.go index ae2c26f33..c2376cdc9 100755 --- a/routers/user/auth.go +++ b/routers/user/auth.go @@ -132,8 +132,9 @@ func checkAutoLogin(ctx *context.Context) bool { if isSucceed { isCourse := ctx.QueryBool("course") - ctx.SetCookie("redirect_to", "", -1, setting.AppSubURL, "", setting.SessionConfig.Secure, true) + if redirectTo == "" && isCourse { + ctx.SetCookie("redirect_to", "", -1, setting.AppSubURL, "", setting.SessionConfig.Secure, true) redirectToCourse := setting.AppSubURL + "/" + setting.Course.OrgName ctx.RedirectToFirst(redirectToCourse) } else { From 74b81213eb531820a46df6e2bc7f0053444cbd14 Mon Sep 17 00:00:00 2001 From: zouap Date: Tue, 10 Jan 2023 15:07:56 +0800 Subject: [PATCH 04/18] =?UTF-8?q?=E7=99=BB=E5=BD=95=E8=B7=B3=E8=BD=AC?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- routers/user/auth.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/routers/user/auth.go b/routers/user/auth.go index c2376cdc9..3741103c4 100755 --- a/routers/user/auth.go +++ b/routers/user/auth.go @@ -121,7 +121,7 @@ func checkAutoLogin(ctx *context.Context) bool { ctx.ServerError("AutoSignIn", err) return true } - + log.Info("here1...") redirectTo := ctx.Query("redirect_to") if len(redirectTo) > 0 { ctx.SetCookie("redirect_to", redirectTo, 0, setting.AppSubURL, "", setting.SessionConfig.Secure, true) @@ -130,7 +130,7 @@ func checkAutoLogin(ctx *context.Context) bool { } if isSucceed { - + log.Info("here2...") isCourse := ctx.QueryBool("course") if redirectTo == "" && isCourse { @@ -138,8 +138,8 @@ func checkAutoLogin(ctx *context.Context) bool { redirectToCourse := setting.AppSubURL + "/" + setting.Course.OrgName ctx.RedirectToFirst(redirectToCourse) } else { + log.Info("here3...") ctx.RedirectToFirst(redirectTo, setting.AppSubURL+string(setting.LandingPageURL)) - } return true } From 0647c5e9f9c51406df7d1d757b74be804d14effb Mon Sep 17 00:00:00 2001 From: zouap Date: Tue, 10 Jan 2023 15:26:04 +0800 Subject: [PATCH 05/18] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- models/user_business_analysis.go | 6 +----- routers/user/auth.go | 3 ++- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/models/user_business_analysis.go b/models/user_business_analysis.go index 693d9861b..b462d7458 100644 --- a/models/user_business_analysis.go +++ b/models/user_business_analysis.go @@ -1030,18 +1030,14 @@ func getCloudBrainInfo(dateRecordAll UserBusinessAnalysisAll, CloudBrainTaskItem } cloudBrainInfo["inference_task_num"] = fmt.Sprint(dateRecordAll.NpuInferenceJob + CloudBrainTaskItemMap[fmt.Sprint(dateRecordAll.ID)+"_GpuInferenceJob"]) cloudBrainInfo["card_runtime"] = fmt.Sprint(dateRecordAll.CloudBrainRunTime) - if dateRecordAll.CloudBrainRunTime >= 100 { - runtime = float64(dateRecordAll.CloudBrainRunTime) / float64(100) - } cloudBrainInfo["card_runtime_money"] = fmt.Sprint(dateRecordAll.CloudBrainRunTime * 5) cloudBrainInfo["CloudBrainOne"] = fmt.Sprint(CloudBrainTaskItemMap[fmt.Sprint(dateRecordAll.ID)+"_CloudBrainOne"]) cloudBrainInfo["CloudBrainTwo"] = fmt.Sprint(CloudBrainTaskItemMap[fmt.Sprint(dateRecordAll.ID)+"_CloudBrainTwo"]) cloudBrainInfo["C2Net"] = fmt.Sprint(CloudBrainTaskItemMap[fmt.Sprint(dateRecordAll.ID)+"_C2Net"]) - cloudBrainInfoJson, _ := json.Marshal(cloudBrainInfo) scoreMap["trainscore"] = trainscore scoreMap["debugscore"] = debugscore - scoreMap["runtime"] = runtime + return string(cloudBrainInfoJson) } else { scoreMap["trainscore"] = trainscore diff --git a/routers/user/auth.go b/routers/user/auth.go index 3741103c4..20807d381 100755 --- a/routers/user/auth.go +++ b/routers/user/auth.go @@ -155,9 +155,10 @@ func getActivityTpl() string { // SignIn render sign in page func SignIn(ctx *context.Context) { ctx.Data["Title"] = ctx.Tr("sign_in") - + log.Info("sign 11111111.........") // Check auto-login. if checkAutoLogin(ctx) { + log.Info("sign 22222.........") return } From 8738240554495b1af8f8a6927fdcfe0db55be2bc Mon Sep 17 00:00:00 2001 From: zouap Date: Tue, 10 Jan 2023 15:34:57 +0800 Subject: [PATCH 06/18] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- modules/context/auth.go | 1 + modules/context/context.go | 1 + 2 files changed, 2 insertions(+) diff --git a/modules/context/auth.go b/modules/context/auth.go index efde3bc2e..2624dabbd 100755 --- a/modules/context/auth.go +++ b/modules/context/auth.go @@ -81,6 +81,7 @@ func Toggle(options *ToggleOptions) macaron.Handler { // Redirect to dashboard if user tries to visit any non-login page. if options.SignOutRequired && ctx.IsSigned && ctx.Req.URL.RequestURI() != "/" { + log.Info("YYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYY") ctx.Redirect(setting.AppSubURL + "/") return } diff --git a/modules/context/context.go b/modules/context/context.go index 8c7808466..779b2c531 100755 --- a/modules/context/context.go +++ b/modules/context/context.go @@ -308,6 +308,7 @@ func Contexter() macaron.Handler { if ctx.User != nil { ctx.IsSigned = true + log.Info("XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX") ctx.Data["IsSigned"] = ctx.IsSigned ctx.Data["SignedUser"] = ctx.User ctx.Data["SignedUserID"] = ctx.User.ID From fcc3824bbdbae7b92ba3ca00becf906a2999e546 Mon Sep 17 00:00:00 2001 From: zouap Date: Tue, 10 Jan 2023 15:41:00 +0800 Subject: [PATCH 07/18] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0=E7=99=BB=E5=BD=95=E9=87=8D=E5=AE=9A?= =?UTF-8?q?=E5=90=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- modules/context/auth.go | 9 +++++++-- modules/context/context.go | 1 - 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/modules/context/auth.go b/modules/context/auth.go index 2624dabbd..7a1c405f8 100755 --- a/modules/context/auth.go +++ b/modules/context/auth.go @@ -81,8 +81,13 @@ func Toggle(options *ToggleOptions) macaron.Handler { // Redirect to dashboard if user tries to visit any non-login page. if options.SignOutRequired && ctx.IsSigned && ctx.Req.URL.RequestURI() != "/" { - log.Info("YYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYY") - ctx.Redirect(setting.AppSubURL + "/") + redirectTo := ctx.Query("redirect_to") + log.Info("redirect_to=" + redirectTo) + if len(redirectTo) > 0 { + ctx.Redirect(redirectTo) + } else { + ctx.Redirect(setting.AppSubURL + "/") + } return } diff --git a/modules/context/context.go b/modules/context/context.go index 779b2c531..8c7808466 100755 --- a/modules/context/context.go +++ b/modules/context/context.go @@ -308,7 +308,6 @@ func Contexter() macaron.Handler { if ctx.User != nil { ctx.IsSigned = true - log.Info("XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX") ctx.Data["IsSigned"] = ctx.IsSigned ctx.Data["SignedUser"] = ctx.User ctx.Data["SignedUserID"] = ctx.User.ID From 7ace826c41462b709e689806d486778a77e076d2 Mon Sep 17 00:00:00 2001 From: zouap Date: Tue, 10 Jan 2023 15:46:28 +0800 Subject: [PATCH 08/18] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E5=B9=B4=E5=BA=A6=E6=8A=A5=E5=91=8A=E9=87=8D=E5=AE=9A=E5=90=91?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- modules/context/auth.go | 1 - routers/user/auth.go | 8 +------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/modules/context/auth.go b/modules/context/auth.go index 7a1c405f8..c9af1456d 100755 --- a/modules/context/auth.go +++ b/modules/context/auth.go @@ -82,7 +82,6 @@ func Toggle(options *ToggleOptions) macaron.Handler { // Redirect to dashboard if user tries to visit any non-login page. if options.SignOutRequired && ctx.IsSigned && ctx.Req.URL.RequestURI() != "/" { redirectTo := ctx.Query("redirect_to") - log.Info("redirect_to=" + redirectTo) if len(redirectTo) > 0 { ctx.Redirect(redirectTo) } else { diff --git a/routers/user/auth.go b/routers/user/auth.go index 20807d381..9620cb969 100755 --- a/routers/user/auth.go +++ b/routers/user/auth.go @@ -121,7 +121,6 @@ func checkAutoLogin(ctx *context.Context) bool { ctx.ServerError("AutoSignIn", err) return true } - log.Info("here1...") redirectTo := ctx.Query("redirect_to") if len(redirectTo) > 0 { ctx.SetCookie("redirect_to", redirectTo, 0, setting.AppSubURL, "", setting.SessionConfig.Secure, true) @@ -130,15 +129,12 @@ func checkAutoLogin(ctx *context.Context) bool { } if isSucceed { - log.Info("here2...") isCourse := ctx.QueryBool("course") - + ctx.SetCookie("redirect_to", "", -1, setting.AppSubURL, "", setting.SessionConfig.Secure, true) if redirectTo == "" && isCourse { - ctx.SetCookie("redirect_to", "", -1, setting.AppSubURL, "", setting.SessionConfig.Secure, true) redirectToCourse := setting.AppSubURL + "/" + setting.Course.OrgName ctx.RedirectToFirst(redirectToCourse) } else { - log.Info("here3...") ctx.RedirectToFirst(redirectTo, setting.AppSubURL+string(setting.LandingPageURL)) } return true @@ -155,10 +151,8 @@ func getActivityTpl() string { // SignIn render sign in page func SignIn(ctx *context.Context) { ctx.Data["Title"] = ctx.Tr("sign_in") - log.Info("sign 11111111.........") // Check auto-login. if checkAutoLogin(ctx) { - log.Info("sign 22222.........") return } From 09d82378e80de934540090a6f169493dbbf6a5b9 Mon Sep 17 00:00:00 2001 From: chenshihai Date: Tue, 10 Jan 2023 15:51:00 +0800 Subject: [PATCH 09/18] fix signup page error in slow network environment --- templates/user/auth/signup_inner.tmpl | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/templates/user/auth/signup_inner.tmpl b/templates/user/auth/signup_inner.tmpl index 219d69408..080a97e40 100644 --- a/templates/user/auth/signup_inner.tmpl +++ b/templates/user/auth/signup_inner.tmpl @@ -163,11 +163,11 @@ return obj; }; var sharedUser = getUrlParams()['sharedUser']; - if (sharedUser) { - setTimeout(function() { - $('.invitation_tips').show().find('.__invitation_code__').text(sharedUser); - $('input#invitation_code').val(sharedUser).attr('readonly', true); - }, 20); + if (sharedUser) { + document.querySelector('.invitation_tips').style.display = "block"; + document.querySelector('.__invitation_code__').innerText = sharedUser; + document.querySelector('#invitation_code').value = sharedUser; + document.querySelector('#invitation_code').setAttribute("readonly", "true"); } })(); From dfefa70bb9ec8c79d0b2efcac0941ba530d59462 Mon Sep 17 00:00:00 2001 From: zouap Date: Tue, 10 Jan 2023 16:02:26 +0800 Subject: [PATCH 10/18] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- models/user_analysis_for_activity.go | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/models/user_analysis_for_activity.go b/models/user_analysis_for_activity.go index 6d8201e69..d872669e6 100644 --- a/models/user_analysis_for_activity.go +++ b/models/user_analysis_for_activity.go @@ -480,5 +480,13 @@ func QueryUserAnnualReport(userId int64) *UserSummaryCurrentYear { } else { log.Info("error:=" + err.Error()) } + dbuser, err := GetUserByID(userId) + if err == nil { + return &UserSummaryCurrentYear{ + ID: dbuser.ID, + Name: dbuser.Name, + RegistDate: dbuser.CreatedUnix, + } + } return nil } From 1ecf111e28c9dd883f9444d9eda19974e3d816da Mon Sep 17 00:00:00 2001 From: chenshihai Date: Tue, 10 Jan 2023 16:15:56 +0800 Subject: [PATCH 11/18] fix go top error in wechat browser --- web_src/js/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web_src/js/index.js b/web_src/js/index.js index 6c22201c0..62eeaebd8 100755 --- a/web_src/js/index.js +++ b/web_src/js/index.js @@ -5221,7 +5221,7 @@ function initTopToHome() { } }); topToHomeEl.on('click', function() { - $('html').animate({ scrollTop: 0 }, 'slow', 'swing'); + $('html,body').animate({ scrollTop: 0 }, 'slow', 'swing'); }); } From d514a8241843ecb43e015fe3991b066145e2f8e0 Mon Sep 17 00:00:00 2001 From: zouap Date: Wed, 11 Jan 2023 11:25:21 +0800 Subject: [PATCH 12/18] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0=E6=95=B0=E6=8D=AE=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- models/user_business_analysis.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/models/user_business_analysis.go b/models/user_business_analysis.go index b462d7458..8e5e15dbd 100644 --- a/models/user_business_analysis.go +++ b/models/user_business_analysis.go @@ -897,10 +897,13 @@ func getBonusWeekDataMap() map[int64][]int { 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)) //email := lines[2] record, ok := bonusMap[userId] if !ok { From e03a89bd26ee460573eeb4d919c2f875c4fb4935 Mon Sep 17 00:00:00 2001 From: zouap Date: Wed, 11 Jan 2023 11:54:29 +0800 Subject: [PATCH 13/18] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=EF=BC=8C=E5=BC=BA=E8=A1=8C=E5=8E=BB=E6=8E=89CSV=E6=9C=AB?= =?UTF-8?q?=E5=B0=BE=E7=9A=84=E7=89=B9=E6=AE=8A=E5=AD=97=E7=AC=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- models/user_business_analysis.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/models/user_business_analysis.go b/models/user_business_analysis.go index 8e5e15dbd..b1fe53bd9 100644 --- a/models/user_business_analysis.go +++ b/models/user_business_analysis.go @@ -893,12 +893,14 @@ func getBonusWeekDataMap() map[int64][]int { //read csv lines := strings.Split(csvContent, "\n") for j := 1; j < len(lines); j++ { + if strings.HasSuffix(lines[j], "\01503d") { + lines[j] = lines[j][0 : len(lines[j])-len("\01503d")] + } + 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]) From ae326f6c187e095ec309c7dfadc417f121e70af5 Mon Sep 17 00:00:00 2001 From: zouap Date: Wed, 11 Jan 2023 14:09:22 +0800 Subject: [PATCH 14/18] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=9B=9E=E8=BD=A6?= =?UTF-8?q?=E6=8D=A2=E8=A1=8C=E7=AC=A6=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- models/user_business_analysis.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/models/user_business_analysis.go b/models/user_business_analysis.go index b1fe53bd9..93bb642c6 100644 --- a/models/user_business_analysis.go +++ b/models/user_business_analysis.go @@ -887,14 +887,17 @@ 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], "\01503d") { - lines[j] = lines[j][0 : len(lines[j])-len("\01503d")] + 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], ",") From 75f01526bf1e91cb3b8110a98ba0ffd5e8fa1e7f Mon Sep 17 00:00:00 2001 From: zouap Date: Wed, 11 Jan 2023 14:12:00 +0800 Subject: [PATCH 15/18] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=EF=BC=8C=E8=A7=A3=E5=86=B3=E5=9B=9E=E8=BD=A6=E6=8D=A2=E8=A1=8C?= =?UTF-8?q?=E7=AC=A6=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- models/user_business_analysis.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/user_business_analysis.go b/models/user_business_analysis.go index 93bb642c6..351723199 100644 --- a/models/user_business_analysis.go +++ b/models/user_business_analysis.go @@ -908,7 +908,7 @@ func getBonusWeekDataMap() map[int64][]int { 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 { From bd9ea70be9845b06e1d4f80640d1d7c69f92f5dd Mon Sep 17 00:00:00 2001 From: zouap Date: Wed, 11 Jan 2023 14:13:07 +0800 Subject: [PATCH 16/18] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=EF=BC=8C=E8=A7=A3=E5=86=B3=E5=9B=9E=E8=BD=A6=E6=8D=A2=E8=A1=8C?= =?UTF-8?q?=E7=AC=A6=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- models/user_business_analysis.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/models/user_business_analysis.go b/models/user_business_analysis.go index 351723199..ee1b17544 100644 --- a/models/user_business_analysis.go +++ b/models/user_business_analysis.go @@ -957,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 From 27c5165430167296f7f4d525dceeaabe3b43dd18 Mon Sep 17 00:00:00 2001 From: chenshihai Date: Wed, 11 Jan 2023 14:39:04 +0800 Subject: [PATCH 17/18] update signup invitation tips --- options/locale/locale_zh-CN.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini index ab05212f2..de7fea353 100755 --- a/options/locale/locale_zh-CN.ini +++ b/options/locale/locale_zh-CN.ini @@ -73,7 +73,7 @@ your_starred=已点赞 your_settings=设置 invite_friends=邀请好友 your_friend=您的好友 -invite_you_to_join_the_OpenI_AI_Collaboration_Platform_and_enjoy_abundant_free_computing_resources=邀请您加入启智社区AI协作平台，畅享充沛的免费算力资源！ +invite_you_to_join_the_OpenI_AI_Collaboration_Platform_and_enjoy_abundant_free_computing_resources=邀请您加入启智社区AI协作平台，畅享充沛的普惠算力资源！ recommender=推荐人 all=所有 From 39d2891c61335856890a8c49453326a14ef151a1 Mon Sep 17 00:00:00 2001 From: liuzx Date: Wed, 11 Jan 2023 17:45:28 +0800 Subject: [PATCH 18/18] fix-3470 --- models/cloudbrain.go | 1 + routers/api/v1/repo/cloudbrain_dashboard.go | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/models/cloudbrain.go b/models/cloudbrain.go index 52eea2b15..a0007c47e 100755 --- a/models/cloudbrain.go +++ b/models/cloudbrain.go @@ -30,6 +30,7 @@ const ( TypeCDCenter //成都智算中心 TypeCloudBrainAll = -1 + AccCardsNumAll = -1 ) const ( diff --git a/routers/api/v1/repo/cloudbrain_dashboard.go b/routers/api/v1/repo/cloudbrain_dashboard.go index 1fbef897b..b980c70b3 100755 --- a/routers/api/v1/repo/cloudbrain_dashboard.go +++ b/routers/api/v1/repo/cloudbrain_dashboard.go @@ -1260,8 +1260,8 @@ func DownloadCloudBrainBoard(ctx *context.Context) { Type: models.TypeCloudBrainAll, BeginTimeUnix: int64(recordBeginTime), EndTimeUnix: endTime.Unix(), + AccCardsNum: models.AccCardsNumAll, }) - log.Info("totalcountisis:", total) if err != nil { log.Warn("Can not get cloud brain info", err) @@ -1290,6 +1290,7 @@ func DownloadCloudBrainBoard(ctx *context.Context) { BeginTimeUnix: int64(recordBeginTime), EndTimeUnix: endTime.Unix(), NeedRepoInfo: true, + AccCardsNum: models.AccCardsNumAll, }) if err != nil { log.Warn("Can not get cloud brain info", err)