From 17718c507fc3234609040ccf921fb17486727c40 Mon Sep 17 00:00:00 2001 From: liuzx Date: Tue, 22 Mar 2022 17:50:50 +0800 Subject: [PATCH 001/239] update --- models/cloudbrain_static.go | 5 + routers/api/v1/api.go | 15 +++ routers/api/v1/repo/cloudbrain_dashboard.go | 119 ++++++++++++++++++++ 3 files changed, 139 insertions(+) create mode 100644 models/cloudbrain_static.go create mode 100644 routers/api/v1/repo/cloudbrain_dashboard.go diff --git a/models/cloudbrain_static.go b/models/cloudbrain_static.go new file mode 100644 index 000000000..9898ebf92 --- /dev/null +++ b/models/cloudbrain_static.go @@ -0,0 +1,5 @@ +package models + +func CountBrainStatByRawSql(sql string) (int64, error) { + return xStatistic.SQL(sql).Count() +} diff --git a/routers/api/v1/api.go b/routers/api/v1/api.go index 306854af3..6118db265 100755 --- a/routers/api/v1/api.go +++ b/routers/api/v1/api.go @@ -554,6 +554,21 @@ func RegisterRoutes(m *macaron.Macaron) { m.Get("/query_user_last_month", operationReq, repo_ext.QueryUserStaticLastMonth) m.Get("/query_user_yesterday", operationReq, repo_ext.QueryUserStaticYesterday) m.Get("/query_user_all", operationReq, repo_ext.QueryUserStaticAll) + //cloudbrain board + m.Group("/cloudbrainboard", func() { + m.Get("/restoreFork", repo.RestoreForkNumber) + m.Get("/downloadAll", repo.ServeAllProjectsPeriodStatisticsFile) + m.Get("/downloadAllOpenI", repo.ServeAllProjectsOpenIStatisticsFile) + m.Group("/cloudbrain", func() { + m.Get("", repo.GetAllCloudbrainsPeriodStatistics) + m.Group("/:id", func() { + m.Get("", repo.GetProjectLatestStatistics) + m.Get("/period", repo.GetProjectPeriodStatistics) + + }) + }) + }, operationReq) + // Users m.Group("/users", func() { m.Get("/search", user.Search) diff --git a/routers/api/v1/repo/cloudbrain_dashboard.go b/routers/api/v1/repo/cloudbrain_dashboard.go new file mode 100644 index 000000000..d39f5c373 --- /dev/null +++ b/routers/api/v1/repo/cloudbrain_dashboard.go @@ -0,0 +1,119 @@ +package repo + +import ( + "net/http" + "strconv" + "time" + + "code.gitea.io/gitea/models" + "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/log" +) + +func GetAllCloudbrainsPeriodStatistics(ctx *context.Context) { + + recordBeginTime, err := getRecordBeginTime() + if err != nil { + log.Error("Can not get record begin time", err) + ctx.Error(http.StatusBadRequest, ctx.Tr("repo.record_begintime_get_err")) + return + } + beginTime, endTime, err := getTimePeroid(ctx, recordBeginTime) + if err != nil { + log.Error("Parameter is wrong", err) + ctx.Error(http.StatusBadRequest, ctx.Tr("repo.parameter_is_wrong")) + return + } + q := ctx.QueryTrim("q") + page := ctx.QueryInt("page") + if page <= 0 { + page = 1 + } + pageSize := ctx.QueryInt("pagesize") + if pageSize <= 0 { + pageSize = DEFAULT_PAGE_SIZE + } + orderBy := getOrderBy(ctx) + + latestUpdatedTime, latestDate, err := models.GetRepoStatLastUpdatedTime() + if err != nil { + log.Error("Can not query the last updated time.", err) + ctx.Error(http.StatusBadRequest, ctx.Tr("repo.last_update_time_error")) + return + } + + DebugOneCountSql := generateDebugOneCountSql(beginTime, endTime) + DebugOneTotal, err := models.CountBrainStatByRawSql(beginTime, endTime) + if err != nil { + log.Error("Can not query total count.", err) + ctx.Error(http.StatusBadRequest, ctx.Tr("repo.total_count_get_error")) + return + } + DebugTwoCountSql := generateDebugTwoCountSql(beginTime, endTime) + DebugOneTotal, err := models.CountBrainStatByRawSql(DebugTwoCountSql) + if err != nil { + log.Error("Can not query total count.", err) + ctx.Error(http.StatusBadRequest, ctx.Tr("repo.total_count_get_error")) + return + } + + sql := generateSqlByType(ctx, beginTime, endTime, latestDate, q, orderBy, page, pageSize) + + projectsPeriodData := ProjectsPeriodData{ + RecordBeginTime: recordBeginTime.Format(DATE_FORMAT), + PageSize: pageSize, + TotalPage: getTotalPage(DebugOneTotal, pageSize), + TotalCount: DebugOneTotal, + LastUpdatedTime: latestUpdatedTime, + PageRecords: models.GetRepoStatisticByRawSql(sql), + } + + ctx.JSON(http.StatusOK, projectsPeriodData) + +} + +func generateDebugOneCountSql(beginTime time.Time, endTime time.Time) string { + countSql := "SELECT count(*) FROM " + + "(SELECT job_id FROM cloudbrain where created_unix >=" + strconv.FormatInt(beginTime.Unix(), 10) + + " and created_unix<" + strconv.FormatInt(endTime.Unix(), 10) + + " and job_type=" + "DEBUG" + + " and type=" + "0" + + " group by job_id) " + return countSql +} +func generateBenchmarkOneCountSql(beginTime time.Time, endTime time.Time) string { + countSql := "SELECT count(*) FROM " + + "(SELECT job_id FROM cloudbrain where created_unix >=" + strconv.FormatInt(beginTime.Unix(), 10) + + " and created_unix<" + strconv.FormatInt(endTime.Unix(), 10) + + " and job_type=" + "BENCHMARK" + + " and type=" + "0" + + " group by job_id) " + return countSql +} +func generateDebugTwoCountSql(beginTime time.Time, endTime time.Time) string { + countSql := "SELECT count(*) FROM " + + "(SELECT job_id FROM cloudbrain where created_unix >=" + strconv.FormatInt(beginTime.Unix(), 10) + + " and created_unix<" + strconv.FormatInt(endTime.Unix(), 10) + + " and job_type=" + "DEBUG" + + " and type=" + "2" + + " group by job_id) " + return countSql +} +func generateTrainTwoCountSql(beginTime time.Time, endTime time.Time) string { + countSql := "SELECT count(*) FROM " + + "(SELECT job_id FROM cloudbrain where created_unix >=" + strconv.FormatInt(beginTime.Unix(), 10) + + " and created_unix<" + strconv.FormatInt(endTime.Unix(), 10) + + " and job_type=" + "TRAIN" + + " and type=" + "1" + + " group by job_id) " + return countSql +} +func generateInferenceTwoCountSql(beginTime time.Time, endTime time.Time) string { + countSql := "SELECT count(*) FROM " + + "(SELECT job_id FROM cloudbrain where created_unix >=" + strconv.FormatInt(beginTime.Unix(), 10) + + " and created_unix<" + strconv.FormatInt(endTime.Unix(), 10) + + " and job_type=" + "INFERENCE" + + " and type=" + "1" + + " group by job_id) " + return countSql +} From 851262f18a4a516cfdc54a5ed65395203934badd Mon Sep 17 00:00:00 2001 From: liuzx Date: Wed, 23 Mar 2022 11:12:06 +0800 Subject: [PATCH 002/239] update --- models/cloudbrain_static.go | 47 ++++++++- routers/api/v1/repo/cloudbrain_dashboard.go | 108 +++++++------------- 2 files changed, 81 insertions(+), 74 deletions(-) diff --git a/models/cloudbrain_static.go b/models/cloudbrain_static.go index 9898ebf92..f388caae7 100644 --- a/models/cloudbrain_static.go +++ b/models/cloudbrain_static.go @@ -1,5 +1,48 @@ package models -func CountBrainStatByRawSql(sql string) (int64, error) { - return xStatistic.SQL(sql).Count() +import ( + "strconv" + "time" +) + +func GenerateDebugOneCount(beginTime time.Time, endTime time.Time) (int64, error) { + countSql := "SELECT count(*) FROM " + + "public.cloudbrain where created_unix >=" + strconv.FormatInt(beginTime.Unix(), 10) + + " and created_unix<" + strconv.FormatInt(endTime.Unix(), 10) + + " and job_type=" + "DEBUG" + + return xStatistic.SQL(countSql).Count() +} + +func GenerateBenchmarkOneCount(beginTime time.Time, endTime time.Time) (int64, error) { + countSql := "SELECT count(*) FROM " + + "SELECT job_id FROM cloudbrain where created_unix >=" + strconv.FormatInt(beginTime.Unix(), 10) + + " and created_unix<" + strconv.FormatInt(endTime.Unix(), 10) + + " and job_type=" + "BENCHMARK" + + " and type=" + "0" + return xStatistic.SQL(countSql).Count() +} +func GenerateDebugTwoCount(beginTime time.Time, endTime time.Time) (int64, error) { + countSql := "SELECT count(*) FROM " + + "SELECT job_id FROM cloudbrain where created_unix >=" + strconv.FormatInt(beginTime.Unix(), 10) + + " and created_unix<" + strconv.FormatInt(endTime.Unix(), 10) + + " and job_type=" + "DEBUG" + + " and type=" + "2" + return xStatistic.SQL(countSql).Count() +} +func GenerateTrainTwoCount(beginTime time.Time, endTime time.Time) (int64, error) { + countSql := "SELECT count(*) FROM " + + "SELECT job_id FROM cloudbrain where created_unix >=" + strconv.FormatInt(beginTime.Unix(), 10) + + " and created_unix<" + strconv.FormatInt(endTime.Unix(), 10) + + " and job_type=" + "TRAIN" + + " and type=" + "1" + return xStatistic.SQL(countSql).Count() +} +func GenerateInferenceTwoCount(beginTime time.Time, endTime time.Time) (int64, error) { + countSql := "SELECT count(*) FROM " + + "SELECT job_id FROM cloudbrain where created_unix >=" + strconv.FormatInt(beginTime.Unix(), 10) + + " and created_unix<" + strconv.FormatInt(endTime.Unix(), 10) + + " and job_type=" + "INFERENCE" + + " and type=" + "1" + return xStatistic.SQL(countSql).Count() } diff --git a/routers/api/v1/repo/cloudbrain_dashboard.go b/routers/api/v1/repo/cloudbrain_dashboard.go index d39f5c373..66df42d88 100644 --- a/routers/api/v1/repo/cloudbrain_dashboard.go +++ b/routers/api/v1/repo/cloudbrain_dashboard.go @@ -2,14 +2,20 @@ package repo import ( "net/http" - "strconv" - "time" "code.gitea.io/gitea/models" "code.gitea.io/gitea/modules/context" "code.gitea.io/gitea/modules/log" ) +type CloudbrainsPeriodData struct { + DebugOneCount int64 `json:"debugOneCount"` + BenchmarkOneCount int64 `json:"benchmarkOneCount"` + DebugTwoCount int64 `json:"debugTwoCount"` + TrainTwoCount int64 `json:"trainTwoCount"` + InferenceTwoCount int64 `json:"inferenceTwoCount"` +} + func GetAllCloudbrainsPeriodStatistics(ctx *context.Context) { recordBeginTime, err := getRecordBeginTime() @@ -24,7 +30,6 @@ func GetAllCloudbrainsPeriodStatistics(ctx *context.Context) { ctx.Error(http.StatusBadRequest, ctx.Tr("repo.parameter_is_wrong")) return } - q := ctx.QueryTrim("q") page := ctx.QueryInt("page") if page <= 0 { page = 1 @@ -33,87 +38,46 @@ func GetAllCloudbrainsPeriodStatistics(ctx *context.Context) { if pageSize <= 0 { pageSize = DEFAULT_PAGE_SIZE } - orderBy := getOrderBy(ctx) - latestUpdatedTime, latestDate, err := models.GetRepoStatLastUpdatedTime() + debugOneCount, err := models.GenerateDebugOneCount(beginTime, endTime) if err != nil { - log.Error("Can not query the last updated time.", err) - ctx.Error(http.StatusBadRequest, ctx.Tr("repo.last_update_time_error")) + log.Error("Can not query debugOneCount.", err) + ctx.Error(http.StatusBadRequest, ctx.Tr("debugOneCount_get_error")) return } - - DebugOneCountSql := generateDebugOneCountSql(beginTime, endTime) - DebugOneTotal, err := models.CountBrainStatByRawSql(beginTime, endTime) + benchmarkOneCount, err := models.GenerateBenchmarkOneCount(beginTime, endTime) if err != nil { - log.Error("Can not query total count.", err) - ctx.Error(http.StatusBadRequest, ctx.Tr("repo.total_count_get_error")) + log.Error("Can not query benchmarkCount.", err) + ctx.Error(http.StatusBadRequest, ctx.Tr("benchmarkOneCount_get_error")) return } - DebugTwoCountSql := generateDebugTwoCountSql(beginTime, endTime) - DebugOneTotal, err := models.CountBrainStatByRawSql(DebugTwoCountSql) + debugTwoCount, err := models.GenerateDebugTwoCount(beginTime, endTime) if err != nil { - log.Error("Can not query total count.", err) - ctx.Error(http.StatusBadRequest, ctx.Tr("repo.total_count_get_error")) + log.Error("Can not query debugTwoCount.", err) + ctx.Error(http.StatusBadRequest, ctx.Tr("debugTwoCount_get_error")) return } - - sql := generateSqlByType(ctx, beginTime, endTime, latestDate, q, orderBy, page, pageSize) - - projectsPeriodData := ProjectsPeriodData{ - RecordBeginTime: recordBeginTime.Format(DATE_FORMAT), - PageSize: pageSize, - TotalPage: getTotalPage(DebugOneTotal, pageSize), - TotalCount: DebugOneTotal, - LastUpdatedTime: latestUpdatedTime, - PageRecords: models.GetRepoStatisticByRawSql(sql), + trainTwoCount, err := models.GenerateTrainTwoCount(beginTime, endTime) + if err != nil { + log.Error("Can not query DebugOneTotal count.", err) + ctx.Error(http.StatusBadRequest, ctx.Tr("total_count_get_error")) + return + } + inferenceTwoCount, err := models.GenerateInferenceTwoCount(beginTime, endTime) + if err != nil { + log.Error("Can not query inferenceTwoCount.", err) + ctx.Error(http.StatusBadRequest, ctx.Tr("inferenceTwoCount_get_error")) + return } - ctx.JSON(http.StatusOK, projectsPeriodData) + cloudbrainsPeriodData := CloudbrainsPeriodData{ + DebugOneCount: debugOneCount, + BenchmarkOneCount: benchmarkOneCount, + DebugTwoCount: debugTwoCount, + TrainTwoCount: trainTwoCount, + InferenceTwoCount: inferenceTwoCount, + } -} + ctx.JSON(http.StatusOK, cloudbrainsPeriodData) -func generateDebugOneCountSql(beginTime time.Time, endTime time.Time) string { - countSql := "SELECT count(*) FROM " + - "(SELECT job_id FROM cloudbrain where created_unix >=" + strconv.FormatInt(beginTime.Unix(), 10) + - " and created_unix<" + strconv.FormatInt(endTime.Unix(), 10) + - " and job_type=" + "DEBUG" + - " and type=" + "0" + - " group by job_id) " - return countSql -} -func generateBenchmarkOneCountSql(beginTime time.Time, endTime time.Time) string { - countSql := "SELECT count(*) FROM " + - "(SELECT job_id FROM cloudbrain where created_unix >=" + strconv.FormatInt(beginTime.Unix(), 10) + - " and created_unix<" + strconv.FormatInt(endTime.Unix(), 10) + - " and job_type=" + "BENCHMARK" + - " and type=" + "0" + - " group by job_id) " - return countSql -} -func generateDebugTwoCountSql(beginTime time.Time, endTime time.Time) string { - countSql := "SELECT count(*) FROM " + - "(SELECT job_id FROM cloudbrain where created_unix >=" + strconv.FormatInt(beginTime.Unix(), 10) + - " and created_unix<" + strconv.FormatInt(endTime.Unix(), 10) + - " and job_type=" + "DEBUG" + - " and type=" + "2" + - " group by job_id) " - return countSql -} -func generateTrainTwoCountSql(beginTime time.Time, endTime time.Time) string { - countSql := "SELECT count(*) FROM " + - "(SELECT job_id FROM cloudbrain where created_unix >=" + strconv.FormatInt(beginTime.Unix(), 10) + - " and created_unix<" + strconv.FormatInt(endTime.Unix(), 10) + - " and job_type=" + "TRAIN" + - " and type=" + "1" + - " group by job_id) " - return countSql -} -func generateInferenceTwoCountSql(beginTime time.Time, endTime time.Time) string { - countSql := "SELECT count(*) FROM " + - "(SELECT job_id FROM cloudbrain where created_unix >=" + strconv.FormatInt(beginTime.Unix(), 10) + - " and created_unix<" + strconv.FormatInt(endTime.Unix(), 10) + - " and job_type=" + "INFERENCE" + - " and type=" + "1" + - " group by job_id) " - return countSql } From 0034d1f23068e87061bdaad427f5942d553ee37d Mon Sep 17 00:00:00 2001 From: liuzx Date: Wed, 23 Mar 2022 16:55:24 +0800 Subject: [PATCH 003/239] update --- models/cloudbrain_static.go | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/models/cloudbrain_static.go b/models/cloudbrain_static.go index f388caae7..e6bdd7848 100644 --- a/models/cloudbrain_static.go +++ b/models/cloudbrain_static.go @@ -9,40 +9,41 @@ func GenerateDebugOneCount(beginTime time.Time, endTime time.Time) (int64, error countSql := "SELECT count(*) FROM " + "public.cloudbrain where created_unix >=" + strconv.FormatInt(beginTime.Unix(), 10) + " and created_unix<" + strconv.FormatInt(endTime.Unix(), 10) + - " and job_type=" + "DEBUG" + " and job_type ='" + string(JobTypeDebug) + "'" + + " and type='" + strconv.Itoa(TypeCloudBrainOne) + "'" - return xStatistic.SQL(countSql).Count() + return x.SQL(countSql).Count() } func GenerateBenchmarkOneCount(beginTime time.Time, endTime time.Time) (int64, error) { countSql := "SELECT count(*) FROM " + - "SELECT job_id FROM cloudbrain where created_unix >=" + strconv.FormatInt(beginTime.Unix(), 10) + + "public.cloudbrain where created_unix >=" + strconv.FormatInt(beginTime.Unix(), 10) + " and created_unix<" + strconv.FormatInt(endTime.Unix(), 10) + - " and job_type=" + "BENCHMARK" + - " and type=" + "0" - return xStatistic.SQL(countSql).Count() + " and job_type ='" + string(JobTypeBenchmark) + "'" + + " and type='" + strconv.Itoa(TypeCloudBrainOne) + "'" + return x.SQL(countSql).Count() } func GenerateDebugTwoCount(beginTime time.Time, endTime time.Time) (int64, error) { countSql := "SELECT count(*) FROM " + - "SELECT job_id FROM cloudbrain where created_unix >=" + strconv.FormatInt(beginTime.Unix(), 10) + + "public.cloudbrain where created_unix >=" + strconv.FormatInt(beginTime.Unix(), 10) + " and created_unix<" + strconv.FormatInt(endTime.Unix(), 10) + - " and job_type=" + "DEBUG" + - " and type=" + "2" - return xStatistic.SQL(countSql).Count() + " and job_type ='" + string(JobTypeDebug) + "'" + + " and type='" + strconv.Itoa(TypeCloudBrainTwo) + "'" + return x.SQL(countSql).Count() } func GenerateTrainTwoCount(beginTime time.Time, endTime time.Time) (int64, error) { countSql := "SELECT count(*) FROM " + - "SELECT job_id FROM cloudbrain where created_unix >=" + strconv.FormatInt(beginTime.Unix(), 10) + + "public.cloudbrain where created_unix >=" + strconv.FormatInt(beginTime.Unix(), 10) + " and created_unix<" + strconv.FormatInt(endTime.Unix(), 10) + - " and job_type=" + "TRAIN" + - " and type=" + "1" - return xStatistic.SQL(countSql).Count() + " and job_type ='" + string(JobTypeTrain) + "'" + + " and type='" + strconv.Itoa(TypeCloudBrainTwo) + "'" + return x.SQL(countSql).Count() } func GenerateInferenceTwoCount(beginTime time.Time, endTime time.Time) (int64, error) { countSql := "SELECT count(*) FROM " + - "SELECT job_id FROM cloudbrain where created_unix >=" + strconv.FormatInt(beginTime.Unix(), 10) + + "public.cloudbrain where created_unix >=" + strconv.FormatInt(beginTime.Unix(), 10) + " and created_unix<" + strconv.FormatInt(endTime.Unix(), 10) + - " and job_type=" + "INFERENCE" + - " and type=" + "1" - return xStatistic.SQL(countSql).Count() + " and job_type ='" + string(JobTypeInference) + "'" + + " and type='" + strconv.Itoa(TypeCloudBrainTwo) + "'" + return x.SQL(countSql).Count() } From 43358dee5eca837cabfd59a41496e498ec63ef7e Mon Sep 17 00:00:00 2001 From: liuzx Date: Thu, 24 Mar 2022 10:42:28 +0800 Subject: [PATCH 004/239] update --- routers/repo/repo_statistic.go | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/routers/repo/repo_statistic.go b/routers/repo/repo_statistic.go index 468e6fa85..8c7ea0fe5 100755 --- a/routers/repo/repo_statistic.go +++ b/routers/repo/repo_statistic.go @@ -17,6 +17,7 @@ import ( func StatisticAuto() { RepoStatisticAuto() TimingCountData() + CloudbrainStatisticAuto() } //auto daily @@ -334,3 +335,12 @@ func UpdateRepoVisits(ctx *macaron.Context, repo *models.Repository, date string } return nil } + +func CloudbrainStatisticAuto() { + yesterday := time.Now().AddDate(0, 0, -1).Format("2006-01-02") + CloudbrainStatisticDaily(yesterday) +} + +func CloudbrainStatisticDaily(date string) { + return +} From 3ea149bada66466eadf721bed4ebf5dba6f180f3 Mon Sep 17 00:00:00 2001 From: liuzx Date: Fri, 25 Mar 2022 09:46:55 +0800 Subject: [PATCH 005/239] update --- models/cloudbrain_static.go | 17 +++++++++++++++++ modules/cron/tasks_basic.go | 11 +++++++++++ routers/repo/repo_statistic.go | 1 - 3 files changed, 28 insertions(+), 1 deletion(-) diff --git a/models/cloudbrain_static.go b/models/cloudbrain_static.go index e6bdd7848..f646daf0c 100644 --- a/models/cloudbrain_static.go +++ b/models/cloudbrain_static.go @@ -3,8 +3,25 @@ package models import ( "strconv" "time" + + "code.gitea.io/gitea/modules/timeutil" ) +// Cloudbrain statistic info of all CloudbrainTasks +type CloudbrainStatistic struct { + ID int64 `xorm:"pk autoincr" json:"-"` + Date string `xorm:"unique(s) NOT NULL" json:"date"` + NumDubugOne int64 `xorm:"NOT NULL DEFAULT 0" json:"numDubugOne"` + NumBenchmarkOne int64 `xorm:"NOT NULL DEFAULT 0" json:"numBenchmarkOne"` + NumTrainOne int64 `xorm:"NOT NULL DEFAULT 0" json:"numTrainOne"` + NumDubugTwo int64 `xorm:"NOT NULL DEFAULT 0" json:"numDubugTwo"` + NumTrainTwo int64 `xorm:"NOT NULL DEFAULT 0" json:"numTrainTwo"` + NumInferenceTwo int64 `xorm:"NOT NULL DEFAULT 0" json:"numInferenceTwo"` + + CreatedUnix timeutil.TimeStamp `xorm:"INDEX created" json:"-"` + UpdatedUnix timeutil.TimeStamp `xorm:"INDEX updated" json:"-"` +} + func GenerateDebugOneCount(beginTime time.Time, endTime time.Time) (int64, error) { countSql := "SELECT count(*) FROM " + "public.cloudbrain where created_unix >=" + strconv.FormatInt(beginTime.Unix(), 10) + diff --git a/modules/cron/tasks_basic.go b/modules/cron/tasks_basic.go index b9838e66f..011cc8dba 100755 --- a/modules/cron/tasks_basic.go +++ b/modules/cron/tasks_basic.go @@ -173,6 +173,16 @@ func registerHandleRepoAndUserStatistic() { return nil }) } +func registerHandleCloudbrainStatistic() { + RegisterTaskFatal("handle_cloudbrain_statistic", &BaseConfig{ + Enabled: true, + RunAtStart: false, + Schedule: "@daily", + }, func(ctx context.Context, _ *models.User, _ Config) error { + repo.CloudbrainStatisticAuto() + return nil + }) +} func registerHandleSummaryStatistic() { RegisterTaskFatal("handle_summary_statistic", &BaseConfig{ @@ -212,6 +222,7 @@ func initBasicTasks() { registerHandleBlockChainUnSuccessCommits() registerHandleRepoAndUserStatistic() + registerHandleCloudbrainStatistic() registerHandleSummaryStatistic() registerSyncCloudbrainStatus() diff --git a/routers/repo/repo_statistic.go b/routers/repo/repo_statistic.go index 8c7ea0fe5..b889eb951 100755 --- a/routers/repo/repo_statistic.go +++ b/routers/repo/repo_statistic.go @@ -17,7 +17,6 @@ import ( func StatisticAuto() { RepoStatisticAuto() TimingCountData() - CloudbrainStatisticAuto() } //auto daily From 6871c8c15e8b1add99775b8fc839ff22876b4ce8 Mon Sep 17 00:00:00 2001 From: liuzx Date: Mon, 28 Mar 2022 18:03:42 +0800 Subject: [PATCH 006/239] update --- models/cloudbrain_static.go | 119 +++++++++++++++++++++++++++ routers/repo/cloudbrain_statistic.go | 115 ++++++++++++++++++++++++++ routers/repo/repo_statistic.go | 9 -- 3 files changed, 234 insertions(+), 9 deletions(-) create mode 100644 routers/repo/cloudbrain_statistic.go diff --git a/models/cloudbrain_static.go b/models/cloudbrain_static.go index f646daf0c..1b7bef01a 100644 --- a/models/cloudbrain_static.go +++ b/models/cloudbrain_static.go @@ -1,9 +1,11 @@ package models import ( + "fmt" "strconv" "time" + "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/timeutil" ) @@ -11,12 +13,24 @@ import ( type CloudbrainStatistic struct { ID int64 `xorm:"pk autoincr" json:"-"` Date string `xorm:"unique(s) NOT NULL" json:"date"` + WhichHour int64 `xorm:"NOT NULL DEFAULT -1" json:"whichHour"` NumDubugOne int64 `xorm:"NOT NULL DEFAULT 0" json:"numDubugOne"` NumBenchmarkOne int64 `xorm:"NOT NULL DEFAULT 0" json:"numBenchmarkOne"` NumTrainOne int64 `xorm:"NOT NULL DEFAULT 0" json:"numTrainOne"` NumDubugTwo int64 `xorm:"NOT NULL DEFAULT 0" json:"numDubugTwo"` NumTrainTwo int64 `xorm:"NOT NULL DEFAULT 0" json:"numTrainTwo"` NumInferenceTwo int64 `xorm:"NOT NULL DEFAULT 0" json:"numInferenceTwo"` + NumCloudOneAll int64 `xorm:"NOT NULL DEFAULT 0" json:"numCloudOneAll"` + NumCloudTwoAll int64 `xorm:"NOT NULL DEFAULT 0" json:"numCloudTwoAll"` + + DurationDubugOne int64 `xorm:"NOT NULL DEFAULT 0" json:"durationDubugOne"` + DurationBenchmarkOne int64 `xorm:"NOT NULL DEFAULT 0" json:"durationBenchmarkOne"` + DurationTrainOne int64 `xorm:"NOT NULL DEFAULT 0" json:"durationTrainOne"` + DurationDebugTwo int64 `xorm:"NOT NULL DEFAULT 0" json:"durationDebugTwo"` + DurationTrainTwo int64 `xorm:"NOT NULL DEFAULT 0" json:"durationTrainTwo"` + DurationInferenceTwo int64 `xorm:"NOT NULL DEFAULT 0" json:"durationInferenceTwo"` + DurationCloudOneAll int64 `xorm:"NOT NULL DEFAULT 0" json:"durationCloudOneAll"` + DurationCloudTwoAll int64 `xorm:"NOT NULL DEFAULT 0" json:"durationCloudTwoAll"` CreatedUnix timeutil.TimeStamp `xorm:"INDEX created" json:"-"` UpdatedUnix timeutil.TimeStamp `xorm:"INDEX updated" json:"-"` @@ -31,6 +45,32 @@ func GenerateDebugOneCount(beginTime time.Time, endTime time.Time) (int64, error return x.SQL(countSql).Count() } +func GetDebugOneDuration(beginTime time.Time, endTime time.Time) (int64, error) { + total, err := x.Where("created_unix >= ? And created_unix < ? And job_type = ? And type = ? ", strconv.FormatInt(beginTime.Unix(), 10), strconv.FormatInt(endTime.Unix(), 10), JobTypeDebug, TypeCloudBrainOne).SumInt(&Cloudbrain{}, "duration") + if err != nil { + return 0, err + } + + return total, nil +} + +func GenerateTrainOneCount(beginTime time.Time, endTime time.Time) (int64, error) { + countSql := "SELECT count(*) FROM " + + "public.cloudbrain where created_unix >=" + strconv.FormatInt(beginTime.Unix(), 10) + + " and created_unix<" + strconv.FormatInt(endTime.Unix(), 10) + + " and job_type ='" + string(JobTypeTrain) + "'" + + " and type='" + strconv.Itoa(TypeCloudBrainOne) + "'" + + return x.SQL(countSql).Count() +} +func GetTrainOneDuration(beginTime time.Time, endTime time.Time) (int64, error) { + total, err := x.Where("created_unix >= ? And created_unix < ? And job_type = ? And type = ? ", strconv.FormatInt(beginTime.Unix(), 10), strconv.FormatInt(endTime.Unix(), 10), JobTypeTrain, TypeCloudBrainOne).SumInt(&Cloudbrain{}, "duration") + if err != nil { + return 0, err + } + + return total, nil +} func GenerateBenchmarkOneCount(beginTime time.Time, endTime time.Time) (int64, error) { countSql := "SELECT count(*) FROM " + @@ -40,6 +80,14 @@ func GenerateBenchmarkOneCount(beginTime time.Time, endTime time.Time) (int64, e " and type='" + strconv.Itoa(TypeCloudBrainOne) + "'" return x.SQL(countSql).Count() } +func GetBenchmarkOneDuration(beginTime time.Time, endTime time.Time) (int64, error) { + total, err := x.Where("created_unix >= ? And created_unix < ? And job_type = ? And type = ? ", strconv.FormatInt(beginTime.Unix(), 10), strconv.FormatInt(endTime.Unix(), 10), JobTypeBenchmark, TypeCloudBrainOne).SumInt(&Cloudbrain{}, "duration") + if err != nil { + return 0, err + } + + return total, nil +} func GenerateDebugTwoCount(beginTime time.Time, endTime time.Time) (int64, error) { countSql := "SELECT count(*) FROM " + "public.cloudbrain where created_unix >=" + strconv.FormatInt(beginTime.Unix(), 10) + @@ -48,6 +96,13 @@ func GenerateDebugTwoCount(beginTime time.Time, endTime time.Time) (int64, error " and type='" + strconv.Itoa(TypeCloudBrainTwo) + "'" return x.SQL(countSql).Count() } +func GetDebugTwoDuration(beginTime time.Time, endTime time.Time) (int64, error) { + total, err := x.Where("created_unix >= ? And created_unix < ? And job_type = ? And type = ? ", strconv.FormatInt(beginTime.Unix(), 10), strconv.FormatInt(endTime.Unix(), 10), JobTypeDebug, TypeCloudBrainTwo).SumInt(&Cloudbrain{}, "duration") + if err != nil { + return 0, err + } + return total, nil +} func GenerateTrainTwoCount(beginTime time.Time, endTime time.Time) (int64, error) { countSql := "SELECT count(*) FROM " + "public.cloudbrain where created_unix >=" + strconv.FormatInt(beginTime.Unix(), 10) + @@ -56,6 +111,13 @@ func GenerateTrainTwoCount(beginTime time.Time, endTime time.Time) (int64, error " and type='" + strconv.Itoa(TypeCloudBrainTwo) + "'" return x.SQL(countSql).Count() } +func GetTrainTwoDuration(beginTime time.Time, endTime time.Time) (int64, error) { + total, err := x.Where("created_unix >= ? And created_unix < ? And job_type = ? And type = ? ", strconv.FormatInt(beginTime.Unix(), 10), strconv.FormatInt(endTime.Unix(), 10), JobTypeTrain, TypeCloudBrainTwo).SumInt(&Cloudbrain{}, "duration") + if err != nil { + return 0, err + } + return total, nil +} func GenerateInferenceTwoCount(beginTime time.Time, endTime time.Time) (int64, error) { countSql := "SELECT count(*) FROM " + "public.cloudbrain where created_unix >=" + strconv.FormatInt(beginTime.Unix(), 10) + @@ -64,3 +126,60 @@ func GenerateInferenceTwoCount(beginTime time.Time, endTime time.Time) (int64, e " and type='" + strconv.Itoa(TypeCloudBrainTwo) + "'" return x.SQL(countSql).Count() } +func GetInferenceTwoDuration(beginTime time.Time, endTime time.Time) (int64, error) { + total, err := x.Where("created_unix >= ? And created_unix < ? And job_type = ? And type = ? ", strconv.FormatInt(beginTime.Unix(), 10), strconv.FormatInt(endTime.Unix(), 10), JobTypeInference, TypeCloudBrainTwo).SumInt(&Cloudbrain{}, "duration") + if err != nil { + return 0, err + } + return total, nil +} + +func DeleteCloudbrainStatisticDaily(date string) error { + sess := xStatistic.NewSession() + defer sess.Close() + if err := sess.Begin(); err != nil { + return fmt.Errorf("Begin: %v", err) + } + + if _, err := sess.Where("date = ?", date).Delete(&CloudbrainStatistic{}); err != nil { + return fmt.Errorf("Delete: %v", err) + } + + if err := sess.Commit(); err != nil { + sess.Close() + return fmt.Errorf("Commit: %v", err) + } + + sess.Close() + return nil +} + +func GetHourStatTime(timeStr string, whichHour int64) (time.Time, time.Time) { + t, _ := time.Parse("2006-01-02", timeStr) + timeNumber := t.Unix() + beginTimeNumber := timeNumber - 8*60*60 + whichHour*60*60 + endTimeNumber := beginTimeNumber + 1*60*60 + beginTime := time.Unix(beginTimeNumber, 0) + endTime := time.Unix(endTimeNumber, 0) + log.Info("%s, %s", beginTime, endTime) + + return beginTime, endTime +} +func GetDayStatTime(timeStr string) (time.Time, time.Time) { + t, _ := time.Parse("2006-01-02", timeStr) + timeNumber := t.Unix() + beginTimeNumber := timeNumber - 8*60*60 + endTimeNumber := beginTimeNumber + 16*60*60 + beginTime := time.Unix(beginTimeNumber, 0) + endTime := time.Unix(endTimeNumber, 0) + log.Info("%s, %s", beginTime, endTime) + + return beginTime, endTime +} + +func CreateCloudbrainStatistic(cloudbrainStat *CloudbrainStatistic) (err error) { + if _, err = xStatistic.Insert(cloudbrainStat); err != nil { + return err + } + return nil +} diff --git a/routers/repo/cloudbrain_statistic.go b/routers/repo/cloudbrain_statistic.go new file mode 100644 index 000000000..926fa68c7 --- /dev/null +++ b/routers/repo/cloudbrain_statistic.go @@ -0,0 +1,115 @@ +package repo + +import ( + "time" + + "code.gitea.io/gitea/models" + "code.gitea.io/gitea/modules/log" + "code.gitea.io/gitea/modules/setting" + "code.gitea.io/gitea/services/mailer" +) + +func CloudbrainStatisticAuto() { + yesterday := time.Now().AddDate(0, 0, -1).Format("2006-01-02") + CloudbrainStatisticDaily(yesterday) +} + +func CloudbrainStatisticDaily(date string) { + log.Info("%s", date) + log.Info("begin Repo Statistic") + warnEmailMessage := "云脑任务统计信息入库失败，请尽快定位。" + if err := models.DeleteCloudbrainStatisticDaily(date); err != nil { + log.Error("DeleteCloudbrainStatisticDaily failed: %v", err.Error()) + mailer.SendWarnNotifyMail(setting.Warn_Notify_Mails, warnEmailMessage) + return + } + + //0 to 23 for each hour, 25 for all 24 hours + var WhichHour [25]int64 = [25]int64{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 25} + for _, whichHour := range WhichHour { + log.Info("start statistic: %s", date) + var beginTime, endTime time.Time + beginTime, endTime = models.GetHourStatTime(date, whichHour) + if whichHour == 25 { + beginTime, endTime = models.GetDayStatTime(date) + } + numDubugOne, err := models.GenerateDebugOneCount(beginTime, endTime) + if err != nil { + log.Error("GenerateDebugOneCount failed(%s): %v", numDubugOne, err) + } + numBenchmarkOne, err := models.GenerateBenchmarkOneCount(beginTime, endTime) + if err != nil { + log.Error("GenerateBenchmarkOneCount failed(%s): %v", numBenchmarkOne, err) + } + numTrainOne, err := models.GenerateTrainOneCount(beginTime, endTime) + if err != nil { + log.Error("GenerateTrainOneCount failed(%s): %v", numTrainOne, err) + } + numDebugTwo, err := models.GenerateDebugTwoCount(beginTime, endTime) + if err != nil { + log.Error("GenerateDebugTwoCount failed(%s): %v", numDebugTwo, err) + } + numTrainTwo, err := models.GenerateTrainTwoCount(beginTime, endTime) + if err != nil { + log.Error("GenerateTrainTwoCount failed(%s): %v", numTrainTwo, err) + } + numInferenceTwo, err := models.GenerateInferenceTwoCount(beginTime, endTime) + if err != nil { + log.Error("GenerateInferenceTwoCount failed(%s): %v", numInferenceTwo, err) + } + numCloudOneAll := numDubugOne + numBenchmarkOne + numTrainOne + numCloudTwoAll := numDebugTwo + numTrainTwo + numInferenceTwo + + durationDubugOne, err := models.GetDebugOneDuration(beginTime, endTime) + if err != nil { + log.Error("GetDebugOneDuration failed(%s): %v", durationDubugOne, err) + } + durationBenchmarkOne, err := models.GetBenchmarkOneDuration(beginTime, endTime) + if err != nil { + log.Error("GetBenchmarkOneDuration failed(%s): %v", durationBenchmarkOne, err) + } + durationTrainOne, err := models.GetTrainOneDuration(beginTime, endTime) + if err != nil { + log.Error("GetTrainOneDuration failed(%s): %v", durationTrainOne, err) + } + durationDebugTwo, err := models.GetDebugTwoDuration(beginTime, endTime) + if err != nil { + log.Error("GetDebugTwoDuration failed(%s): %v", durationDebugTwo, err) + } + durationTrainTwo, err := models.GetTrainTwoDuration(beginTime, endTime) + if err != nil { + log.Error("GetTrainTwoDuration failed(%s): %v", durationTrainTwo, err) + } + durationInferenceTwo, err := models.GetInferenceTwoDuration(beginTime, endTime) + if err != nil { + log.Error("GetInferenceTwoDuration failed(%s): %v", durationInferenceTwo, err) + } + durationCloudOneAll := durationDubugOne + durationBenchmarkOne + durationTrainOne + durationCloudTwoAll := durationDebugTwo + durationTrainTwo + durationInferenceTwo + + err = models.CreateCloudbrainStatistic(&models.CloudbrainStatistic{ + Date: date, + WhichHour: whichHour, + NumDubugOne: numDubugOne, + NumBenchmarkOne: numBenchmarkOne, + NumTrainOne: numTrainOne, + NumDubugTwo: numDebugTwo, + NumTrainTwo: numTrainTwo, + NumInferenceTwo: numInferenceTwo, + NumCloudOneAll: numCloudOneAll, + NumCloudTwoAll: numCloudTwoAll, + DurationDubugOne: durationDubugOne, + DurationBenchmarkOne: durationBenchmarkOne, + DurationTrainOne: durationTrainOne, + DurationDebugTwo: durationDebugTwo, + DurationTrainTwo: durationTrainTwo, + DurationInferenceTwo: durationInferenceTwo, + DurationCloudOneAll: durationCloudOneAll, + DurationCloudTwoAll: durationCloudTwoAll, + }) + if err != nil { + log.Error("CreateCloudbrainStatistic(%s) failed:%v", date, err.Error()) + return + } + } +} diff --git a/routers/repo/repo_statistic.go b/routers/repo/repo_statistic.go index b889eb951..468e6fa85 100755 --- a/routers/repo/repo_statistic.go +++ b/routers/repo/repo_statistic.go @@ -334,12 +334,3 @@ func UpdateRepoVisits(ctx *macaron.Context, repo *models.Repository, date string } return nil } - -func CloudbrainStatisticAuto() { - yesterday := time.Now().AddDate(0, 0, -1).Format("2006-01-02") - CloudbrainStatisticDaily(yesterday) -} - -func CloudbrainStatisticDaily(date string) { - return -} From 34cf97e9bb7d7e97407a12585d3928ec69f5f8b5 Mon Sep 17 00:00:00 2001 From: liuzx Date: Tue, 29 Mar 2022 09:42:48 +0800 Subject: [PATCH 007/239] update --- routers/api/v1/api.go | 8 -------- 1 file changed, 8 deletions(-) diff --git a/routers/api/v1/api.go b/routers/api/v1/api.go index 6118db265..89914f688 100755 --- a/routers/api/v1/api.go +++ b/routers/api/v1/api.go @@ -556,16 +556,8 @@ func RegisterRoutes(m *macaron.Macaron) { m.Get("/query_user_all", operationReq, repo_ext.QueryUserStaticAll) //cloudbrain board m.Group("/cloudbrainboard", func() { - m.Get("/restoreFork", repo.RestoreForkNumber) - m.Get("/downloadAll", repo.ServeAllProjectsPeriodStatisticsFile) - m.Get("/downloadAllOpenI", repo.ServeAllProjectsOpenIStatisticsFile) m.Group("/cloudbrain", func() { m.Get("", repo.GetAllCloudbrainsPeriodStatistics) - m.Group("/:id", func() { - m.Get("", repo.GetProjectLatestStatistics) - m.Get("/period", repo.GetProjectPeriodStatistics) - - }) }) }, operationReq) From 3696ce23c414dd9bfd56d82c82f74a9ee8badaa8 Mon Sep 17 00:00:00 2001 From: liuzx Date: Thu, 31 Mar 2022 10:33:25 +0800 Subject: [PATCH 008/239] update --- models/cloudbrain_static.go | 2 +- models/models.go | 1 + routers/api/v1/api.go | 1 + routers/api/v1/repo/cloudbrain_dashboard.go | 74 +++++++++++++++++++++ routers/repo/cloudbrain_statistic.go | 4 +- routers/routes/routes.go | 1 + 6 files changed, 80 insertions(+), 3 deletions(-) diff --git a/models/cloudbrain_static.go b/models/cloudbrain_static.go index 1b7bef01a..4d0e7cfaa 100644 --- a/models/cloudbrain_static.go +++ b/models/cloudbrain_static.go @@ -12,7 +12,7 @@ import ( // Cloudbrain statistic info of all CloudbrainTasks type CloudbrainStatistic struct { ID int64 `xorm:"pk autoincr" json:"-"` - Date string `xorm:"unique(s) NOT NULL" json:"date"` + Date string `xorm:"NOT NULL DEFAULT 0" json:"date"` WhichHour int64 `xorm:"NOT NULL DEFAULT -1" json:"whichHour"` NumDubugOne int64 `xorm:"NOT NULL DEFAULT 0" json:"numDubugOne"` NumBenchmarkOne int64 `xorm:"NOT NULL DEFAULT 0" json:"numBenchmarkOne"` diff --git a/models/models.go b/models/models.go index 0f4679b4f..02cfb3144 100755 --- a/models/models.go +++ b/models/models.go @@ -151,6 +151,7 @@ func init() { new(UserBusinessAnalysisCurrentWeek), new(UserBusinessAnalysisYesterday), new(UserLoginLog), + new(CloudbrainStatistic), ) gonicNames := []string{"SSL", "UID"} diff --git a/routers/api/v1/api.go b/routers/api/v1/api.go index 89914f688..87af1d19b 100755 --- a/routers/api/v1/api.go +++ b/routers/api/v1/api.go @@ -556,6 +556,7 @@ func RegisterRoutes(m *macaron.Macaron) { m.Get("/query_user_all", operationReq, repo_ext.QueryUserStaticAll) //cloudbrain board m.Group("/cloudbrainboard", func() { + m.Get("/downloadtable", repo.ServeCloudbrainPeriodStatisticsFile) m.Group("/cloudbrain", func() { m.Get("", repo.GetAllCloudbrainsPeriodStatistics) }) diff --git a/routers/api/v1/repo/cloudbrain_dashboard.go b/routers/api/v1/repo/cloudbrain_dashboard.go index 66df42d88..358aa6c37 100644 --- a/routers/api/v1/repo/cloudbrain_dashboard.go +++ b/routers/api/v1/repo/cloudbrain_dashboard.go @@ -2,10 +2,12 @@ package repo import ( "net/http" + "net/url" "code.gitea.io/gitea/models" "code.gitea.io/gitea/modules/context" "code.gitea.io/gitea/modules/log" + "github.com/360EntSecGroup-Skylar/excelize/v2" ) type CloudbrainsPeriodData struct { @@ -81,3 +83,75 @@ func GetAllCloudbrainsPeriodStatistics(ctx *context.Context) { ctx.JSON(http.StatusOK, cloudbrainsPeriodData) } +func ServeCloudbrainPeriodStatisticsFile(ctx *context.Context) { + + recordBeginTime, err := getRecordBeginTime() + if err != nil { + log.Error("Can not get record begin time", err) + ctx.Error(http.StatusBadRequest, ctx.Tr("repo.record_begintime_get_err")) + return + } + beginTime, endTime, err := getTimePeroid(ctx, recordBeginTime) + if err != nil { + log.Error("Parameter is wrong", err) + ctx.Error(http.StatusBadRequest, ctx.Tr("repo.parameter_is_wrong")) + return + } + q := ctx.QueryTrim("q") + page := ctx.QueryInt("page") + if page <= 0 { + page = 1 + } + pageSize := 1000 + orderBy := getOrderBy(ctx) + + _, latestDate, err := models.GetRepoStatLastUpdatedTime() + if err != nil { + log.Error("Can not query the last updated time.", err) + ctx.Error(http.StatusBadRequest, ctx.Tr("repo.last_update_time_error")) + return + } + + countSql := generateCountSql(beginTime, endTime, latestDate, q) + total, err := models.CountRepoStatByRawSql(countSql) + if err != nil { + log.Error("Can not query total count.", err) + ctx.Error(http.StatusBadRequest, ctx.Tr("repo.total_count_get_error")) + return + } + var projectAnalysis = ctx.Tr("repo.repo_stat_inspect") + fileName := getFileName(ctx, beginTime, endTime, projectAnalysis) + + totalPage := getTotalPage(total, pageSize) + + f := excelize.NewFile() + + index := f.NewSheet(projectAnalysis) + f.DeleteSheet("Sheet1") + + for k, v := range allProjectsPeroidHeader(ctx) { + f.SetCellValue(projectAnalysis, k, v) + } + + var row = 2 + for i := 0; i <= totalPage; i++ { + + pageRecords := models.GetRepoStatisticByRawSql(generateSqlByType(ctx, beginTime, endTime, latestDate, q, orderBy, i+1, pageSize)) + for _, record := range pageRecords { + + for k, v := range allProjectsPeroidValues(row, record, ctx) { + f.SetCellValue(projectAnalysis, k, v) + } + row++ + + } + + } + f.SetActiveSheet(index) + + ctx.Resp.Header().Set("Content-Disposition", "attachment; filename="+url.QueryEscape(fileName)) + ctx.Resp.Header().Set("Content-Type", "application/octet-stream") + + f.WriteTo(ctx.Resp) + +} diff --git a/routers/repo/cloudbrain_statistic.go b/routers/repo/cloudbrain_statistic.go index 926fa68c7..16137ed2e 100644 --- a/routers/repo/cloudbrain_statistic.go +++ b/routers/repo/cloudbrain_statistic.go @@ -10,13 +10,13 @@ import ( ) func CloudbrainStatisticAuto() { - yesterday := time.Now().AddDate(0, 0, -1).Format("2006-01-02") + yesterday := time.Now().AddDate(0, 0, 0).Format("2006-01-02") CloudbrainStatisticDaily(yesterday) } func CloudbrainStatisticDaily(date string) { log.Info("%s", date) - log.Info("begin Repo Statistic") + log.Info("begin Cloudbrain Statistic") warnEmailMessage := "云脑任务统计信息入库失败，请尽快定位。" if err := models.DeleteCloudbrainStatisticDaily(date); err != nil { log.Error("DeleteCloudbrainStatisticDaily failed: %v", err.Error()) diff --git a/routers/routes/routes.go b/routers/routes/routes.go index 2d146c2c6..a2e969a60 100755 --- a/routers/routes/routes.go +++ b/routers/routes/routes.go @@ -990,6 +990,7 @@ func RegisterRoutes(m *macaron.Macaron) { }, context.RepoRef()) m.Group("/cloudbrain", func() { + m.Get("/test", repo.CloudbrainStatisticAuto) m.Group("/:id", func() { m.Get("", reqRepoCloudBrainReader, repo.CloudBrainShow) m.Get("/debug", cloudbrain.AdminOrJobCreaterRight, repo.CloudBrainDebug) From 29fdbd5d580f6cd341255332616f0a2a3bea1070 Mon Sep 17 00:00:00 2001 From: liuzx Date: Wed, 6 Apr 2022 18:15:35 +0800 Subject: [PATCH 009/239] update --- models/cloudbrain_static.go | 10 + routers/api/v1/api.go | 1 + routers/api/v1/repo/cloudbrain_dashboard.go | 272 +++++++++++++++++++- routers/repo/cloudbrain_statistic.go | 2 +- 4 files changed, 283 insertions(+), 2 deletions(-) diff --git a/models/cloudbrain_static.go b/models/cloudbrain_static.go index 4d0e7cfaa..8e9329ce2 100644 --- a/models/cloudbrain_static.go +++ b/models/cloudbrain_static.go @@ -36,6 +36,16 @@ type CloudbrainStatistic struct { UpdatedUnix timeutil.TimeStamp `xorm:"INDEX updated" json:"-"` } +type TimeCloudbrainNum struct { + Time time.Time `json:"time"` + DebugOneCount int64 `json:"debugOneCount"` + BenchmarkOneCount int64 `json:"benchmarkOneCount"` + TrainOneCount int64 `json:"trainOneCount"` + DebugTwoCount int64 `json:"debugTwoCount"` + TrainTwoCount int64 `json:"trainTwoCount"` + InferenceTwoCount int64 `json:"inferenceTwoCount"` +} + func GenerateDebugOneCount(beginTime time.Time, endTime time.Time) (int64, error) { countSql := "SELECT count(*) FROM " + "public.cloudbrain where created_unix >=" + strconv.FormatInt(beginTime.Unix(), 10) + diff --git a/routers/api/v1/api.go b/routers/api/v1/api.go index fded809f4..c03ffbe02 100755 --- a/routers/api/v1/api.go +++ b/routers/api/v1/api.go @@ -559,6 +559,7 @@ func RegisterRoutes(m *macaron.Macaron) { m.Group("/cloudbrainboard", func() { m.Get("/downloadtable", repo.ServeCloudbrainPeriodStatisticsFile) m.Group("/cloudbrain", func() { + m.Get("/trend", repo.GetAllCloudbrainsTrend) m.Get("", repo.GetAllCloudbrainsPeriodStatistics) }) }, operationReq) diff --git a/routers/api/v1/repo/cloudbrain_dashboard.go b/routers/api/v1/repo/cloudbrain_dashboard.go index 358aa6c37..609783bfb 100644 --- a/routers/api/v1/repo/cloudbrain_dashboard.go +++ b/routers/api/v1/repo/cloudbrain_dashboard.go @@ -1,8 +1,10 @@ package repo import ( + "fmt" "net/http" "net/url" + "time" "code.gitea.io/gitea/models" "code.gitea.io/gitea/modules/context" @@ -13,10 +15,52 @@ import ( type CloudbrainsPeriodData struct { DebugOneCount int64 `json:"debugOneCount"` BenchmarkOneCount int64 `json:"benchmarkOneCount"` + TrainOneCount int64 `json:"trainOneCount"` DebugTwoCount int64 `json:"debugTwoCount"` TrainTwoCount int64 `json:"trainTwoCount"` InferenceTwoCount int64 `json:"inferenceTwoCount"` } +type TimeCloudbrainsNum struct { + TimeCloudbrainNum []models.TimeCloudbrainNum `json:"imeCloudbrainNum"` +} + +func GetAllCloudbrainsTrend(ctx *context.Context) { + + recordBeginTime, err := getRecordBeginTime() + if err != nil { + log.Error("Can not get record begin time", err) + ctx.Error(http.StatusBadRequest, ctx.Tr("repo.record_begintime_get_err")) + return + } + timeCloudbrainNum, beginTime, endTime, err := getCloudbrainTrendTime(ctx, recordBeginTime) + if err != nil { + log.Error("Parameter is wrong", err) + ctx.Error(http.StatusBadRequest, ctx.Tr("repo.parameter_is_wrong")) + return + } + page := ctx.QueryInt("page") + if page <= 0 { + page = 1 + } + pageSize := ctx.QueryInt("pagesize") + if pageSize <= 0 { + pageSize = DEFAULT_PAGE_SIZE + } + + cloudbrainsPeriodData := TimeCloudbrainsNum{ + TimeCloudbrainNum: timeCloudbrainNum, + } + now := time.Now() + endTime = now + beginTime = time.Date(endTime.Year(), endTime.Month(), 2, 0, 0, 0, 0, now.Location()) + testtime := now.AddDate(0, -1, 1) + fmt.Printf("beginTime is: %s", beginTime) + fmt.Printf("endTime is: %s", endTime) + fmt.Printf("testtime is:%s", testtime) + + ctx.JSON(http.StatusOK, cloudbrainsPeriodData) + +} func GetAllCloudbrainsPeriodStatistics(ctx *context.Context) { @@ -53,6 +97,12 @@ func GetAllCloudbrainsPeriodStatistics(ctx *context.Context) { ctx.Error(http.StatusBadRequest, ctx.Tr("benchmarkOneCount_get_error")) return } + trainOneCount, err := models.GenerateTrainOneCount(beginTime, endTime) + if err != nil { + log.Error("Can not query trainOneCount.", err) + ctx.Error(http.StatusBadRequest, ctx.Tr("trainOneCount_get_error")) + return + } debugTwoCount, err := models.GenerateDebugTwoCount(beginTime, endTime) if err != nil { log.Error("Can not query debugTwoCount.", err) @@ -75,10 +125,18 @@ func GetAllCloudbrainsPeriodStatistics(ctx *context.Context) { cloudbrainsPeriodData := CloudbrainsPeriodData{ DebugOneCount: debugOneCount, BenchmarkOneCount: benchmarkOneCount, + TrainOneCount: trainOneCount, DebugTwoCount: debugTwoCount, TrainTwoCount: trainTwoCount, InferenceTwoCount: inferenceTwoCount, } + now := time.Now() + endTime = now + beginTime = time.Date(endTime.Year(), endTime.Month(), 2, 0, 0, 0, 0, now.Location()) + testtime := now.AddDate(0, -1, 1) + fmt.Printf("beginTime is: %s", beginTime) + fmt.Printf("endTime is: %s", endTime) + fmt.Printf("testtime is:%s", testtime) ctx.JSON(http.StatusOK, cloudbrainsPeriodData) @@ -91,7 +149,7 @@ func ServeCloudbrainPeriodStatisticsFile(ctx *context.Context) { ctx.Error(http.StatusBadRequest, ctx.Tr("repo.record_begintime_get_err")) return } - beginTime, endTime, err := getTimePeroid(ctx, recordBeginTime) + beginTime, endTime, err := getCloudbrainTimePeroid(ctx, recordBeginTime) if err != nil { log.Error("Parameter is wrong", err) ctx.Error(http.StatusBadRequest, ctx.Tr("repo.parameter_is_wrong")) @@ -155,3 +213,215 @@ func ServeCloudbrainPeriodStatisticsFile(ctx *context.Context) { f.WriteTo(ctx.Resp) } + +func getCloudbrainTimePeroid(ctx *context.Context, recordBeginTime time.Time) (time.Time, time.Time, error) { + queryType := ctx.QueryTrim("type") + now := time.Now() + recordBeginTimeTemp := recordBeginTime.AddDate(0, 0, 1) + + beginTimeStr := ctx.QueryTrim("beginTime") + endTimeStr := ctx.QueryTrim("endTime") + var beginTime time.Time + var endTime time.Time + var err error + if queryType != "" { + + if queryType == "all" { + beginTime = recordBeginTimeTemp + endTime = now + } else if queryType == "yesterday" { + endTime = now + beginTime = time.Date(endTime.Year(), endTime.Month(), endTime.Day(), 0, 0, 0, 0, now.Location()) + + } else if queryType == "current_week" { + beginTime = now.AddDate(0, 0, -int(time.Now().Weekday())+2) //begin from monday + beginTime = time.Date(beginTime.Year(), beginTime.Month(), beginTime.Day(), 0, 0, 0, 0, now.Location()) + endTime = now + } else if queryType == "current_month" { + endTime = now + beginTime = time.Date(endTime.Year(), endTime.Month(), 2, 0, 0, 0, 0, now.Location()) + } else if queryType == "monthly" { + endTime = now + beginTime = now.AddDate(0, -1, 1) + beginTime = time.Date(beginTime.Year(), beginTime.Month(), beginTime.Day(), 0, 0, 0, 0, now.Location()) + + } else if queryType == "current_year" { + endTime = now + beginTime = time.Date(endTime.Year(), 1, 2, 0, 0, 0, 0, now.Location()) + + } else if queryType == "last_month" { + + lastMonthTime := now.AddDate(0, -1, 0) + beginTime = time.Date(lastMonthTime.Year(), lastMonthTime.Month(), 2, 0, 0, 0, 0, now.Location()) + endTime = time.Date(now.Year(), now.Month(), 2, 0, 0, 0, 0, now.Location()) + + } else { + return now, now, fmt.Errorf("The value of type parameter is wrong.") + + } + + } else { + if beginTimeStr == "" || endTimeStr == "" { + //如果查询类型和开始时间结束时间都未设置，按queryType=all处理 + beginTime = recordBeginTimeTemp + endTime = now + + } else { + + beginTime, err = time.ParseInLocation("2006-01-02", beginTimeStr, time.Local) + if err != nil { + return now, now, err + } + + endTime, err = time.ParseInLocation("2006-01-02", endTimeStr, time.Local) + if err != nil { + return now, now, err + } + + beginTime = beginTime.AddDate(0, 0, 1) + endTime = endTime.AddDate(0, 0, 1) + } + + } + + if beginTime.Before(recordBeginTimeTemp) { + beginTime = recordBeginTimeTemp + } + + return beginTime, endTime, nil + +} + +func getCloudbrainTrendTime(ctx *context.Context, recordBeginTime time.Time) ([]models.TimeCloudbrainNum, time.Time, time.Time, error) { + queryType := ctx.QueryTrim("type") + now := time.Now() + recordBeginTimeTemp := recordBeginTime.AddDate(0, 0, 1) + + beginTimeStr := ctx.QueryTrim("beginTime") + endTimeStr := ctx.QueryTrim("endTime") + var beginTime time.Time + var endTime time.Time + var err error + timeCloudbrainNum := make([]models.TimeCloudbrainNum, 0) + if queryType != "" { + + if queryType == "all" { + beginTime = recordBeginTimeTemp + endTime = now + } else if queryType == "yesterday" { + endTime = now + beginTime = time.Date(endTime.Year(), endTime.Month(), endTime.Day(), 0, 0, 0, 0, now.Location()) + + } else if queryType == "current_week" { + beginTime = now.AddDate(0, 0, -int(time.Now().Weekday())+2) //begin from monday + beginTime = time.Date(beginTime.Year(), beginTime.Month(), beginTime.Day(), 0, 0, 0, 0, now.Location()) + endTime = now + } else if queryType == "current_month" { + endTime = now + beginTime = time.Date(endTime.Year(), endTime.Month(), 1, 0, 0, 0, 0, now.Location()) + endTime1 := beginTime.AddDate(0, 0, 1) + for endTime1.Before(endTime) { + debugOneCount, benchmarkOneCount, trainOneCount, debugTwoCount, trainTwoCount, inferenceTwoCount, err := getCloudbrainCount(beginTime, endTime1) + if err != nil { + log.Error("Can not query debugOneCount.", err) + ctx.Error(http.StatusBadRequest, ctx.Tr("debugOneCount_get_error")) + } + timeCloudbrainNum = append(timeCloudbrainNum, models.TimeCloudbrainNum{ + Time: beginTime, + DebugOneCount: debugOneCount, + BenchmarkOneCount: benchmarkOneCount, + TrainOneCount: trainOneCount, + DebugTwoCount: debugTwoCount, + TrainTwoCount: trainTwoCount, + InferenceTwoCount: inferenceTwoCount, + }) + beginTime = endTime1 + endTime1 = beginTime.AddDate(0, 0, 1) + } + return timeCloudbrainNum, beginTime, endTime, nil + + } else if queryType == "monthly" { + endTime = now + beginTime = now.AddDate(0, -1, 1) + beginTime = time.Date(beginTime.Year(), beginTime.Month(), beginTime.Day(), 0, 0, 0, 0, now.Location()) + + } else if queryType == "current_year" { + endTime = now + beginTime = time.Date(endTime.Year(), 1, 2, 0, 0, 0, 0, now.Location()) + + } else if queryType == "last_month" { + + lastMonthTime := now.AddDate(0, -1, 0) + beginTime = time.Date(lastMonthTime.Year(), lastMonthTime.Month(), 2, 0, 0, 0, 0, now.Location()) + endTime = time.Date(now.Year(), now.Month(), 2, 0, 0, 0, 0, now.Location()) + + } else { + return timeCloudbrainNum, now, now, fmt.Errorf("The value of type parameter is wrong.") + + } + + } else { + if beginTimeStr == "" || endTimeStr == "" { + //如果查询类型和开始时间结束时间都未设置，按queryType=all处理 + beginTime = recordBeginTimeTemp + endTime = now + + } else { + + beginTime, err = time.ParseInLocation("2006-01-02", beginTimeStr, time.Local) + if err != nil { + return timeCloudbrainNum, now, now, err + } + + endTime, err = time.ParseInLocation("2006-01-02", endTimeStr, time.Local) + if err != nil { + return timeCloudbrainNum, now, now, err + } + + beginTime = beginTime.AddDate(0, 0, 1) + endTime = endTime.AddDate(0, 0, 1) + } + + } + + if beginTime.Before(recordBeginTimeTemp) { + beginTime = recordBeginTimeTemp + } + + return timeCloudbrainNum, beginTime, endTime, nil + +} + +func getCloudbrainCount(beginTime time.Time, endTime time.Time) (int64, int64, int64, int64, int64, int64, error) { + debugOneCount, err := models.GenerateDebugOneCount(beginTime, endTime) + if err != nil { + log.Error("Can not query debugOneCount.", err) + return 0, 0, 0, 0, 0, 0, err + } + benchmarkOneCount, err := models.GenerateBenchmarkOneCount(beginTime, endTime) + if err != nil { + log.Error("Can not query benchmarkCount.", err) + return 0, 0, 0, 0, 0, 0, err + } + trainOneCount, err := models.GenerateTrainOneCount(beginTime, endTime) + if err != nil { + log.Error("Can not query trainOneCount.", err) + return 0, 0, 0, 0, 0, 0, err + } + debugTwoCount, err := models.GenerateDebugTwoCount(beginTime, endTime) + if err != nil { + log.Error("Can not query debugTwoCount.", err) + return 0, 0, 0, 0, 0, 0, err + } + trainTwoCount, err := models.GenerateTrainTwoCount(beginTime, endTime) + if err != nil { + log.Error("Can not query DebugOneTotal count.", err) + return 0, 0, 0, 0, 0, 0, err + } + inferenceTwoCount, err := models.GenerateInferenceTwoCount(beginTime, endTime) + if err != nil { + log.Error("Can not query inferenceTwoCount.", err) + return 0, 0, 0, 0, 0, 0, err + } + return debugOneCount, benchmarkOneCount, trainOneCount, debugTwoCount, trainTwoCount, inferenceTwoCount, err +} diff --git a/routers/repo/cloudbrain_statistic.go b/routers/repo/cloudbrain_statistic.go index 16137ed2e..142b0c14e 100644 --- a/routers/repo/cloudbrain_statistic.go +++ b/routers/repo/cloudbrain_statistic.go @@ -10,7 +10,7 @@ import ( ) func CloudbrainStatisticAuto() { - yesterday := time.Now().AddDate(0, 0, 0).Format("2006-01-02") + yesterday := time.Now().AddDate(0, 0, -1).Format("2006-01-02") CloudbrainStatisticDaily(yesterday) } From f7bff308e2b7ba9f43890da10f5da948faf3bc20 Mon Sep 17 00:00:00 2001 From: liuzx Date: Thu, 7 Apr 2022 17:01:30 +0800 Subject: [PATCH 010/239] update --- models/cloudbrain_static.go | 10 - modules/setting/setting.go | 26 +- routers/api/v1/repo/cloudbrain_dashboard.go | 528 ++++++++++++-------- 3 files changed, 334 insertions(+), 230 deletions(-) diff --git a/models/cloudbrain_static.go b/models/cloudbrain_static.go index 8e9329ce2..4d0e7cfaa 100644 --- a/models/cloudbrain_static.go +++ b/models/cloudbrain_static.go @@ -36,16 +36,6 @@ type CloudbrainStatistic struct { UpdatedUnix timeutil.TimeStamp `xorm:"INDEX updated" json:"-"` } -type TimeCloudbrainNum struct { - Time time.Time `json:"time"` - DebugOneCount int64 `json:"debugOneCount"` - BenchmarkOneCount int64 `json:"benchmarkOneCount"` - TrainOneCount int64 `json:"trainOneCount"` - DebugTwoCount int64 `json:"debugTwoCount"` - TrainTwoCount int64 `json:"trainTwoCount"` - InferenceTwoCount int64 `json:"inferenceTwoCount"` -} - func GenerateDebugOneCount(beginTime time.Time, endTime time.Time) (int64, error) { countSql := "SELECT count(*) FROM " + "public.cloudbrain where created_unix >=" + strconv.FormatInt(beginTime.Unix(), 10) + diff --git a/modules/setting/setting.go b/modules/setting/setting.go index 26f068193..19620f5db 100755 --- a/modules/setting/setting.go +++ b/modules/setting/setting.go @@ -452,18 +452,19 @@ var ( DecompressOBSTaskName string //cloudbrain config - CBAuthUser string - CBAuthPassword string - RestServerHost string - JobPath string - CBCodePathPrefix string - JobType string - GpuTypes string - DebugServerHost string - ResourceSpecs string - MaxDuration int64 - TrainGpuTypes string - TrainResourceSpecs string + CBAuthUser string + CBAuthPassword string + RestServerHost string + JobPath string + CBCodePathPrefix string + JobType string + GpuTypes string + DebugServerHost string + ResourceSpecs string + MaxDuration int64 + TrainGpuTypes string + TrainResourceSpecs string + BrainRecordBeginTime string //benchmark config IsBenchmarkEnabled bool @@ -1290,6 +1291,7 @@ func NewContext() { MaxDuration = sec.Key("MAX_DURATION").MustInt64(14400) TrainGpuTypes = sec.Key("TRAIN_GPU_TYPES").MustString("") TrainResourceSpecs = sec.Key("TRAIN_RESOURCE_SPECS").MustString("") + BrainRecordBeginTime = sec.Key("brain_record_beigin_time").MustString("2021-01-01") sec = Cfg.Section("benchmark") IsBenchmarkEnabled = sec.Key("ENABLED").MustBool(false) diff --git a/routers/api/v1/repo/cloudbrain_dashboard.go b/routers/api/v1/repo/cloudbrain_dashboard.go index 609783bfb..85bea2189 100644 --- a/routers/api/v1/repo/cloudbrain_dashboard.go +++ b/routers/api/v1/repo/cloudbrain_dashboard.go @@ -9,6 +9,7 @@ import ( "code.gitea.io/gitea/models" "code.gitea.io/gitea/modules/context" "code.gitea.io/gitea/modules/log" + "code.gitea.io/gitea/modules/setting" "github.com/360EntSecGroup-Skylar/excelize/v2" ) @@ -21,42 +22,172 @@ type CloudbrainsPeriodData struct { InferenceTwoCount int64 `json:"inferenceTwoCount"` } type TimeCloudbrainsNum struct { - TimeCloudbrainNum []models.TimeCloudbrainNum `json:"imeCloudbrainNum"` + TimeCloudbrainNum []DateCloudbrainNum `json:"dateCloudbrainNum"` +} +type DateCloudbrainNum struct { + Date string `json:"date"` + DebugOneCount int64 `json:"debugOneCount"` + BenchmarkOneCount int64 `json:"benchmarkOneCount"` + TrainOneCount int64 `json:"trainOneCount"` + DebugTwoCount int64 `json:"debugTwoCount"` + TrainTwoCount int64 `json:"trainTwoCount"` + InferenceTwoCount int64 `json:"inferenceTwoCount"` + CloudbrainOneCount int64 `json:"cloudbrainOneCount"` + CloudbrainTwoCount int64 `json:"cloudbrainTwoCount"` + CloudbrainCount int64 `json:"cloudbrainCount"` } func GetAllCloudbrainsTrend(ctx *context.Context) { - - recordBeginTime, err := getRecordBeginTime() + brainRecordBeginTime, err := getBrainRecordBeginTime() if err != nil { - log.Error("Can not get record begin time", err) - ctx.Error(http.StatusBadRequest, ctx.Tr("repo.record_begintime_get_err")) + log.Error("Can not get brain record begin time", err) + ctx.Error(http.StatusBadRequest, ctx.Tr("repo.brain_record_begintime_get_err")) return } - timeCloudbrainNum, beginTime, endTime, err := getCloudbrainTrendTime(ctx, recordBeginTime) - if err != nil { - log.Error("Parameter is wrong", err) - ctx.Error(http.StatusBadRequest, ctx.Tr("repo.parameter_is_wrong")) - return - } - page := ctx.QueryInt("page") - if page <= 0 { - page = 1 - } - pageSize := ctx.QueryInt("pagesize") - if pageSize <= 0 { - pageSize = DEFAULT_PAGE_SIZE - } + queryType := ctx.QueryTrim("type") + now := time.Now() + + beginTimeStr := ctx.QueryTrim("beginTime") + endTimeStr := ctx.QueryTrim("endTime") + var beginTime time.Time + var endTime time.Time + var endTimeTemp time.Time + dateCloudbrainNum := make([]DateCloudbrainNum, 0) + if queryType != "" { + if queryType == "all" { + beginTime = brainRecordBeginTime + endTime = now + endTimeTemp = beginTime.AddDate(0, 1, 0) + dateCloudbrainNum, err = getYearCloudbrainNum(beginTime, endTimeTemp, endTime) + if err != nil { + log.Error("Can not query getYearCloudbrainNum.", err) + ctx.Error(http.StatusBadRequest, ctx.Tr("getYearCloudbrainNum_get_error")) + return + } + } else if queryType == "yesterday" { + beginTime = now.AddDate(0, 0, -1) + beginTime = time.Date(beginTime.Year(), beginTime.Month(), beginTime.Day(), 0, 0, 0, 0, now.Location()) + endTimeTemp = beginTime.Add(time.Hour) + endTime = time.Date(now.Year(), now.Month(), now.Day(), 0, 0, 0, 0, now.Location()) + dateCloudbrainNum, err = getHourCloudbrainNum(beginTime, endTimeTemp, endTime) + if err != nil { + log.Error("Can not query getHourCloudbrainNum.", err) + ctx.Error(http.StatusBadRequest, ctx.Tr("getYearCloudbrainNum_get_error")) + return + } + + } else if queryType == "current_week" { + beginTime = now.AddDate(0, 0, -int(time.Now().Weekday())+1) //begin from monday + beginTime = time.Date(beginTime.Year(), beginTime.Month(), beginTime.Day(), 0, 0, 0, 0, now.Location()) + endTime = now + endTimeTemp = beginTime.AddDate(0, 0, 1) + dateCloudbrainNum, err = getDayCloudbrainNum(beginTime, endTimeTemp, endTime) + if err != nil { + log.Error("Can not query getDayCloudbrainNum.", err) + ctx.Error(http.StatusBadRequest, ctx.Tr("getDayCloudbrainNum_get_error")) + return + } + } else if queryType == "current_month" { + endTime = now + beginTime = time.Date(endTime.Year(), endTime.Month(), 1, 0, 0, 0, 0, now.Location()) + endTimeTemp = beginTime.AddDate(0, 0, 1) + dateCloudbrainNum, err = getDayCloudbrainNum(beginTime, endTimeTemp, endTime) + if err != nil { + log.Error("Can not query getDayCloudbrainNum.", err) + ctx.Error(http.StatusBadRequest, ctx.Tr("getDayCloudbrainNum_get_error")) + return + } + + } else if queryType == "monthly" { + endTime = now + beginTime = now.AddDate(0, -1, 0) + beginTime = time.Date(beginTime.Year(), beginTime.Month(), beginTime.Day(), 0, 0, 0, 0, now.Location()) + endTimeTemp = beginTime.AddDate(0, 0, 1) + dateCloudbrainNum, err = getDayCloudbrainNum(beginTime, endTimeTemp, endTime) + if err != nil { + log.Error("Can not query getDayCloudbrainNum.", err) + ctx.Error(http.StatusBadRequest, ctx.Tr("getDayCloudbrainNum_get_error")) + return + } + + } else if queryType == "current_year" { + endTime = now + beginTime = time.Date(endTime.Year(), 1, 1, 0, 0, 0, 0, now.Location()) + endTimeTemp = beginTime.AddDate(0, 1, 0) + dateCloudbrainNum, err = getYearCloudbrainNum(beginTime, endTimeTemp, endTime) + if err != nil { + log.Error("Can not query getDayCloudbrainNum.", err) + ctx.Error(http.StatusBadRequest, ctx.Tr("getYearCloudbrainNum_get_error")) + return + } + + } else if queryType == "last_month" { + + lastMonthTime := now.AddDate(0, -1, 0) + beginTime = time.Date(lastMonthTime.Year(), lastMonthTime.Month(), 1, 0, 0, 0, 0, now.Location()) + endTime = time.Date(now.Year(), now.Month(), 2, 0, 0, 0, 0, now.Location()) + endTimeTemp = beginTime.AddDate(0, 0, 1) + dateCloudbrainNum, err = getDayCloudbrainNum(beginTime, endTimeTemp, endTime) + if err != nil { + log.Error("Can not query getDayCloudbrainNum.", err) + ctx.Error(http.StatusBadRequest, ctx.Tr("getDayCloudbrainNum_get_error")) + return + } + + } + + } else { + if beginTimeStr == "" || endTimeStr == "" { + //如果查询类型和开始时间结束时间都未设置，按queryType=all处理 + beginTime = brainRecordBeginTime + endTime = now + endTimeTemp = beginTime.AddDate(0, 1, 0) + dateCloudbrainNum, err = getYearCloudbrainNum(beginTime, endTimeTemp, endTime) + if err != nil { + log.Error("Can not query getDayCloudbrainNum.", err) + ctx.Error(http.StatusBadRequest, ctx.Tr("getYearCloudbrainNum_get_error")) + return + } + } else { + beginTime, err = time.ParseInLocation("2006-01-02", beginTimeStr, time.Local) + if err != nil { + log.Error("Can not ParseInLocation.", err) + ctx.Error(http.StatusBadRequest, ctx.Tr("ParseInLocation_get_error")) + return + } + endTime, err = time.ParseInLocation("2006-01-02", endTimeStr, time.Local) + if err != nil { + log.Error("Can not ParseInLocation.", err) + ctx.Error(http.StatusBadRequest, ctx.Tr("ParseInLocation_get_error")) + return + } + days := (endTime.Unix() - beginTime.Unix()) / 3600 / 24 + if 1 < days { + endTimeTemp = beginTime.AddDate(0, 0, 1) + endTime = endTime.AddDate(0, 0, 2) + dateCloudbrainNum, err = getDayCloudbrainNum(beginTime, endTimeTemp, endTime) + if err != nil { + log.Error("Can not query getDayCloudbrainNum.", err) + ctx.Error(http.StatusBadRequest, ctx.Tr("getDayCloudbrainNum_get_error")) + return + } + } else if 0 < days || days <= 1 { + endTimeTemp = beginTime.Add(time.Hour) + dateCloudbrainNum, err = getHourCloudbrainNum(beginTime, endTimeTemp, endTime) + if err != nil { + log.Error("Can not query getHourCloudbrainNum.", err) + ctx.Error(http.StatusBadRequest, ctx.Tr("getHourCloudbrainNum_get_error")) + return + } + } else { + return + } + } + } cloudbrainsPeriodData := TimeCloudbrainsNum{ - TimeCloudbrainNum: timeCloudbrainNum, + TimeCloudbrainNum: dateCloudbrainNum, } - now := time.Now() - endTime = now - beginTime = time.Date(endTime.Year(), endTime.Month(), 2, 0, 0, 0, 0, now.Location()) - testtime := now.AddDate(0, -1, 1) - fmt.Printf("beginTime is: %s", beginTime) - fmt.Printf("endTime is: %s", endTime) - fmt.Printf("testtime is:%s", testtime) ctx.JSON(http.StatusOK, cloudbrainsPeriodData) @@ -141,79 +272,6 @@ func GetAllCloudbrainsPeriodStatistics(ctx *context.Context) { ctx.JSON(http.StatusOK, cloudbrainsPeriodData) } -func ServeCloudbrainPeriodStatisticsFile(ctx *context.Context) { - - recordBeginTime, err := getRecordBeginTime() - if err != nil { - log.Error("Can not get record begin time", err) - ctx.Error(http.StatusBadRequest, ctx.Tr("repo.record_begintime_get_err")) - return - } - beginTime, endTime, err := getCloudbrainTimePeroid(ctx, recordBeginTime) - if err != nil { - log.Error("Parameter is wrong", err) - ctx.Error(http.StatusBadRequest, ctx.Tr("repo.parameter_is_wrong")) - return - } - q := ctx.QueryTrim("q") - page := ctx.QueryInt("page") - if page <= 0 { - page = 1 - } - pageSize := 1000 - orderBy := getOrderBy(ctx) - - _, latestDate, err := models.GetRepoStatLastUpdatedTime() - if err != nil { - log.Error("Can not query the last updated time.", err) - ctx.Error(http.StatusBadRequest, ctx.Tr("repo.last_update_time_error")) - return - } - - countSql := generateCountSql(beginTime, endTime, latestDate, q) - total, err := models.CountRepoStatByRawSql(countSql) - if err != nil { - log.Error("Can not query total count.", err) - ctx.Error(http.StatusBadRequest, ctx.Tr("repo.total_count_get_error")) - return - } - var projectAnalysis = ctx.Tr("repo.repo_stat_inspect") - fileName := getFileName(ctx, beginTime, endTime, projectAnalysis) - - totalPage := getTotalPage(total, pageSize) - - f := excelize.NewFile() - - index := f.NewSheet(projectAnalysis) - f.DeleteSheet("Sheet1") - - for k, v := range allProjectsPeroidHeader(ctx) { - f.SetCellValue(projectAnalysis, k, v) - } - - var row = 2 - for i := 0; i <= totalPage; i++ { - - pageRecords := models.GetRepoStatisticByRawSql(generateSqlByType(ctx, beginTime, endTime, latestDate, q, orderBy, i+1, pageSize)) - for _, record := range pageRecords { - - for k, v := range allProjectsPeroidValues(row, record, ctx) { - f.SetCellValue(projectAnalysis, k, v) - } - row++ - - } - - } - f.SetActiveSheet(index) - - ctx.Resp.Header().Set("Content-Disposition", "attachment; filename="+url.QueryEscape(fileName)) - ctx.Resp.Header().Set("Content-Type", "application/octet-stream") - - f.WriteTo(ctx.Resp) - -} - func getCloudbrainTimePeroid(ctx *context.Context, recordBeginTime time.Time) (time.Time, time.Time, error) { queryType := ctx.QueryTrim("type") now := time.Now() @@ -292,136 +350,190 @@ func getCloudbrainTimePeroid(ctx *context.Context, recordBeginTime time.Time) (t } -func getCloudbrainTrendTime(ctx *context.Context, recordBeginTime time.Time) ([]models.TimeCloudbrainNum, time.Time, time.Time, error) { - queryType := ctx.QueryTrim("type") - now := time.Now() - recordBeginTimeTemp := recordBeginTime.AddDate(0, 0, 1) - - beginTimeStr := ctx.QueryTrim("beginTime") - endTimeStr := ctx.QueryTrim("endTime") - var beginTime time.Time - var endTime time.Time - var err error - timeCloudbrainNum := make([]models.TimeCloudbrainNum, 0) - if queryType != "" { - - if queryType == "all" { - beginTime = recordBeginTimeTemp - endTime = now - } else if queryType == "yesterday" { - endTime = now - beginTime = time.Date(endTime.Year(), endTime.Month(), endTime.Day(), 0, 0, 0, 0, now.Location()) - - } else if queryType == "current_week" { - beginTime = now.AddDate(0, 0, -int(time.Now().Weekday())+2) //begin from monday - beginTime = time.Date(beginTime.Year(), beginTime.Month(), beginTime.Day(), 0, 0, 0, 0, now.Location()) - endTime = now - } else if queryType == "current_month" { - endTime = now - beginTime = time.Date(endTime.Year(), endTime.Month(), 1, 0, 0, 0, 0, now.Location()) - endTime1 := beginTime.AddDate(0, 0, 1) - for endTime1.Before(endTime) { - debugOneCount, benchmarkOneCount, trainOneCount, debugTwoCount, trainTwoCount, inferenceTwoCount, err := getCloudbrainCount(beginTime, endTime1) - if err != nil { - log.Error("Can not query debugOneCount.", err) - ctx.Error(http.StatusBadRequest, ctx.Tr("debugOneCount_get_error")) - } - timeCloudbrainNum = append(timeCloudbrainNum, models.TimeCloudbrainNum{ - Time: beginTime, - DebugOneCount: debugOneCount, - BenchmarkOneCount: benchmarkOneCount, - TrainOneCount: trainOneCount, - DebugTwoCount: debugTwoCount, - TrainTwoCount: trainTwoCount, - InferenceTwoCount: inferenceTwoCount, - }) - beginTime = endTime1 - endTime1 = beginTime.AddDate(0, 0, 1) - } - return timeCloudbrainNum, beginTime, endTime, nil - - } else if queryType == "monthly" { - endTime = now - beginTime = now.AddDate(0, -1, 1) - beginTime = time.Date(beginTime.Year(), beginTime.Month(), beginTime.Day(), 0, 0, 0, 0, now.Location()) - - } else if queryType == "current_year" { - endTime = now - beginTime = time.Date(endTime.Year(), 1, 2, 0, 0, 0, 0, now.Location()) - - } else if queryType == "last_month" { - - lastMonthTime := now.AddDate(0, -1, 0) - beginTime = time.Date(lastMonthTime.Year(), lastMonthTime.Month(), 2, 0, 0, 0, 0, now.Location()) - endTime = time.Date(now.Year(), now.Month(), 2, 0, 0, 0, 0, now.Location()) - - } else { - return timeCloudbrainNum, now, now, fmt.Errorf("The value of type parameter is wrong.") - - } - - } else { - if beginTimeStr == "" || endTimeStr == "" { - //如果查询类型和开始时间结束时间都未设置，按queryType=all处理 - beginTime = recordBeginTimeTemp - endTime = now - - } else { - - beginTime, err = time.ParseInLocation("2006-01-02", beginTimeStr, time.Local) - if err != nil { - return timeCloudbrainNum, now, now, err - } - - endTime, err = time.ParseInLocation("2006-01-02", endTimeStr, time.Local) - if err != nil { - return timeCloudbrainNum, now, now, err - } - - beginTime = beginTime.AddDate(0, 0, 1) - endTime = endTime.AddDate(0, 0, 1) - } - - } - - if beginTime.Before(recordBeginTimeTemp) { - beginTime = recordBeginTimeTemp - } - - return timeCloudbrainNum, beginTime, endTime, nil - -} - -func getCloudbrainCount(beginTime time.Time, endTime time.Time) (int64, int64, int64, int64, int64, int64, error) { +func getCloudbrainCount(beginTime time.Time, endTime time.Time) (int64, int64, int64, int64, int64, int64, int64, int64, int64, error) { debugOneCount, err := models.GenerateDebugOneCount(beginTime, endTime) if err != nil { log.Error("Can not query debugOneCount.", err) - return 0, 0, 0, 0, 0, 0, err + return 0, 0, 0, 0, 0, 0, 0, 0, 0, err } benchmarkOneCount, err := models.GenerateBenchmarkOneCount(beginTime, endTime) if err != nil { log.Error("Can not query benchmarkCount.", err) - return 0, 0, 0, 0, 0, 0, err + return 0, 0, 0, 0, 0, 0, 0, 0, 0, err } trainOneCount, err := models.GenerateTrainOneCount(beginTime, endTime) if err != nil { log.Error("Can not query trainOneCount.", err) - return 0, 0, 0, 0, 0, 0, err + return 0, 0, 0, 0, 0, 0, 0, 0, 0, err } debugTwoCount, err := models.GenerateDebugTwoCount(beginTime, endTime) if err != nil { log.Error("Can not query debugTwoCount.", err) - return 0, 0, 0, 0, 0, 0, err + return 0, 0, 0, 0, 0, 0, 0, 0, 0, err } trainTwoCount, err := models.GenerateTrainTwoCount(beginTime, endTime) if err != nil { log.Error("Can not query DebugOneTotal count.", err) - return 0, 0, 0, 0, 0, 0, err + return 0, 0, 0, 0, 0, 0, 0, 0, 0, err } inferenceTwoCount, err := models.GenerateInferenceTwoCount(beginTime, endTime) if err != nil { log.Error("Can not query inferenceTwoCount.", err) - return 0, 0, 0, 0, 0, 0, err + return 0, 0, 0, 0, 0, 0, 0, 0, 0, err } - return debugOneCount, benchmarkOneCount, trainOneCount, debugTwoCount, trainTwoCount, inferenceTwoCount, err + cloudbrainOneCount := debugOneCount + benchmarkOneCount + trainOneCount + cloudbrainTwoCount := debugTwoCount + trainTwoCount + inferenceTwoCount + cloudbrainCount := cloudbrainOneCount + cloudbrainTwoCount + return debugOneCount, benchmarkOneCount, trainOneCount, debugTwoCount, trainTwoCount, inferenceTwoCount, cloudbrainOneCount, cloudbrainTwoCount, cloudbrainCount, err +} +func getHourCloudbrainNum(beginTime time.Time, endTimeTemp time.Time, endTime time.Time) ([]DateCloudbrainNum, error) { + dayCloudbrainNum := make([]DateCloudbrainNum, 0) + for endTimeTemp.Before(endTime) || endTimeTemp.Equal(endTime) { + debugOneCount, benchmarkOneCount, trainOneCount, debugTwoCount, trainTwoCount, inferenceTwoCount, cloudbrainOneCount, cloudbrainTwoCount, cloudbrainCount, err := getCloudbrainCount(beginTime, endTimeTemp) + if err != nil { + log.Error("Can not query getCloudbrainCount.", err) + return nil, err + } + dayCloudbrainNum = append(dayCloudbrainNum, DateCloudbrainNum{ + Date: beginTime.Format(time.RFC3339), + DebugOneCount: debugOneCount, + BenchmarkOneCount: benchmarkOneCount, + TrainOneCount: trainOneCount, + DebugTwoCount: debugTwoCount, + TrainTwoCount: trainTwoCount, + InferenceTwoCount: inferenceTwoCount, + CloudbrainOneCount: cloudbrainOneCount, + CloudbrainTwoCount: cloudbrainTwoCount, + CloudbrainCount: cloudbrainCount, + }) + beginTime = endTimeTemp + endTimeTemp = beginTime.Add(time.Hour) + } + return dayCloudbrainNum, nil +} +func getDayCloudbrainNum(beginTime time.Time, endTimeTemp time.Time, endTime time.Time) ([]DateCloudbrainNum, error) { + dayCloudbrainNum := make([]DateCloudbrainNum, 0) + for endTimeTemp.Before(endTime) { + debugOneCount, benchmarkOneCount, trainOneCount, debugTwoCount, trainTwoCount, inferenceTwoCount, cloudbrainOneCount, cloudbrainTwoCount, cloudbrainCount, err := getCloudbrainCount(beginTime, endTimeTemp) + if err != nil { + log.Error("Can not query getCloudbrainCount.", err) + return nil, err + } + dayCloudbrainNum = append(dayCloudbrainNum, DateCloudbrainNum{ + Date: beginTime.Format("2006-01-02"), + DebugOneCount: debugOneCount, + BenchmarkOneCount: benchmarkOneCount, + TrainOneCount: trainOneCount, + DebugTwoCount: debugTwoCount, + TrainTwoCount: trainTwoCount, + InferenceTwoCount: inferenceTwoCount, + CloudbrainOneCount: cloudbrainOneCount, + CloudbrainTwoCount: cloudbrainTwoCount, + CloudbrainCount: cloudbrainCount, + }) + beginTime = endTimeTemp + endTimeTemp = beginTime.AddDate(0, 0, 1) + } + return dayCloudbrainNum, nil +} +func getYearCloudbrainNum(beginTime time.Time, endTimeTemp time.Time, endTime time.Time) ([]DateCloudbrainNum, error) { + yearCloudbrainNum := make([]DateCloudbrainNum, 0) + for endTimeTemp.Before(endTime) { + debugOneCount, benchmarkOneCount, trainOneCount, debugTwoCount, trainTwoCount, inferenceTwoCount, cloudbrainOneCount, cloudbrainTwoCount, cloudbrainCount, err := getCloudbrainCount(beginTime, endTimeTemp) + if err != nil { + log.Error("Can not query getCloudbrainCount.", err) + return nil, err + } + yearCloudbrainNum = append(yearCloudbrainNum, DateCloudbrainNum{ + Date: beginTime.Format("2006-01"), + DebugOneCount: debugOneCount, + BenchmarkOneCount: benchmarkOneCount, + TrainOneCount: trainOneCount, + DebugTwoCount: debugTwoCount, + TrainTwoCount: trainTwoCount, + InferenceTwoCount: inferenceTwoCount, + CloudbrainOneCount: cloudbrainOneCount, + CloudbrainTwoCount: cloudbrainTwoCount, + CloudbrainCount: cloudbrainCount, + }) + beginTime = endTimeTemp + endTimeTemp = beginTime.AddDate(0, 1, 0) + } + return yearCloudbrainNum, nil +} +func getBrainRecordBeginTime() (time.Time, error) { + return time.ParseInLocation(DATE_FORMAT, setting.BrainRecordBeginTime, time.Local) +} + +func ServeCloudbrainPeriodStatisticsFile(ctx *context.Context) { + + recordBeginTime, err := getRecordBeginTime() + if err != nil { + log.Error("Can not get record begin time", err) + ctx.Error(http.StatusBadRequest, ctx.Tr("repo.record_begintime_get_err")) + return + } + beginTime, endTime, err := getCloudbrainTimePeroid(ctx, recordBeginTime) + if err != nil { + log.Error("Parameter is wrong", err) + ctx.Error(http.StatusBadRequest, ctx.Tr("repo.parameter_is_wrong")) + return + } + q := ctx.QueryTrim("q") + page := ctx.QueryInt("page") + if page <= 0 { + page = 1 + } + pageSize := 1000 + orderBy := getOrderBy(ctx) + + _, latestDate, err := models.GetRepoStatLastUpdatedTime() + if err != nil { + log.Error("Can not query the last updated time.", err) + ctx.Error(http.StatusBadRequest, ctx.Tr("repo.last_update_time_error")) + return + } + + countSql := generateCountSql(beginTime, endTime, latestDate, q) + total, err := models.CountRepoStatByRawSql(countSql) + if err != nil { + log.Error("Can not query total count.", err) + ctx.Error(http.StatusBadRequest, ctx.Tr("repo.total_count_get_error")) + return + } + var projectAnalysis = ctx.Tr("repo.repo_stat_inspect") + fileName := getFileName(ctx, beginTime, endTime, projectAnalysis) + + totalPage := getTotalPage(total, pageSize) + + f := excelize.NewFile() + + index := f.NewSheet(projectAnalysis) + f.DeleteSheet("Sheet1") + + for k, v := range allProjectsPeroidHeader(ctx) { + f.SetCellValue(projectAnalysis, k, v) + } + + var row = 2 + for i := 0; i <= totalPage; i++ { + + pageRecords := models.GetRepoStatisticByRawSql(generateSqlByType(ctx, beginTime, endTime, latestDate, q, orderBy, i+1, pageSize)) + for _, record := range pageRecords { + + for k, v := range allProjectsPeroidValues(row, record, ctx) { + f.SetCellValue(projectAnalysis, k, v) + } + row++ + + } + + } + f.SetActiveSheet(index) + + ctx.Resp.Header().Set("Content-Disposition", "attachment; filename="+url.QueryEscape(fileName)) + ctx.Resp.Header().Set("Content-Type", "application/octet-stream") + + f.WriteTo(ctx.Resp) + } From 05ab115942601cc6716acb905e6f2a3ae482573c Mon Sep 17 00:00:00 2001 From: liuzx Date: Fri, 8 Apr 2022 18:25:35 +0800 Subject: [PATCH 011/239] update --- models/cloudbrain.go | 65 +- options/locale/locale_zh-CN.ini | 2 + routers/api/v1/api.go | 5 +- routers/api/v1/repo/cloudbrain_dashboard.go | 123 +++ web_src/js/components/BrainAnalysis.vue | 1008 +++++++++++++++++++ web_src/js/components/DataAnalysis.vue | 10 + 6 files changed, 1210 insertions(+), 3 deletions(-) create mode 100644 web_src/js/components/BrainAnalysis.vue diff --git a/models/cloudbrain.go b/models/cloudbrain.go index 1662dcd96..7f7b9bcd6 100755 --- a/models/cloudbrain.go +++ b/models/cloudbrain.go @@ -1,13 +1,14 @@ package models import ( - "code.gitea.io/gitea/modules/util" "encoding/json" "fmt" "strconv" "strings" "time" + "code.gitea.io/gitea/modules/util" + "xorm.io/builder" "xorm.io/xorm" @@ -1564,3 +1565,65 @@ func RestartCloudbrain(old *Cloudbrain, new *Cloudbrain) (err error) { return nil } + +func CloudbrainAll(opts *CloudbrainsOptions) ([]*CloudbrainInfo, int64, error) { + sess := x.NewSession() + defer sess.Close() + var cond = builder.NewCond() + if (opts.Type) >= 0 { + cond = cond.And( + builder.Eq{"cloudbrain.type": opts.Type}, + ) + } + + var count int64 + var err error + condition := "cloudbrain.user_id = `user`.id" + if len(opts.Keyword) == 0 { + count, err = sess.Where(cond).Count(new(Cloudbrain)) + } else { + lowerKeyWord := strings.ToLower(opts.Keyword) + + cond = cond.And(builder.Or(builder.Like{"LOWER(cloudbrain.job_name)", lowerKeyWord}, builder.Like{"LOWER(cloudbrain.display_job_name)", lowerKeyWord}, builder.Like{"`user`.lower_name", lowerKeyWord})) + count, err = sess.Table(&Cloudbrain{}).Where(cond). + Join("left", "`user`", condition).Count(new(CloudbrainInfo)) + + } + + if err != nil { + return nil, 0, fmt.Errorf("Count: %v", err) + } + + if opts.Page >= 0 && opts.PageSize > 0 { + var start int + if opts.Page == 0 { + start = 0 + } else { + start = (opts.Page - 1) * opts.PageSize + } + sess.Limit(opts.PageSize, start) + } + + sess.OrderBy("cloudbrain.created_unix DESC") + cloudbrains := make([]*CloudbrainInfo, 0, setting.UI.IssuePagingNum) + if err := sess.Table(&Cloudbrain{}).Unscoped().Where(cond). + Join("left", "`user`", condition). + Find(&cloudbrains); err != nil { + return nil, 0, fmt.Errorf("Find: %v", err) + } + if opts.NeedRepoInfo { + var ids []int64 + for _, task := range cloudbrains { + ids = append(ids, task.RepoID) + } + repositoryMap, err := GetRepositoriesMapByIDs(ids) + if err == nil { + for _, task := range cloudbrains { + task.Repo = repositoryMap[task.RepoID] + } + } + + } + + return cloudbrains, count, nil +} diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini index d26065363..06ea4bd7f 100755 --- a/options/locale/locale_zh-CN.ini +++ b/options/locale/locale_zh-CN.ini @@ -1005,6 +1005,8 @@ modelarts.train_job.job_status=任务状态 modelarts.train_job.job_name=任务名称 modelarts.train_job.version=任务版本 modelarts.train_job.start_time=开始时间 +modelarts.train_job.end_time=结束时间 +modelarts.train_job.wait_time=等待时间 modelarts.train_job.dura_time=运行时长 modelarts.train_job.description=任务描述 modelarts.train_job.parameter_setting=参数设置 diff --git a/routers/api/v1/api.go b/routers/api/v1/api.go index c03ffbe02..14bd2e2d1 100755 --- a/routers/api/v1/api.go +++ b/routers/api/v1/api.go @@ -557,10 +557,11 @@ func RegisterRoutes(m *macaron.Macaron) { m.Get("/query_user_all", operationReq, repo_ext.QueryUserStaticAll) //cloudbrain board m.Group("/cloudbrainboard", func() { - m.Get("/downloadtable", repo.ServeCloudbrainPeriodStatisticsFile) + m.Get("/downloadStatistics", repo.ServeCloudbrainPeriodStatisticsFile) + m.Get("/downloadAll", repo.DownloadCloudBrainBoard) m.Group("/cloudbrain", func() { m.Get("/trend", repo.GetAllCloudbrainsTrend) - m.Get("", repo.GetAllCloudbrainsPeriodStatistics) + m.Get("/statistics", repo.GetAllCloudbrainsPeriodStatistics) }) }, operationReq) diff --git a/routers/api/v1/repo/cloudbrain_dashboard.go b/routers/api/v1/repo/cloudbrain_dashboard.go index 85bea2189..ab26d7dfc 100644 --- a/routers/api/v1/repo/cloudbrain_dashboard.go +++ b/routers/api/v1/repo/cloudbrain_dashboard.go @@ -537,3 +537,126 @@ func ServeCloudbrainPeriodStatisticsFile(ctx *context.Context) { f.WriteTo(ctx.Resp) } +func DownloadCloudBrainBoard(ctx *context.Context) { + + page := 1 + + pageSize := 300 + + var cloudBrain = ctx.Tr("repo.cloudbrain") + fileName := getCloudbrainFileName(cloudBrain) + + _, total, err := models.CloudbrainAll(&models.CloudbrainsOptions{ + ListOptions: models.ListOptions{ + Page: page, + PageSize: 1, + }, + Type: models.TypeCloudBrainAll, + NeedRepoInfo: false, + }) + + if err != nil { + log.Warn("Can not get cloud brain info", err) + ctx.Error(http.StatusBadRequest, ctx.Tr("repo.cloudbrain_query_fail")) + return + } + + totalPage := getTotalPage(total, pageSize) + fmt.Printf("total:%v", total) + fmt.Printf("totalPage:%v", totalPage) + + f := excelize.NewFile() + + index := f.NewSheet(cloudBrain) + f.DeleteSheet("Sheet1") + + for k, v := range allHeader(ctx) { + f.SetCellValue(cloudBrain, k, v) + } + + var row = 2 + for i := 0; i < totalPage; i++ { + + pageRecords, _, err := models.CloudbrainAll(&models.CloudbrainsOptions{ + ListOptions: models.ListOptions{ + Page: page, + PageSize: pageSize, + }, + Type: models.TypeCloudBrainAll, + NeedRepoInfo: true, + }) + if err != nil { + log.Warn("Can not get cloud brain info", err) + continue + } + for _, record := range pageRecords { + + for k, v := range allValues(row, record, ctx) { + f.SetCellValue(cloudBrain, k, v) + } + row++ + + } + + page++ + } + f.SetActiveSheet(index) + + ctx.Resp.Header().Set("Content-Disposition", "attachment; filename="+url.QueryEscape(fileName)) + ctx.Resp.Header().Set("Content-Type", "application/octet-stream") + + f.WriteTo(ctx.Resp) +} + +func getCloudbrainFileName(baseName string) string { + return baseName + "_" + time.Now().Format(EXCEL_DATE_FORMAT) + ".xlsx" + +} +func allHeader(ctx *context.Context) map[string]string { + + return map[string]string{"A1": ctx.Tr("repo.cloudbrain_task"), "B1": ctx.Tr("repo.cloudbrain_task_type"), "C1": ctx.Tr("repo.modelarts.status"), + "D1": ctx.Tr("repo.modelarts.createtime"), "E1": ctx.Tr("repo.modelarts.train_job.dura_time"), "F1": ctx.Tr("repo.modelarts.computing_resources"), + "G1": ctx.Tr("repo.cloudbrain_creator"), "H1": ctx.Tr("repo.repo_name"), "I1": ctx.Tr("repo.cloudbrain_task_name"), "J1": ctx.Tr("repo.modelarts.train_job.start_time"), + "K1": ctx.Tr("repo.modelarts.train_job.end_time"), "L1": ctx.Tr("repo.modelarts.train_job.wait_time")} + +} +func allValues(row int, rs *models.CloudbrainInfo, ctx *context.Context) map[string]string { + return map[string]string{getCellName("A", row): rs.DisplayJobName, getCellName("B", row): rs.JobType, getCellName("C", row): rs.Status, + getCellName("D", row): time.Unix(int64(rs.Cloudbrain.CreatedUnix), 0).Format(CREATE_TIME_FORMAT), getCellName("E", row): rs.TrainJobDuration, + getCellName("F", row): rs.ComputeResource, getCellName("G", row): rs.Name, getCellName("H", row): getRepoPathName(rs), + getCellName("I", row): rs.JobName, getCellName("J", row): getBrainStartTime(rs), + getCellName("K", row): getBrainEndTime(rs), getCellName("L", row): getBrainWaitTime(rs), + } +} +func getRepoPathName(rs *models.CloudbrainInfo) string { + if rs.Repo != nil { + return rs.Repo.OwnerName + "/" + rs.Repo.Alias + } + return "" +} +func getBrainStartTime(rs *models.CloudbrainInfo) string { + timeString := time.Unix(int64(rs.Cloudbrain.StartTime), 0).Format(CREATE_TIME_FORMAT) + if timeString != "1970/01/01 08:00:00" { + return timeString + } else { + return "0" + } + +} +func getBrainEndTime(rs *models.CloudbrainInfo) string { + timeString := time.Unix(int64(rs.Cloudbrain.EndTime), 0).Format(CREATE_TIME_FORMAT) + if timeString != "1970/01/01 08:00:00" { + return timeString + } else { + return "0" + } + +} +func getBrainWaitTime(rs *models.CloudbrainInfo) string { + waitTime := rs.Cloudbrain.StartTime - rs.Cloudbrain.CreatedUnix + if waitTime <= 0 { + return "0" + } else { + return models.ConvertDurationToStr(int64(waitTime)) + } +} diff --git a/web_src/js/components/BrainAnalysis.vue b/web_src/js/components/BrainAnalysis.vue new file mode 100644 index 000000000..4f096e024 --- /dev/null +++ b/web_src/js/components/BrainAnalysis.vue @@ -0,0 +1,1008 @@ + + + + + diff --git a/web_src/js/components/DataAnalysis.vue b/web_src/js/components/DataAnalysis.vue index ae536db28..6f80c3481 100755 --- a/web_src/js/components/DataAnalysis.vue +++ b/web_src/js/components/DataAnalysis.vue @@ -26,6 +26,14 @@ + + + + + + 云脑分析 + + @@ -33,12 +41,14 @@ -{{end}} -{{if .PageIsHome}} - {{end}} {{template "custom/footer" .}} +{{if .PageIsHome}} + + + + + + +{{end}} diff --git a/templates/base/head_home.tmpl b/templates/base/head_home.tmpl index 25d7a92ec..2def358f8 100644 --- a/templates/base/head_home.tmpl +++ b/templates/base/head_home.tmpl @@ -192,6 +192,8 @@ var _hmt = _hmt || []; + + {{template "custom/body_outer_pre" .}} diff --git a/templates/home.tmpl b/templates/home.tmpl index 5edd65ceb..9e8e6acf4 100755 --- a/templates/home.tmpl +++ b/templates/home.tmpl @@ -1,7 +1,59 @@ {{template "base/head_home" .}}
-
+
+ +
+

完成AI任务
1716

+

运行AI任务
120

+

等待AI任务
80

+
+ +
+ +
+ + +
+
+
+
+
+ +

{{item.name}}

+
+
+
+
+
+
+
+ + + + +
+
调试任务 #31412022050816002
+
+
+ + + +
+
+
+ + + + +
+
+
+
+
+
+
+

{{.page_title}}
@@ -16,7 +68,7 @@ {{.page_use}} {{end}}
-
+

* {{.page_only_dynamic}}

From b38e1b048cc447f17741613d897dc101097b8987 Mon Sep 17 00:00:00 2001 From: OpenIhu Date: Mon, 23 May 2022 11:46:22 +0800 Subject: [PATCH 033/239] =?UTF-8?q?=E9=9A=90=E8=97=8F=E4=B8=AD=E5=BF=83?= =?UTF-8?q?=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- templates/home.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/home.tmpl b/templates/home.tmpl index 9e8e6acf4..401cf02e3 100755 --- a/templates/home.tmpl +++ b/templates/home.tmpl @@ -20,7 +20,7 @@
-

{{item.name}}

+
From 37b139ffb1140edae546a96d64104eb374707999 Mon Sep 17 00:00:00 2001 From: OpenIhu Date: Mon, 23 May 2022 11:52:14 +0800 Subject: [PATCH 034/239] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=A6=96=E9=A1=B5?= =?UTF-8?q?=E5=BC=80=E6=BA=90=E5=8A=A8=E6=80=81=E5=AE=BD=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- templates/home.tmpl | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/templates/home.tmpl b/templates/home.tmpl index 401cf02e3..cf27a682e 100755 --- a/templates/home.tmpl +++ b/templates/home.tmpl @@ -69,15 +69,11 @@ {{end}}

-
+

* {{.page_only_dynamic}}

-
-
-
-
- -
-
+
+
+
From dfba0588313d81f2a9d4c9206e3878571231077a Mon Sep 17 00:00:00 2001 From: OpenIhu Date: Mon, 23 May 2022 11:56:49 +0800 Subject: [PATCH 035/239] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dhomenews?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- templates/home.tmpl | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/templates/home.tmpl b/templates/home.tmpl index cf27a682e..2d2fcf3e2 100755 --- a/templates/home.tmpl +++ b/templates/home.tmpl @@ -71,9 +71,11 @@

* {{.page_only_dynamic}}

-
-
- +
+
+
+ +
From 5cde254ce07f3210a0c825be77faea3733b7b9a8 Mon Sep 17 00:00:00 2001 From: OpenIhu Date: Mon, 23 May 2022 12:02:14 +0800 Subject: [PATCH 036/239] =?UTF-8?q?=E8=B0=83=E6=95=B4h1=E6=96=87=E5=AD=97?= =?UTF-8?q?=E5=AE=BD=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- templates/home.tmpl | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/templates/home.tmpl b/templates/home.tmpl index 2d2fcf3e2..5a602dab7 100755 --- a/templates/home.tmpl +++ b/templates/home.tmpl @@ -54,19 +54,23 @@
-

- {{.page_title}} -
- {{.page_small_title}} +
+
+

+ {{.page_title}} +
+ {{.page_small_title}} +
+

+

{{.page_description}}

+ + {{if .IsSigned}} + {{.page_use}} + {{else}} + {{.page_use}} + {{end}}
-

-

{{.page_description}}

- - {{if .IsSigned}} - {{.page_use}} - {{else}} - {{.page_use}} - {{end}} +
From 3f319dc9f1bf2e0b6755c9bdbfad60130116c9e1 Mon Sep 17 00:00:00 2001 From: OpenIhu Date: Mon, 23 May 2022 15:18:01 +0800 Subject: [PATCH 037/239] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=A6=96=E9=A1=B5?= =?UTF-8?q?=E5=8A=A8=E6=80=81=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- custom/public/css/git.openi.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/custom/public/css/git.openi.css b/custom/public/css/git.openi.css index 10f68d625..d50b7e2cd 100644 --- a/custom/public/css/git.openi.css +++ b/custom/public/css/git.openi.css @@ -152,10 +152,10 @@ margin-left: 2.3em; } .homenews{ - border-radius: 2em; + border-radius: 1.2em; background-color: rgba(16, 16, 16, .9); position: relative; - padding-left: 1.5em !important; + padding-left: 1.3em !important; } .homeorg, .homepro, .homemodel, .i-env{ position: relative; @@ -186,7 +186,7 @@ padding: 0; } .newslist{ - height: 285px; + height: 260px; overflow: hidden; } From f3d2a2ebff10a483d19e26bd7659639c23325a1b Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Mon, 23 May 2022 15:26:16 +0800 Subject: [PATCH 038/239] fix issue --- routers/routes/routes.go | 2 + routers/user/auth.go | 105 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 107 insertions(+) diff --git a/routers/routes/routes.go b/routers/routes/routes.go index 701df7147..e7ee14a36 100755 --- a/routers/routes/routes.go +++ b/routers/routes/routes.go @@ -328,6 +328,7 @@ func RegisterRoutes(m *macaron.Macaron) { m.Post("/all/search/", routers.Search) m.Get("/all/search/", routers.EmptySearch) m.Get("/all/dosearch/", routers.SearchApi) + m.Post("/user/login/kanban", user.SignInPostAPI) m.Get("/home/term", routers.HomeTerm) m.Group("/explore", func() { m.Get("", func(ctx *context.Context) { @@ -355,6 +356,7 @@ func RegisterRoutes(m *macaron.Macaron) { m.Group("/user", func() { m.Get("/login", user.SignIn) m.Get("/login/cloud_brain", user.SignInCloudBrain) + m.Post("/login", bindIgnErr(auth.SignInForm{}), user.SignInPost) m.Group("", func() { m.Combo("/login/openid"). diff --git a/routers/user/auth.go b/routers/user/auth.go index a02cf24dc..faef017d4 100755 --- a/routers/user/auth.go +++ b/routers/user/auth.go @@ -176,6 +176,48 @@ func SignInCloudBrain(ctx *context.Context) { ctx.HTML(200, tplSignInCloudBrain) } + + + +func SignInPostAPI(ctx *context.Context) { + ctx.Data["Title"] = ctx.Tr("sign_in") + UserName := ctx.Query("UserName") + Password := ctx.Query("Password") + log.Info("0000000") + orderedOAuth2Names, oauth2Providers, err := models.GetActiveOAuth2Providers() + if err != nil { + ctx.ServerError("UserSignIn", err) + return + } + ctx.Data["OrderedOAuth2Names"] = orderedOAuth2Names + ctx.Data["OAuth2Providers"] = oauth2Providers + ctx.Data["Title"] = ctx.Tr("sign_in") + ctx.Data["SignInLink"] = setting.AppSubURL + "/user/login" + ctx.Data["PageIsSignIn"] = true + ctx.Data["PageIsLogin"] = true + ctx.Data["IsCourse"] = ctx.QueryBool("course") + ctx.Data["EnableSSPI"] = models.IsSSPIEnabled() + + if ctx.HasError() { + ctx.HTML(200, tplSignIn) + return + } + log.Info("1111111") + u, err := models.UserSignIn(UserName, Password) + log.Info("22222") + if err != nil { + ctx.ServerError("UserSignIn", err) + return + } + log.Info("3333") + models.SaveLoginInfoToDb(ctx.Req.Request, u) + // If this user is enrolled in 2FA, we can't sign the user in just yet. + // Instead, redirect them to the 2FA authentication page. + //handleSignInFull(ctx, u, form.Remember, false) + handleSignInFullNotRedirect(ctx, u, true, false) +} + + // SignInPost response for sign in request func SignInPost(ctx *context.Context, form auth.SignInForm) { ctx.Data["Title"] = ctx.Tr("sign_in") @@ -518,6 +560,69 @@ func handleSignIn(ctx *context.Context, u *models.User, remember bool) { handleSignInFull(ctx, u, remember, true) } +func handleSignInFullNotRedirect(ctx *context.Context, u *models.User, remember bool, obeyRedirect bool) string { + + log.Info("enter here.") + if remember { + days := 86400 * setting.LogInRememberDays + ctx.SetCookie(setting.CookieUserName, u.Name, days, setting.AppSubURL, setting.SessionConfig.Domain, setting.SessionConfig.Secure, true) + ctx.SetSuperSecureCookie(base.EncodeMD5(u.Rands+u.Passwd), + setting.CookieRememberName, u.Name, days, setting.AppSubURL, setting.SessionConfig.Domain, setting.SessionConfig.Secure, true) + } + + _ = ctx.Session.Delete("openid_verified_uri") + _ = ctx.Session.Delete("openid_signin_remember") + _ = ctx.Session.Delete("openid_determined_email") + _ = ctx.Session.Delete("openid_determined_username") + _ = ctx.Session.Delete("twofaUid") + _ = ctx.Session.Delete("twofaRemember") + _ = ctx.Session.Delete("u2fChallenge") + _ = ctx.Session.Delete("linkAccount") + if err := ctx.Session.Set("uid", u.ID); err != nil { + log.Error("Error setting uid %d in session: %v", u.ID, err) + } + if err := ctx.Session.Set("uname", u.Name); err != nil { + log.Error("Error setting uname %s session: %v", u.Name, err) + } + if err := ctx.Session.Release(); err != nil { + log.Error("Unable to store session: %v", err) + } + + // If the user does not have a locale set, we save the current one. + if len(u.Language) == 0 { + if len(ctx.GetCookie("lang")) != 0 { + u.Language = ctx.GetCookie("lang") + } else { + u.Language = ctx.Locale.Language() + } + + if err := models.UpdateUserCols(u, "language"); err != nil { + log.Error(fmt.Sprintf("Error updating user language [user: %d, locale: %s]", u.ID, u.Language)) + return setting.AppSubURL + "/dashboard" + } + } else { + // Language setting of the user use the one previously set + if len(ctx.GetCookie("lang")) != 0 { + u.Language = ctx.GetCookie("lang") + } + } + + ctx.SetCookie("lang", u.Language, nil, setting.AppSubURL, setting.SessionConfig.Domain, setting.SessionConfig.Secure, true) + + // Clear whatever CSRF has right now, force to generate a new one + ctx.SetCookie(setting.CSRFCookieName, "", -1, setting.AppSubURL, setting.SessionConfig.Domain, setting.SessionConfig.Secure, true) + + // Register last login + u.SetLastLogin() + if err := models.UpdateUserCols(u, "last_login_unix"); err != nil { + ctx.ServerError("UpdateUserCols", err) + return setting.AppSubURL + "/dashboard" + } + + + return setting.AppSubURL + "/dashboard" +} + func handleSignInFull(ctx *context.Context, u *models.User, remember bool, obeyRedirect bool) string { if remember { days := 86400 * setting.LogInRememberDays From e8f24be5c4777be8af0eaf9c87fc0bc1bd3f8daf Mon Sep 17 00:00:00 2001 From: chenyifan01 Date: Mon, 23 May 2022 15:44:00 +0800 Subject: [PATCH 039/239] #2026 update --- models/cloudbrain.go | 5 +++++ routers/repo/cloudbrain.go | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/models/cloudbrain.go b/models/cloudbrain.go index cb7fda7a0..03eef25e1 100755 --- a/models/cloudbrain.go +++ b/models/cloudbrain.go @@ -1489,6 +1489,11 @@ func UpdateJob(job *Cloudbrain) error { return updateJob(x, job) } +func UpdateJobDurationWithDeleted(job *Cloudbrain) error { + _, err := x.Exec("update cloudbrain set start_time=?, end_time=?,train_job_duration=?,duration=? where id=?", job.StartTime, job.EndTime, job.TrainJobDuration, job.Duration, job.ID) + return err +} + func updateJob(e Engine, job *Cloudbrain) error { _, err := e.ID(job.ID).AllCols().Update(job) return err diff --git a/routers/repo/cloudbrain.go b/routers/repo/cloudbrain.go index 9929992e2..82efe47e1 100755 --- a/routers/repo/cloudbrain.go +++ b/routers/repo/cloudbrain.go @@ -1572,7 +1572,7 @@ func handleNoDurationTask(cloudBrains []*models.Cloudbrain) { } task.Duration = task.EndTime.AsTime().Unix() - task.StartTime.AsTime().Unix() task.TrainJobDuration = models.ConvertDurationToStr(task.Duration) - err = models.UpdateJob(task) + err = models.UpdateJobDurationWithDeleted(task) if err != nil { log.Error("UpdateJob(%s) failed:%v", task.JobName, err) } @@ -1597,7 +1597,7 @@ func handleNoDurationTask(cloudBrains []*models.Cloudbrain) { } task.CorrectCreateUnix() task.ComputeAndSetDuration() - err = models.UpdateJob(task) + err = models.UpdateJobDurationWithDeleted(task) if err != nil { log.Error("UpdateJob(%s) failed:%v", task.JobName, err) continue @@ -1618,7 +1618,7 @@ func handleNoDurationTask(cloudBrains []*models.Cloudbrain) { task.EndTime = task.StartTime.Add(result.Duration / 1000) } task.ComputeAndSetDuration() - err = models.UpdateJob(task) + err = models.UpdateJobDurationWithDeleted(task) if err != nil { log.Error("UpdateJob(%s) failed:%v", task.JobName, err) continue @@ -1639,7 +1639,7 @@ func updateDefaultDuration(task *models.Cloudbrain) { task.StartTime = task.CreatedUnix task.EndTime = task.UpdatedUnix task.ComputeAndSetDuration() - err := models.UpdateJob(task) + err := models.UpdateJobDurationWithDeleted(task) if err != nil { log.Error("UpdateJob(%s) failed:%v", task.JobName, err) } From ff1a056905eabb30d30c450330857905bc2371fd Mon Sep 17 00:00:00 2001 From: OpenIhu Date: Mon, 23 May 2022 15:58:43 +0800 Subject: [PATCH 040/239] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=A6=96=E9=A1=B5?= =?UTF-8?q?=E5=8A=A8=E6=80=81=E4=B8=BA9=E6=9D=A1=E4=B8=80=E5=B1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- custom/public/css/git.openi.css | 8 ++++---- public/home/home.js | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/custom/public/css/git.openi.css b/custom/public/css/git.openi.css index d50b7e2cd..7d05d503b 100644 --- a/custom/public/css/git.openi.css +++ b/custom/public/css/git.openi.css @@ -66,7 +66,7 @@ background: #DFE9F0; padding-top: 0; border: none; - margin-bottom: 11em; + margin-bottom: 13em; } .ui.secondary.hometop.segment #navbar{ z-index: 10; @@ -155,7 +155,7 @@ border-radius: 1.2em; background-color: rgba(16, 16, 16, .9); position: relative; - padding-left: 1.3em !important; + padding: 1.0em 1.0em 1.0em 1.3em; } .homeorg, .homepro, .homemodel, .i-env{ position: relative; @@ -169,7 +169,7 @@ bottom: 0; background-color: rgba(105, 192, 255, .4); width: 2px; -} +} .homenews .time-since{ padding-left: 1em; color: #888888; @@ -186,7 +186,7 @@ padding: 0; } .newslist{ - height: 260px; + height: 300px; overflow: hidden; } diff --git a/public/home/home.js b/public/home/home.js index 3b2a34f06..1f11b9a4f 100755 --- a/public/home/home.js +++ b/public/home/home.js @@ -9,7 +9,7 @@ if(isEmpty(token)){ var swiperNewMessage = new Swiper(".newslist", { direction: "vertical", - slidesPerView: 10, + slidesPerView: 9, loop: true, autoplay: { delay: 2500, From 23b519585b67e543e8d497d159e35a1183b80b01 Mon Sep 17 00:00:00 2001 From: OpenIhu Date: Tue, 24 May 2022 14:42:19 +0800 Subject: [PATCH 041/239] =?UTF-8?q?=E6=81=A2=E5=A4=8D=E6=99=BA=E7=AE=97?= =?UTF-8?q?=E7=BD=91=E7=BB=9C=E5=88=86=E4=B8=AD=E5=BF=83=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- custom/public/rotation3D/rotation3D.css | 30 +++++++++++++++++++++++++ templates/home.tmpl | 2 +- 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/custom/public/rotation3D/rotation3D.css b/custom/public/rotation3D/rotation3D.css index 7f93f1025..d29ee5cb7 100644 --- a/custom/public/rotation3D/rotation3D.css +++ b/custom/public/rotation3D/rotation3D.css @@ -29,6 +29,36 @@ .rotation3D__item .cont{ position: relative; z-index: 2; } .rotation3D__item .cont .iconfont { font-size: 28px; margin-top: 30px; margin-bottom: 96px; display: block; } .rotation3D__item .cont p{ color: #101010; } +.itemList .rotation3D__item .cont p::after{ + content: ''; + position: absolute; + left: 0; + right: 0; +} +.itemList .rotation3D__item:nth-child(1) .cont p::after{ + content: "云脑一号"; +} +.itemList .rotation3D__item:nth-child(2) .cont p::after{ + content: "云脑二号"; +} +.itemList .rotation3D__item:nth-child(3) .cont p::after{ + content: "北大分中心"; +} +.itemList .rotation3D__item:nth-child(4) .cont p::after{ + content: "合肥分中心"; +} +.itemList .rotation3D__item:nth-child(5) .cont p::after{ + content: "武汉AI中心"; +} +.itemList .rotation3D__item:nth-child(6) .cont p::after{ + content: "西安AI中心"; +} +.itemList .rotation3D__item:nth-child(7) .cont p::after{ + content: "中原AI中心"; +} +.itemList .rotation3D__item:nth-child(8) .cont p::after{ + content: "成都AI中心"; +} .rotation3D__item.blue{ color: #01e9fc; } .rotation3D__item.green{ color: #b4b3ca; } diff --git a/templates/home.tmpl b/templates/home.tmpl index 5a602dab7..aa7a21ccc 100755 --- a/templates/home.tmpl +++ b/templates/home.tmpl @@ -20,7 +20,7 @@
- +

From 27630014b9eb586a172f05936e2594950613d8a6 Mon Sep 17 00:00:00 2001 From: zouap Date: Tue, 24 May 2022 16:37:15 +0800 Subject: [PATCH 042/239] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=94=B9=E7=89=88?= =?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 --- public/home/home.js | 89 ++++++++++++++++++++++++++-------------- routers/home.go | 79 ++++++++++++++++++++++++----------- routers/routes/routes.go | 7 ++-- templates/home.tmpl | 6 +-- 4 files changed, 122 insertions(+), 59 deletions(-) diff --git a/public/home/home.js b/public/home/home.js index 1f11b9a4f..9a4847e73 100755 --- a/public/home/home.js +++ b/public/home/home.js @@ -117,6 +117,7 @@ socket.onmessage = function (e) { continue; } } + refresh3DInfo(record); var recordPrefix = getMsg(record); if(record.OpType == "6" || record.OpType == "10" || record.OpType == "12" || record.OpType == "13"){ html += recordPrefix + actionName; @@ -200,6 +201,22 @@ function getTaskLink(record){ return re; } +function refresh3DInfo(record){ + if(record.OpType == "25" || record.OpType == "29" || record.OpType == "31"){ + //cloudbrain one + var lines = $('.rotation3D__line blue'); + console.log("cloudbrain one line length=" + lines.length); + lines[0].find("span").text(record.RefName); + + }else if(record.OpType == "26" || record.OpType == "27" || record.OpType == "28"){ + //cloudbrain two + var lines = $('.rotation3D__line blue'); + console.log("cloudbrain two line length=" + lines.length); + lines[1].find("span").text(record.RefName); + } + +} + function getMsg(record){ var html =""; html += "
"; @@ -418,48 +435,60 @@ queryRecommendData(); function queryRecommendData(){ $.ajax({ type:"GET", - url:"/recommend/org", + url:"/recommend/home", headers: { authorization:token, }, dataType:"json", async:false, success:function(json){ - displayOrg(json); + displayOrg(json.org); + displayRepo(json.repo); + displayActivity(json.image); + displayCloudBrain(json.cloudbrain) }, error:function(response) { } }); - $.ajax({ - type:"GET", - url:"/recommend/repo", - headers: { - authorization:token, - }, - dataType:"json", - async:false, - success:function(json){ - displayRepo(json); - }, - error:function(response) { - } - }); + // $.ajax({ + // type:"GET", + // url:"/recommend/repo", + // headers: { + // authorization:token, + // }, + // dataType:"json", + // async:false, + // success:function(json){ + // displayRepo(json); + // }, + // error:function(response) { + // } + // }); + + // $.ajax({ + // type:"GET", + // url:"/recommend/imageinfo", + // headers: { + // authorization:token, + // }, + // dataType:"json", + // async:false, + // success:function(json){ + // displayActivity(json); + // }, + // error:function(response) { + // } + // }); +} - $.ajax({ - type:"GET", - url:"/recommend/imageinfo", - headers: { - authorization:token, - }, - dataType:"json", - async:false, - success:function(json){ - displayActivity(json); - }, - error:function(response) { - } - }); +function displayCloudBrain(json){ + var completed_task = document.getElementById("completed_task"); + completed_task.text(json.completed_task); + var running_task = document.getElementById("running_task"); + running_task.text(json.running_task); + var wait_task = document.getElementById("wait_task"); + wait_task.text(json.wait_task); } function displayActivity(json){ diff --git a/routers/home.go b/routers/home.go index e37cacb01..09fe97dc6 100755 --- a/routers/home.go +++ b/routers/home.go @@ -471,7 +471,7 @@ func ExploreOrganizations(ctx *context.Context) { return } - recommendOrgs, err := GetRecommendOrg() + recommendOrgs, err := getRecommendOrg() if err != nil { log.Error("GetRecommendOrgInfos failed:%v", err.Error(), ctx.Data["MsgID"]) ctx.ServerError("GetRecommendOrgInfos", err) @@ -606,31 +606,31 @@ func ExploreImages(ctx *context.Context) { } func ExploreDataAnalysisUserTrend(ctx *context.Context) { - ctx.Data["url_params"]="UserTrend" + ctx.Data["url_params"] = "UserTrend" ctx.HTML(200, tplExploreExploreDataAnalysis) } func ExploreDataAnalysisUserAnalysis(ctx *context.Context) { - ctx.Data["url_params"]="UserAnalysis" + ctx.Data["url_params"] = "UserAnalysis" ctx.HTML(200, tplExploreExploreDataAnalysis) } func ExploreDataAnalysisProTrend(ctx *context.Context) { - ctx.Data["url_params"]="ProTrend" + ctx.Data["url_params"] = "ProTrend" ctx.HTML(200, tplExploreExploreDataAnalysis) } func ExploreDataAnalysisProAnalysis(ctx *context.Context) { - ctx.Data["url_params"]="ProAnalysis" + ctx.Data["url_params"] = "ProAnalysis" ctx.HTML(200, tplExploreExploreDataAnalysis) } func ExploreDataAnalysisOverview(ctx *context.Context) { - ctx.Data["url_params"]="Overview" + ctx.Data["url_params"] = "Overview" ctx.HTML(200, tplExploreExploreDataAnalysis) } func ExploreDataAnalysisBrainAnalysis(ctx *context.Context) { - ctx.Data["url_params"]="BrainAnalysis" + ctx.Data["url_params"] = "BrainAnalysis" ctx.HTML(200, tplExploreExploreDataAnalysis) } func ExploreDataAnalysis(ctx *context.Context) { - ctx.Data["url_params"]="" + ctx.Data["url_params"] = "" ctx.HTML(200, tplExploreExploreDataAnalysis) } @@ -640,7 +640,7 @@ func NotFound(ctx *context.Context) { ctx.NotFound("home.NotFound", nil) } -func GetRecommendOrg() ([]map[string]interface{}, error) { +func getRecommendOrg() ([]map[string]interface{}, error) { url := setting.RecommentRepoAddr + "organizations" result, err := repository.RecommendFromPromote(url) @@ -668,7 +668,7 @@ func GetRecommendOrg() ([]map[string]interface{}, error) { } return resultOrg, nil } -func GetImageInfo() ([]map[string]interface{}, error) { +func getImageInfo() ([]map[string]interface{}, error) { url := setting.RecommentRepoAddr + "picture_info" result, err := repository.RecommendFromPromote(url) @@ -731,14 +731,14 @@ func GetRankUser(index string) ([]map[string]interface{}, error) { return resultOrg, nil } -func GetImageInfoFromPromote(ctx *context.Context) { - imageInfo, err := GetImageInfo() - if err != nil { - ctx.ServerError("500", err) - return - } - ctx.JSON(200, imageInfo) -} +// func GetImageInfoFromPromote(ctx *context.Context) { +// imageInfo, err := GetImageInfo() +// if err != nil { +// ctx.ServerError("500", err) +// return +// } +// ctx.JSON(200, imageInfo) +// } func GetUserRankFromPromote(ctx *context.Context) { index := ctx.Params("index") @@ -750,15 +750,48 @@ func GetUserRankFromPromote(ctx *context.Context) { ctx.JSON(200, resultUserRank) } -func RecommendOrgFromPromote(ctx *context.Context) { - resultOrg, err := GetRecommendOrg() +func RecommendHomeInfo(ctx *context.Context) { + resultOrg, err := getRecommendOrg() if err != nil { - ctx.ServerError("500", err) - return + log.Info("error." + err.Error()) } - ctx.JSON(200, resultOrg) + resultRepo, err := repository.GetRecommendRepoFromPromote("projects") + if err != nil { + log.Info("error." + err.Error()) + } + resultImage, err := getImageInfo() + if err != nil { + log.Info("error." + err.Error()) + } + resultCloudBrain, err := getCloudbrainNums() + if err != nil { + log.Info("error." + err.Error()) + } + mapInterface := make(map[string]interface{}) + mapInterface["org"] = resultOrg + mapInterface["repo"] = resultRepo + mapInterface["image"] = resultImage + mapInterface["cloudbrain"] = resultCloudBrain + ctx.JSON(http.StatusOK, mapInterface) } +func getCloudbrainNums() (map[string]string, error) { + result := make(map[string]string) + result["completed_task"] = "1800" + result["running_task"] = "20" + result["wait_task"] = "30" + return result, nil +} + +// func RecommendOrgFromPromote(ctx *context.Context) { +// resultOrg, err := GetRecommendOrg() +// if err != nil { +// ctx.ServerError("500", err) +// return +// } +// ctx.JSON(200, resultOrg) +// } + func RecommendRepoFromPromote(ctx *context.Context) { result, err := repository.GetRecommendRepoFromPromote("projects") if err != nil { diff --git a/routers/routes/routes.go b/routers/routes/routes.go index 4c3f5f472..12d0e1cf8 100755 --- a/routers/routes/routes.go +++ b/routers/routes/routes.go @@ -323,10 +323,11 @@ func RegisterRoutes(m *macaron.Macaron) { m.Get("/dashboard", routers.Dashboard) go routers.SocketManager.Run() m.Get("/action/notification", routers.ActionNotification) - m.Get("/recommend/org", routers.RecommendOrgFromPromote) - m.Get("/recommend/repo", routers.RecommendRepoFromPromote) + m.Get("/recommend/home", routers.RecommendHomeInfo) + //m.Get("/recommend/org", routers.RecommendOrgFromPromote) + //m.Get("/recommend/repo", routers.RecommendRepoFromPromote) m.Get("/recommend/userrank/:index", routers.GetUserRankFromPromote) - m.Get("/recommend/imageinfo", routers.GetImageInfoFromPromote) + //m.Get("/recommend/imageinfo", routers.GetImageInfoFromPromote) m.Post("/all/search/", routers.Search) m.Get("/all/search/", routers.EmptySearch) m.Get("/all/dosearch/", routers.SearchApi) diff --git a/templates/home.tmpl b/templates/home.tmpl index aa7a21ccc..ccf734081 100755 --- a/templates/home.tmpl +++ b/templates/home.tmpl @@ -4,9 +4,9 @@
-

完成AI任务
1716

-

运行AI任务
120

-

等待AI任务
80

+

完成AI任务
1716

+

运行AI任务
120

+

等待AI任务
80

From 616d002d2f69971ae3f0c721c9d5b67fd412a38a Mon Sep 17 00:00:00 2001 From: zouap Date: Tue, 24 May 2022 16:47:40 +0800 Subject: [PATCH 043/239] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=94=B9=E7=89=88?= =?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 --- public/home/home.js | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/public/home/home.js b/public/home/home.js index 9a4847e73..89aad85e0 100755 --- a/public/home/home.js +++ b/public/home/home.js @@ -483,12 +483,9 @@ function queryRecommendData(){ } function displayCloudBrain(json){ - var completed_task = document.getElementById("completed_task"); - completed_task.text(json.completed_task); - var running_task = document.getElementById("running_task"); - running_task.text(json.running_task); - var wait_task = document.getElementById("wait_task"); - wait_task.text(json.wait_task); + $('#completed_task').text(json.completed_task); + $('#running_task').text(json.running_task); + $('#wait_task').text(json.wait_task); } function displayActivity(json){ From 656b5e89c73292e2746aecfe1920dfebacca52d3 Mon Sep 17 00:00:00 2001 From: zouap Date: Tue, 24 May 2022 16:51:20 +0800 Subject: [PATCH 044/239] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=94=B9=E7=89=88?= =?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 --- public/home/home.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/home/home.js b/public/home/home.js index 89aad85e0..bf0da85d6 100755 --- a/public/home/home.js +++ b/public/home/home.js @@ -204,13 +204,13 @@ function getTaskLink(record){ function refresh3DInfo(record){ if(record.OpType == "25" || record.OpType == "29" || record.OpType == "31"){ //cloudbrain one - var lines = $('.rotation3D__line blue'); + var lines = $('.rotation3D__line'); console.log("cloudbrain one line length=" + lines.length); lines[0].find("span").text(record.RefName); }else if(record.OpType == "26" || record.OpType == "27" || record.OpType == "28"){ //cloudbrain two - var lines = $('.rotation3D__line blue'); + var lines = $('.rotation3D__line'); console.log("cloudbrain two line length=" + lines.length); lines[1].find("span").text(record.RefName); } From c50ee706b3e982b7a716753e6925687e9fe0ed2e Mon Sep 17 00:00:00 2001 From: zouap Date: Tue, 24 May 2022 16:55:49 +0800 Subject: [PATCH 045/239] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=94=B9=E7=89=88?= =?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 --- public/home/home.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/public/home/home.js b/public/home/home.js index bf0da85d6..2d27c76f5 100755 --- a/public/home/home.js +++ b/public/home/home.js @@ -205,14 +205,15 @@ function refresh3DInfo(record){ if(record.OpType == "25" || record.OpType == "29" || record.OpType == "31"){ //cloudbrain one var lines = $('.rotation3D__line'); - console.log("cloudbrain one line length=" + lines.length); + var spans = $('.rotation3D__line').find("span") + console.log("cloudbrain one line length=" + lines.length + " spans=" + spans.length); lines[0].find("span").text(record.RefName); }else if(record.OpType == "26" || record.OpType == "27" || record.OpType == "28"){ //cloudbrain two var lines = $('.rotation3D__line'); console.log("cloudbrain two line length=" + lines.length); - lines[1].find("span").text(record.RefName); + //lines[1].find("span").text(record.RefName); } } From 4330c46658792218327cab63138878fc02870770 Mon Sep 17 00:00:00 2001 From: zouap Date: Tue, 24 May 2022 16:58:05 +0800 Subject: [PATCH 046/239] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=94=B9=E7=89=88?= =?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 --- public/home/home.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/public/home/home.js b/public/home/home.js index 2d27c76f5..bca9ddb1e 100755 --- a/public/home/home.js +++ b/public/home/home.js @@ -205,14 +205,14 @@ function refresh3DInfo(record){ if(record.OpType == "25" || record.OpType == "29" || record.OpType == "31"){ //cloudbrain one var lines = $('.rotation3D__line'); - var spans = $('.rotation3D__line').find("span") - console.log("cloudbrain one line length=" + lines.length + " spans=" + spans.length); - lines[0].find("span").text(record.RefName); - + $('.rotation3D__line').find("span").eq(0).text(record.RefName) + console.log("cloudbrain one line length=" + lines.length); + //lines[0].find("span").text(record.RefName); }else if(record.OpType == "26" || record.OpType == "27" || record.OpType == "28"){ //cloudbrain two var lines = $('.rotation3D__line'); console.log("cloudbrain two line length=" + lines.length); + $('.rotation3D__line').find("span").eq(1).text(record.RefName) //lines[1].find("span").text(record.RefName); } From 6216bcc30772b1d1be183ab985cbb27f29c02f56 Mon Sep 17 00:00:00 2001 From: zouap Date: Tue, 24 May 2022 17:03:29 +0800 Subject: [PATCH 047/239] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=94=B9=E7=89=88?= =?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 --- public/home/home.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/public/home/home.js b/public/home/home.js index bca9ddb1e..6bba5134a 100755 --- a/public/home/home.js +++ b/public/home/home.js @@ -205,14 +205,16 @@ function refresh3DInfo(record){ if(record.OpType == "25" || record.OpType == "29" || record.OpType == "31"){ //cloudbrain one var lines = $('.rotation3D__line'); - $('.rotation3D__line').find("span").eq(0).text(record.RefName) + var span = $('.rotation3D__line').find("span")[0]; + console.log(span); + //$('.rotation3D__line').find("span").eq(0).text(record.RefName) console.log("cloudbrain one line length=" + lines.length); //lines[0].find("span").text(record.RefName); }else if(record.OpType == "26" || record.OpType == "27" || record.OpType == "28"){ //cloudbrain two var lines = $('.rotation3D__line'); console.log("cloudbrain two line length=" + lines.length); - $('.rotation3D__line').find("span").eq(1).text(record.RefName) + //$('.rotation3D__line').find("span").eq(1).text(record.RefName) //lines[1].find("span").text(record.RefName); } From 460bff4614bde11e9acda192c2f9a98d2472dca5 Mon Sep 17 00:00:00 2001 From: zouap Date: Tue, 24 May 2022 17:07:32 +0800 Subject: [PATCH 048/239] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=94=B9=E7=89=88?= =?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 --- public/home/home.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/public/home/home.js b/public/home/home.js index 6bba5134a..33c7edc47 100755 --- a/public/home/home.js +++ b/public/home/home.js @@ -207,6 +207,7 @@ function refresh3DInfo(record){ var lines = $('.rotation3D__line'); var span = $('.rotation3D__line').find("span")[0]; console.log(span); + span.innerText =record.RefName; //$('.rotation3D__line').find("span").eq(0).text(record.RefName) console.log("cloudbrain one line length=" + lines.length); //lines[0].find("span").text(record.RefName); @@ -214,6 +215,9 @@ function refresh3DInfo(record){ //cloudbrain two var lines = $('.rotation3D__line'); console.log("cloudbrain two line length=" + lines.length); + var span = $('.rotation3D__line').find("span")[1]; + console.log(span); + span.innerText =record.RefName; //$('.rotation3D__line').find("span").eq(1).text(record.RefName) //lines[1].find("span").text(record.RefName); } From bcc84cb4f5b91505165fae9256517c56722bed22 Mon Sep 17 00:00:00 2001 From: liuzx Date: Wed, 25 May 2022 16:26:02 +0800 Subject: [PATCH 049/239] add jobstatus analysis --- models/cloudbrain_static.go | 30 +++++++++++ routers/api/v1/api.go | 3 ++ routers/api/v1/repo/cloudbrain_dashboard.go | 58 +++++++++++++++++++++ 3 files changed, 91 insertions(+) create mode 100644 models/cloudbrain_static.go diff --git a/models/cloudbrain_static.go b/models/cloudbrain_static.go new file mode 100644 index 000000000..de3575632 --- /dev/null +++ b/models/cloudbrain_static.go @@ -0,0 +1,30 @@ +package models + +func GetJobWaitingCount() (int64, error) { + countSql := "SELECT count(*) FROM " + "public.cloudbrain where status ='" + string(JobWaiting) + "'" + return x.SQL(countSql).Count() +} +func GetJobStoppedCount() (int64, error) { + countSql := "SELECT count(*) FROM " + "public.cloudbrain where status ='" + string(JobStopped) + "'" + return x.SQL(countSql).Count() +} +func GetJobCompletedCount() (int64, error) { + countSql := "SELECT count(*) FROM " + "public.cloudbrain where status ='" + string(ModelArtsTrainJobCompleted) + "'" + return x.SQL(countSql).Count() +} +func GetJobFailedCount() (int64, error) { + countSql := "SELECT count(*) FROM " + "public.cloudbrain where status ='" + string(JobFailed) + "'" + return x.SQL(countSql).Count() +} +func GetJobRunningCount() (int64, error) { + countSql := "SELECT count(*) FROM " + "public.cloudbrain where status ='" + string(JobRunning) + "'" + return x.SQL(countSql).Count() +} +func GetJobKilledCount() (int64, error) { + countSql := "SELECT count(*) FROM " + "public.cloudbrain where status ='" + string(ModelArtsTrainJobKilled) + "'" + return x.SQL(countSql).Count() +} +func GetJobInitCount() (int64, error) { + countSql := "SELECT count(*) FROM " + "public.cloudbrain where status ='" + string(ModelArtsTrainJobInit) + "'" + return x.SQL(countSql).Count() +} diff --git a/routers/api/v1/api.go b/routers/api/v1/api.go index 9a05aa8ae..17122b09d 100755 --- a/routers/api/v1/api.go +++ b/routers/api/v1/api.go @@ -573,6 +573,9 @@ func RegisterRoutes(m *macaron.Macaron) { //cloudbrain board m.Group("/cloudbrainboard", func() { m.Get("/downloadAll", repo.DownloadCloudBrainBoard) + m.Group("/cloudbrain", func() { + m.Get("/status_analysis", repo.GetCloudbrainsStatusAnalysis) + }) }, operationReq) // Users m.Group("/users", func() { diff --git a/routers/api/v1/repo/cloudbrain_dashboard.go b/routers/api/v1/repo/cloudbrain_dashboard.go index 2090a2cf2..47a64b5aa 100644 --- a/routers/api/v1/repo/cloudbrain_dashboard.go +++ b/routers/api/v1/repo/cloudbrain_dashboard.go @@ -11,6 +11,16 @@ import ( "github.com/360EntSecGroup-Skylar/excelize/v2" ) +type CloudbrainsStatusAnalysis struct { + JobWaitingCount int64 `json:"jobWaitingCount"` + JobRunningCount int64 `json:"jobRunningCount"` + JobStoppedCount int64 `json:"jobStoppedCount"` + JobCompletedCount int64 `json:"jobCompletedCount"` + JobFailedCount int64 `json:"jobFailedCount"` + JobKilledCount int64 `json:"jobKilledCount"` + JobInitCount int64 `json:"jobInitCount"` +} + func DownloadCloudBrainBoard(ctx *context.Context) { page := 1 @@ -133,3 +143,51 @@ func getBrainWaitTime(rs *models.CloudbrainInfo) string { return models.ConvertDurationToStr(int64(waitTime)) } } +func GetCloudbrainsStatusAnalysis(ctx *context.Context) { + jobWaitingCount, err := models.GetJobWaitingCount() + if err != nil { + log.Error("Can not query jobWaitingCount.", err) + return + } + jobRunningCount, err := models.GetJobRunningCount() + if err != nil { + log.Error("Can not query jobRunningCount.", err) + return + } + jobStoppedCount, err := models.GetJobStoppedCount() + if err != nil { + log.Error("Can not query jobStoppedCount.", err) + return + } + jobCompletedCount, err := models.GetJobCompletedCount() + if err != nil { + log.Error("Can not query jobCompletedCount.", err) + return + } + jobFailedCount, err := models.GetJobFailedCount() + if err != nil { + log.Error("Can not query jobFailedCount.", err) + return + } + jobKilledCount, err := models.GetJobKilledCount() + if err != nil { + log.Error("Can not query jobKilledCount.", err) + return + } + jobInitCount, err := models.GetJobInitCount() + if err != nil { + log.Error("Can not query jobInitCount.", err) + return + } + + cloudbrainsStatusAnalysis := CloudbrainsStatusAnalysis{ + JobWaitingCount: jobWaitingCount, + JobRunningCount: jobRunningCount, + JobStoppedCount: jobStoppedCount, + JobCompletedCount: jobCompletedCount, + JobFailedCount: jobFailedCount, + JobKilledCount: jobKilledCount, + JobInitCount: jobInitCount, + } + ctx.JSON(http.StatusOK, cloudbrainsStatusAnalysis) +} From 14753d2a341ec2ab6009e19bc620d69adf3c8518 Mon Sep 17 00:00:00 2001 From: liuzx Date: Wed, 25 May 2022 17:58:55 +0800 Subject: [PATCH 050/239] update --- models/cloudbrain_static.go | 36 ++++++++--------- routers/api/v1/repo/cloudbrain_dashboard.go | 45 ++------------------- 2 files changed, 21 insertions(+), 60 deletions(-) diff --git a/models/cloudbrain_static.go b/models/cloudbrain_static.go index 3cf8dfb80..dfc1b6dd6 100644 --- a/models/cloudbrain_static.go +++ b/models/cloudbrain_static.go @@ -215,25 +215,23 @@ func GetCreatorCount() (int64, error) { return x.SQL(countSql).Count() } -func GetJobWaitingCount() (int64, error) { - countSql := "SELECT count(*) FROM " + "public.cloudbrain where status ='" + string(JobWaiting) + "'" - return x.SQL(countSql).Count() -} -func GetJobStoppedCount() (int64, error) { - countSql := "SELECT count(*) FROM " + "public.cloudbrain where status ='" + string(JobStopped) + "'" - return x.SQL(countSql).Count() -} -func GetJobSucceededCount() (int64, error) { - countSql := "SELECT count(*) FROM " + "public.cloudbrain where status ='" + string(JobSucceeded) + "'" - return x.SQL(countSql).Count() -} -func GetJobFailedCount() (int64, error) { - countSql := "SELECT count(*) FROM " + "public.cloudbrain where status ='" + string(JobFailed) + "'" - return x.SQL(countSql).Count() -} -func GetJobRunningCount() (int64, error) { - countSql := "SELECT count(*) FROM " + "public.cloudbrain where status ='" + string(JobRunning) + "'" - return x.SQL(countSql).Count() +func GetAllStatusCloudBrain() map[string]int { + sess := x.NewSession() + defer sess.Close() + cloudbrains := make([]*CloudbrainInfo, 0) + if err := sess.Table(&Cloudbrain{}).Unscoped(). + Find(&cloudbrains); err != nil { + log.Info("find error.") + } + cloudBrainStatusResult := make(map[string]int) + for _, cloudbrain := range cloudbrains { + if _, ok := cloudBrainStatusResult[cloudbrain.Status]; !ok { + cloudBrainStatusResult[cloudbrain.Status] = 1 + } else { + cloudBrainStatusResult[cloudbrain.Status] += 1 + } + } + return cloudBrainStatusResult } func getCreatePeriodCount(dateBeginTime string, dateEndTime string, hourBeginTime string, hourEndTime string) (int64, error) { diff --git a/routers/api/v1/repo/cloudbrain_dashboard.go b/routers/api/v1/repo/cloudbrain_dashboard.go index 3a80abc20..01c78ff87 100644 --- a/routers/api/v1/repo/cloudbrain_dashboard.go +++ b/routers/api/v1/repo/cloudbrain_dashboard.go @@ -43,13 +43,6 @@ type CloudbrainsOverviewData struct { CreatorCount int64 `json:"creatorCount"` } -type CloudbrainsStatusAnalysis struct { - JobWaitingCount int64 `json:"jobWaitingCount"` - JobRunningCount int64 `json:"jobRunningCount"` - JobStoppedCount int64 `json:"jobStoppedCount"` - JobSucceededCount int64 `json:"jobSucceededCount"` - JobFailedCount int64 `json:"jobFailedCount"` -} type TimeCloudbrainsNum struct { TimeCloudbrainNum []DateCloudbrainNum `json:"dateCloudbrainNum"` } @@ -379,40 +372,10 @@ func GetAllCloudbrainsPeriodDistribution(ctx *context.Context) { } func GetCloudbrainsStatusAnalysis(ctx *context.Context) { - jobWaitingCount, err := models.GetJobWaitingCount() - if err != nil { - log.Error("Can not query jobWaitingCount.", err) - return - } - jobRunningCount, err := models.GetJobRunningCount() - if err != nil { - log.Error("Can not query jobRunningCount.", err) - return - } - jobStoppedCount, err := models.GetJobStoppedCount() - if err != nil { - log.Error("Can not query jobStoppedCount.", err) - return - } - jobSucceededCount, err := models.GetJobSucceededCount() - if err != nil { - log.Error("Can not query jobSucceededCount.", err) - return - } - jobFailedCount, err := models.GetJobFailedCount() - if err != nil { - log.Error("Can not query jobFailedCount.", err) - return - } - - cloudbrainsStatusAnalysis := CloudbrainsStatusAnalysis{ - JobWaitingCount: jobWaitingCount, - JobRunningCount: jobRunningCount, - JobStoppedCount: jobStoppedCount, - JobSucceededCount: jobSucceededCount, - JobFailedCount: jobFailedCount, - } - ctx.JSON(http.StatusOK, cloudbrainsStatusAnalysis) + cloudBrainStatusResult := models.GetAllStatusCloudBrain() + ctx.JSON(http.StatusOK, map[string]interface{}{ + "cloudBrainStatusResult": cloudBrainStatusResult, + }) } func GetCloudbrainsDetailData(ctx *context.Context) { From deba9009e6d33753d3d6aa1afd799986799e95a7 Mon Sep 17 00:00:00 2001 From: liuzx Date: Wed, 25 May 2022 18:06:47 +0800 Subject: [PATCH 051/239] update --- models/cloudbrain_static.go | 46 ++++++++----------- routers/api/v1/repo/cloudbrain_dashboard.go | 50 ++------------------- 2 files changed, 23 insertions(+), 73 deletions(-) diff --git a/models/cloudbrain_static.go b/models/cloudbrain_static.go index de3575632..31f66d4fc 100644 --- a/models/cloudbrain_static.go +++ b/models/cloudbrain_static.go @@ -1,30 +1,22 @@ package models -func GetJobWaitingCount() (int64, error) { - countSql := "SELECT count(*) FROM " + "public.cloudbrain where status ='" + string(JobWaiting) + "'" - return x.SQL(countSql).Count() -} -func GetJobStoppedCount() (int64, error) { - countSql := "SELECT count(*) FROM " + "public.cloudbrain where status ='" + string(JobStopped) + "'" - return x.SQL(countSql).Count() -} -func GetJobCompletedCount() (int64, error) { - countSql := "SELECT count(*) FROM " + "public.cloudbrain where status ='" + string(ModelArtsTrainJobCompleted) + "'" - return x.SQL(countSql).Count() -} -func GetJobFailedCount() (int64, error) { - countSql := "SELECT count(*) FROM " + "public.cloudbrain where status ='" + string(JobFailed) + "'" - return x.SQL(countSql).Count() -} -func GetJobRunningCount() (int64, error) { - countSql := "SELECT count(*) FROM " + "public.cloudbrain where status ='" + string(JobRunning) + "'" - return x.SQL(countSql).Count() -} -func GetJobKilledCount() (int64, error) { - countSql := "SELECT count(*) FROM " + "public.cloudbrain where status ='" + string(ModelArtsTrainJobKilled) + "'" - return x.SQL(countSql).Count() -} -func GetJobInitCount() (int64, error) { - countSql := "SELECT count(*) FROM " + "public.cloudbrain where status ='" + string(ModelArtsTrainJobInit) + "'" - return x.SQL(countSql).Count() +import "code.gitea.io/gitea/modules/log" + +func GetAllStatusCloudBrain() map[string]int { + sess := x.NewSession() + defer sess.Close() + cloudbrains := make([]*CloudbrainInfo, 0) + if err := sess.Table(&Cloudbrain{}).Unscoped(). + Find(&cloudbrains); err != nil { + log.Info("find error.") + } + cloudBrainStatusResult := make(map[string]int) + for _, cloudbrain := range cloudbrains { + if _, ok := cloudBrainStatusResult[cloudbrain.Status]; !ok { + cloudBrainStatusResult[cloudbrain.Status] = 1 + } else { + cloudBrainStatusResult[cloudbrain.Status] += 1 + } + } + return cloudBrainStatusResult } diff --git a/routers/api/v1/repo/cloudbrain_dashboard.go b/routers/api/v1/repo/cloudbrain_dashboard.go index 47a64b5aa..0710a21e4 100644 --- a/routers/api/v1/repo/cloudbrain_dashboard.go +++ b/routers/api/v1/repo/cloudbrain_dashboard.go @@ -144,50 +144,8 @@ func getBrainWaitTime(rs *models.CloudbrainInfo) string { } } func GetCloudbrainsStatusAnalysis(ctx *context.Context) { - jobWaitingCount, err := models.GetJobWaitingCount() - if err != nil { - log.Error("Can not query jobWaitingCount.", err) - return - } - jobRunningCount, err := models.GetJobRunningCount() - if err != nil { - log.Error("Can not query jobRunningCount.", err) - return - } - jobStoppedCount, err := models.GetJobStoppedCount() - if err != nil { - log.Error("Can not query jobStoppedCount.", err) - return - } - jobCompletedCount, err := models.GetJobCompletedCount() - if err != nil { - log.Error("Can not query jobCompletedCount.", err) - return - } - jobFailedCount, err := models.GetJobFailedCount() - if err != nil { - log.Error("Can not query jobFailedCount.", err) - return - } - jobKilledCount, err := models.GetJobKilledCount() - if err != nil { - log.Error("Can not query jobKilledCount.", err) - return - } - jobInitCount, err := models.GetJobInitCount() - if err != nil { - log.Error("Can not query jobInitCount.", err) - return - } - - cloudbrainsStatusAnalysis := CloudbrainsStatusAnalysis{ - JobWaitingCount: jobWaitingCount, - JobRunningCount: jobRunningCount, - JobStoppedCount: jobStoppedCount, - JobCompletedCount: jobCompletedCount, - JobFailedCount: jobFailedCount, - JobKilledCount: jobKilledCount, - JobInitCount: jobInitCount, - } - ctx.JSON(http.StatusOK, cloudbrainsStatusAnalysis) + cloudBrainStatusResult := models.GetAllStatusCloudBrain() + ctx.JSON(http.StatusOK, map[string]interface{}{ + "cloudBrainStatusResult": cloudBrainStatusResult, + }) } From 09879828aade23f7ca85735e572e85e781d3476b Mon Sep 17 00:00:00 2001 From: zouap Date: Thu, 26 May 2022 08:56:36 +0800 Subject: [PATCH 052/239] =?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/home.go | 19 ++++++++++++++----- templates/explore/repo_right.tmpl | 2 +- templates/user/dashboard/repolist.tmpl | 4 ++-- 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/routers/home.go b/routers/home.go index 09fe97dc6..2f37357e4 100755 --- a/routers/home.go +++ b/routers/home.go @@ -259,7 +259,11 @@ func ExploreRepos(ctx *context.Context) { ctx.Data["PageIsExplore"] = true ctx.Data["PageIsExploreRepositories"] = true ctx.Data["IsRepoIndexerEnabled"] = setting.Indexer.RepoIndexerEnabled - + pictureInfo, err := getImageInfo("dashboard-picture") + if err == nil && len(pictureInfo) > 0 { + ctx.Data["image_url"] = pictureInfo[0]["url"] + ctx.Data["image_link"] = pictureInfo[0]["image_link"] + } var ownerID int64 if ctx.User != nil && !ctx.User.IsAdmin { ownerID = ctx.User.ID @@ -434,7 +438,11 @@ func ExploreUsers(ctx *context.Context) { ctx.Data["PageIsExplore"] = true ctx.Data["PageIsExploreUsers"] = true ctx.Data["IsRepoIndexerEnabled"] = setting.Indexer.RepoIndexerEnabled - + pictureInfo, err := getImageInfo("explore-user-picture") + if err == nil && len(pictureInfo) > 0 { + ctx.Data["image_url"] = pictureInfo[0]["url"] + ctx.Data["image_link"] = pictureInfo[0]["image_link"] + } RenderUserSearch(ctx, &models.SearchUserOptions{ Actor: ctx.User, Type: models.UserTypeIndividual, @@ -668,8 +676,9 @@ func getRecommendOrg() ([]map[string]interface{}, error) { } return resultOrg, nil } -func getImageInfo() ([]map[string]interface{}, error) { - url := setting.RecommentRepoAddr + "picture_info" + +func getImageInfo(filename string) ([]map[string]interface{}, error) { + url := setting.RecommentRepoAddr + filename result, err := repository.RecommendFromPromote(url) if err != nil { @@ -759,7 +768,7 @@ func RecommendHomeInfo(ctx *context.Context) { if err != nil { log.Info("error." + err.Error()) } - resultImage, err := getImageInfo() + resultImage, err := getImageInfo("picture_info") if err != nil { log.Info("error." + err.Error()) } diff --git a/templates/explore/repo_right.tmpl b/templates/explore/repo_right.tmpl index 5e05e797b..d4eebbe6d 100644 --- a/templates/explore/repo_right.tmpl +++ b/templates/explore/repo_right.tmpl @@ -1,4 +1,4 @@ - +
diff --git a/templates/user/dashboard/repolist.tmpl b/templates/user/dashboard/repolist.tmpl index 06dc65aae..ecd61c565 100644 --- a/templates/user/dashboard/repolist.tmpl +++ b/templates/user/dashboard/repolist.tmpl @@ -166,8 +166,8 @@
From ee4e2c570a899f324ed038e648384322b5dd97fd Mon Sep 17 00:00:00 2001 From: zouap Date: Thu, 26 May 2022 09:06:32 +0800 Subject: [PATCH 053/239] =?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 --- templates/explore/repo_right.tmpl | 2 +- templates/user/dashboard/repolist.tmpl | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/explore/repo_right.tmpl b/templates/explore/repo_right.tmpl index d4eebbe6d..cf0b7d349 100644 --- a/templates/explore/repo_right.tmpl +++ b/templates/explore/repo_right.tmpl @@ -1,4 +1,4 @@ - +
diff --git a/templates/user/dashboard/repolist.tmpl b/templates/user/dashboard/repolist.tmpl index ecd61c565..eab293707 100644 --- a/templates/user/dashboard/repolist.tmpl +++ b/templates/user/dashboard/repolist.tmpl @@ -166,8 +166,8 @@
From 65d26e495e3a39750f0b21adc640bf3f0328ddf6 Mon Sep 17 00:00:00 2001 From: zouap Date: Thu, 26 May 2022 09:14:43 +0800 Subject: [PATCH 054/239] =?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/home.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/routers/home.go b/routers/home.go index 2f37357e4..87de2342d 100755 --- a/routers/home.go +++ b/routers/home.go @@ -261,6 +261,7 @@ func ExploreRepos(ctx *context.Context) { ctx.Data["IsRepoIndexerEnabled"] = setting.Indexer.RepoIndexerEnabled pictureInfo, err := getImageInfo("dashboard-picture") if err == nil && len(pictureInfo) > 0 { + log.Info("set image info=" + pictureInfo[0]["url"]) ctx.Data["image_url"] = pictureInfo[0]["url"] ctx.Data["image_link"] = pictureInfo[0]["image_link"] } @@ -677,17 +678,17 @@ func getRecommendOrg() ([]map[string]interface{}, error) { return resultOrg, nil } -func getImageInfo(filename string) ([]map[string]interface{}, error) { +func getImageInfo(filename string) ([]map[string]string, error) { url := setting.RecommentRepoAddr + filename result, err := repository.RecommendFromPromote(url) if err != nil { return nil, err } - imageInfo := make([]map[string]interface{}, 0) + imageInfo := make([]map[string]string, 0) for i := 0; i < (len(result) - 1); i++ { line := result[i] - imageMap := make(map[string]interface{}) + imageMap := make(map[string]string) if line[0:4] == "url=" { url := line[4:] imageMap["url"] = url From 549ce0e5e2198904b296793439a50fd76cd6a1d4 Mon Sep 17 00:00:00 2001 From: zouap Date: Thu, 26 May 2022 09:22:08 +0800 Subject: [PATCH 055/239] =?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/home.go | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/routers/home.go b/routers/home.go index 87de2342d..c093f6596 100755 --- a/routers/home.go +++ b/routers/home.go @@ -99,6 +99,12 @@ func setRecommendURL(ctx *context.Context) { func Dashboard(ctx *context.Context) { if ctx.IsSigned { + pictureInfo, err := getImageInfo("dashboard-picture") + if err == nil && len(pictureInfo) > 0 { + log.Info("set image info=" + pictureInfo[0]["url"]) + ctx.Data["image_url"] = pictureInfo[0]["url"] + ctx.Data["image_link"] = pictureInfo[0]["image_link"] + } if !ctx.User.IsActive && setting.Service.RegisterEmailConfirm { ctx.Data["Title"] = ctx.Tr("auth.active_your_account") ctx.HTML(200, user.TplActivate) @@ -259,9 +265,8 @@ func ExploreRepos(ctx *context.Context) { ctx.Data["PageIsExplore"] = true ctx.Data["PageIsExploreRepositories"] = true ctx.Data["IsRepoIndexerEnabled"] = setting.Indexer.RepoIndexerEnabled - pictureInfo, err := getImageInfo("dashboard-picture") + pictureInfo, err := getImageInfo("explore-user-picture") if err == nil && len(pictureInfo) > 0 { - log.Info("set image info=" + pictureInfo[0]["url"]) ctx.Data["image_url"] = pictureInfo[0]["url"] ctx.Data["image_link"] = pictureInfo[0]["image_link"] } From 9378f3229ba1554882f30a00f659131692451901 Mon Sep 17 00:00:00 2001 From: zouap Date: Thu, 26 May 2022 11:23:32 +0800 Subject: [PATCH 056/239] =?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/home.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/routers/home.go b/routers/home.go index c093f6596..1b02c43ad 100755 --- a/routers/home.go +++ b/routers/home.go @@ -7,6 +7,7 @@ package routers import ( "bytes" + "fmt" "net/http" "strconv" "strings" @@ -792,9 +793,10 @@ func RecommendHomeInfo(ctx *context.Context) { func getCloudbrainNums() (map[string]string, error) { result := make(map[string]string) - result["completed_task"] = "1800" - result["running_task"] = "20" - result["wait_task"] = "30" + cloudStatusMap := models.GetAllStatusCloudBrain() + result["completed_task"] = fmt.Sprint(cloudStatusMap["COMPLETED"]) + result["running_task"] = fmt.Sprint(cloudStatusMap["RUNNING"]) + result["wait_task"] = fmt.Sprint(cloudStatusMap["WAITING"]) return result, nil } From cc8136a372f80ceb5916e6232f92aa16950c5436 Mon Sep 17 00:00:00 2001 From: liuzx Date: Thu, 26 May 2022 16:14:10 +0800 Subject: [PATCH 057/239] update --- models/cloudbrain.go | 2 + models/cloudbrain_static.go | 134 +++-- modules/setting/setting.go | 2 +- routers/api/v1/repo/cloudbrain_dashboard.go | 536 +++++++++++--------- 4 files changed, 367 insertions(+), 307 deletions(-) diff --git a/models/cloudbrain.go b/models/cloudbrain.go index 03eef25e1..10d57df2e 100755 --- a/models/cloudbrain.go +++ b/models/cloudbrain.go @@ -327,6 +327,8 @@ type CloudbrainsOptions struct { JobTypeNot bool NeedRepoInfo bool RepoIDList []int64 + BeginTime time.Time + EndTime time.Time } type TaskPod struct { diff --git a/models/cloudbrain_static.go b/models/cloudbrain_static.go index dfc1b6dd6..7239c5d89 100644 --- a/models/cloudbrain_static.go +++ b/models/cloudbrain_static.go @@ -5,48 +5,69 @@ import ( "time" "code.gitea.io/gitea/modules/log" + "code.gitea.io/gitea/modules/timeutil" ) -func GetJobWaitingPeriodCount(beginTime time.Time, endTime time.Time) (int64, error) { - countSql := "SELECT count(*) FROM " + - "public.cloudbrain where created_unix >=" + strconv.FormatInt(beginTime.Unix(), 10) + - " and created_unix<" + strconv.FormatInt(endTime.Unix(), 10) + - " and status ='" + string(JobWaiting) + "'" - - return x.SQL(countSql).Count() +type AllTask struct { + List []TaskDetail `json:"list"` +} +type TaskDetail struct { + ID int64 `json:"ID"` + JobName string `json:"JobName"` + DisplayJobName string `json:"DisplayJobName"` + Status string `json:"Status"` + JobType string `json:"JobType"` + CreatedUnix timeutil.TimeStamp `json:"CreatedUnix"` + WaitTime timeutil.TimeStamp `json:"WaitTime"` + RunTime timeutil.TimeStamp `json:"RunTime"` + StartTime timeutil.TimeStamp `json:"StartTime"` + EndTime timeutil.TimeStamp `json:"EndTime"` + ComputeResource string `json:"ComputeResource"` + Type int `json:"Type"` + UserID int64 `json:"UserID"` + RepoID int64 `json:"RepoID"` } -func GetJobRunningPeriodCount(beginTime time.Time, endTime time.Time) (int64, error) { - countSql := "SELECT count(*) FROM " + - "public.cloudbrain where created_unix >=" + strconv.FormatInt(beginTime.Unix(), 10) + - " and created_unix<" + strconv.FormatInt(endTime.Unix(), 10) + - " and status ='" + string(JobRunning) + "'" - return x.SQL(countSql).Count() -} -func GetJobStoppedPeriodCount(beginTime time.Time, endTime time.Time) (int64, error) { - countSql := "SELECT count(*) FROM " + - "public.cloudbrain where created_unix >=" + strconv.FormatInt(beginTime.Unix(), 10) + - " and created_unix<" + strconv.FormatInt(endTime.Unix(), 10) + - " and status ='" + string(JobStopped) + "'" +// func GetJobWaitingPeriodCount(beginTime time.Time, endTime time.Time) (int64, error) { +// countSql := "SELECT count(*) FROM " + +// "public.cloudbrain where created_unix >=" + strconv.FormatInt(beginTime.Unix(), 10) + +// " and created_unix<" + strconv.FormatInt(endTime.Unix(), 10) + +// " and status ='" + string(JobWaiting) + "'" - return x.SQL(countSql).Count() -} -func GetJobSucceededPeriodCount(beginTime time.Time, endTime time.Time) (int64, error) { - countSql := "SELECT count(*) FROM " + - "public.cloudbrain where created_unix >=" + strconv.FormatInt(beginTime.Unix(), 10) + - " and created_unix<" + strconv.FormatInt(endTime.Unix(), 10) + - " and status ='" + string(JobSucceeded) + "'" +// return x.SQL(countSql).Count() +// } +// func GetJobRunningPeriodCount(beginTime time.Time, endTime time.Time) (int64, error) { +// countSql := "SELECT count(*) FROM " + +// "public.cloudbrain where created_unix >=" + strconv.FormatInt(beginTime.Unix(), 10) + +// " and created_unix<" + strconv.FormatInt(endTime.Unix(), 10) + +// " and status ='" + string(JobRunning) + "'" - return x.SQL(countSql).Count() -} -func GetJobFailedPeriodCount(beginTime time.Time, endTime time.Time) (int64, error) { - countSql := "SELECT count(*) FROM " + - "public.cloudbrain where created_unix >=" + strconv.FormatInt(beginTime.Unix(), 10) + - " and created_unix<" + strconv.FormatInt(endTime.Unix(), 10) + - " and status ='" + string(JobFailed) + "'" +// return x.SQL(countSql).Count() +// } +// func GetJobStoppedPeriodCount(beginTime time.Time, endTime time.Time) (int64, error) { +// countSql := "SELECT count(*) FROM " + +// "public.cloudbrain where created_unix >=" + strconv.FormatInt(beginTime.Unix(), 10) + +// " and created_unix<" + strconv.FormatInt(endTime.Unix(), 10) + +// " and status ='" + string(JobStopped) + "'" - return x.SQL(countSql).Count() -} +// return x.SQL(countSql).Count() +// } +// func GetJobSucceededPeriodCount(beginTime time.Time, endTime time.Time) (int64, error) { +// countSql := "SELECT count(*) FROM " + +// "public.cloudbrain where created_unix >=" + strconv.FormatInt(beginTime.Unix(), 10) + +// " and created_unix<" + strconv.FormatInt(endTime.Unix(), 10) + +// " and status ='" + string(JobSucceeded) + "'" + +// return x.SQL(countSql).Count() +// } +// func GetJobFailedPeriodCount(beginTime time.Time, endTime time.Time) (int64, error) { +// countSql := "SELECT count(*) FROM " + +// "public.cloudbrain where created_unix >=" + strconv.FormatInt(beginTime.Unix(), 10) + +// " and created_unix<" + strconv.FormatInt(endTime.Unix(), 10) + +// " and status ='" + string(JobFailed) + "'" + +// return x.SQL(countSql).Count() +// } func GetDebugOnePeriodCount(beginTime time.Time, endTime time.Time) (int64, error) { countSql := "SELECT count(*) FROM " + @@ -175,36 +196,7 @@ func GetCloudBrainTwoPeriodDuration(beginTime time.Time, endTime time.Time) (int return total, nil } -func GetCloudBrainOneCount() (int64, error) { - countSql := "SELECT count(*) FROM " + - "public.cloudbrain where type='" + strconv.Itoa(TypeCloudBrainOne) + "'" - - return x.SQL(countSql).Count() -} -func GetCloudBrainOneDuration() (int64, error) { - total, err := x.Where("type = ? ", TypeCloudBrainOne).SumInt(&Cloudbrain{}, "duration") - if err != nil { - return 0, err - } - - return total, nil -} -func GetCloudBrainTwoCount() (int64, error) { - countSql := "SELECT count(*) FROM " + - "public.cloudbrain where type='" + strconv.Itoa(TypeCloudBrainTwo) + "'" - - return x.SQL(countSql).Count() -} -func GetCloudBrainTwoDuration() (int64, error) { - total, err := x.Where("type = ? ", TypeCloudBrainTwo).SumInt(&Cloudbrain{}, "duration") - if err != nil { - return 0, err - } - - return total, nil -} - -func GetCreatorPeriodCount(beginTime time.Time, endTime time.Time) (int64, error) { +func GetTodayCreatorCount(beginTime time.Time, endTime time.Time) (int64, error) { countSql := "SELECT count(distinct user_id) FROM " + "public.cloudbrain where created_unix >=" + strconv.FormatInt(beginTime.Unix(), 10) + " and created_unix<" + strconv.FormatInt(endTime.Unix(), 10) @@ -215,7 +207,7 @@ func GetCreatorCount() (int64, error) { return x.SQL(countSql).Count() } -func GetAllStatusCloudBrain() map[string]int { +func GetAllCloudBrain() ([]*CloudbrainInfo, error) { sess := x.NewSession() defer sess.Close() cloudbrains := make([]*CloudbrainInfo, 0) @@ -223,15 +215,7 @@ func GetAllStatusCloudBrain() map[string]int { Find(&cloudbrains); err != nil { log.Info("find error.") } - cloudBrainStatusResult := make(map[string]int) - for _, cloudbrain := range cloudbrains { - if _, ok := cloudBrainStatusResult[cloudbrain.Status]; !ok { - cloudBrainStatusResult[cloudbrain.Status] = 1 - } else { - cloudBrainStatusResult[cloudbrain.Status] += 1 - } - } - return cloudBrainStatusResult + return cloudbrains, nil } func getCreatePeriodCount(dateBeginTime string, dateEndTime string, hourBeginTime string, hourEndTime string) (int64, error) { diff --git a/modules/setting/setting.go b/modules/setting/setting.go index 12bae39c0..cd7357dc1 100755 --- a/modules/setting/setting.go +++ b/modules/setting/setting.go @@ -1293,7 +1293,7 @@ func NewContext() { MaxDuration = sec.Key("MAX_DURATION").MustInt64(14400) TrainGpuTypes = sec.Key("TRAIN_GPU_TYPES").MustString("") TrainResourceSpecs = sec.Key("TRAIN_RESOURCE_SPECS").MustString("") - BrainRecordBeginTime = sec.Key("brain_record_beigin_time").MustString("2021-01-01") + BrainRecordBeginTime = sec.Key("brain_record_begin_time").MustString("2021-01-01") sec = Cfg.Section("benchmark") IsBenchmarkEnabled = sec.Key("ENABLED").MustBool(false) diff --git a/routers/api/v1/repo/cloudbrain_dashboard.go b/routers/api/v1/repo/cloudbrain_dashboard.go index 01c78ff87..83fdb612e 100644 --- a/routers/api/v1/repo/cloudbrain_dashboard.go +++ b/routers/api/v1/repo/cloudbrain_dashboard.go @@ -1,7 +1,6 @@ package repo import ( - "fmt" "net/http" "net/url" "strings" @@ -16,126 +15,99 @@ import ( "code.gitea.io/gitea/modules/setting" ) -type CloudbrainsPeriodData struct { - DebugOnePeriodCount int64 `json:"debugOnePeriodCount"` - BenchmarkOnePeriodCount int64 `json:"benchmarkOnePeriodCount"` - TrainOnePeriodCount int64 `json:"trainOnePeriodCount"` - DebugTwoPeriodCount int64 `json:"debugTwoPeriodCount"` - TrainTwoPeriodCount int64 `json:"trainTwoPeriodCount"` - InferenceTwoPeriodCount int64 `json:"inferenceTwoPeriodCount"` - JobWaitingPeriodCount int64 `json:"jobWaitingPeriodCount"` - JobRunningPeriodCount int64 `json:"jobRunningPeriodCount"` - JobSucceededPeriodCount int64 `json:"jobRunningPeriodCount"` - CloudBrainOnePeriodCount int64 `json:"cloudBrainOnePeriodCount"` - CloudBrainTwoPeriodCount int64 `json:"cloudBrainTwoPeriodCount"` -} -type CloudbrainsOverviewData struct { - JobWaitingPeriodCount int64 `json:"jobWaitingPeriodCount"` - JobRunningPeriodCount int64 `json:"jobRunningPeriodCount"` - JobStoppedPeriodCount int64 `json:"jobStoppedPeriodCount"` - JobSucceededPeriodCount int64 `json:"jobSucceededPeriodCount"` - JobFailedPeriodCount int64 `json:"jobFailedPeriodCount"` - CloudBrainOneCount int64 `json:"cloudBrainOneCount"` - CloudBrainTwoCount int64 `json:"cloudBrainTwoCount"` - CloudBrainOneDuration int64 `json:"cloudBrainOneDuration"` - CloudBrainTwoDuration int64 `json:"cloudBrainTwoDuration"` - CreatorPeriodCount int64 `json:"creatorPeriodCount"` - CreatorCount int64 `json:"creatorCount"` -} - type TimeCloudbrainsNum struct { TimeCloudbrainNum []DateCloudbrainNum `json:"dateCloudbrainNum"` } type DateCloudbrainNum struct { - Date string `json:"date"` - DebugOneCount int64 `json:"debugOneCount"` - BenchmarkOneCount int64 `json:"benchmarkOneCount"` - TrainOneCount int64 `json:"trainOneCount"` - DebugTwoCount int64 `json:"debugTwoCount"` - TrainTwoCount int64 `json:"trainTwoCount"` - InferenceTwoCount int64 `json:"inferenceTwoCount"` - CloudbrainOneCount int64 `json:"cloudbrainOneCount"` - CloudbrainTwoCount int64 `json:"cloudbrainTwoCount"` - CloudbrainCount int64 `json:"cloudbrainCount"` + Date string `json:"date"` + CloudOneJobTypeRes map[string]int `json:"cloudOneJobTypeRes"` + CloudTwoJobTypeRes map[string]int `json:"cloudTwoJobTypeRes"` + IntelligentNetJobTypeRes map[string]int `json:"intelligentNetJobTypeRes"` + CloudBrainPeriodNum map[int]int `json:"cloudBrainPeriodNum"` + CloudBrainComputeResource map[string]int `json:"cloudBrainComputeResource"` } func GetAllCloudbrainsOverview(ctx *context.Context) { + recordBeginTime, err := getBrainRecordBeginTime() + if err != nil { + log.Error("Can not get record begin time", err) + ctx.Error(http.StatusBadRequest, ctx.Tr("repo.record_begintime_get_err")) + return + } now := time.Now() //today overview beginTime := now.AddDate(0, 0, 0) beginTime = time.Date(beginTime.Year(), beginTime.Month(), beginTime.Day(), 0, 0, 0, 0, now.Location()) endTime := now - jobWaitingPeriodCount, err := models.GetJobWaitingPeriodCount(beginTime, endTime) - if err != nil { - log.Error("Can not query jobWaitingCount.", err) - return - } - jobRunningPeriodCount, err := models.GetJobRunningPeriodCount(beginTime, endTime) - if err != nil { - log.Error("Can not query jobRunningCount.", err) - return - } - jobStoppedPeriodCount, err := models.GetJobStoppedPeriodCount(beginTime, endTime) - if err != nil { - log.Error("Can not query jobStoppedCount.", err) - return - } - jobSucceededPeriodCount, err := models.GetJobSucceededPeriodCount(beginTime, endTime) - if err != nil { - log.Error("Can not query jobSucceededCount.", err) - return - } - jobFailedPeriodCount, err := models.GetJobFailedPeriodCount(beginTime, endTime) - if err != nil { - log.Error("Can not query jobFailedCount.", err) - return - } - cloudBrainOneCount, err := models.GetCloudBrainOneCount() + todayCreatorCount, err := models.GetTodayCreatorCount(beginTime, endTime) if err != nil { - log.Error("Can not query cloudBrainOneCount.", err) + log.Error("Can not query todayCreatorCount.", err) return } - cloudBrainOneDuration, err := models.GetCloudBrainOneDuration() - if err != nil { - log.Error("Can not query cloudBrainOneDuration.", err) - return - } - cloudBrainTwoCount, err := models.GetCloudBrainTwoCount() - if err != nil { - log.Error("Can not query cloudBrainTwoCount.", err) - return - } - cloudBrainTwoDuration, err := models.GetCloudBrainTwoDuration() + creatorCount, err := models.GetCreatorCount() if err != nil { - log.Error("Can not query cloudBrainTwoDuration.", err) + log.Error("Can not query creatorCount.", err) return } - creatorPeriodCount, err := models.GetCreatorPeriodCount(beginTime, endTime) + + cloudbrains, err := models.GetAllCloudBrain() if err != nil { - log.Error("Can not query creatorPeriodCount.", err) + log.Error("Getcloudbrains failed:%v", err) return } - creatorCount, err := models.GetCreatorCount() - if err != nil { - log.Error("Can not query creatorCount.", err) - return + + todayStatusResult := make(map[string]int) + cloudBrainNum := make(map[int]int) + cloudBrainOneDuration := int64(0) + cloudBrainTwoDuration := int64(0) + for _, cloudbrain := range cloudbrains { + if int64(cloudbrain.Cloudbrain.CreatedUnix) >= beginTime.Unix() && int64(cloudbrain.Cloudbrain.CreatedUnix) < endTime.Unix() { + if _, ok := todayStatusResult[cloudbrain.Status]; !ok { + todayStatusResult[cloudbrain.Status] = 1 + } else { + todayStatusResult[cloudbrain.Status] += 1 + } + } + + if _, ok := cloudBrainNum[cloudbrain.Cloudbrain.Type]; !ok { + cloudBrainNum[cloudbrain.Cloudbrain.Type] = 1 + } else { + cloudBrainNum[cloudbrain.Cloudbrain.Type] += 1 + } + + if cloudbrain.Cloudbrain.Type == models.TypeCloudBrainOne { + cloudBrainOneDuration = cloudBrainOneDuration + cloudbrain.Cloudbrain.Duration + } + if cloudbrain.Cloudbrain.Type == models.TypeCloudBrainTwo { + cloudBrainTwoDuration = cloudBrainTwoDuration + cloudbrain.Cloudbrain.Duration + } + } - CloudbrainsOverviewData := CloudbrainsOverviewData{ - JobWaitingPeriodCount: jobWaitingPeriodCount, - JobRunningPeriodCount: jobRunningPeriodCount, - JobStoppedPeriodCount: jobStoppedPeriodCount, - JobSucceededPeriodCount: jobSucceededPeriodCount, - JobFailedPeriodCount: jobFailedPeriodCount, - CloudBrainOneCount: cloudBrainOneCount, - CloudBrainTwoCount: cloudBrainTwoCount, - CloudBrainOneDuration: cloudBrainOneDuration, - CloudBrainTwoDuration: cloudBrainTwoDuration, - CreatorPeriodCount: creatorPeriodCount, - CreatorCount: creatorCount, + statusNameList := []string{"COMPLETED", "FAILED", "INIT", "RUNNING", "START_FAILED", "STOPPED", "SUCCEEDED", "WAITING", "KILLED"} + for _, v := range statusNameList { + if _, ok := todayStatusResult[v]; !ok { + todayStatusResult[v] = 0 + } } - ctx.JSON(http.StatusOK, CloudbrainsOverviewData) + todayRunningCount := todayStatusResult["RUNNING"] + todayCompletedCount := todayStatusResult["COMPLETED"] + todayStatusResult["FAILED"] + todayStatusResult["START_FAILED"] + todayStatusResult["STOPPED"] + todayStatusResult["SUCCEEDED"] + todayStatusResult["KILLED"] + todayWaitingCount := todayStatusResult["INIT"] + todayStatusResult["WAITING"] + + ctx.JSON(http.StatusOK, map[string]interface{}{ + // "todayStatusResult": todayStatusResult, + "recordBeginTime": recordBeginTime, + "cloudBrainNum": cloudBrainNum, + "cloudBrainOneDuration": cloudBrainOneDuration, + "cloudBrainTwoDuration": cloudBrainTwoDuration, + "intelligentNetDuration": 0, + "todayCreatorCount": todayCreatorCount, + "creatorCount": creatorCount, + "todayRunningCount": todayRunningCount, + "todayCompletedCount": todayCompletedCount, + "todayWaitingCount": todayWaitingCount, + }) } func GetAllCloudbrainsTrend(ctx *context.Context) { @@ -308,71 +280,128 @@ func GetAllCloudbrainsPeriodDistribution(ctx *context.Context) { ctx.Error(http.StatusBadRequest, ctx.Tr("repo.parameter_is_wrong")) return } - debugOnePeriodCount, err := models.GetDebugOnePeriodCount(beginTime, endTime) - if err != nil { - log.Error("Can not query debugOneCount.", err) - ctx.Error(http.StatusBadRequest, ctx.Tr("debugOneCount_get_error")) - return - } - benchmarkOnePeriodCount, err := models.GetBenchmarkOnePeriodCount(beginTime, endTime) - if err != nil { - log.Error("Can not query benchmarkCount.", err) - ctx.Error(http.StatusBadRequest, ctx.Tr("benchmarkOneCount_get_error")) - return - } - trainOnePeriodCount, err := models.GetTrainOnePeriodCount(beginTime, endTime) - if err != nil { - log.Error("Can not query trainOneCount.", err) - ctx.Error(http.StatusBadRequest, ctx.Tr("trainOneCount_get_error")) - return - } - debugTwoPeriodCount, err := models.GetDebugTwoPeriodCount(beginTime, endTime) - if err != nil { - log.Error("Can not query debugTwoCount.", err) - ctx.Error(http.StatusBadRequest, ctx.Tr("debugTwoCount_get_error")) + // debugOnePeriodCount, err := models.GetDebugOnePeriodCount(beginTime, endTime) + // if err != nil { + // log.Error("Can not query debugOneCount.", err) + // ctx.Error(http.StatusBadRequest, ctx.Tr("debugOneCount_get_error")) + // return + // } + // benchmarkOnePeriodCount, err := models.GetBenchmarkOnePeriodCount(beginTime, endTime) + // if err != nil { + // log.Error("Can not query benchmarkCount.", err) + // ctx.Error(http.StatusBadRequest, ctx.Tr("benchmarkOneCount_get_error")) + // return + // } + // trainOnePeriodCount, err := models.GetTrainOnePeriodCount(beginTime, endTime) + // if err != nil { + // log.Error("Can not query trainOneCount.", err) + // ctx.Error(http.StatusBadRequest, ctx.Tr("trainOneCount_get_error")) + // return + // } + // debugTwoPeriodCount, err := models.GetDebugTwoPeriodCount(beginTime, endTime) + // if err != nil { + // log.Error("Can not query debugTwoCount.", err) + // ctx.Error(http.StatusBadRequest, ctx.Tr("debugTwoCount_get_error")) + // return + // } + // trainTwoPeriodCount, err := models.GetTrainTwoPeriodCount(beginTime, endTime) + // if err != nil { + // log.Error("Can not query DebugOneTotal count.", err) + // ctx.Error(http.StatusBadRequest, ctx.Tr("total_count_get_error")) + // return + // } + // inferenceTwoPeriodCount, err := models.GetInferenceTwoPeriodCount(beginTime, endTime) + // if err != nil { + // log.Error("Can not query inferenceTwoCount.", err) + // ctx.Error(http.StatusBadRequest, ctx.Tr("inferenceTwoCount_get_error")) + // return + // } + // cloudBrainOnePeriodCount, err := models.GetCloudBrainOnePeriodCount(beginTime, endTime) + // if err != nil { + // log.Error("Can not query cloudBrainOnePeriodCount.", err) + // ctx.Error(http.StatusBadRequest, ctx.Tr("cloudBrainOnePeriodCount_get_error")) + // return + // } + // cloudBrainTwoPeriodCount, err := models.GetCloudBrainTwoPeriodCount(beginTime, endTime) + // if err != nil { + // log.Error("Can not query cloudBrainTwoPeriodCount.", err) + // ctx.Error(http.StatusBadRequest, ctx.Tr("cloudBrainTwoPeriodCount_get_error")) + // return + // } + + cloudbrains, err := models.GetAllCloudBrain() + if err != nil { + log.Error("Getcloudbrains failed:%v", err) return } - trainTwoPeriodCount, err := models.GetTrainTwoPeriodCount(beginTime, endTime) - if err != nil { - log.Error("Can not query DebugOneTotal count.", err) - ctx.Error(http.StatusBadRequest, ctx.Tr("total_count_get_error")) - return - } - inferenceTwoPeriodCount, err := models.GetInferenceTwoPeriodCount(beginTime, endTime) - if err != nil { - log.Error("Can not query inferenceTwoCount.", err) - ctx.Error(http.StatusBadRequest, ctx.Tr("inferenceTwoCount_get_error")) - return - } - cloudBrainOnePeriodCount, err := models.GetCloudBrainOnePeriodCount(beginTime, endTime) - if err != nil { - log.Error("Can not query cloudBrainOnePeriodCount.", err) - ctx.Error(http.StatusBadRequest, ctx.Tr("cloudBrainOnePeriodCount_get_error")) - return - } - cloudBrainTwoPeriodCount, err := models.GetCloudBrainTwoPeriodCount(beginTime, endTime) - if err != nil { - log.Error("Can not query cloudBrainTwoPeriodCount.", err) - ctx.Error(http.StatusBadRequest, ctx.Tr("cloudBrainTwoPeriodCount_get_error")) - return + cloudOneJobTypeRes := make(map[string]int) + cloudTwoJobTypeRes := make(map[string]int) + intelligentNetJobTypeRes := make(map[string]int) + cloudBrainPeriodNum := make(map[int]int) + for _, cloudbrain := range cloudbrains { + if int64(cloudbrain.Cloudbrain.CreatedUnix) >= beginTime.Unix() && int64(cloudbrain.Cloudbrain.CreatedUnix) < endTime.Unix() { + if cloudbrain.Cloudbrain.Type == models.TypeCloudBrainOne { + if _, ok := cloudOneJobTypeRes[cloudbrain.JobType]; !ok { + cloudOneJobTypeRes[cloudbrain.JobType] = 1 + } else { + cloudOneJobTypeRes[cloudbrain.JobType] += 1 + } + } + if cloudbrain.Cloudbrain.Type == models.TypeCloudBrainTwo { + if _, ok := cloudTwoJobTypeRes[cloudbrain.JobType]; !ok { + cloudTwoJobTypeRes[cloudbrain.JobType] = 1 + } else { + cloudTwoJobTypeRes[cloudbrain.JobType] += 1 + } + } + + if _, ok := cloudBrainPeriodNum[cloudbrain.Cloudbrain.Type]; !ok { + cloudBrainPeriodNum[cloudbrain.Cloudbrain.Type] = 1 + } else { + cloudBrainPeriodNum[cloudbrain.Cloudbrain.Type] += 1 + } + + } } - cloudbrainsPeriodData := CloudbrainsPeriodData{ - DebugOnePeriodCount: debugOnePeriodCount, - BenchmarkOnePeriodCount: benchmarkOnePeriodCount, - TrainOnePeriodCount: trainOnePeriodCount, - DebugTwoPeriodCount: debugTwoPeriodCount, - TrainTwoPeriodCount: trainTwoPeriodCount, - InferenceTwoPeriodCount: inferenceTwoPeriodCount, - CloudBrainOnePeriodCount: cloudBrainOnePeriodCount, - CloudBrainTwoPeriodCount: cloudBrainTwoPeriodCount, + jobTypeList := []string{"DEBUG", "BENCHMARK", "INFERENCE", "TRAIN", "SNN4IMAGENET", "BRAINSCORE"} + for _, v := range jobTypeList { + if _, ok := cloudOneJobTypeRes[v]; !ok { + cloudOneJobTypeRes[v] = 0 + } + if _, ok := cloudTwoJobTypeRes[v]; !ok { + cloudTwoJobTypeRes[v] = 0 + } + if _, ok := intelligentNetJobTypeRes[v]; !ok { + intelligentNetJobTypeRes[v] = 0 + } } - ctx.JSON(http.StatusOK, cloudbrainsPeriodData) + cloudOneJobTypeRes["EVALUATION"] = cloudOneJobTypeRes["BENCHMARK"] + cloudOneJobTypeRes["SNN4IMAGENET"] + cloudOneJobTypeRes["BRAINSCORE"] + cloudTwoJobTypeRes["EVALUATION"] = cloudTwoJobTypeRes["BENCHMARK"] + cloudTwoJobTypeRes["SNN4IMAGENET"] + cloudTwoJobTypeRes["BRAINSCORE"] + intelligentNetJobTypeRes["EVALUATION"] = intelligentNetJobTypeRes["BENCHMARK"] + intelligentNetJobTypeRes["SNN4IMAGENET"] + intelligentNetJobTypeRes["BRAINSCORE"] + ctx.JSON(http.StatusOK, map[string]interface{}{ + "cloudOneJobTypeRes": cloudOneJobTypeRes, + "cloudTwoJobTypeRes": cloudTwoJobTypeRes, + "intelligentNetJobTypeRes": intelligentNetJobTypeRes, + "cloudBrainPeriodNum": cloudBrainPeriodNum, + }) } func GetCloudbrainsStatusAnalysis(ctx *context.Context) { - cloudBrainStatusResult := models.GetAllStatusCloudBrain() + cloudbrains, err := models.GetAllCloudBrain() + if err != nil { + log.Error("Getcloudbrains failed:%v", err) + return + } + cloudBrainStatusResult := make(map[string]int) + for _, cloudbrain := range cloudbrains { + if _, ok := cloudBrainStatusResult[cloudbrain.Status]; !ok { + cloudBrainStatusResult[cloudbrain.Status] = 1 + } else { + cloudBrainStatusResult[cloudbrain.Status] += 1 + } + } ctx.JSON(http.StatusOK, map[string]interface{}{ "cloudBrainStatusResult": cloudBrainStatusResult, }) @@ -434,11 +463,13 @@ func GetCloudbrainsDetailData(ctx *context.Context) { ctx.ServerError("Get job failed:", err) return } + // var taskList := []*models.TaskDetail for i, task := range ciTasks { ciTasks[i].CanDebug = true ciTasks[i].CanDel = true ciTasks[i].Cloudbrain.ComputeResource = task.ComputeResource + } pager := context.NewPagination(int(count), setting.UI.IssuePagingNum, page, getTotalPage(count, setting.UI.IssuePagingNum)) @@ -598,70 +629,127 @@ func GetCloudbrainsRunHoursData(ctx *context.Context) { } -func getCloudbrainCount(beginTime time.Time, endTime time.Time) (int64, int64, int64, int64, int64, int64, int64, int64, int64, error) { - debugOneCount, err := models.GetDebugOnePeriodCount(beginTime, endTime) - if err != nil { - log.Error("Can not query debugOneCount.", err) - return 0, 0, 0, 0, 0, 0, 0, 0, 0, err - } - benchmarkOneCount, err := models.GetBenchmarkOnePeriodCount(beginTime, endTime) - if err != nil { - log.Error("Can not query benchmarkCount.", err) - return 0, 0, 0, 0, 0, 0, 0, 0, 0, err - } - trainOneCount, err := models.GetTrainOnePeriodCount(beginTime, endTime) - if err != nil { - log.Error("Can not query trainOneCount.", err) - return 0, 0, 0, 0, 0, 0, 0, 0, 0, err - } - debugTwoCount, err := models.GetDebugTwoPeriodCount(beginTime, endTime) - if err != nil { - log.Error("Can not query debugTwoCount.", err) - return 0, 0, 0, 0, 0, 0, 0, 0, 0, err - } - trainTwoCount, err := models.GetTrainTwoPeriodCount(beginTime, endTime) - if err != nil { - log.Error("Can not query DebugOneTotal count.", err) - return 0, 0, 0, 0, 0, 0, 0, 0, 0, err - } - inferenceTwoCount, err := models.GetInferenceTwoPeriodCount(beginTime, endTime) - if err != nil { - log.Error("Can not query inferenceTwoCount.", err) - return 0, 0, 0, 0, 0, 0, 0, 0, 0, err +func getCloudbrainCount(beginTime time.Time, endTime time.Time) (map[string]int, map[string]int, map[string]int, map[int]int, map[string]int, error) { + // debugOneCount, err := models.GetDebugOnePeriodCount(beginTime, endTime) + // if err != nil { + // log.Error("Can not query debugOneCount.", err) + // return 0, 0, 0, 0, 0, 0, 0, 0, 0, err + // } + // benchmarkOneCount, err := models.GetBenchmarkOnePeriodCount(beginTime, endTime) + // if err != nil { + // log.Error("Can not query benchmarkCount.", err) + // return 0, 0, 0, 0, 0, 0, 0, 0, 0, err + // } + // trainOneCount, err := models.GetTrainOnePeriodCount(beginTime, endTime) + // if err != nil { + // log.Error("Can not query trainOneCount.", err) + // return 0, 0, 0, 0, 0, 0, 0, 0, 0, err + // } + // debugTwoCount, err := models.GetDebugTwoPeriodCount(beginTime, endTime) + // if err != nil { + // log.Error("Can not query debugTwoCount.", err) + // return 0, 0, 0, 0, 0, 0, 0, 0, 0, err + // } + // trainTwoCount, err := models.GetTrainTwoPeriodCount(beginTime, endTime) + // if err != nil { + // log.Error("Can not query DebugOneTotal count.", err) + // return 0, 0, 0, 0, 0, 0, 0, 0, 0, err + // } + // inferenceTwoCount, err := models.GetInferenceTwoPeriodCount(beginTime, endTime) + // if err != nil { + // log.Error("Can not query inferenceTwoCount.", err) + // return 0, 0, 0, 0, 0, 0, 0, 0, 0, err + // } + // cloudbrainOneCount, err := models.GetCloudBrainOnePeriodCount(beginTime, endTime) + // if err != nil { + // log.Error("Can not query cloudbrainOneCount.", err) + // return 0, 0, 0, 0, 0, 0, 0, 0, 0, err + // } + // cloudbrainTwoCount, err := models.GetCloudBrainTwoPeriodCount(beginTime, endTime) + // if err != nil { + // log.Error("Can not query cloudbrainOneCount.", err) + // return 0, 0, 0, 0, 0, 0, 0, 0, 0, err + // } + // cloudbrainCount := cloudbrainOneCount + cloudbrainTwoCount + + cloudbrains, err := models.GetAllCloudBrain() + if err != nil { + log.Error("Getcloudbrains failed:%v", err) + return nil, nil, nil, nil, nil, err + } + cloudOneJobTypeRes := make(map[string]int) + cloudTwoJobTypeRes := make(map[string]int) + intelligentNetJobTypeRes := make(map[string]int) + cloudBrainPeriodNum := make(map[int]int) + cloudBrainComputeResource := make(map[string]int) + for _, cloudbrain := range cloudbrains { + if int64(cloudbrain.Cloudbrain.CreatedUnix) >= beginTime.Unix() && int64(cloudbrain.Cloudbrain.CreatedUnix) < endTime.Unix() { + if cloudbrain.Cloudbrain.Type == models.TypeCloudBrainOne { + if _, ok := cloudOneJobTypeRes[cloudbrain.Cloudbrain.JobType]; !ok { + cloudOneJobTypeRes[cloudbrain.Cloudbrain.JobType] = 1 + } else { + cloudOneJobTypeRes[cloudbrain.Cloudbrain.JobType] += 1 + } + } + if cloudbrain.Cloudbrain.Type == models.TypeCloudBrainTwo { + if _, ok := cloudTwoJobTypeRes[cloudbrain.JobType]; !ok { + cloudTwoJobTypeRes[cloudbrain.Cloudbrain.JobType] = 1 + } else { + cloudTwoJobTypeRes[cloudbrain.Cloudbrain.JobType] += 1 + } + } + + if _, ok := cloudBrainPeriodNum[cloudbrain.Cloudbrain.Type]; !ok { + cloudBrainPeriodNum[cloudbrain.Cloudbrain.Type] = 1 + } else { + cloudBrainPeriodNum[cloudbrain.Cloudbrain.Type] += 1 + } + + if _, ok := cloudBrainComputeResource[cloudbrain.Cloudbrain.ComputeResource]; !ok { + cloudBrainComputeResource[cloudbrain.Cloudbrain.ComputeResource] = 1 + } else { + cloudBrainComputeResource[cloudbrain.Cloudbrain.ComputeResource] += 1 + } + + } } - cloudbrainOneCount, err := models.GetCloudBrainOnePeriodCount(beginTime, endTime) - if err != nil { - log.Error("Can not query cloudbrainOneCount.", err) - return 0, 0, 0, 0, 0, 0, 0, 0, 0, err + + jobTypeList := []string{"DEBUG", "BENCHMARK", "INFERENCE", "TRAIN", "SNN4IMAGENET", "BRAINSCORE"} + cloudBrainTypeList := []int{0, 1, 2} + for _, v := range jobTypeList { + if _, ok := cloudOneJobTypeRes[v]; !ok { + cloudOneJobTypeRes[v] = 0 + } + if _, ok := cloudTwoJobTypeRes[v]; !ok { + cloudTwoJobTypeRes[v] = 0 + } + if _, ok := intelligentNetJobTypeRes[v]; !ok { + intelligentNetJobTypeRes[v] = 0 + } } - cloudbrainTwoCount, err := models.GetCloudBrainTwoPeriodCount(beginTime, endTime) - if err != nil { - log.Error("Can not query cloudbrainOneCount.", err) - return 0, 0, 0, 0, 0, 0, 0, 0, 0, err + for _, v := range cloudBrainTypeList { + if _, ok := cloudBrainPeriodNum[v]; !ok { + cloudBrainPeriodNum[v] = 0 + } } - cloudbrainCount := cloudbrainOneCount + cloudbrainTwoCount - return debugOneCount, benchmarkOneCount, trainOneCount, debugTwoCount, trainTwoCount, inferenceTwoCount, cloudbrainOneCount, cloudbrainTwoCount, cloudbrainCount, err + return cloudOneJobTypeRes, cloudTwoJobTypeRes, intelligentNetJobTypeRes, cloudBrainPeriodNum, cloudBrainComputeResource, err } func getHourCloudbrainNum(beginTime time.Time, endTimeTemp time.Time, endTime time.Time) ([]DateCloudbrainNum, error) { dayCloudbrainNum := make([]DateCloudbrainNum, 0) for endTimeTemp.Before(endTime) || endTimeTemp.Equal(endTime) { - debugOneCount, benchmarkOneCount, trainOneCount, debugTwoCount, trainTwoCount, inferenceTwoCount, cloudbrainOneCount, cloudbrainTwoCount, cloudbrainCount, err := getCloudbrainCount(beginTime, endTimeTemp) + cloudOneJobTypeRes, cloudTwoJobTypeRes, intelligentNetJobTypeRes, cloudBrainPeriodNum, cloudBrainComputeResource, err := getCloudbrainCount(beginTime, endTimeTemp) if err != nil { log.Error("Can not query getCloudbrainCount.", err) return nil, err } dayCloudbrainNum = append(dayCloudbrainNum, DateCloudbrainNum{ - Date: beginTime.Format(time.RFC3339), - DebugOneCount: debugOneCount, - BenchmarkOneCount: benchmarkOneCount, - TrainOneCount: trainOneCount, - DebugTwoCount: debugTwoCount, - TrainTwoCount: trainTwoCount, - InferenceTwoCount: inferenceTwoCount, - CloudbrainOneCount: cloudbrainOneCount, - CloudbrainTwoCount: cloudbrainTwoCount, - CloudbrainCount: cloudbrainCount, + Date: beginTime.Format(time.RFC3339), + CloudOneJobTypeRes: cloudOneJobTypeRes, + CloudTwoJobTypeRes: cloudTwoJobTypeRes, + IntelligentNetJobTypeRes: intelligentNetJobTypeRes, + CloudBrainPeriodNum: cloudBrainPeriodNum, + CloudBrainComputeResource: cloudBrainComputeResource, }) beginTime = endTimeTemp endTimeTemp = beginTime.Add(time.Hour) @@ -671,23 +759,18 @@ func getHourCloudbrainNum(beginTime time.Time, endTimeTemp time.Time, endTime ti func getDayCloudbrainNum(beginTime time.Time, endTimeTemp time.Time, endTime time.Time) ([]DateCloudbrainNum, error) { dayCloudbrainNum := make([]DateCloudbrainNum, 0) for endTimeTemp.Before(endTime) { - debugOneCount, benchmarkOneCount, trainOneCount, debugTwoCount, trainTwoCount, inferenceTwoCount, cloudbrainOneCount, - cloudbrainTwoCount, cloudbrainCount, err := getCloudbrainCount(beginTime, endTimeTemp) + cloudOneJobTypeRes, cloudTwoJobTypeRes, intelligentNetJobTypeRes, cloudBrainPeriodNum, cloudBrainComputeResource, err := getCloudbrainCount(beginTime, endTimeTemp) if err != nil { log.Error("Can not query getCloudbrainCount.", err) return nil, err } dayCloudbrainNum = append(dayCloudbrainNum, DateCloudbrainNum{ - Date: beginTime.Format("2006-01-02"), - DebugOneCount: debugOneCount, - BenchmarkOneCount: benchmarkOneCount, - TrainOneCount: trainOneCount, - DebugTwoCount: debugTwoCount, - TrainTwoCount: trainTwoCount, - InferenceTwoCount: inferenceTwoCount, - CloudbrainOneCount: cloudbrainOneCount, - CloudbrainTwoCount: cloudbrainTwoCount, - CloudbrainCount: cloudbrainCount, + Date: beginTime.Format("2006-01-02"), + CloudOneJobTypeRes: cloudOneJobTypeRes, + CloudTwoJobTypeRes: cloudTwoJobTypeRes, + IntelligentNetJobTypeRes: intelligentNetJobTypeRes, + CloudBrainPeriodNum: cloudBrainPeriodNum, + CloudBrainComputeResource: cloudBrainComputeResource, }) beginTime = endTimeTemp endTimeTemp = beginTime.AddDate(0, 0, 1) @@ -697,23 +780,18 @@ func getDayCloudbrainNum(beginTime time.Time, endTimeTemp time.Time, endTime tim func getYearCloudbrainNum(beginTime time.Time, endTimeTemp time.Time, endTime time.Time) ([]DateCloudbrainNum, error) { yearCloudbrainNum := make([]DateCloudbrainNum, 0) for endTimeTemp.Before(endTime) { - debugOneCount, benchmarkOneCount, trainOneCount, debugTwoCount, trainTwoCount, inferenceTwoCount, cloudbrainOneCount, - cloudbrainTwoCount, cloudbrainCount, err := getCloudbrainCount(beginTime, endTimeTemp) + cloudOneJobTypeRes, cloudTwoJobTypeRes, intelligentNetJobTypeRes, cloudBrainPeriodNum, cloudBrainComputeResource, err := getCloudbrainCount(beginTime, endTimeTemp) if err != nil { log.Error("Can not query getCloudbrainCount.", err) return nil, err } yearCloudbrainNum = append(yearCloudbrainNum, DateCloudbrainNum{ - Date: beginTime.Format("2006-01"), - DebugOneCount: debugOneCount, - BenchmarkOneCount: benchmarkOneCount, - TrainOneCount: trainOneCount, - DebugTwoCount: debugTwoCount, - TrainTwoCount: trainTwoCount, - InferenceTwoCount: inferenceTwoCount, - CloudbrainOneCount: cloudbrainOneCount, - CloudbrainTwoCount: cloudbrainTwoCount, - CloudbrainCount: cloudbrainCount, + Date: beginTime.Format("2006-01"), + CloudOneJobTypeRes: cloudOneJobTypeRes, + CloudTwoJobTypeRes: cloudTwoJobTypeRes, + IntelligentNetJobTypeRes: intelligentNetJobTypeRes, + CloudBrainPeriodNum: cloudBrainPeriodNum, + CloudBrainComputeResource: cloudBrainComputeResource, }) beginTime = endTimeTemp endTimeTemp = beginTime.AddDate(0, 1, 0) @@ -747,11 +825,7 @@ func DownloadCloudBrainBoard(ctx *context.Context) { ctx.Error(http.StatusBadRequest, ctx.Tr("repo.cloudbrain_query_fail")) return } - totalPage := getTotalPage(total, pageSize) - fmt.Printf("total:%v", total) - fmt.Printf("totalPage:%v", totalPage) - f := excelize.NewFile() index := f.NewSheet(cloudBrain) From fb36068eae2146e7748b1beda4a7c9f9e40a69a7 Mon Sep 17 00:00:00 2001 From: liuzx Date: Thu, 26 May 2022 17:13:38 +0800 Subject: [PATCH 058/239] update --- routers/api/v1/api.go | 4 +- routers/api/v1/repo/cloudbrain_dashboard.go | 42 +++++++++++++++++++-- routers/api/v1/repo/repo_dashbord.go | 11 +++++- 3 files changed, 49 insertions(+), 8 deletions(-) diff --git a/routers/api/v1/api.go b/routers/api/v1/api.go index a4df6143e..2ace1c1bf 100755 --- a/routers/api/v1/api.go +++ b/routers/api/v1/api.go @@ -566,8 +566,8 @@ func RegisterRoutes(m *macaron.Macaron) { m.Get("/trend", repo.GetAllCloudbrainsTrend) m.Get("/status_analysis", repo.GetCloudbrainsStatusAnalysis) m.Get("/detail_data", repo.GetCloudbrainsDetailData) - m.Get("/create_hours_data", repo.GetCloudbrainsCreateHoursData) - m.Get("/run_hours_data", repo.GetCloudbrainsRunHoursData) + m.Get("/hours_data", repo.GetCloudbrainsCreateHoursData) + // m.Get("/run_hours_data", repo.GetCloudbrainsRunHoursData) }) }, operationReq) diff --git a/routers/api/v1/repo/cloudbrain_dashboard.go b/routers/api/v1/repo/cloudbrain_dashboard.go index 83fdb612e..b4db09bb9 100644 --- a/routers/api/v1/repo/cloudbrain_dashboard.go +++ b/routers/api/v1/repo/cloudbrain_dashboard.go @@ -149,8 +149,19 @@ func GetAllCloudbrainsTrend(ctx *context.Context) { return } - } else if queryType == "current_week" { - beginTime = now.AddDate(0, 0, -int(time.Now().Weekday())+1) //begin from monday + } else if queryType == "last_7day" { + beginTime = now.AddDate(0, 0, -7) //begin from monday + beginTime = time.Date(beginTime.Year(), beginTime.Month(), beginTime.Day(), 0, 0, 0, 0, now.Location()) + endTime = now + endTimeTemp = beginTime.AddDate(0, 0, 1) + dateCloudbrainNum, err = getDayCloudbrainNum(beginTime, endTimeTemp, endTime) + if err != nil { + log.Error("Can not query getDayCloudbrainNum.", err) + ctx.Error(http.StatusBadRequest, ctx.Tr("getDayCloudbrainNum_get_error")) + return + } + } else if queryType == "last_30day" { + beginTime = now.AddDate(0, 0, -30) //begin from monday beginTime = time.Date(beginTime.Year(), beginTime.Month(), beginTime.Day(), 0, 0, 0, 0, now.Location()) endTime = now endTimeTemp = beginTime.AddDate(0, 0, 1) @@ -376,6 +387,13 @@ func GetAllCloudbrainsPeriodDistribution(ctx *context.Context) { intelligentNetJobTypeRes[v] = 0 } } + cloudBrainTypeList := []int{0, 1, 2} + for _, v := range cloudBrainTypeList { + if _, ok := cloudBrainPeriodNum[v]; !ok { + cloudBrainPeriodNum[v] = 0 + } + } + // totalTasksCount := cloudBrainPeriodNum[0] + cloudBrainPeriodNum[1] + cloudBrainPeriodNum[2] cloudOneJobTypeRes["EVALUATION"] = cloudOneJobTypeRes["BENCHMARK"] + cloudOneJobTypeRes["SNN4IMAGENET"] + cloudOneJobTypeRes["BRAINSCORE"] cloudTwoJobTypeRes["EVALUATION"] = cloudTwoJobTypeRes["BENCHMARK"] + cloudTwoJobTypeRes["SNN4IMAGENET"] + cloudTwoJobTypeRes["BRAINSCORE"] @@ -385,6 +403,7 @@ func GetAllCloudbrainsPeriodDistribution(ctx *context.Context) { "cloudTwoJobTypeRes": cloudTwoJobTypeRes, "intelligentNetJobTypeRes": intelligentNetJobTypeRes, "cloudBrainPeriodNum": cloudBrainPeriodNum, + // "totalTasksCount": totalTasksCount, }) } @@ -463,13 +482,16 @@ func GetCloudbrainsDetailData(ctx *context.Context) { ctx.ServerError("Get job failed:", err) return } - // var taskList := []*models.TaskDetail - + res := &models.AllTask{} + res.List = []models.TaskDetail{} for i, task := range ciTasks { ciTasks[i].CanDebug = true ciTasks[i].CanDel = true ciTasks[i].Cloudbrain.ComputeResource = task.ComputeResource + var dataOne models.TaskDetail + dataOne.DisplayJobName = ciTasks[i].DisplayJobName + res.List = append(res.List, dataOne) } pager := context.NewPagination(int(count), setting.UI.IssuePagingNum, page, getTotalPage(count, setting.UI.IssuePagingNum)) @@ -502,6 +524,9 @@ func GetCloudbrainsCreateHoursData(ctx *context.Context) { if queryType == "all" { beginTime = brainRecordBeginTime endTime = now + } else if queryType == "today" { + beginTime = now.AddDate(0, 0, 0) + endTime = time.Date(now.Year(), now.Month(), now.Day(), 0, 0, 0, 0, now.Location()) } else if queryType == "yesterday" { beginTime = now.AddDate(0, 0, -1) endTime = time.Date(now.Year(), now.Month(), now.Day(), 0, 0, 0, 0, now.Location()) @@ -551,8 +576,16 @@ func GetCloudbrainsCreateHoursData(ctx *context.Context) { ctx.Error(http.StatusBadRequest, ctx.Tr("hourPeriodCount_get_error")) return } + + runHourPeriodCount, err := models.GetRunHourPeriodCount(dateBeginTime, dateEndTime) + if err != nil { + log.Error("Can not query runHourPeriodCount.", err) + ctx.Error(http.StatusBadRequest, ctx.Tr("runHourPeriodCount_get_error")) + return + } ctx.JSON(http.StatusOK, map[string]interface{}{ "createHourPeriodCount": createHourPeriodCount, + "runHourPeriodCount": runHourPeriodCount, }) } @@ -732,6 +765,7 @@ func getCloudbrainCount(beginTime time.Time, endTime time.Time) (map[string]int, cloudBrainPeriodNum[v] = 0 } } + cloudBrainPeriodNum[-1] = cloudBrainPeriodNum[0] + cloudBrainPeriodNum[1] + cloudBrainPeriodNum[2] return cloudOneJobTypeRes, cloudTwoJobTypeRes, intelligentNetJobTypeRes, cloudBrainPeriodNum, cloudBrainComputeResource, err } diff --git a/routers/api/v1/repo/repo_dashbord.go b/routers/api/v1/repo/repo_dashbord.go index 2c42f8a16..7d9ab3ffc 100644 --- a/routers/api/v1/repo/repo_dashbord.go +++ b/routers/api/v1/repo/repo_dashbord.go @@ -566,12 +566,19 @@ func getTimePeroid(ctx *context.Context, recordBeginTime time.Time) (time.Time, if queryType == "all" { beginTime = recordBeginTimeTemp endTime = now + } else if queryType == "today" { + endTime = now + beginTime = time.Date(endTime.Year(), endTime.Month(), endTime.Day(), 0, 0, 0, 0, now.Location()) } else if queryType == "yesterday" { endTime = now beginTime = time.Date(endTime.Year(), endTime.Month(), endTime.Day(), 0, 0, 0, 0, now.Location()) - } else if queryType == "current_week" { - beginTime = now.AddDate(0, 0, -int(time.Now().Weekday())+2) //begin from monday + } else if queryType == "last_7day" { + beginTime = now.AddDate(0, 0, -7) + beginTime = time.Date(beginTime.Year(), beginTime.Month(), beginTime.Day(), 0, 0, 0, 0, now.Location()) + endTime = now + } else if queryType == "last_30day" { + beginTime = now.AddDate(0, 0, -30) beginTime = time.Date(beginTime.Year(), beginTime.Month(), beginTime.Day(), 0, 0, 0, 0, now.Location()) endTime = now } else if queryType == "current_month" { From 931950116548273430924ff0844ef3856d1e2351 Mon Sep 17 00:00:00 2001 From: liuzx Date: Fri, 27 May 2022 11:42:32 +0800 Subject: [PATCH 059/239] update --- routers/api/v1/repo/cloudbrain_dashboard.go | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/routers/api/v1/repo/cloudbrain_dashboard.go b/routers/api/v1/repo/cloudbrain_dashboard.go index b4db09bb9..f2ff3b5b8 100644 --- a/routers/api/v1/repo/cloudbrain_dashboard.go +++ b/routers/api/v1/repo/cloudbrain_dashboard.go @@ -403,7 +403,6 @@ func GetAllCloudbrainsPeriodDistribution(ctx *context.Context) { "cloudTwoJobTypeRes": cloudTwoJobTypeRes, "intelligentNetJobTypeRes": intelligentNetJobTypeRes, "cloudBrainPeriodNum": cloudBrainPeriodNum, - // "totalTasksCount": totalTasksCount, }) } @@ -547,6 +546,14 @@ func GetCloudbrainsCreateHoursData(ctx *context.Context) { lastMonthTime := now.AddDate(0, -1, 0) beginTime = time.Date(lastMonthTime.Year(), lastMonthTime.Month(), 1, 0, 0, 0, 0, now.Location()) endTime = time.Date(now.Year(), now.Month(), 2, 0, 0, 0, 0, now.Location()) + } else if queryType == "last_7day" { + lastMonthTime := now.AddDate(0, 0, -7) + beginTime = time.Date(lastMonthTime.Year(), lastMonthTime.Month(), 1, 0, 0, 0, 0, now.Location()) + endTime = time.Date(now.Year(), now.Month(), 2, 0, 0, 0, 0, now.Location()) + } else if queryType == "last_30day" { + lastMonthTime := now.AddDate(0, 0, -30) + beginTime = time.Date(lastMonthTime.Year(), lastMonthTime.Month(), 1, 0, 0, 0, 0, now.Location()) + endTime = time.Date(now.Year(), now.Month(), 2, 0, 0, 0, 0, now.Location()) } } else { if beginTimeStr == "" || endTimeStr == "" { From 782bcfe8da3780e74fa2c385c2a4e3f4a42eed25 Mon Sep 17 00:00:00 2001 From: zouap Date: Fri, 27 May 2022 16:38:27 +0800 Subject: [PATCH 060/239] =?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 --- templates/home.tmpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/home.tmpl b/templates/home.tmpl index ccf734081..d5e037038 100755 --- a/templates/home.tmpl +++ b/templates/home.tmpl @@ -2,12 +2,12 @@
- +
From 053461e8d2fcca34a87615dc1767760dcead6c91 Mon Sep 17 00:00:00 2001 From: zouap Date: Fri, 27 May 2022 16:43:04 +0800 Subject: [PATCH 061/239] =?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 --- templates/base/footer.tmpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/base/footer.tmpl b/templates/base/footer.tmpl index a0f5754d5..c27aea469 100644 --- a/templates/base/footer.tmpl +++ b/templates/base/footer.tmpl @@ -42,8 +42,8 @@ {{template "custom/footer" .}} {{if .PageIsHome}} - - + - + + From d48c23ae040684986c12da85cbdaa3187395c8e1 Mon Sep 17 00:00:00 2001 From: zouap Date: Fri, 27 May 2022 16:49:40 +0800 Subject: [PATCH 063/239] =?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 --- templates/base/footer.tmpl | 2 +- templates/home.tmpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/base/footer.tmpl b/templates/base/footer.tmpl index fc2d49164..aa626c526 100644 --- a/templates/base/footer.tmpl +++ b/templates/base/footer.tmpl @@ -42,7 +42,7 @@ {{template "custom/footer" .}} {{if .PageIsHome}} - + From 818f1b8fd8fa722d7018317295c01d667069700a Mon Sep 17 00:00:00 2001 From: zouap Date: Fri, 27 May 2022 17:00:39 +0800 Subject: [PATCH 064/239] =?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 --- templates/base/footer.tmpl | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/templates/base/footer.tmpl b/templates/base/footer.tmpl index aa626c526..38e29d718 100644 --- a/templates/base/footer.tmpl +++ b/templates/base/footer.tmpl @@ -12,7 +12,12 @@ {{template "base/footer_content" .}} +{{if .PageIsHome}} + +{{else}} +{{end}} + {{if .RequireSimpleMDE}} From f91b0d50890ea001c54ca74f2381616570f4e2d4 Mon Sep 17 00:00:00 2001 From: zouap Date: Fri, 27 May 2022 17:04:10 +0800 Subject: [PATCH 065/239] =?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 --- templates/base/footer.tmpl | 8 ++++---- templates/home.tmpl | 3 +-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/templates/base/footer.tmpl b/templates/base/footer.tmpl index 38e29d718..091b9a7e7 100644 --- a/templates/base/footer.tmpl +++ b/templates/base/footer.tmpl @@ -12,11 +12,9 @@ {{template "base/footer_content" .}} -{{if .PageIsHome}} -{{else}} -{{end}} + {{if .RequireSimpleMDE}} @@ -47,7 +45,9 @@ {{template "custom/footer" .}} {{if .PageIsHome}} - + + + - + {{template "base/footer" .}} From 8ab91da45c70731b67d27811ed4d97563fb035e1 Mon Sep 17 00:00:00 2001 From: zouap Date: Fri, 27 May 2022 17:08:48 +0800 Subject: [PATCH 066/239] =?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 --- templates/base/footer.tmpl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/templates/base/footer.tmpl b/templates/base/footer.tmpl index 091b9a7e7..7ec89d2ee 100644 --- a/templates/base/footer.tmpl +++ b/templates/base/footer.tmpl @@ -13,7 +13,7 @@ {{template "base/footer_content" .}} - + {{if .RequireSimpleMDE}} @@ -83,5 +83,6 @@ }); {{end}} + From 95b18157da4137399696ec67eb8d18943c96d659 Mon Sep 17 00:00:00 2001 From: zouap Date: Fri, 27 May 2022 17:11:29 +0800 Subject: [PATCH 067/239] =?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 --- templates/base/footer.tmpl | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/templates/base/footer.tmpl b/templates/base/footer.tmpl index 7ec89d2ee..599dd246d 100644 --- a/templates/base/footer.tmpl +++ b/templates/base/footer.tmpl @@ -40,12 +40,16 @@ {{if .RequireTribute}} {{end}} +{{if .PageIsHome}} + +{{end}} + {{template "custom/footer" .}} {{if .PageIsHome}} - + @@ -83,6 +87,6 @@ }); {{end}} - + From f127a7cc18c5d314f2b12cfff3fb40c66668a139 Mon Sep 17 00:00:00 2001 From: zouap Date: Fri, 27 May 2022 17:27:53 +0800 Subject: [PATCH 068/239] =?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 --- templates/base/footer.tmpl | 1 + 1 file changed, 1 insertion(+) diff --git a/templates/base/footer.tmpl b/templates/base/footer.tmpl index 599dd246d..4472dc257 100644 --- a/templates/base/footer.tmpl +++ b/templates/base/footer.tmpl @@ -52,6 +52,7 @@ + -{{end}} - - - -{{template "custom/footer" .}} -{{if .PageIsHome}} - - - - + {{end}} - + + + +{{template "custom/footer" .}} + From 1e70e25352f528a1be71a22edcb9c4491c25fef5 Mon Sep 17 00:00:00 2001 From: zouap Date: Fri, 27 May 2022 20:27:02 +0800 Subject: [PATCH 070/239] =?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 --- custom/public/rotation3D/rotation3D.js | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/custom/public/rotation3D/rotation3D.js b/custom/public/rotation3D/rotation3D.js index da37ee43b..92e396695 100644 --- a/custom/public/rotation3D/rotation3D.js +++ b/custom/public/rotation3D/rotation3D.js @@ -235,7 +235,7 @@ Rotation3D.prototype.lineStyle = function($line, index, rotation) { Rotation3D.prototype.goTo = function (index) { var self = this; this.currenIndex = index; - console.log('currenIndex', index); + console.log('goTo currenIndex', index); /** * 1.计算floatIndex,用于控死amdiff */ @@ -293,7 +293,7 @@ Rotation3D.prototype.scheduleNextFrame = function () { */ Rotation3D.prototype.render = function () { var self=this; - + console.log("render...."); // 图形间隔：弧度 var spacing = 2 * Math.PI / this.$item.length; var itemRotation = this.rotation; @@ -319,6 +319,7 @@ Rotation3D.prototype.onAutoPlay = function () { if (self.currenIndex < 0) { self.currenIndex = self.length - 1 } + console.log("autoPlayTimer...."); self.goTo(self.currenIndex); self.currenIndex--; //倒叙 }, this.autoPlayDelay) @@ -330,12 +331,12 @@ Rotation3D.prototype.onAutoPlay = function () { Rotation3D.prototype.onDrag = function () { var self = this; var startX, startY, moveX, moveY, endX, endY; - + console.log("onDrag...."); // 拖拽：三个事件-按下 移动 抬起 //按下 this.$rotation.mousedown(function (e) { startX = e.pageX; startY = e.pageY; - + console.log("mousedown...."); // 移动 $(document).mousemove(function (e) { // console.log('移动'); @@ -347,7 +348,7 @@ Rotation3D.prototype.onDrag = function () { $(document).mouseup(function (e) { endX = e.pageX; endY = e.pageY; moveX = endX - startX; moveY = endY - startY; - + console.log("mouseup...."); // 每40旋转一步 var moveIndex = parseInt(Math.abs(moveX) / 50) console.log('moveIndex',moveIndex) From 4862a5024eb0af3a6afc47929d2bfa781f95a8f1 Mon Sep 17 00:00:00 2001 From: zouap Date: Fri, 27 May 2022 20:30:25 +0800 Subject: [PATCH 071/239] =?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 --- templates/base/footer.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/base/footer.tmpl b/templates/base/footer.tmpl index 0851e00d3..17ba8c5dd 100644 --- a/templates/base/footer.tmpl +++ b/templates/base/footer.tmpl @@ -45,7 +45,7 @@ - + {{end}} {{if .PageIsHome}} - + +{{end}} + + + +{{template "custom/footer" .}} +{{if .PageIsHome}} + @@ -79,10 +86,5 @@ }); {{end}} - - - -{{template "custom/footer" .}} - From 12f4cf3cddc869f7820c372a262aa9d3e0ff7a1a Mon Sep 17 00:00:00 2001 From: zouap Date: Fri, 27 May 2022 20:57:50 +0800 Subject: [PATCH 075/239] =?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 --- templates/base/footer.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/base/footer.tmpl b/templates/base/footer.tmpl index a37feeec5..3863e77ce 100644 --- a/templates/base/footer.tmpl +++ b/templates/base/footer.tmpl @@ -49,7 +49,7 @@ {{template "custom/footer" .}} {{if .PageIsHome}} - + From 8fedcc8ed5e3704e9d97aacc632ceeee71afeef6 Mon Sep 17 00:00:00 2001 From: zouap Date: Fri, 27 May 2022 20:58:13 +0800 Subject: [PATCH 076/239] =?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 --- templates/base/footer.tmpl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/templates/base/footer.tmpl b/templates/base/footer.tmpl index 3863e77ce..adc858a71 100644 --- a/templates/base/footer.tmpl +++ b/templates/base/footer.tmpl @@ -41,7 +41,8 @@ {{end}} {{if .PageIsHome}} - + + {{end}} From 55295f6268ae8fbe1fd2e580f1ca4bff057e73a9 Mon Sep 17 00:00:00 2001 From: zouap Date: Fri, 27 May 2022 21:00:55 +0800 Subject: [PATCH 077/239] =?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 --- templates/base/footer.tmpl | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/templates/base/footer.tmpl b/templates/base/footer.tmpl index adc858a71..6cd8258ea 100644 --- a/templates/base/footer.tmpl +++ b/templates/base/footer.tmpl @@ -45,9 +45,7 @@ {{end}} - - - + {{template "custom/footer" .}} {{if .PageIsHome}} @@ -87,5 +85,8 @@ }); {{end}} + + + From 13062b369574a61f1e9e6bea8c82082e4931655b Mon Sep 17 00:00:00 2001 From: zouap Date: Mon, 30 May 2022 08:50:28 +0800 Subject: [PATCH 078/239] =?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 --- templates/base/footer.tmpl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/templates/base/footer.tmpl b/templates/base/footer.tmpl index 6cd8258ea..f11187421 100644 --- a/templates/base/footer.tmpl +++ b/templates/base/footer.tmpl @@ -41,7 +41,8 @@ {{end}} {{if .PageIsHome}} - + + {{end}} From 56511fa06b515f84d318a11cdc3c6e24f6783945 Mon Sep 17 00:00:00 2001 From: zouap Date: Mon, 30 May 2022 08:54:30 +0800 Subject: [PATCH 079/239] =?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 --- templates/base/footer.tmpl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/templates/base/footer.tmpl b/templates/base/footer.tmpl index f11187421..6bb873213 100644 --- a/templates/base/footer.tmpl +++ b/templates/base/footer.tmpl @@ -40,9 +40,10 @@ {{if .RequireTribute}} {{end}} + {{if .PageIsHome}} - + {{end}} From d4e883425beebe1f6bd96eef99f569828879da24 Mon Sep 17 00:00:00 2001 From: zouap Date: Mon, 30 May 2022 08:59:08 +0800 Subject: [PATCH 080/239] =?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 --- package-lock.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package-lock.json b/package-lock.json index 9233b813b..d65d6b49a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5439,7 +5439,7 @@ "gulp-tap": "^1.0.1", "gulp-uglify": "^3.0.1", "inquirer": "^6.2.1", - "jquery": "^3.4.0", + "jquery": "^3.5.1", "less": "^3.7.0", "map-stream": "^0.1.0", "merge-stream": "^2.0.0", From 07f3f868989917685810b7f30686f8e0b6e3f2e7 Mon Sep 17 00:00:00 2001 From: zouap Date: Mon, 30 May 2022 09:05:07 +0800 Subject: [PATCH 081/239] =?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 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 748291d5c..1594e5b5f 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,7 @@ "fs": "0.0.1-security", "highlight.js": "10.4.1", "imports-loader": "0.8.0", - "jquery": "3.5.1", + "jquery": "3.5.0", "jquery-datetimepicker": "2.5.21", "jquery.are-you-sure": "1.9.0", "js-cookie": "3.0.1", From a4e297a802021830de96dbc0ee368fe0eda44574 Mon Sep 17 00:00:00 2001 From: zouap Date: Mon, 30 May 2022 09:08:01 +0800 Subject: [PATCH 082/239] =?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 --- package-lock.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index d65d6b49a..9ab821687 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7742,8 +7742,8 @@ } }, "jquery": { - "version": "3.5.1", - "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.5.1.tgz", + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.5.0.tgz", "integrity": "sha512-XwIBPqcMn57FxfT+Go5pzySnm4KWkT1Tv7gjrpT1srtf8Weynl6R273VJ5GjkRb51IzMp5nbaPjJXMWeju2MKg==" }, "jquery-datetimepicker": { From 7f7e3d3e39c5eafeb480f8d345105daad07b1d5e Mon Sep 17 00:00:00 2001 From: zouap Date: Mon, 30 May 2022 09:20:43 +0800 Subject: [PATCH 083/239] =?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 --- package-lock.json | 4 ++-- package.json | 2 +- templates/base/footer.tmpl | 6 ++---- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9ab821687..d65d6b49a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7742,8 +7742,8 @@ } }, "jquery": { - "version": "3.5.0", - "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.5.0.tgz", + "version": "3.5.1", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.5.1.tgz", "integrity": "sha512-XwIBPqcMn57FxfT+Go5pzySnm4KWkT1Tv7gjrpT1srtf8Weynl6R273VJ5GjkRb51IzMp5nbaPjJXMWeju2MKg==" }, "jquery-datetimepicker": { diff --git a/package.json b/package.json index 1594e5b5f..748291d5c 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,7 @@ "fs": "0.0.1-security", "highlight.js": "10.4.1", "imports-loader": "0.8.0", - "jquery": "3.5.0", + "jquery": "3.5.1", "jquery-datetimepicker": "2.5.21", "jquery.are-you-sure": "1.9.0", "js-cookie": "3.0.1", diff --git a/templates/base/footer.tmpl b/templates/base/footer.tmpl index 6bb873213..f5226430c 100644 --- a/templates/base/footer.tmpl +++ b/templates/base/footer.tmpl @@ -42,15 +42,13 @@ {{end}} {{if .PageIsHome}} - - - + {{end}} {{template "custom/footer" .}} {{if .PageIsHome}} - + From 0ecff728be7088345a3bd9c3ccf9be50e93496ca Mon Sep 17 00:00:00 2001 From: zouap Date: Mon, 30 May 2022 09:23:07 +0800 Subject: [PATCH 084/239] =?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 --- templates/base/footer.tmpl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/templates/base/footer.tmpl b/templates/base/footer.tmpl index f5226430c..da925ea85 100644 --- a/templates/base/footer.tmpl +++ b/templates/base/footer.tmpl @@ -45,7 +45,9 @@ {{end}} - + + + {{template "custom/footer" .}} {{if .PageIsHome}} @@ -85,8 +87,6 @@ }); {{end}} - - - + From 9d85a53d04436358aff5a6ab52edf3aef9160af3 Mon Sep 17 00:00:00 2001 From: zouap Date: Mon, 30 May 2022 09:31:56 +0800 Subject: [PATCH 085/239] =?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 --- templates/base/footer.tmpl | 5 ++--- web_src/js/jquery-3.5.0.min.js | 2 ++ web_src/js/jquery.js | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) create mode 100644 web_src/js/jquery-3.5.0.min.js diff --git a/templates/base/footer.tmpl b/templates/base/footer.tmpl index da925ea85..a013d724c 100644 --- a/templates/base/footer.tmpl +++ b/templates/base/footer.tmpl @@ -40,9 +40,8 @@ {{if .RequireTribute}} {{end}} - {{if .PageIsHome}} - + {{end}} @@ -50,7 +49,7 @@ {{template "custom/footer" .}} {{if .PageIsHome}} - + diff --git a/web_src/js/jquery-3.5.0.min.js b/web_src/js/jquery-3.5.0.min.js new file mode 100644 index 000000000..9fd22ca70 --- /dev/null +++ b/web_src/js/jquery-3.5.0.min.js @@ -0,0 +1,2 @@ +/*! jQuery v3.5.0 | (c) JS Foundation and other contributors | jquery.org/license */ +!function(e,t){"use strict";"object"==typeof module&&"object"==typeof module.exports?module.exports=e.document?t(e,!0):function(e){if(!e.document)throw new Error("jQuery requires a window with a document");return t(e)}:t(e)}("undefined"!=typeof window?window:this,function(C,e){"use strict";var t=[],r=Object.getPrototypeOf,s=t.slice,g=t.flat?function(e){return t.flat.call(e)}:function(e){return t.concat.apply([],e)},u=t.push,i=t.indexOf,n={},o=n.toString,v=n.hasOwnProperty,a=v.toString,l=a.call(Object),y={},m=function(e){return"function"==typeof e&&"number"!=typeof e.nodeType},x=function(e){return null!=e&&e===e.window},E=C.document,c={type:!0,src:!0,nonce:!0,noModule:!0};function b(e,t,n){var r,i,o=(n=n||E).createElement("script");if(o.text=e,t)for(r in c)(i=t[r]||t.getAttribute&&t.getAttribute(r))&&o.setAttribute(r,i);n.head.appendChild(o).parentNode.removeChild(o)}function w(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?n[o.call(e)]||"object":typeof e}var f="3.5.0",S=function(e,t){return new S.fn.init(e,t)};function p(e){var t=!!e&&"length"in e&&e.length,n=w(e);return!m(e)&&!x(e)&&("array"===n||0===t||"number"==typeof t&&0+~]|"+M+")"+M+"*"),U=new RegExp(M+"|>"),X=new RegExp(F),V=new RegExp("^"+I+"$"),G={ID:new RegExp("^#("+I+")"),CLASS:new RegExp("^\\.("+I+")"),TAG:new RegExp("^("+I+"|[*])"),ATTR:new RegExp("^"+W),PSEUDO:new RegExp("^"+F),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+M+"*(even|odd|(([+-]|)(\\d*)n|)"+M+"*(?:([+-]|)"+M+"*(\\d+)|))"+M+"*\\)|)","i"),bool:new RegExp("^(?:"+R+")$","i"),needsContext:new RegExp("^"+M+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+M+"*((?:-\\d)?\\d*)"+M+"*\\)|)(?=[^-]|$)","i")},Y=/HTML$/i,Q=/^(?:input|select|textarea|button)$/i,J=/^h\d$/i,K=/^[^{]+\{\s*\[native \w/,Z=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,ee=/[+~]/,te=new RegExp("\\\\[\\da-fA-F]{1,6}"+M+"?|\\\\([^\\r\\n\\f])","g"),ne=function(e,t){var n="0x"+e.slice(1)-65536;return t||(n<0?String.fromCharCode(n+65536):String.fromCharCode(n>>10|55296,1023&n|56320))},re=/([\0-\x1f\x7f]|^-?\d)|^-$|[^\0-\x1f\x7f-\uFFFF\w-]/g,ie=function(e,t){return t?"\0"===e?"\ufffd":e.slice(0,-1)+"\\"+e.charCodeAt(e.length-1).toString(16)+" ":"\\"+e},oe=function(){T()},ae=be(function(e){return!0===e.disabled&&"fieldset"===e.nodeName.toLowerCase()},{dir:"parentNode",next:"legend"});try{H.apply(t=O.call(p.childNodes),p.childNodes),t[p.childNodes.length].nodeType}catch(e){H={apply:t.length?function(e,t){L.apply(e,O.call(t))}:function(e,t){var n=e.length,r=0;while(e[n++]=t[r++]);e.length=n-1}}}function se(t,e,n,r){var i,o,a,s,u,l,c,f=e&&e.ownerDocument,p=e?e.nodeType:9;if(n=n||[],"string"!=typeof t||!t||1!==p&&9!==p&&11!==p)return n;if(!r&&(T(e),e=e||C,E)){if(11!==p&&(u=Z.exec(t)))if(i=u[1]){if(9===p){if(!(a=e.getElementById(i)))return n;if(a.id===i)return n.push(a),n}else if(f&&(a=f.getElementById(i))&&y(e,a)&&a.id===i)return n.push(a),n}else{if(u[2])return H.apply(n,e.getElementsByTagName(t)),n;if((i=u[3])&&d.getElementsByClassName&&e.getElementsByClassName)return H.apply(n,e.getElementsByClassName(i)),n}if(d.qsa&&!N[t+" "]&&(!v||!v.test(t))&&(1!==p||"object"!==e.nodeName.toLowerCase())){if(c=t,f=e,1===p&&(U.test(t)||z.test(t))){(f=ee.test(t)&&ye(e.parentNode)||e)===e&&d.scope||((s=e.getAttribute("id"))?s=s.replace(re,ie):e.setAttribute("id",s=S)),o=(l=h(t)).length;while(o--)l[o]=(s?"#"+s:":scope")+" "+xe(l[o]);c=l.join(",")}try{return H.apply(n,f.querySelectorAll(c)),n}catch(e){N(t,!0)}finally{s===S&&e.removeAttribute("id")}}}return g(t.replace($,"$1"),e,n,r)}function ue(){var r=[];return function e(t,n){return r.push(t+" ")>b.cacheLength&&delete e[r.shift()],e[t+" "]=n}}function le(e){return e[S]=!0,e}function ce(e){var t=C.createElement("fieldset");try{return!!e(t)}catch(e){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function fe(e,t){var n=e.split("|"),r=n.length;while(r--)b.attrHandle[n[r]]=t}function pe(e,t){var n=t&&e,r=n&&1===e.nodeType&&1===t.nodeType&&e.sourceIndex-t.sourceIndex;if(r)return r;if(n)while(n=n.nextSibling)if(n===t)return-1;return e?1:-1}function de(t){return function(e){return"input"===e.nodeName.toLowerCase()&&e.type===t}}function he(n){return function(e){var t=e.nodeName.toLowerCase();return("input"===t||"button"===t)&&e.type===n}}function ge(t){return function(e){return"form"in e?e.parentNode&&!1===e.disabled?"label"in e?"label"in e.parentNode?e.parentNode.disabled===t:e.disabled===t:e.isDisabled===t||e.isDisabled!==!t&&ae(e)===t:e.disabled===t:"label"in e&&e.disabled===t}}function ve(a){return le(function(o){return o=+o,le(function(e,t){var n,r=a([],e.length,o),i=r.length;while(i--)e[n=r[i]]&&(e[n]=!(t[n]=e[n]))})})}function ye(e){return e&&"undefined"!=typeof e.getElementsByTagName&&e}for(e in d=se.support={},i=se.isXML=function(e){var t=e.namespaceURI,n=(e.ownerDocument||e).documentElement;return!Y.test(t||n&&n.nodeName||"HTML")},T=se.setDocument=function(e){var t,n,r=e?e.ownerDocument||e:p;return r!=C&&9===r.nodeType&&r.documentElement&&(a=(C=r).documentElement,E=!i(C),p!=C&&(n=C.defaultView)&&n.top!==n&&(n.addEventListener?n.addEventListener("unload",oe,!1):n.attachEvent&&n.attachEvent("onunload",oe)),d.scope=ce(function(e){return a.appendChild(e).appendChild(C.createElement("div")),"undefined"!=typeof e.querySelectorAll&&!e.querySelectorAll(":scope fieldset div").length}),d.attributes=ce(function(e){return e.className="i",!e.getAttribute("className")}),d.getElementsByTagName=ce(function(e){return e.appendChild(C.createComment("")),!e.getElementsByTagName("*").length}),d.getElementsByClassName=K.test(C.getElementsByClassName),d.getById=ce(function(e){return a.appendChild(e).id=S,!C.getElementsByName||!C.getElementsByName(S).length}),d.getById?(b.filter.ID=function(e){var t=e.replace(te,ne);return function(e){return e.getAttribute("id")===t}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&E){var n=t.getElementById(e);return n?[n]:[]}}):(b.filter.ID=function(e){var n=e.replace(te,ne);return function(e){var t="undefined"!=typeof e.getAttributeNode&&e.getAttributeNode("id");return t&&t.value===n}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&E){var n,r,i,o=t.getElementById(e);if(o){if((n=o.getAttributeNode("id"))&&n.value===e)return[o];i=t.getElementsByName(e),r=0;while(o=i[r++])if((n=o.getAttributeNode("id"))&&n.value===e)return[o]}return[]}}),b.find.TAG=d.getElementsByTagName?function(e,t){return"undefined"!=typeof t.getElementsByTagName?t.getElementsByTagName(e):d.qsa?t.querySelectorAll(e):void 0}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){while(n=o[i++])1===n.nodeType&&r.push(n);return r}return o},b.find.CLASS=d.getElementsByClassName&&function(e,t){if("undefined"!=typeof t.getElementsByClassName&&E)return t.getElementsByClassName(e)},s=[],v=[],(d.qsa=K.test(C.querySelectorAll))&&(ce(function(e){var t;a.appendChild(e).innerHTML="",e.querySelectorAll("[msallowcapture^='']").length&&v.push("[*^$]="+M+"*(?:''|\"\")"),e.querySelectorAll("[selected]").length||v.push("\\["+M+"*(?:value|"+R+")"),e.querySelectorAll("[id~="+S+"-]").length||v.push("~="),(t=C.createElement("input")).setAttribute("name",""),e.appendChild(t),e.querySelectorAll("[name='']").length||v.push("\\["+M+"*name"+M+"*="+M+"*(?:''|\"\")"),e.querySelectorAll(":checked").length||v.push(":checked"),e.querySelectorAll("a#"+S+"+*").length||v.push(".#.+[+~]"),e.querySelectorAll("\\\f"),v.push("[\\r\\n\\f]")}),ce(function(e){e.innerHTML="";var t=C.createElement("input");t.setAttribute("type","hidden"),e.appendChild(t).setAttribute("name","D"),e.querySelectorAll("[name=d]").length&&v.push("name"+M+"*[*^$|!~]?="),2!==e.querySelectorAll(":enabled").length&&v.push(":enabled",":disabled"),a.appendChild(e).disabled=!0,2!==e.querySelectorAll(":disabled").length&&v.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),v.push(",.*:")})),(d.matchesSelector=K.test(c=a.matches||a.webkitMatchesSelector||a.mozMatchesSelector||a.oMatchesSelector||a.msMatchesSelector))&&ce(function(e){d.disconnectedMatch=c.call(e,"*"),c.call(e,"[s!='']:x"),s.push("!=",F)}),v=v.length&&new RegExp(v.join("|")),s=s.length&&new RegExp(s.join("|")),t=K.test(a.compareDocumentPosition),y=t||K.test(a.contains)?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)while(t=t.parentNode)if(t===e)return!0;return!1},D=t?function(e,t){if(e===t)return l=!0,0;var n=!e.compareDocumentPosition-!t.compareDocumentPosition;return n||(1&(n=(e.ownerDocument||e)==(t.ownerDocument||t)?e.compareDocumentPosition(t):1)||!d.sortDetached&&t.compareDocumentPosition(e)===n?e==C||e.ownerDocument==p&&y(p,e)?-1:t==C||t.ownerDocument==p&&y(p,t)?1:u?P(u,e)-P(u,t):0:4&n?-1:1)}:function(e,t){if(e===t)return l=!0,0;var n,r=0,i=e.parentNode,o=t.parentNode,a=[e],s=[t];if(!i||!o)return e==C?-1:t==C?1:i?-1:o?1:u?P(u,e)-P(u,t):0;if(i===o)return pe(e,t);n=e;while(n=n.parentNode)a.unshift(n);n=t;while(n=n.parentNode)s.unshift(n);while(a[r]===s[r])r++;return r?pe(a[r],s[r]):a[r]==p?-1:s[r]==p?1:0}),C},se.matches=function(e,t){return se(e,null,null,t)},se.matchesSelector=function(e,t){if(T(e),d.matchesSelector&&E&&!N[t+" "]&&(!s||!s.test(t))&&(!v||!v.test(t)))try{var n=c.call(e,t);if(n||d.disconnectedMatch||e.document&&11!==e.document.nodeType)return n}catch(e){N(t,!0)}return 0":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(te,ne),e[3]=(e[3]||e[4]||e[5]||"").replace(te,ne),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||se.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&se.error(e[0]),e},PSEUDO:function(e){var t,n=!e[6]&&e[2];return G.CHILD.test(e[0])?null:(e[3]?e[2]=e[4]||e[5]||"":n&&X.test(n)&&(t=h(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(te,ne).toLowerCase();return"*"===e?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=m[e+" "];return t||(t=new RegExp("(^|"+M+")"+e+"("+M+"|$)"))&&m(e,function(e){return t.test("string"==typeof e.className&&e.className||"undefined"!=typeof e.getAttribute&&e.getAttribute("class")||"")})},ATTR:function(n,r,i){return function(e){var t=se.attr(e,n);return null==t?"!="===r:!r||(t+="","="===r?t===i:"!="===r?t!==i:"^="===r?i&&0===t.indexOf(i):"*="===r?i&&-1:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i;function D(e,n,r){return m(n)?S.grep(e,function(e,t){return!!n.call(e,t,e)!==r}):n.nodeType?S.grep(e,function(e){return e===n!==r}):"string"!=typeof n?S.grep(e,function(e){return-1)[^>]*|#([\w-]+))$/;(S.fn.init=function(e,t,n){var r,i;if(!e)return this;if(n=n||j,"string"==typeof e){if(!(r="<"===e[0]&&">"===e[e.length-1]&&3<=e.length?[null,e,null]:q.exec(e))||!r[1]&&t)return!t||t.jquery?(t||n).find(e):this.constructor(t).find(e);if(r[1]){if(t=t instanceof S?t[0]:t,S.merge(this,S.parseHTML(r[1],t&&t.nodeType?t.ownerDocument||t:E,!0)),N.test(r[1])&&S.isPlainObject(t))for(r in t)m(this[r])?this[r](t[r]):this.attr(r,t[r]);return this}return(i=E.getElementById(r[2]))&&(this[0]=i,this.length=1),this}return e.nodeType?(this[0]=e,this.length=1,this):m(e)?void 0!==n.ready?n.ready(e):e(S):S.makeArray(e,this)}).prototype=S.fn,j=S(E);var L=/^(?:parents|prev(?:Until|All))/,H={children:!0,contents:!0,next:!0,prev:!0};function O(e,t){while((e=e[t])&&1!==e.nodeType);return e}S.fn.extend({has:function(e){var t=S(e,this),n=t.length;return this.filter(function(){for(var e=0;e\x20\t\r\n\f]*)/i,he=/^$|^module$|\/(?:java|ecma)script/i;ce=E.createDocumentFragment().appendChild(E.createElement("div")),(fe=E.createElement("input")).setAttribute("type","radio"),fe.setAttribute("checked","checked"),fe.setAttribute("name","t"),ce.appendChild(fe),y.checkClone=ce.cloneNode(!0).cloneNode(!0).lastChild.checked,ce.innerHTML="",y.noCloneChecked=!!ce.cloneNode(!0).lastChild.defaultValue,ce.innerHTML="",y.option=!!ce.lastChild;var ge={thead:[1,"","
"],col:[2,"","
"],tr:[2,"","
"],td:[3,"","
"],_default:[0,"",""]};function ve(e,t){var n;return n="undefined"!=typeof e.getElementsByTagName?e.getElementsByTagName(t||"*"):"undefined"!=typeof e.querySelectorAll?e.querySelectorAll(t||"*"):[],void 0===t||t&&A(e,t)?S.merge([e],n):n}function ye(e,t){for(var n=0,r=e.length;n",""]);var me=/<|&#?\w+;/;function xe(e,t,n,r,i){for(var o,a,s,u,l,c,f=t.createDocumentFragment(),p=[],d=0,h=e.length;d\s*$/g;function qe(e,t){return A(e,"table")&&A(11!==t.nodeType?t:t.firstChild,"tr")&&S(e).children("tbody")[0]||e}function Le(e){return e.type=(null!==e.getAttribute("type"))+"/"+e.type,e}function He(e){return"true/"===(e.type||"").slice(0,5)?e.type=e.type.slice(5):e.removeAttribute("type"),e}function Oe(e,t){var n,r,i,o,a,s;if(1===t.nodeType){if(Y.hasData(e)&&(s=Y.get(e).events))for(i in Y.remove(t,"handle events"),s)for(n=0,r=s[i].length;n").attr(n.scriptAttrs||{}).prop({charset:n.scriptCharset,src:n.url}).on("load error",i=function(e){r.remove(),i=null,e&&t("error"===e.type?404:200,e.type)}),E.head.appendChild(r[0])},abort:function(){i&&i()}}});var Ut,Xt=[],Vt=/(=)\?(?=&|$)|\?\?/;S.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=Xt.pop()||S.expando+"_"+Ct.guid++;return this[e]=!0,e}}),S.ajaxPrefilter("json jsonp",function(e,t,n){var r,i,o,a=!1!==e.jsonp&&(Vt.test(e.url)?"url":"string"==typeof e.data&&0===(e.contentType||"").indexOf("application/x-www-form-urlencoded")&&Vt.test(e.data)&&"data");if(a||"jsonp"===e.dataTypes[0])return r=e.jsonpCallback=m(e.jsonpCallback)?e.jsonpCallback():e.jsonpCallback,a?e[a]=e[a].replace(Vt,"$1"+r):!1!==e.jsonp&&(e.url+=(Et.test(e.url)?"&":"?")+e.jsonp+"="+r),e.converters["script json"]=function(){return o||S.error(r+" was not called"),o[0]},e.dataTypes[0]="json",i=C[r],C[r]=function(){o=arguments},n.always(function(){void 0===i?S(C).removeProp(r):C[r]=i,e[r]&&(e.jsonpCallback=t.jsonpCallback,Xt.push(r)),o&&m(i)&&i(o[0]),o=i=void 0}),"script"}),y.createHTMLDocument=((Ut=E.implementation.createHTMLDocument("").body).innerHTML="
",2===Ut.childNodes.length),S.parseHTML=function(e,t,n){return"string"!=typeof e?[]:("boolean"==typeof t&&(n=t,t=!1),t||(y.createHTMLDocument?((r=(t=E.implementation.createHTMLDocument("")).createElement("base")).href=E.location.href,t.head.appendChild(r)):t=E),o=!n&&[],(i=N.exec(e))?[t.createElement(i[1])]:(i=xe([e],t,o),o&&o.length&&S(o).remove(),S.merge([],i.childNodes)));var r,i,o},S.fn.load=function(e,t,n){var r,i,o,a=this,s=e.indexOf(" ");return-1").append(S.parseHTML(e)).find(r):e)}).always(n&&function(e,t){a.each(function(){n.apply(this,o||[e.responseText,t,e])})}),this},S.expr.pseudos.animated=function(t){return S.grep(S.timers,function(e){return t===e.elem}).length},S.offset={setOffset:function(e,t,n){var r,i,o,a,s,u,l=S.css(e,"position"),c=S(e),f={};"static"===l&&(e.style.position="relative"),s=c.offset(),o=S.css(e,"top"),u=S.css(e,"left"),("absolute"===l||"fixed"===l)&&-1<(o+u).indexOf("auto")?(a=(r=c.position()).top,i=r.left):(a=parseFloat(o)||0,i=parseFloat(u)||0),m(t)&&(t=t.call(e,n,S.extend({},s))),null!=t.top&&(f.top=t.top-s.top+a),null!=t.left&&(f.left=t.left-s.left+i),"using"in t?t.using.call(e,f):("number"==typeof f.top&&(f.top+="px"),"number"==typeof f.left&&(f.left+="px"),c.css(f))}},S.fn.extend({offset:function(t){if(arguments.length)return void 0===t?this:this.each(function(e){S.offset.setOffset(this,t,e)});var e,n,r=this[0];return r?r.getClientRects().length?(e=r.getBoundingClientRect(),n=r.ownerDocument.defaultView,{top:e.top+n.pageYOffset,left:e.left+n.pageXOffset}):{top:0,left:0}:void 0},position:function(){if(this[0]){var e,t,n,r=this[0],i={top:0,left:0};if("fixed"===S.css(r,"position"))t=r.getBoundingClientRect();else{t=this.offset(),n=r.ownerDocument,e=r.offsetParent||n.documentElement;while(e&&(e===n.body||e===n.documentElement)&&"static"===S.css(e,"position"))e=e.parentNode;e&&e!==r&&1===e.nodeType&&((i=S(e).offset()).top+=S.css(e,"borderTopWidth",!0),i.left+=S.css(e,"borderLeftWidth",!0))}return{top:t.top-i.top-S.css(r,"marginTop",!0),left:t.left-i.left-S.css(r,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var e=this.offsetParent;while(e&&"static"===S.css(e,"position"))e=e.offsetParent;return e||re})}}),S.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(t,i){var o="pageYOffset"===i;S.fn[t]=function(e){return $(this,function(e,t,n){var r;if(x(e)?r=e:9===e.nodeType&&(r=e.defaultView),void 0===n)return r?r[i]:e[t];r?r.scrollTo(o?r.pageXOffset:n,o?n:r.pageYOffset):e[t]=n},t,e,arguments.length)}}),S.each(["top","left"],function(e,n){S.cssHooks[n]=$e(y.pixelPosition,function(e,t){if(t)return t=Be(e,n),Me.test(t)?S(e).position()[n]+"px":t})}),S.each({Height:"height",Width:"width"},function(a,s){S.each({padding:"inner"+a,content:s,"":"outer"+a},function(r,o){S.fn[o]=function(e,t){var n=arguments.length&&(r||"boolean"!=typeof e),i=r||(!0===e||!0===t?"margin":"border");return $(this,function(e,t,n){var r;return x(e)?0===o.indexOf("outer")?e["inner"+a]:e.document.documentElement["client"+a]:9===e.nodeType?(r=e.documentElement,Math.max(e.body["scroll"+a],r["scroll"+a],e.body["offset"+a],r["offset"+a],r["client"+a])):void 0===n?S.css(e,t,i):S.style(e,t,n,i)},s,n?e:void 0,n)}})}),S.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){S.fn[t]=function(e){return this.on(t,e)}}),S.fn.extend({bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return 1===arguments.length?this.off(e,"**"):this.off(t,e||"**",n)},hover:function(e,t){return this.mouseenter(e).mouseleave(t||e)}}),S.each("blur focus focusin focusout resize scroll click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup contextmenu".split(" "),function(e,n){S.fn[n]=function(e,t){return 0 Date: Mon, 30 May 2022 09:36:08 +0800 Subject: [PATCH 086/239] =?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 --- web_src/js/jquery-3.5.0.min.js | 2 -- web_src/js/jquery.js | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) delete mode 100644 web_src/js/jquery-3.5.0.min.js diff --git a/web_src/js/jquery-3.5.0.min.js b/web_src/js/jquery-3.5.0.min.js deleted file mode 100644 index 9fd22ca70..000000000 --- a/web_src/js/jquery-3.5.0.min.js +++ /dev/null @@ -1,2 +0,0 @@ -/*! jQuery v3.5.0 | (c) JS Foundation and other contributors | jquery.org/license */ -!function(e,t){"use strict";"object"==typeof module&&"object"==typeof module.exports?module.exports=e.document?t(e,!0):function(e){if(!e.document)throw new Error("jQuery requires a window with a document");return t(e)}:t(e)}("undefined"!=typeof window?window:this,function(C,e){"use strict";var t=[],r=Object.getPrototypeOf,s=t.slice,g=t.flat?function(e){return t.flat.call(e)}:function(e){return t.concat.apply([],e)},u=t.push,i=t.indexOf,n={},o=n.toString,v=n.hasOwnProperty,a=v.toString,l=a.call(Object),y={},m=function(e){return"function"==typeof e&&"number"!=typeof e.nodeType},x=function(e){return null!=e&&e===e.window},E=C.document,c={type:!0,src:!0,nonce:!0,noModule:!0};function b(e,t,n){var r,i,o=(n=n||E).createElement("script");if(o.text=e,t)for(r in c)(i=t[r]||t.getAttribute&&t.getAttribute(r))&&o.setAttribute(r,i);n.head.appendChild(o).parentNode.removeChild(o)}function w(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?n[o.call(e)]||"object":typeof e}var f="3.5.0",S=function(e,t){return new S.fn.init(e,t)};function p(e){var t=!!e&&"length"in e&&e.length,n=w(e);return!m(e)&&!x(e)&&("array"===n||0===t||"number"==typeof t&&0+~]|"+M+")"+M+"*"),U=new RegExp(M+"|>"),X=new RegExp(F),V=new RegExp("^"+I+"$"),G={ID:new RegExp("^#("+I+")"),CLASS:new RegExp("^\\.("+I+")"),TAG:new RegExp("^("+I+"|[*])"),ATTR:new RegExp("^"+W),PSEUDO:new RegExp("^"+F),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+M+"*(even|odd|(([+-]|)(\\d*)n|)"+M+"*(?:([+-]|)"+M+"*(\\d+)|))"+M+"*\\)|)","i"),bool:new RegExp("^(?:"+R+")$","i"),needsContext:new RegExp("^"+M+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+M+"*((?:-\\d)?\\d*)"+M+"*\\)|)(?=[^-]|$)","i")},Y=/HTML$/i,Q=/^(?:input|select|textarea|button)$/i,J=/^h\d$/i,K=/^[^{]+\{\s*\[native \w/,Z=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,ee=/[+~]/,te=new RegExp("\\\\[\\da-fA-F]{1,6}"+M+"?|\\\\([^\\r\\n\\f])","g"),ne=function(e,t){var n="0x"+e.slice(1)-65536;return t||(n<0?String.fromCharCode(n+65536):String.fromCharCode(n>>10|55296,1023&n|56320))},re=/([\0-\x1f\x7f]|^-?\d)|^-$|[^\0-\x1f\x7f-\uFFFF\w-]/g,ie=function(e,t){return t?"\0"===e?"\ufffd":e.slice(0,-1)+"\\"+e.charCodeAt(e.length-1).toString(16)+" ":"\\"+e},oe=function(){T()},ae=be(function(e){return!0===e.disabled&&"fieldset"===e.nodeName.toLowerCase()},{dir:"parentNode",next:"legend"});try{H.apply(t=O.call(p.childNodes),p.childNodes),t[p.childNodes.length].nodeType}catch(e){H={apply:t.length?function(e,t){L.apply(e,O.call(t))}:function(e,t){var n=e.length,r=0;while(e[n++]=t[r++]);e.length=n-1}}}function se(t,e,n,r){var i,o,a,s,u,l,c,f=e&&e.ownerDocument,p=e?e.nodeType:9;if(n=n||[],"string"!=typeof t||!t||1!==p&&9!==p&&11!==p)return n;if(!r&&(T(e),e=e||C,E)){if(11!==p&&(u=Z.exec(t)))if(i=u[1]){if(9===p){if(!(a=e.getElementById(i)))return n;if(a.id===i)return n.push(a),n}else if(f&&(a=f.getElementById(i))&&y(e,a)&&a.id===i)return n.push(a),n}else{if(u[2])return H.apply(n,e.getElementsByTagName(t)),n;if((i=u[3])&&d.getElementsByClassName&&e.getElementsByClassName)return H.apply(n,e.getElementsByClassName(i)),n}if(d.qsa&&!N[t+" "]&&(!v||!v.test(t))&&(1!==p||"object"!==e.nodeName.toLowerCase())){if(c=t,f=e,1===p&&(U.test(t)||z.test(t))){(f=ee.test(t)&&ye(e.parentNode)||e)===e&&d.scope||((s=e.getAttribute("id"))?s=s.replace(re,ie):e.setAttribute("id",s=S)),o=(l=h(t)).length;while(o--)l[o]=(s?"#"+s:":scope")+" "+xe(l[o]);c=l.join(",")}try{return H.apply(n,f.querySelectorAll(c)),n}catch(e){N(t,!0)}finally{s===S&&e.removeAttribute("id")}}}return g(t.replace($,"$1"),e,n,r)}function ue(){var r=[];return function e(t,n){return r.push(t+" ")>b.cacheLength&&delete e[r.shift()],e[t+" "]=n}}function le(e){return e[S]=!0,e}function ce(e){var t=C.createElement("fieldset");try{return!!e(t)}catch(e){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function fe(e,t){var n=e.split("|"),r=n.length;while(r--)b.attrHandle[n[r]]=t}function pe(e,t){var n=t&&e,r=n&&1===e.nodeType&&1===t.nodeType&&e.sourceIndex-t.sourceIndex;if(r)return r;if(n)while(n=n.nextSibling)if(n===t)return-1;return e?1:-1}function de(t){return function(e){return"input"===e.nodeName.toLowerCase()&&e.type===t}}function he(n){return function(e){var t=e.nodeName.toLowerCase();return("input"===t||"button"===t)&&e.type===n}}function ge(t){return function(e){return"form"in e?e.parentNode&&!1===e.disabled?"label"in e?"label"in e.parentNode?e.parentNode.disabled===t:e.disabled===t:e.isDisabled===t||e.isDisabled!==!t&&ae(e)===t:e.disabled===t:"label"in e&&e.disabled===t}}function ve(a){return le(function(o){return o=+o,le(function(e,t){var n,r=a([],e.length,o),i=r.length;while(i--)e[n=r[i]]&&(e[n]=!(t[n]=e[n]))})})}function ye(e){return e&&"undefined"!=typeof e.getElementsByTagName&&e}for(e in d=se.support={},i=se.isXML=function(e){var t=e.namespaceURI,n=(e.ownerDocument||e).documentElement;return!Y.test(t||n&&n.nodeName||"HTML")},T=se.setDocument=function(e){var t,n,r=e?e.ownerDocument||e:p;return r!=C&&9===r.nodeType&&r.documentElement&&(a=(C=r).documentElement,E=!i(C),p!=C&&(n=C.defaultView)&&n.top!==n&&(n.addEventListener?n.addEventListener("unload",oe,!1):n.attachEvent&&n.attachEvent("onunload",oe)),d.scope=ce(function(e){return a.appendChild(e).appendChild(C.createElement("div")),"undefined"!=typeof e.querySelectorAll&&!e.querySelectorAll(":scope fieldset div").length}),d.attributes=ce(function(e){return e.className="i",!e.getAttribute("className")}),d.getElementsByTagName=ce(function(e){return e.appendChild(C.createComment("")),!e.getElementsByTagName("*").length}),d.getElementsByClassName=K.test(C.getElementsByClassName),d.getById=ce(function(e){return a.appendChild(e).id=S,!C.getElementsByName||!C.getElementsByName(S).length}),d.getById?(b.filter.ID=function(e){var t=e.replace(te,ne);return function(e){return e.getAttribute("id")===t}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&E){var n=t.getElementById(e);return n?[n]:[]}}):(b.filter.ID=function(e){var n=e.replace(te,ne);return function(e){var t="undefined"!=typeof e.getAttributeNode&&e.getAttributeNode("id");return t&&t.value===n}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&E){var n,r,i,o=t.getElementById(e);if(o){if((n=o.getAttributeNode("id"))&&n.value===e)return[o];i=t.getElementsByName(e),r=0;while(o=i[r++])if((n=o.getAttributeNode("id"))&&n.value===e)return[o]}return[]}}),b.find.TAG=d.getElementsByTagName?function(e,t){return"undefined"!=typeof t.getElementsByTagName?t.getElementsByTagName(e):d.qsa?t.querySelectorAll(e):void 0}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){while(n=o[i++])1===n.nodeType&&r.push(n);return r}return o},b.find.CLASS=d.getElementsByClassName&&function(e,t){if("undefined"!=typeof t.getElementsByClassName&&E)return t.getElementsByClassName(e)},s=[],v=[],(d.qsa=K.test(C.querySelectorAll))&&(ce(function(e){var t;a.appendChild(e).innerHTML="",e.querySelectorAll("[msallowcapture^='']").length&&v.push("[*^$]="+M+"*(?:''|\"\")"),e.querySelectorAll("[selected]").length||v.push("\\["+M+"*(?:value|"+R+")"),e.querySelectorAll("[id~="+S+"-]").length||v.push("~="),(t=C.createElement("input")).setAttribute("name",""),e.appendChild(t),e.querySelectorAll("[name='']").length||v.push("\\["+M+"*name"+M+"*="+M+"*(?:''|\"\")"),e.querySelectorAll(":checked").length||v.push(":checked"),e.querySelectorAll("a#"+S+"+*").length||v.push(".#.+[+~]"),e.querySelectorAll("\\\f"),v.push("[\\r\\n\\f]")}),ce(function(e){e.innerHTML="";var t=C.createElement("input");t.setAttribute("type","hidden"),e.appendChild(t).setAttribute("name","D"),e.querySelectorAll("[name=d]").length&&v.push("name"+M+"*[*^$|!~]?="),2!==e.querySelectorAll(":enabled").length&&v.push(":enabled",":disabled"),a.appendChild(e).disabled=!0,2!==e.querySelectorAll(":disabled").length&&v.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),v.push(",.*:")})),(d.matchesSelector=K.test(c=a.matches||a.webkitMatchesSelector||a.mozMatchesSelector||a.oMatchesSelector||a.msMatchesSelector))&&ce(function(e){d.disconnectedMatch=c.call(e,"*"),c.call(e,"[s!='']:x"),s.push("!=",F)}),v=v.length&&new RegExp(v.join("|")),s=s.length&&new RegExp(s.join("|")),t=K.test(a.compareDocumentPosition),y=t||K.test(a.contains)?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)while(t=t.parentNode)if(t===e)return!0;return!1},D=t?function(e,t){if(e===t)return l=!0,0;var n=!e.compareDocumentPosition-!t.compareDocumentPosition;return n||(1&(n=(e.ownerDocument||e)==(t.ownerDocument||t)?e.compareDocumentPosition(t):1)||!d.sortDetached&&t.compareDocumentPosition(e)===n?e==C||e.ownerDocument==p&&y(p,e)?-1:t==C||t.ownerDocument==p&&y(p,t)?1:u?P(u,e)-P(u,t):0:4&n?-1:1)}:function(e,t){if(e===t)return l=!0,0;var n,r=0,i=e.parentNode,o=t.parentNode,a=[e],s=[t];if(!i||!o)return e==C?-1:t==C?1:i?-1:o?1:u?P(u,e)-P(u,t):0;if(i===o)return pe(e,t);n=e;while(n=n.parentNode)a.unshift(n);n=t;while(n=n.parentNode)s.unshift(n);while(a[r]===s[r])r++;return r?pe(a[r],s[r]):a[r]==p?-1:s[r]==p?1:0}),C},se.matches=function(e,t){return se(e,null,null,t)},se.matchesSelector=function(e,t){if(T(e),d.matchesSelector&&E&&!N[t+" "]&&(!s||!s.test(t))&&(!v||!v.test(t)))try{var n=c.call(e,t);if(n||d.disconnectedMatch||e.document&&11!==e.document.nodeType)return n}catch(e){N(t,!0)}return 0":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(te,ne),e[3]=(e[3]||e[4]||e[5]||"").replace(te,ne),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||se.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&se.error(e[0]),e},PSEUDO:function(e){var t,n=!e[6]&&e[2];return G.CHILD.test(e[0])?null:(e[3]?e[2]=e[4]||e[5]||"":n&&X.test(n)&&(t=h(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(te,ne).toLowerCase();return"*"===e?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=m[e+" "];return t||(t=new RegExp("(^|"+M+")"+e+"("+M+"|$)"))&&m(e,function(e){return t.test("string"==typeof e.className&&e.className||"undefined"!=typeof e.getAttribute&&e.getAttribute("class")||"")})},ATTR:function(n,r,i){return function(e){var t=se.attr(e,n);return null==t?"!="===r:!r||(t+="","="===r?t===i:"!="===r?t!==i:"^="===r?i&&0===t.indexOf(i):"*="===r?i&&-1:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i;function D(e,n,r){return m(n)?S.grep(e,function(e,t){return!!n.call(e,t,e)!==r}):n.nodeType?S.grep(e,function(e){return e===n!==r}):"string"!=typeof n?S.grep(e,function(e){return-1)[^>]*|#([\w-]+))$/;(S.fn.init=function(e,t,n){var r,i;if(!e)return this;if(n=n||j,"string"==typeof e){if(!(r="<"===e[0]&&">"===e[e.length-1]&&3<=e.length?[null,e,null]:q.exec(e))||!r[1]&&t)return!t||t.jquery?(t||n).find(e):this.constructor(t).find(e);if(r[1]){if(t=t instanceof S?t[0]:t,S.merge(this,S.parseHTML(r[1],t&&t.nodeType?t.ownerDocument||t:E,!0)),N.test(r[1])&&S.isPlainObject(t))for(r in t)m(this[r])?this[r](t[r]):this.attr(r,t[r]);return this}return(i=E.getElementById(r[2]))&&(this[0]=i,this.length=1),this}return e.nodeType?(this[0]=e,this.length=1,this):m(e)?void 0!==n.ready?n.ready(e):e(S):S.makeArray(e,this)}).prototype=S.fn,j=S(E);var L=/^(?:parents|prev(?:Until|All))/,H={children:!0,contents:!0,next:!0,prev:!0};function O(e,t){while((e=e[t])&&1!==e.nodeType);return e}S.fn.extend({has:function(e){var t=S(e,this),n=t.length;return this.filter(function(){for(var e=0;e\x20\t\r\n\f]*)/i,he=/^$|^module$|\/(?:java|ecma)script/i;ce=E.createDocumentFragment().appendChild(E.createElement("div")),(fe=E.createElement("input")).setAttribute("type","radio"),fe.setAttribute("checked","checked"),fe.setAttribute("name","t"),ce.appendChild(fe),y.checkClone=ce.cloneNode(!0).cloneNode(!0).lastChild.checked,ce.innerHTML="",y.noCloneChecked=!!ce.cloneNode(!0).lastChild.defaultValue,ce.innerHTML="",y.option=!!ce.lastChild;var ge={thead:[1,"","
"],col:[2,"","
"],tr:[2,"","
"],td:[3,"","
"],_default:[0,"",""]};function ve(e,t){var n;return n="undefined"!=typeof e.getElementsByTagName?e.getElementsByTagName(t||"*"):"undefined"!=typeof e.querySelectorAll?e.querySelectorAll(t||"*"):[],void 0===t||t&&A(e,t)?S.merge([e],n):n}function ye(e,t){for(var n=0,r=e.length;n",""]);var me=/<|&#?\w+;/;function xe(e,t,n,r,i){for(var o,a,s,u,l,c,f=t.createDocumentFragment(),p=[],d=0,h=e.length;d\s*$/g;function qe(e,t){return A(e,"table")&&A(11!==t.nodeType?t:t.firstChild,"tr")&&S(e).children("tbody")[0]||e}function Le(e){return e.type=(null!==e.getAttribute("type"))+"/"+e.type,e}function He(e){return"true/"===(e.type||"").slice(0,5)?e.type=e.type.slice(5):e.removeAttribute("type"),e}function Oe(e,t){var n,r,i,o,a,s;if(1===t.nodeType){if(Y.hasData(e)&&(s=Y.get(e).events))for(i in Y.remove(t,"handle events"),s)for(n=0,r=s[i].length;n").attr(n.scriptAttrs||{}).prop({charset:n.scriptCharset,src:n.url}).on("load error",i=function(e){r.remove(),i=null,e&&t("error"===e.type?404:200,e.type)}),E.head.appendChild(r[0])},abort:function(){i&&i()}}});var Ut,Xt=[],Vt=/(=)\?(?=&|$)|\?\?/;S.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=Xt.pop()||S.expando+"_"+Ct.guid++;return this[e]=!0,e}}),S.ajaxPrefilter("json jsonp",function(e,t,n){var r,i,o,a=!1!==e.jsonp&&(Vt.test(e.url)?"url":"string"==typeof e.data&&0===(e.contentType||"").indexOf("application/x-www-form-urlencoded")&&Vt.test(e.data)&&"data");if(a||"jsonp"===e.dataTypes[0])return r=e.jsonpCallback=m(e.jsonpCallback)?e.jsonpCallback():e.jsonpCallback,a?e[a]=e[a].replace(Vt,"$1"+r):!1!==e.jsonp&&(e.url+=(Et.test(e.url)?"&":"?")+e.jsonp+"="+r),e.converters["script json"]=function(){return o||S.error(r+" was not called"),o[0]},e.dataTypes[0]="json",i=C[r],C[r]=function(){o=arguments},n.always(function(){void 0===i?S(C).removeProp(r):C[r]=i,e[r]&&(e.jsonpCallback=t.jsonpCallback,Xt.push(r)),o&&m(i)&&i(o[0]),o=i=void 0}),"script"}),y.createHTMLDocument=((Ut=E.implementation.createHTMLDocument("").body).innerHTML="
",2===Ut.childNodes.length),S.parseHTML=function(e,t,n){return"string"!=typeof e?[]:("boolean"==typeof t&&(n=t,t=!1),t||(y.createHTMLDocument?((r=(t=E.implementation.createHTMLDocument("")).createElement("base")).href=E.location.href,t.head.appendChild(r)):t=E),o=!n&&[],(i=N.exec(e))?[t.createElement(i[1])]:(i=xe([e],t,o),o&&o.length&&S(o).remove(),S.merge([],i.childNodes)));var r,i,o},S.fn.load=function(e,t,n){var r,i,o,a=this,s=e.indexOf(" ");return-1").append(S.parseHTML(e)).find(r):e)}).always(n&&function(e,t){a.each(function(){n.apply(this,o||[e.responseText,t,e])})}),this},S.expr.pseudos.animated=function(t){return S.grep(S.timers,function(e){return t===e.elem}).length},S.offset={setOffset:function(e,t,n){var r,i,o,a,s,u,l=S.css(e,"position"),c=S(e),f={};"static"===l&&(e.style.position="relative"),s=c.offset(),o=S.css(e,"top"),u=S.css(e,"left"),("absolute"===l||"fixed"===l)&&-1<(o+u).indexOf("auto")?(a=(r=c.position()).top,i=r.left):(a=parseFloat(o)||0,i=parseFloat(u)||0),m(t)&&(t=t.call(e,n,S.extend({},s))),null!=t.top&&(f.top=t.top-s.top+a),null!=t.left&&(f.left=t.left-s.left+i),"using"in t?t.using.call(e,f):("number"==typeof f.top&&(f.top+="px"),"number"==typeof f.left&&(f.left+="px"),c.css(f))}},S.fn.extend({offset:function(t){if(arguments.length)return void 0===t?this:this.each(function(e){S.offset.setOffset(this,t,e)});var e,n,r=this[0];return r?r.getClientRects().length?(e=r.getBoundingClientRect(),n=r.ownerDocument.defaultView,{top:e.top+n.pageYOffset,left:e.left+n.pageXOffset}):{top:0,left:0}:void 0},position:function(){if(this[0]){var e,t,n,r=this[0],i={top:0,left:0};if("fixed"===S.css(r,"position"))t=r.getBoundingClientRect();else{t=this.offset(),n=r.ownerDocument,e=r.offsetParent||n.documentElement;while(e&&(e===n.body||e===n.documentElement)&&"static"===S.css(e,"position"))e=e.parentNode;e&&e!==r&&1===e.nodeType&&((i=S(e).offset()).top+=S.css(e,"borderTopWidth",!0),i.left+=S.css(e,"borderLeftWidth",!0))}return{top:t.top-i.top-S.css(r,"marginTop",!0),left:t.left-i.left-S.css(r,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var e=this.offsetParent;while(e&&"static"===S.css(e,"position"))e=e.offsetParent;return e||re})}}),S.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(t,i){var o="pageYOffset"===i;S.fn[t]=function(e){return $(this,function(e,t,n){var r;if(x(e)?r=e:9===e.nodeType&&(r=e.defaultView),void 0===n)return r?r[i]:e[t];r?r.scrollTo(o?r.pageXOffset:n,o?n:r.pageYOffset):e[t]=n},t,e,arguments.length)}}),S.each(["top","left"],function(e,n){S.cssHooks[n]=$e(y.pixelPosition,function(e,t){if(t)return t=Be(e,n),Me.test(t)?S(e).position()[n]+"px":t})}),S.each({Height:"height",Width:"width"},function(a,s){S.each({padding:"inner"+a,content:s,"":"outer"+a},function(r,o){S.fn[o]=function(e,t){var n=arguments.length&&(r||"boolean"!=typeof e),i=r||(!0===e||!0===t?"margin":"border");return $(this,function(e,t,n){var r;return x(e)?0===o.indexOf("outer")?e["inner"+a]:e.document.documentElement["client"+a]:9===e.nodeType?(r=e.documentElement,Math.max(e.body["scroll"+a],r["scroll"+a],e.body["offset"+a],r["offset"+a],r["client"+a])):void 0===n?S.css(e,t,i):S.style(e,t,n,i)},s,n?e:void 0,n)}})}),S.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){S.fn[t]=function(e){return this.on(t,e)}}),S.fn.extend({bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return 1===arguments.length?this.off(e,"**"):this.off(t,e||"**",n)},hover:function(e,t){return this.mouseenter(e).mouseleave(t||e)}}),S.each("blur focus focusin focusout resize scroll click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup contextmenu".split(" "),function(e,n){S.fn[n]=function(e,t){return 0 Date: Mon, 30 May 2022 09:52:11 +0800 Subject: [PATCH 087/239] =?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 --- custom/public/rotation3D/rotation3D copy.js | 380 ++++++++++++++++++++ custom/public/rotation3D/rotation3D.js | 11 +- 2 files changed, 382 insertions(+), 9 deletions(-) create mode 100644 custom/public/rotation3D/rotation3D copy.js diff --git a/custom/public/rotation3D/rotation3D copy.js b/custom/public/rotation3D/rotation3D copy.js new file mode 100644 index 000000000..8ec5b6938 --- /dev/null +++ b/custom/public/rotation3D/rotation3D copy.js @@ -0,0 +1,380 @@ +var cancelFrame = window.cancelAnimationFrame || window.cancelRequestAnimationFrame; +var requestFrame = window.requestAnimationFrame; +var time = !window.performance || !window.performance.now ? + function () {return +new Date()}: + function () {return performance.now()}; + +/** + * 计算两点距离 + * @param points + * @returns {number} + * distance([{x:0,y:0},{x:1,y:1}]); + */ +var distance = function(points) { + var p1=points[0]; + var p2=points[1]; + var a = p2.x-p1.x; + var b = p2.y-p1.y; + return Math.sqrt(a*a+b*b); +}; + +/** + * 圆公式 + * @param rotation 弧度 + * 计算公式： + * Math.PI; //圆周率 + * Math.sin(); //正弦 x -左 +右 + * Math.cos; //余弦 y -下 +上 + */ +var circleMath = { + /** + * 根据弧度计算角度 + * @param rotation 弧度 + * rotation, farScale, xs, xr, ys, yr, itemWidth + */ + // parseRotate: function (rotation) { + // return (180 / Math.PI * rotation) - 180; + // }, + parseRotate: function (rotation, self) { + var sin = Math.sin(rotation), cos = Math.cos(rotation); + var sin_cos = sin*cos; //得出偏移正负值，从0°向左依次 +-+- + var angle = (180 / Math.PI * rotation) - 180; + var lastAngle = angle; + + // console.log('rotation',rotation) + // console.log('sin',sin) + // console.log('cos',cos) + // console.log('sin*cos',sin*cos); + // console.log('统一偏移角度',self.yr * (sin_cos/Math.PI)) + + lastAngle = angle + (self.yr * (sin_cos/(Math.PI+1))); + + return lastAngle; + }, + /** + * 计算scale,x,y + * scale 最小尺寸 + ((1 - 最小尺寸) * (sin正弦 + 1) * 0.5) + * x x起点 + (尺寸 * cos余弦 * x半径) - 元素宽度一半 + * y y起点 + (尺寸 * sin正弦 * x半径) - 元素宽度一半 + * farScale, xs, xr, ys, yr, itemWidth + */ + parseSXY: function (rotation, self) { + var farScale=self.farScale; + var itemWidth=self.itemWidth; + var xs=self.xs; var xr=self.xr; var ys=self.ys; var yr=self.yr; + var sin = Math.sin(rotation), cos = Math.cos(rotation); + var scale = farScale + ((1 - farScale) * (sin + 1) * 0.5); //单个尺寸 + + // 按设置尺寸 + // var x = xs + (scale * cos * xr) - (itemWidth * 0.5); + // var y = ys + (scale * sin * yr) - (itemWidth * 0.5); + // 不使用压缩 + // var x = xs + (cos * xs) - (itemWidth * 0.5); + // var y = ys + (sin * ys) - (itemWidth * 0.5); + // 使用压缩 + var x = xs + (cos * xr) - (itemWidth * 0.5); + var y = ys + (sin * yr) - (itemWidth * 0.5); + var distanceNumber = distance([ + {x:self.$rotation.width()/2 - self.$item.width()/2, y:self.$rotation.height()/2 - self.$item.height()/2}, + {x:x,y:y}] + ); + + // console.log({x:self.$rotation.width()/2, y:self.$rotation.height()/2}) + // console.log('x,y',x,y) + // console.log('两点距离',distanceNumber) + + return { + x: x, + y: y, + scale: scale, + distanceNumber: distanceNumber, + } + }, +} +/** + * 3D旋转 + * @param id + */ +var Rotation3D = window.Rotation3D = function (_opts) { + var self=this; + this.$rotation = $(_opts.id) + this.$lineList = this.$rotation.find('.lineList') + this.$item = this.$rotation.find('.rotation3D__item') + this.$line = this.$rotation.find('.rotation3D__line') + this.itemWidth = this.$item.width(); + this.itemHeight = this.$item.height(); + this.length = this.$item.length; + // 圆计算 + this.rotation = Math.PI / 2; //圆周率/2 + this.destRotation = this.rotation; + + var xr = this.$rotation.width() * 0.5; + var yr = this.$rotation.height() * 0.5; + var xRadius = _opts.xRadius || 0; + var yRadius = _opts.yRadius || 0; + + var opts = Object.assign({ + farScale: 1, // 最小尺寸 + xs: xr, // x起点 + ys: yr, // y起点 + xr: xr - xRadius, // x半径-压缩 + yr: yr - yRadius, // y半径-压缩 + // 播放 + autoPlay:false, + autoPlayDelay:3000, + currenIndex:-1, + fps:30, + speed:4, + },_opts) + Object.assign(this, opts) + + // 遍历子元素 + this.$item.each(function (index) { + $(this).click(function () { + $(this).addClass('active').siblings().removeClass('active') + self.goTo(index) + }) + }) + // 当前控件进入离开 + this.$rotation.mouseenter(function () { + clearInterval(self.autoPlayTimer) + }) + this.$rotation.mouseleave(function () { + self.onAutoPlay() + }) + + this.onAutoPlay() + this.onDrag() + this.render() + +} +/** + * item样式 + * x x起点 + (尺寸 * 余弦 * x压缩) - 元素宽度一半 + * y y起点 + (尺寸 * 正弦 * y压缩) - 元素宽度一半 + */ +Rotation3D.prototype.itemStyle = function($item, index, rotation) { + console.log("itemStyle=" + rotation + " index=" + index); + var parseSXY = circleMath.parseSXY(rotation, this); + var scale = parseSXY.scale; + var x = parseSXY.x; + var y = parseSXY.y; + var $line = this.$lineList.find('.rotation3D__line').eq(index); + + //设置当前子菜单的位置（left,top） = (x,y) + $item.find('.scale').css({ + 'transform': `scale(${scale})`, + // 'top': `${this.itemWidth * (1-scale) }`, + }) + $item.css({ + position: 'absolute', + display: 'inline-block', + // opacity: scale, + 'z-index': parseInt(scale * 100), + 'transform-origin': '0px 0px', + // 'transform': `translate(${x}px, ${y}px) scale(${scale})`, + 'transform': `translate(${x}px, ${y}px)`, + }); + + /** + * 线样式 + */ + $line.css({ + height:parseSXY.distanceNumber, + }) + $line.find('svg').css({ + height:parseSXY.distanceNumber, + }) + $line.find('.dot1').css({ + 'offset-path':`path("M0 ${parseSXY.distanceNumber}, 0 0")`, + }) + $line.find('#path1').attr({ + 'd':`M0 ${parseSXY.distanceNumber}, 0 0`, + }) + + $line.find('.dot2').css({ + 'offset-path':`path("M0 ${parseSXY.distanceNumber/2}, 0 0")`, + }) + $line.find('#path2').attr({ + 'd':`M0 ${parseSXY.distanceNumber}, 0 0`, + }) + + $line.find('.dot3').css({ + 'offset-path':`path("M20 ${parseSXY.distanceNumber} S 0 ${parseSXY.distanceNumber/2}, 20 0")`, + }) + $line.find('#path3').attr({ + 'd':`M20 ${parseSXY.distanceNumber} S 0 ${parseSXY.distanceNumber/2}, 20 0`, + }) + + $line.find('.dot4').css({ + 'offset-path':`path("M20 0 S 40 ${parseSXY.distanceNumber/2}, 20 ${parseSXY.distanceNumber}")`, + }) + $line.find('#path4').attr({ + 'd':`M20 0 S 40 ${parseSXY.distanceNumber/2}, 20 ${parseSXY.distanceNumber}`, + }) + +} +/** + * line样式 + */ +Rotation3D.prototype.lineStyle = function($line, index, rotation) { + var rotate = circleMath.parseRotate(rotation, this) + console.log("lineStyle=" + rotation + " index=" + index); + + $line.css({ + transform: 'rotate(' + rotate + 'deg)', + }) + this.$lineList.css({ + // transform: `rotateX(${this.yRadius / 3}deg)`, + }) +} + +/** + * 旋转至index + */ +Rotation3D.prototype.goTo = function (index) { + var self = this; + this.currenIndex = index; + console.log('goTo currenIndex', index); + /** + * 1.计算floatIndex,用于控死amdiff + */ + var itemsRotated = this.length * ((Math.PI / 2) - this.rotation) / (2 * Math.PI); + var floatIndex = itemsRotated % this.length; + if (floatIndex < 0) { floatIndex = floatIndex + this.length; } + + /** + * 2.计算diff,判断方向正反 + */ + var diff = index - (floatIndex % this.length); + if (2 * Math.abs(diff) > this.length) { + diff -= (diff > 0) ? this.length : -this.length; + } + // 停止任何正在进行的旋转 + this.destRotation += (2 * Math.PI / this.length) * -diff; + this.scheduleNextFrame(); + +} +/** + * 定时器渐近旋转 + */ +Rotation3D.prototype.scheduleNextFrame = function () { + var self = this + this.lastTime = time(); + // 暂停 + var pause = function () { + cancelFrame ? cancelFrame(this.timer) : clearTimeout(self.timer); + self.timer = 0; + } + // 渐进播放 + var playFrame = function () { + var rem = self.destRotation - self.rotation; + var now = time(), dt = (now - self.lastTime) * 0.002; + self.lastTime = now; + // console.log('rem',rem) + + if (Math.abs(rem) < 0.003) { + self.rotation = self.destRotation; + pause(); + } else { + // 渐近地接近目的地 + self.rotation = self.destRotation - rem / (1 + (self.speed * dt)); + self.scheduleNextFrame(); + } + self.render(); + } + + this.timer = cancelFrame ? + requestFrame(playFrame) : + setTimeout(playFrame, 1000 / this.fps); +} +/** + * 更新 + */ +Rotation3D.prototype.render = function () { + var self=this; + + // 图形间隔：弧度 + var spacing = 2 * Math.PI / this.$item.length; + var itemRotation = this.rotation; + var lineRotation = this.rotation + (Math.PI/2); + + this.$item.each(function (index) { + self.itemStyle($(this), index, itemRotation) + itemRotation += spacing; + }) + this.$line.each(function (index) { + self.lineStyle($(this), index, lineRotation) + lineRotation += spacing; + }) +} +/** + * 自动播放 + */ +Rotation3D.prototype.onAutoPlay = function () { + var self = this; + + if (this.autoPlay) { + this.autoPlayTimer = setInterval(function () { + if (self.currenIndex < 0) { + self.currenIndex = self.length - 1 + } + console.log("autoPlayTimer...."); + self.goTo(self.currenIndex); + self.currenIndex--; //倒叙 + }, this.autoPlayDelay) + } +} +/** + * 拖拽 + */ +Rotation3D.prototype.onDrag = function () { + var self = this; + var startX, startY, moveX, moveY, endX, endY; + console.log("onDrag...."); + // 拖拽：三个事件-按下 移动 抬起 + //按下 + this.$rotation.mousedown(function (e) { + startX = e.pageX; startY = e.pageY; + console.log("mousedown...."); + // 移动 + $(document).mousemove(function (e) { + // console.log('移动'); + endX = e.pageX; endY = e.pageY; + moveX = endX - startX; moveY = endY - startY; + // console.log('x,y',moveX,moveY); + }) + // 抬起 + $(document).mouseup(function (e) { + endX = e.pageX; endY = e.pageY; + moveX = endX - startX; moveY = endY - startY; + console.log("mouseup...."); + // 每40旋转一步 + var moveIndex = parseInt(Math.abs(moveX) / 50) + console.log('moveIndex',moveIndex) + if (moveIndex > 0) { + // console.log(moveX<0 ? '向左' : '向右') + if (moveX < 0) { //向左 + self.currenIndex = self.currenIndex - moveIndex + play(moveIndex) + } else { //向右 + self.currenIndex = self.currenIndex + moveIndex + play(moveIndex) + } + } + + // 解绑 + $(document).unbind("mousemove"); + $(document).unbind("mouseup"); + }) + + }) + + function play() { + if (self.currenIndex == 0) { + self.currenIndex = self.length - 1 + } + self.goTo(self.currenIndex % self.length); + } + +} \ No newline at end of file diff --git a/custom/public/rotation3D/rotation3D.js b/custom/public/rotation3D/rotation3D.js index 8ec5b6938..5a29de481 100644 --- a/custom/public/rotation3D/rotation3D.js +++ b/custom/public/rotation3D/rotation3D.js @@ -166,15 +166,8 @@ Rotation3D.prototype.itemStyle = function($item, index, rotation) { 'transform': `scale(${scale})`, // 'top': `${this.itemWidth * (1-scale) }`, }) - $item.css({ - position: 'absolute', - display: 'inline-block', - // opacity: scale, - 'z-index': parseInt(scale * 100), - 'transform-origin': '0px 0px', - // 'transform': `translate(${x}px, ${y}px) scale(${scale})`, - 'transform': `translate(${x}px, ${y}px)`, - }); + var tmp = `translate(${x}px, ${y}px)` + $item.attr("style","position: absolute;display: inline-block;z-index: " + parseInt(scale * 100) + ";transform-origin:0px 0px;transform:" + tmp); /** * 线样式 From 63a5259f0da10bdaa0b211cf0b73e5ded9784198 Mon Sep 17 00:00:00 2001 From: zouap Date: Mon, 30 May 2022 10:20:05 +0800 Subject: [PATCH 088/239] =?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 --- custom/public/rotation3D/rotation3D copy.js | 380 -------------------- custom/public/rotation3D/rotation3D.js | 11 +- templates/base/footer.tmpl | 8 +- 3 files changed, 12 insertions(+), 387 deletions(-) delete mode 100644 custom/public/rotation3D/rotation3D copy.js diff --git a/custom/public/rotation3D/rotation3D copy.js b/custom/public/rotation3D/rotation3D copy.js deleted file mode 100644 index 8ec5b6938..000000000 --- a/custom/public/rotation3D/rotation3D copy.js +++ /dev/null @@ -1,380 +0,0 @@ -var cancelFrame = window.cancelAnimationFrame || window.cancelRequestAnimationFrame; -var requestFrame = window.requestAnimationFrame; -var time = !window.performance || !window.performance.now ? - function () {return +new Date()}: - function () {return performance.now()}; - -/** - * 计算两点距离 - * @param points - * @returns {number} - * distance([{x:0,y:0},{x:1,y:1}]); - */ -var distance = function(points) { - var p1=points[0]; - var p2=points[1]; - var a = p2.x-p1.x; - var b = p2.y-p1.y; - return Math.sqrt(a*a+b*b); -}; - -/** - * 圆公式 - * @param rotation 弧度 - * 计算公式： - * Math.PI; //圆周率 - * Math.sin(); //正弦 x -左 +右 - * Math.cos; //余弦 y -下 +上 - */ -var circleMath = { - /** - * 根据弧度计算角度 - * @param rotation 弧度 - * rotation, farScale, xs, xr, ys, yr, itemWidth - */ - // parseRotate: function (rotation) { - // return (180 / Math.PI * rotation) - 180; - // }, - parseRotate: function (rotation, self) { - var sin = Math.sin(rotation), cos = Math.cos(rotation); - var sin_cos = sin*cos; //得出偏移正负值，从0°向左依次 +-+- - var angle = (180 / Math.PI * rotation) - 180; - var lastAngle = angle; - - // console.log('rotation',rotation) - // console.log('sin',sin) - // console.log('cos',cos) - // console.log('sin*cos',sin*cos); - // console.log('统一偏移角度',self.yr * (sin_cos/Math.PI)) - - lastAngle = angle + (self.yr * (sin_cos/(Math.PI+1))); - - return lastAngle; - }, - /** - * 计算scale,x,y - * scale 最小尺寸 + ((1 - 最小尺寸) * (sin正弦 + 1) * 0.5) - * x x起点 + (尺寸 * cos余弦 * x半径) - 元素宽度一半 - * y y起点 + (尺寸 * sin正弦 * x半径) - 元素宽度一半 - * farScale, xs, xr, ys, yr, itemWidth - */ - parseSXY: function (rotation, self) { - var farScale=self.farScale; - var itemWidth=self.itemWidth; - var xs=self.xs; var xr=self.xr; var ys=self.ys; var yr=self.yr; - var sin = Math.sin(rotation), cos = Math.cos(rotation); - var scale = farScale + ((1 - farScale) * (sin + 1) * 0.5); //单个尺寸 - - // 按设置尺寸 - // var x = xs + (scale * cos * xr) - (itemWidth * 0.5); - // var y = ys + (scale * sin * yr) - (itemWidth * 0.5); - // 不使用压缩 - // var x = xs + (cos * xs) - (itemWidth * 0.5); - // var y = ys + (sin * ys) - (itemWidth * 0.5); - // 使用压缩 - var x = xs + (cos * xr) - (itemWidth * 0.5); - var y = ys + (sin * yr) - (itemWidth * 0.5); - var distanceNumber = distance([ - {x:self.$rotation.width()/2 - self.$item.width()/2, y:self.$rotation.height()/2 - self.$item.height()/2}, - {x:x,y:y}] - ); - - // console.log({x:self.$rotation.width()/2, y:self.$rotation.height()/2}) - // console.log('x,y',x,y) - // console.log('两点距离',distanceNumber) - - return { - x: x, - y: y, - scale: scale, - distanceNumber: distanceNumber, - } - }, -} -/** - * 3D旋转 - * @param id - */ -var Rotation3D = window.Rotation3D = function (_opts) { - var self=this; - this.$rotation = $(_opts.id) - this.$lineList = this.$rotation.find('.lineList') - this.$item = this.$rotation.find('.rotation3D__item') - this.$line = this.$rotation.find('.rotation3D__line') - this.itemWidth = this.$item.width(); - this.itemHeight = this.$item.height(); - this.length = this.$item.length; - // 圆计算 - this.rotation = Math.PI / 2; //圆周率/2 - this.destRotation = this.rotation; - - var xr = this.$rotation.width() * 0.5; - var yr = this.$rotation.height() * 0.5; - var xRadius = _opts.xRadius || 0; - var yRadius = _opts.yRadius || 0; - - var opts = Object.assign({ - farScale: 1, // 最小尺寸 - xs: xr, // x起点 - ys: yr, // y起点 - xr: xr - xRadius, // x半径-压缩 - yr: yr - yRadius, // y半径-压缩 - // 播放 - autoPlay:false, - autoPlayDelay:3000, - currenIndex:-1, - fps:30, - speed:4, - },_opts) - Object.assign(this, opts) - - // 遍历子元素 - this.$item.each(function (index) { - $(this).click(function () { - $(this).addClass('active').siblings().removeClass('active') - self.goTo(index) - }) - }) - // 当前控件进入离开 - this.$rotation.mouseenter(function () { - clearInterval(self.autoPlayTimer) - }) - this.$rotation.mouseleave(function () { - self.onAutoPlay() - }) - - this.onAutoPlay() - this.onDrag() - this.render() - -} -/** - * item样式 - * x x起点 + (尺寸 * 余弦 * x压缩) - 元素宽度一半 - * y y起点 + (尺寸 * 正弦 * y压缩) - 元素宽度一半 - */ -Rotation3D.prototype.itemStyle = function($item, index, rotation) { - console.log("itemStyle=" + rotation + " index=" + index); - var parseSXY = circleMath.parseSXY(rotation, this); - var scale = parseSXY.scale; - var x = parseSXY.x; - var y = parseSXY.y; - var $line = this.$lineList.find('.rotation3D__line').eq(index); - - //设置当前子菜单的位置（left,top） = (x,y) - $item.find('.scale').css({ - 'transform': `scale(${scale})`, - // 'top': `${this.itemWidth * (1-scale) }`, - }) - $item.css({ - position: 'absolute', - display: 'inline-block', - // opacity: scale, - 'z-index': parseInt(scale * 100), - 'transform-origin': '0px 0px', - // 'transform': `translate(${x}px, ${y}px) scale(${scale})`, - 'transform': `translate(${x}px, ${y}px)`, - }); - - /** - * 线样式 - */ - $line.css({ - height:parseSXY.distanceNumber, - }) - $line.find('svg').css({ - height:parseSXY.distanceNumber, - }) - $line.find('.dot1').css({ - 'offset-path':`path("M0 ${parseSXY.distanceNumber}, 0 0")`, - }) - $line.find('#path1').attr({ - 'd':`M0 ${parseSXY.distanceNumber}, 0 0`, - }) - - $line.find('.dot2').css({ - 'offset-path':`path("M0 ${parseSXY.distanceNumber/2}, 0 0")`, - }) - $line.find('#path2').attr({ - 'd':`M0 ${parseSXY.distanceNumber}, 0 0`, - }) - - $line.find('.dot3').css({ - 'offset-path':`path("M20 ${parseSXY.distanceNumber} S 0 ${parseSXY.distanceNumber/2}, 20 0")`, - }) - $line.find('#path3').attr({ - 'd':`M20 ${parseSXY.distanceNumber} S 0 ${parseSXY.distanceNumber/2}, 20 0`, - }) - - $line.find('.dot4').css({ - 'offset-path':`path("M20 0 S 40 ${parseSXY.distanceNumber/2}, 20 ${parseSXY.distanceNumber}")`, - }) - $line.find('#path4').attr({ - 'd':`M20 0 S 40 ${parseSXY.distanceNumber/2}, 20 ${parseSXY.distanceNumber}`, - }) - -} -/** - * line样式 - */ -Rotation3D.prototype.lineStyle = function($line, index, rotation) { - var rotate = circleMath.parseRotate(rotation, this) - console.log("lineStyle=" + rotation + " index=" + index); - - $line.css({ - transform: 'rotate(' + rotate + 'deg)', - }) - this.$lineList.css({ - // transform: `rotateX(${this.yRadius / 3}deg)`, - }) -} - -/** - * 旋转至index - */ -Rotation3D.prototype.goTo = function (index) { - var self = this; - this.currenIndex = index; - console.log('goTo currenIndex', index); - /** - * 1.计算floatIndex,用于控死amdiff - */ - var itemsRotated = this.length * ((Math.PI / 2) - this.rotation) / (2 * Math.PI); - var floatIndex = itemsRotated % this.length; - if (floatIndex < 0) { floatIndex = floatIndex + this.length; } - - /** - * 2.计算diff,判断方向正反 - */ - var diff = index - (floatIndex % this.length); - if (2 * Math.abs(diff) > this.length) { - diff -= (diff > 0) ? this.length : -this.length; - } - // 停止任何正在进行的旋转 - this.destRotation += (2 * Math.PI / this.length) * -diff; - this.scheduleNextFrame(); - -} -/** - * 定时器渐近旋转 - */ -Rotation3D.prototype.scheduleNextFrame = function () { - var self = this - this.lastTime = time(); - // 暂停 - var pause = function () { - cancelFrame ? cancelFrame(this.timer) : clearTimeout(self.timer); - self.timer = 0; - } - // 渐进播放 - var playFrame = function () { - var rem = self.destRotation - self.rotation; - var now = time(), dt = (now - self.lastTime) * 0.002; - self.lastTime = now; - // console.log('rem',rem) - - if (Math.abs(rem) < 0.003) { - self.rotation = self.destRotation; - pause(); - } else { - // 渐近地接近目的地 - self.rotation = self.destRotation - rem / (1 + (self.speed * dt)); - self.scheduleNextFrame(); - } - self.render(); - } - - this.timer = cancelFrame ? - requestFrame(playFrame) : - setTimeout(playFrame, 1000 / this.fps); -} -/** - * 更新 - */ -Rotation3D.prototype.render = function () { - var self=this; - - // 图形间隔：弧度 - var spacing = 2 * Math.PI / this.$item.length; - var itemRotation = this.rotation; - var lineRotation = this.rotation + (Math.PI/2); - - this.$item.each(function (index) { - self.itemStyle($(this), index, itemRotation) - itemRotation += spacing; - }) - this.$line.each(function (index) { - self.lineStyle($(this), index, lineRotation) - lineRotation += spacing; - }) -} -/** - * 自动播放 - */ -Rotation3D.prototype.onAutoPlay = function () { - var self = this; - - if (this.autoPlay) { - this.autoPlayTimer = setInterval(function () { - if (self.currenIndex < 0) { - self.currenIndex = self.length - 1 - } - console.log("autoPlayTimer...."); - self.goTo(self.currenIndex); - self.currenIndex--; //倒叙 - }, this.autoPlayDelay) - } -} -/** - * 拖拽 - */ -Rotation3D.prototype.onDrag = function () { - var self = this; - var startX, startY, moveX, moveY, endX, endY; - console.log("onDrag...."); - // 拖拽：三个事件-按下 移动 抬起 - //按下 - this.$rotation.mousedown(function (e) { - startX = e.pageX; startY = e.pageY; - console.log("mousedown...."); - // 移动 - $(document).mousemove(function (e) { - // console.log('移动'); - endX = e.pageX; endY = e.pageY; - moveX = endX - startX; moveY = endY - startY; - // console.log('x,y',moveX,moveY); - }) - // 抬起 - $(document).mouseup(function (e) { - endX = e.pageX; endY = e.pageY; - moveX = endX - startX; moveY = endY - startY; - console.log("mouseup...."); - // 每40旋转一步 - var moveIndex = parseInt(Math.abs(moveX) / 50) - console.log('moveIndex',moveIndex) - if (moveIndex > 0) { - // console.log(moveX<0 ? '向左' : '向右') - if (moveX < 0) { //向左 - self.currenIndex = self.currenIndex - moveIndex - play(moveIndex) - } else { //向右 - self.currenIndex = self.currenIndex + moveIndex - play(moveIndex) - } - } - - // 解绑 - $(document).unbind("mousemove"); - $(document).unbind("mouseup"); - }) - - }) - - function play() { - if (self.currenIndex == 0) { - self.currenIndex = self.length - 1 - } - self.goTo(self.currenIndex % self.length); - } - -} \ No newline at end of file diff --git a/custom/public/rotation3D/rotation3D.js b/custom/public/rotation3D/rotation3D.js index 5a29de481..8ec5b6938 100644 --- a/custom/public/rotation3D/rotation3D.js +++ b/custom/public/rotation3D/rotation3D.js @@ -166,8 +166,15 @@ Rotation3D.prototype.itemStyle = function($item, index, rotation) { 'transform': `scale(${scale})`, // 'top': `${this.itemWidth * (1-scale) }`, }) - var tmp = `translate(${x}px, ${y}px)` - $item.attr("style","position: absolute;display: inline-block;z-index: " + parseInt(scale * 100) + ";transform-origin:0px 0px;transform:" + tmp); + $item.css({ + position: 'absolute', + display: 'inline-block', + // opacity: scale, + 'z-index': parseInt(scale * 100), + 'transform-origin': '0px 0px', + // 'transform': `translate(${x}px, ${y}px) scale(${scale})`, + 'transform': `translate(${x}px, ${y}px)`, + }); /** * 线样式 diff --git a/templates/base/footer.tmpl b/templates/base/footer.tmpl index a013d724c..68af56e59 100644 --- a/templates/base/footer.tmpl +++ b/templates/base/footer.tmpl @@ -40,16 +40,14 @@ {{if .RequireTribute}} {{end}} -{{if .PageIsHome}} - - -{{end}} + {{template "custom/footer" .}} {{if .PageIsHome}} - + + From caaf01ccedabee5b6bd96bfb6e9ca5cf7fd56c54 Mon Sep 17 00:00:00 2001 From: OpenIhu Date: Mon, 30 May 2022 10:38:16 +0800 Subject: [PATCH 089/239] =?UTF-8?q?=E8=B0=83=E8=AF=95=E4=B8=8B=E6=9D=A5?= =?UTF-8?q?=E8=8F=9C=E5=8D=95=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web_src/js/index.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web_src/js/index.js b/web_src/js/index.js index f3f25c03a..ac492c36a 100755 --- a/web_src/js/index.js +++ b/web_src/js/index.js @@ -3967,7 +3967,7 @@ function initVueDataset() { }, methods: { copyUrl(url) { - const cInput = document.createElement('input') + const cInput = document.createElementNS('input') cInput.value = url document.body.appendChild(cInput) cInput.select() @@ -4915,7 +4915,7 @@ window.onOAuthLoginClick = function () { // Pull SVGs via AJAX to workaround CORS issues with tags // https://css-tricks.com/ajaxing-svg-sprite/ $.get(`${window.config.StaticUrlPrefix}/img/svg/icons.svg`, (data) => { - const div = document.createElement('div'); + const div = document.createElementNS('div'); div.style.display = 'none'; div.innerHTML = new XMLSerializer().serializeToString(data.documentElement); document.body.insertBefore(div, document.body.childNodes[0]); From cf0e8ae2467378446bc1acb0bdfc7c1d867c5dc6 Mon Sep 17 00:00:00 2001 From: OpenIhu Date: Mon, 30 May 2022 10:54:56 +0800 Subject: [PATCH 090/239] =?UTF-8?q?=E5=9B=9E=E9=80=80=E4=B8=8A=E4=B8=80?= =?UTF-8?q?=E6=AC=A1=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 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 b3e8e3d0e..316da2bf3 100755 --- a/web_src/js/index.js +++ b/web_src/js/index.js @@ -3955,7 +3955,7 @@ function initVueDataset() { }, methods: { copyUrl(url) { - const cInput = document.createElementNS('input') + const cInput = document.createElement('input') cInput.value = url document.body.appendChild(cInput) cInput.select() From 1cd3c2c2c166ece10ea4106ead02a6d477bd39b6 Mon Sep 17 00:00:00 2001 From: liuzx Date: Mon, 30 May 2022 11:14:44 +0800 Subject: [PATCH 091/239] update --- models/cloudbrain_static.go | 6 ++-- routers/api/v1/repo/cloudbrain_dashboard.go | 39 +++++++++++++++------ 2 files changed, 30 insertions(+), 15 deletions(-) diff --git a/models/cloudbrain_static.go b/models/cloudbrain_static.go index 7239c5d89..e582af829 100644 --- a/models/cloudbrain_static.go +++ b/models/cloudbrain_static.go @@ -8,9 +8,6 @@ import ( "code.gitea.io/gitea/modules/timeutil" ) -type AllTask struct { - List []TaskDetail `json:"list"` -} type TaskDetail struct { ID int64 `json:"ID"` JobName string `json:"JobName"` @@ -24,7 +21,8 @@ type TaskDetail struct { EndTime timeutil.TimeStamp `json:"EndTime"` ComputeResource string `json:"ComputeResource"` Type int `json:"Type"` - UserID int64 `json:"UserID"` + UserName string `json:"UserName"` + RepoName string `json:"RepoName"` RepoID int64 `json:"RepoID"` } diff --git a/routers/api/v1/repo/cloudbrain_dashboard.go b/routers/api/v1/repo/cloudbrain_dashboard.go index f2ff3b5b8..417f1de87 100644 --- a/routers/api/v1/repo/cloudbrain_dashboard.go +++ b/routers/api/v1/repo/cloudbrain_dashboard.go @@ -481,16 +481,34 @@ func GetCloudbrainsDetailData(ctx *context.Context) { ctx.ServerError("Get job failed:", err) return } - res := &models.AllTask{} - res.List = []models.TaskDetail{} + // res := &models.AllTask{} + tasks := []models.TaskDetail{} for i, task := range ciTasks { - ciTasks[i].CanDebug = true - ciTasks[i].CanDel = true ciTasks[i].Cloudbrain.ComputeResource = task.ComputeResource - var dataOne models.TaskDetail - dataOne.DisplayJobName = ciTasks[i].DisplayJobName - res.List = append(res.List, dataOne) + var taskDetail models.TaskDetail + taskDetail.ID = ciTasks[i].Cloudbrain.ID + taskDetail.JobName = ciTasks[i].JobName + taskDetail.DisplayJobName = ciTasks[i].DisplayJobName + taskDetail.Status = ciTasks[i].Status + taskDetail.JobType = ciTasks[i].JobType + taskDetail.CreatedUnix = ciTasks[i].Cloudbrain.CreatedUnix + taskDetail.RunTime = ciTasks[i].EndTime - ciTasks[i].StartTime + taskDetail.StartTime = ciTasks[i].StartTime + taskDetail.EndTime = ciTasks[i].EndTime + taskDetail.ComputeResource = ciTasks[i].ComputeResource + taskDetail.Type = ciTasks[i].Cloudbrain.Type + taskDetail.UserName = ciTasks[i].User.Name + taskDetail.RepoID = ciTasks[i].RepoID + if ciTasks[i].Repo != nil { + taskDetail.RepoName = ciTasks[i].Repo.OwnerName + "/" + ciTasks[i].Repo.Name + } + taskDetail.WaitTime = ciTasks[i].StartTime - ciTasks[i].Cloudbrain.CreatedUnix + if taskDetail.WaitTime < 0 { + taskDetail.WaitTime = 0 + } + + tasks = append(tasks, taskDetail) } pager := context.NewPagination(int(count), setting.UI.IssuePagingNum, page, getTotalPage(count, setting.UI.IssuePagingNum)) @@ -498,10 +516,9 @@ func GetCloudbrainsDetailData(ctx *context.Context) { pager.AddParam(ctx, "listType", "ListType") ctx.JSON(http.StatusOK, map[string]interface{}{ - "Title": ctx.Tr("kanban.cloudBrains"), - "Tasks": ciTasks, - "CanCreate": true, - "Keyword": keyword, + "Title": ctx.Tr("kanban.cloudBrains"), + "Tasks": tasks, + "Keyword": keyword, }) } From c52d1aa1af5a4c6aa21ce1f1ed8caccffe139060 Mon Sep 17 00:00:00 2001 From: liuzx Date: Mon, 30 May 2022 11:56:33 +0800 Subject: [PATCH 092/239] update --- routers/api/v1/repo/cloudbrain_dashboard.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/routers/api/v1/repo/cloudbrain_dashboard.go b/routers/api/v1/repo/cloudbrain_dashboard.go index 417f1de87..871b4a793 100644 --- a/routers/api/v1/repo/cloudbrain_dashboard.go +++ b/routers/api/v1/repo/cloudbrain_dashboard.go @@ -519,6 +519,8 @@ func GetCloudbrainsDetailData(ctx *context.Context) { "Title": ctx.Tr("kanban.cloudBrains"), "Tasks": tasks, "Keyword": keyword, + "pager": pager, + "count": count, }) } From 651cf3fb787e061b575665660592e4e6defe440a Mon Sep 17 00:00:00 2001 From: OpenIhu Date: Mon, 30 May 2022 14:56:13 +0800 Subject: [PATCH 093/239] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E4=B8=8B=E6=8B=89=E8=8F=9C=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- templates/base/head_navbar.tmpl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/templates/base/head_navbar.tmpl b/templates/base/head_navbar.tmpl index 741bd567e..51761a7e5 100755 --- a/templates/base/head_navbar.tmpl +++ b/templates/base/head_navbar.tmpl @@ -34,7 +34,7 @@ {{.i18n.Tr "custom.head.project"}} {{.i18n.Tr "custom.head.dataset"}} -