Merge branch 'V20221130' into zouap

models/cloudbrain.go

@@ -2344,6 +2344,61 @@ func CloudbrainAllStatic(opts *CloudbrainsOptions) ([]*CloudbrainInfo, int64, er
 	return cloudbrains, count, nil
 }
 
+func CloudbrainAllKanBan(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},
+		)
+	}
+	if opts.BeginTimeUnix > 0 && opts.EndTimeUnix > 0 {
+		cond = cond.And(
+			builder.And(builder.Gte{"cloudbrain.created_unix": opts.BeginTimeUnix}, builder.Lte{"cloudbrain.created_unix": opts.EndTimeUnix}),
+		)
+	}
+	var count int64
+	var err error
+	count, err = sess.Unscoped().Where(cond).Count(new(Cloudbrain))
+
+	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.Cols("id", "type", "work_server_number", "duration", "train_job_duration", "ai_center", "cluster").Table(&Cloudbrain{}).Unscoped().Where(cond).
+		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
+}
+
 func GetStartedCloudbrainTaskByUpdatedUnix(startTime, endTime time.Time) ([]Cloudbrain, error) {
 	r := make([]Cloudbrain, 0)
 	err := x.Where("updated_unix >= ? and updated_unix <= ? and start_time > 0", startTime.Unix(), endTime.Unix()).Unscoped().Find(&r)

models/cloudbrain_static.go

@@ -46,7 +46,8 @@ type CloudbrainDurationStatistic struct {
 	ComputeResource string
 	AccCardType     string `xorm:"INDEX"`
 
-	DateTime           timeutil.TimeStamp `xorm:"INDEX"`
+	DateTime           timeutil.TimeStamp `xorm:"INDEX DEFAULT 0"`
+	DateTimeUnix       timeutil.TimeStamp `xorm:"INDEX DEFAULT 0"`
 	DayTime            string             `xorm:"INDEX"`
 	HourTime           int                `xorm:"INDEX"`
 	CardsUseDuration   int
@@ -274,7 +275,6 @@ func GetCloudbrainByTime(beginTime int64, endTime int64) ([]*CloudbrainInfo, err
 	sess := x.NewSession()
 	defer sess.Close()
 	var cond = builder.NewCond()
-	sess.Exec("if ")
 	cond = cond.Or(
 		builder.And(builder.Gte{"cloudbrain.end_time": beginTime}, builder.Lte{"cloudbrain.start_time": beginTime}, builder.Gt{"cloudbrain.start_time": 0}),
 	)
@@ -284,11 +284,12 @@ func GetCloudbrainByTime(beginTime int64, endTime int64) ([]*CloudbrainInfo, err
 	cond = cond.Or(
 		builder.And(builder.Eq{"cloudbrain.status": string(JobRunning)}),
 	)
-	sess.OrderBy("cloudbrain.created_unix ASC")
+	sess.OrderBy("cloudbrain.id ASC")
 	cloudbrains := make([]*CloudbrainInfo, 0, 10)
 	if err := sess.Table(&Cloudbrain{}).Unscoped().Where(cond).
 		Find(&cloudbrains); err != nil {
-		log.Info("find error.")
+		log.Error("find error.")
+		return nil, err
 	}
 	return cloudbrains, nil
 }
@@ -303,7 +304,8 @@ func GetSpecByAiCenterCodeAndType(aiCenterCode string, accCardType string) ([]*C
 	cloudbrainSpecs := make([]*CloudbrainSpec, 0, 10)
 	if err := sess.Table(&CloudbrainSpec{}).Where(cond).
 		Find(&cloudbrainSpecs); err != nil {
-		log.Info("find error.")
+		log.Error("find error.")
+		return nil, err
 	}
 	return cloudbrainSpecs, nil
 }
@@ -328,7 +330,8 @@ func GetCanUseCardInfo() ([]*ResourceQueue, error) {
 	sess.OrderBy("resource_queue.cluster DESC, resource_queue.ai_center_code ASC")
 	ResourceQueues := make([]*ResourceQueue, 0, 10)
 	if err := sess.Table(&ResourceQueue{}).Find(&ResourceQueues); err != nil {
-		log.Info("find error.")
+		log.Error("find error.")
+		return nil, err
 	}
 	return ResourceQueues, nil
 }
@@ -339,7 +342,7 @@ func GetCardDurationStatistics(opts *DurationStatisticOptions) ([]*CloudbrainDur
 	var cond = builder.NewCond()
 	if opts.BeginTime.Unix() > 0 && opts.EndTime.Unix() > 0 {
 		cond = cond.And(
-			builder.And(builder.Gte{"cloudbrain_duration_statistic.date_time": opts.BeginTime.Unix()}, builder.Lt{"cloudbrain_duration_statistic.date_time": opts.EndTime.Unix()}),
+			builder.And(builder.Gte{"cloudbrain_duration_statistic.date_time_unix": opts.BeginTime.Unix()}, builder.Lt{"cloudbrain_duration_statistic.date_time_unix": opts.EndTime.Unix()}),
 		)
 	}
 	if opts.AiCenterCode != "" {
@@ -350,7 +353,8 @@ func GetCardDurationStatistics(opts *DurationStatisticOptions) ([]*CloudbrainDur
 	CloudbrainDurationStatistics := make([]*CloudbrainDurationStatistic, 0, 10)
 	if err := sess.Table(&CloudbrainDurationStatistic{}).Where(cond).
 		Find(&CloudbrainDurationStatistics); err != nil {
-		log.Info("find error.")
+		log.Error("find error.")
+		return nil, err
 	}
 	return CloudbrainDurationStatistics, nil
 }
@@ -358,10 +362,18 @@ func GetCardDurationStatistics(opts *DurationStatisticOptions) ([]*CloudbrainDur
 func GetDurationRecordBeginTime() ([]*CloudbrainDurationStatistic, error) {
 	sess := xStatistic.NewSession()
 	defer sess.Close()
-	sess.OrderBy("cloudbrain_duration_statistic.date_time ASC limit 1")
+
+	var cond = builder.NewCond()
+
+	cond = cond.And(
+		builder.Gt{"cloudbrain_duration_statistic.date_time_unix": 0},
+	)
+
+	sess.OrderBy("cloudbrain_duration_statistic.date_time_unix ASC limit 1")
 	CloudbrainDurationStatistics := make([]*CloudbrainDurationStatistic, 0)
-	if err := sess.Table(&CloudbrainDurationStatistic{}).Find(&CloudbrainDurationStatistics); err != nil {
-		log.Info("find error.")
+	if err := sess.Table(&CloudbrainDurationStatistic{}).Where(cond).Find(&CloudbrainDurationStatistics); err != nil {
+		log.Error("find error.")
+		return nil, err
 	}
 	return CloudbrainDurationStatistics, nil
 }
@@ -369,10 +381,16 @@ func GetDurationRecordBeginTime() ([]*CloudbrainDurationStatistic, error) {
 func GetDurationRecordUpdateTime() ([]*CloudbrainDurationStatistic, error) {
 	sess := xStatistic.NewSession()
 	defer sess.Close()
-	sess.OrderBy("cloudbrain_duration_statistic.date_time DESC limit 1")
+	var cond = builder.NewCond()
+
+	cond = cond.And(
+		builder.Gt{"cloudbrain_duration_statistic.date_time_unix": 1577808000},
+	)
+	sess.OrderBy("cloudbrain_duration_statistic.date_time_unix DESC limit 1")
 	CloudbrainDurationStatistics := make([]*CloudbrainDurationStatistic, 0)
-	if err := sess.Table(&CloudbrainDurationStatistic{}).Find(&CloudbrainDurationStatistics); err != nil {
-		log.Info("find error.")
+	if err := sess.Table(&CloudbrainDurationStatistic{}).Where(cond).Find(&CloudbrainDurationStatistics); err != nil {
+		log.Error("find error.")
+		return nil, err
 	}
 	return CloudbrainDurationStatistics, nil
 }
@@ -380,8 +398,8 @@ func GetDurationRecordUpdateTime() ([]*CloudbrainDurationStatistic, error) {
 func DeleteCloudbrainDurationStatistic(beginTime timeutil.TimeStamp, endTime timeutil.TimeStamp) error {
 	sess := xStatistic.NewSession()
 	defer sess.Close()
-	if _, err := sess.Exec("DELETE FROM cloudbrain_duration_statistic WHERE cloudbrain_duration_statistic.date_time BETWEEN ? AND ?", beginTime, endTime); err != nil {
-		log.Info("DELETE cloudbrain_duration_statistic data error.")
+	if _, err := sess.Exec("DELETE FROM cloudbrain_duration_statistic WHERE cloudbrain_duration_statistic.date_time_unix BETWEEN ? AND ?", beginTime, endTime); err != nil {
+		log.Error("DELETE cloudbrain_duration_statistic data error.")
 		return err
 	}
 	return nil

modules/setting/setting.go

@@ -584,6 +584,8 @@ var (
 	TrainJobFLAVORINFOS   string
 	ModelArtsSpecialPools string
 	ModelArtsMultiNode    string
+	//kanban
+	IsCloudbrainTimingEnabled bool
 
 	// modelarts-cd config
 	ModelartsCD = struct {
@@ -1609,6 +1611,9 @@ func NewContext() {
 	FileNoteBook.ImageNPUDescription = sec.Key("image_npu_desc").MustString("")
 	FileNoteBook.ImageNPUCDDescription = sec.Key("image_npu_cd_desc").MustString("")
 
+	sec = Cfg.Section("kanban")
+	IsCloudbrainTimingEnabled = sec.Key("ENABLED").MustBool(false)
+
 	getGrampusConfig()
 	getModelartsCDConfig()
 	getModelConvertConfig()

options/locale/locale_en-US.ini

@@ -261,7 +261,7 @@ page_dev_env_desc3_title=Once Configuration, Multiple Reuse
 page_dev_env_desc3_desc=Provide execution environment sharing, Once Configuration, Multiple Reuse. Lower the threshold of model development, and avoid spending repetitive time configuring complex environments.
 page_dev_yunlao=OpenI AI Collaboration Platform
 page_dev_yunlao_desc1=OpenI AI collaboration platform has cooperated with Pengcheng cloud brain and China computing power network (C²NET) can be used to complete AI development tasks by using the rich computing resources of Pengcheng cloud brain and China computing network.
-page_dev_yunlao_desc2=Pengcheng CloudBrain's existing AI computing power is 100p FLOPS@FP16 (billions of half precision floating-point calculations per second), the main hardware infrastructure consists of GPU servers equipped with NVIDIA Tesla V100 and A100, and Atlas 900 AI clusters equipped with Kunpeng and shengteng processors.
+page_dev_yunlao_desc2=Pengcheng CloudBrain is existing AI computing power is 100p FLOPS@FP16 (billions of half precision floating-point calculations per second), the main hardware infrastructure consists of GPU servers equipped with NVIDIA Tesla V100 and A100, and Atlas 900 AI clusters equipped with Kunpeng and shengteng processors.
 page_dev_yunlao_desc3=China computing power network (C²NET) phase I can realize high-speed network interconnection between different artificial intelligence computing centers, and realize reasonable scheduling of computing power and flexible allocation of resources. At present, 11 intelligent computing centers have been connected, and the total scale of computing power is 1924p OPS@FP16. OpenI AI collaboration platform has been connected to Pengcheng Cloud Computing Institute, Chengdu Intelligent Computing Center, Zhongyuan Intelligent Computing Center, Hefei brain and other nodes.
 page_dev_yunlao_desc4=Developers can freely select the corresponding computing resources according to the use needs, and can test the adaptability, performance, stability, etc. of the model in different hardware environments.
 page_dev_yunlao_desc5=If your model requires more computing resources, you can also apply for it separately.
@@ -353,8 +353,10 @@ account_activated = Account has been activated
 prohibit_login = Sign In Prohibited
 prohibit_login_desc = Your account is prohibited to sign in, please contact your site administrator.
 resent_limit_prompt = You have already requested an activation email recently. Please wait 3 minutes and try again.
-has_unconfirmed_mail = Hi %s, you have an unconfirmed email address (<b>%s</b>). If you haven't received a confirmation email or need to resend a new one, please click on the button below.
-resend_mail = Click here to resend your activation email
+has_unconfirmed_mail = Hi %s, you have an unconfirmed email address (<b>%s</b>).
+has_unconfirmed_mail_resend = If you did not receive the activation email, or need to resend it, please click the "Resend your activation email" button below.
+has_unconfirmed_mail_change =If you need to change your email address before sending an activation email, please click the "Change email" button below.
+resend_mail = Resend your activation email
 email_not_associate = The email address is not associated with any account.
 email_not_main=The email address is wrong, please input your primary email address.
 email_not_right=The email address is not associated with any account, please input the right email address.

options/locale/locale_zh-CN.ini

@@ -356,8 +356,10 @@ account_activated=帐户已激活
 prohibit_login=禁止登录
 prohibit_login_desc=您的帐户被禁止登录，请与网站管理员联系。
 resent_limit_prompt=您请求发送激活邮件过于频繁，请等待 3 分钟后再试！
-has_unconfirmed_mail=%s 您好，系统检测到您有一封发送至 <b>%s</b> 但未被确认的邮件。如果您未收到激活邮件，或需要重新发送，请单击下方的按钮。
-resend_mail=单击此处重新发送确认邮件
+has_unconfirmed_mail=%s 您好，系统检测到您有一封发送至 <b>%s</b> 但未被确认的邮件。
+has_unconfirmed_mail_resend=如果您未收到激活邮件，或需要重新发送，请单击下方的 "重新发送确认邮件 " 按钮。
+has_unconfirmed_mail_change=如果您需要更改邮箱后再发送激活邮件，请单击下方的 "修改邮箱" 按钮。
+resend_mail=重新发送确认邮件
 email_not_associate=您输入的邮箱地址未被关联到任何帐号！
 email_not_main=电子邮箱地址不正确，请输入您设置的主要邮箱地址。
 email_not_right=您输入了不存在的邮箱地址，请输入正确的邮箱地址。

routers/api/v1/repo/cloudbrain_dashboard.go

@@ -11,6 +11,7 @@ import (
 	"code.gitea.io/gitea/models"
 	"code.gitea.io/gitea/modules/context"
 	"code.gitea.io/gitea/modules/log"
+	"code.gitea.io/gitea/modules/timeutil"
 	"code.gitea.io/gitea/routers/repo"
 	cloudbrainService "code.gitea.io/gitea/services/cloudbrain"
 	"code.gitea.io/gitea/services/cloudbrain/resource"
@@ -58,42 +59,30 @@ func GetAllCloudbrainsOverview(ctx *context.Context) {
 		return
 	}
 	cloudbrainTypeCount, err := models.GetCloudbrainTypeCount()
-	log.Info("cloudbrainTypeCount:", cloudbrainTypeCount)
 	if err != nil {
 		log.Error("Can not query cloudbrainTypeCount.", err)
 		return
 	}
 
-	cloudbrainTpyeDurationSum, err := models.GetCloudbrainTpyeDurationSum()
-	log.Info("cloudbrainTpyeDurationSum:", cloudbrainTpyeDurationSum)
-	if err != nil {
-		log.Error("Can not query cloudbrainTpyeDurationSum.", err)
-		return
-	}
-
 	todayCloudbrainCount, err := models.GetTodayCloudbrainCount(beginTime, endTime)
-	log.Info("todayCloudbrainCount:", todayCloudbrainCount)
 	if err != nil {
 		log.Error("Can not query todayCloudbrainCount.", err)
 		return
 	}
 
 	todayRunningCount, err := models.GetTodayRunningCount(beginTime, endTime)
-	log.Info("todayRunningCount:", todayRunningCount)
 	if err != nil {
 		log.Error("Can not query todayRunningCount.", err)
 		return
 	}
 
 	todayWaitingCount, err := models.GetTodayWaitingCount(beginTime, endTime)
-	log.Info("todayWaittingCount:", todayWaitingCount)
 	if err != nil {
 		log.Error("Can not query todayWaitingCount.", err)
 		return
 	}
 
 	todayCompletedCount := todayCloudbrainCount - todayRunningCount - todayWaitingCount
-	log.Info("todayCompletedCount:", todayCompletedCount)
 
 	creatorCount, err := models.GetCreatorCount()
 	if err != nil {
@@ -139,60 +128,48 @@ func GetOverviewDuration(ctx *context.Context) {
 	c2NetDuration := int64(0)
 	cDCenterDuration := int64(0)
 
-	page := 1
-	pagesize := 10000
-	count := pagesize
-	// Each time a maximum of 10000 pieces of data are detected to the memory, batch processing
-	for count == pagesize && count != 0 {
-		cloudbrains, _, err := models.CloudbrainAllStatic(&models.CloudbrainsOptions{
-			ListOptions: models.ListOptions{
-				Page:     page,
-				PageSize: pagesize,
-			},
-			Type:          models.TypeCloudBrainAll,
-			BeginTimeUnix: int64(recordBeginTime),
-			EndTimeUnix:   endTime.Unix(),
-		})
-		if err != nil {
-			ctx.ServerError("Get cloudbrains failed:", err)
-			return
-		}
-		models.LoadSpecs4CloudbrainInfo(cloudbrains)
-
-		for _, cloudbrain := range cloudbrains {
-			cloudbrain = cloudbrainService.UpdateCloudbrainAiCenter(cloudbrain)
-			if cloudbrain.Cloudbrain.Spec != nil {
-				cardNum = int64(cloudbrain.Cloudbrain.Spec.AccCardsNum)
-			} else {
-				cardNum = 1
-			}
-			if cloudbrain.Cloudbrain.WorkServerNumber >= 1 {
-				workServerNumber = int64(cloudbrain.Cloudbrain.WorkServerNumber)
-			} else {
-				workServerNumber = 1
-			}
-			duration := models.ConvertStrToDuration(cloudbrain.TrainJobDuration)
-			CardDuration := workServerNumber * int64(cardNum) * duration
-
-			if cloudbrain.Cloudbrain.Type == models.TypeCloudBrainOne {
-				cloudBrainOneDuration += duration
-				cloudBrainOneCardDuSum += CardDuration
-			} else if cloudbrain.Cloudbrain.Type == models.TypeCloudBrainTwo {
-				cloudBrainTwoDuration += duration
-				cloudBrainTwoCardDuSum += CardDuration
-			} else if cloudbrain.Cloudbrain.Type == models.TypeC2Net {
-				c2NetDuration += duration
-				c2NetCardDuSum += CardDuration
-			} else if cloudbrain.Cloudbrain.Type == models.TypeCDCenter {
-				cDCenterDuration += duration
-				cDNetCardDuSum += CardDuration
-			}
+	cloudbrains, _, err := models.CloudbrainAllKanBan(&models.CloudbrainsOptions{
+		Type:          models.TypeCloudBrainAll,
+		BeginTimeUnix: int64(recordBeginTime),
+		EndTimeUnix:   endTime.Unix(),
+	})
+	if err != nil {
+		ctx.ServerError("Get cloudbrains failed:", err)
+		return
+	}
+	models.LoadSpecs4CloudbrainInfo(cloudbrains)
 
-			durationAllSum += duration
-			cardDuSum += CardDuration
+	for _, cloudbrain := range cloudbrains {
+		cloudbrain = cloudbrainService.UpdateCloudbrainAiCenter(cloudbrain)
+		if cloudbrain.Cloudbrain.Spec != nil {
+			cardNum = int64(cloudbrain.Cloudbrain.Spec.AccCardsNum)
+		} else {
+			cardNum = 1
 		}
-		count = len(cloudbrains)
-		page += 1
+		if cloudbrain.Cloudbrain.WorkServerNumber >= 1 {
+			workServerNumber = int64(cloudbrain.Cloudbrain.WorkServerNumber)
+		} else {
+			workServerNumber = 1
+		}
+		duration := models.ConvertStrToDuration(cloudbrain.TrainJobDuration)
+		CardDuration := workServerNumber * int64(cardNum) * duration
+
+		if cloudbrain.Cloudbrain.Type == models.TypeCloudBrainOne {
+			cloudBrainOneDuration += duration
+			cloudBrainOneCardDuSum += CardDuration
+		} else if cloudbrain.Cloudbrain.Type == models.TypeCloudBrainTwo {
+			cloudBrainTwoDuration += duration
+			cloudBrainTwoCardDuSum += CardDuration
+		} else if cloudbrain.Cloudbrain.Type == models.TypeC2Net {
+			c2NetDuration += duration
+			c2NetCardDuSum += CardDuration
+		} else if cloudbrain.Cloudbrain.Type == models.TypeCDCenter {
+			cDCenterDuration += duration
+			cDNetCardDuSum += CardDuration
+		}
+
+		durationAllSum += duration
+		cardDuSum += CardDuration
 	}
 	ctx.JSON(http.StatusOK, map[string]interface{}{
 		"cloudBrainOneCardDuSum": cloudBrainOneCardDuSum,
@@ -1488,12 +1465,17 @@ func getCloudbrainTimePeroid(ctx *context.Context, recordBeginTime time.Time) (t
 }
 
 func GetCloudbrainResourceOverview(ctx *context.Context) {
+	var recordBeginTime timeutil.TimeStamp
 	recordCloudbrainDuration, err := models.GetDurationRecordBeginTime()
 	if err != nil {
 		log.Error("Can not get GetDurationRecordBeginTime", err)
 		return
 	}
-	recordBeginTime := recordCloudbrainDuration[0].DateTime
+	if len(recordCloudbrainDuration) > 0 && err == nil {
+		recordBeginTime = recordCloudbrainDuration[0].DateTimeUnix
+	} else {
+		recordBeginTime = timeutil.TimeStamp(time.Now().Unix())
+	}
 	recordUpdateTime := time.Now().Unix()
 	resourceQueues, err := models.GetCanUseCardInfo()
 	if err != nil {
@@ -1620,6 +1602,7 @@ func getBeginAndEndTime(ctx *context.Context) (time.Time, time.Time) {
 	now := time.Now()
 	beginTimeStr := ctx.QueryTrim("beginTime")
 	endTimeStr := ctx.QueryTrim("endTime")
+	var brainRecordBeginTime time.Time
 
 	var beginTime time.Time
 	var endTime time.Time
@@ -1632,7 +1615,12 @@ func getBeginAndEndTime(ctx *context.Context) (time.Time, time.Time) {
 				ctx.Error(http.StatusBadRequest, ctx.Tr("repo.record_begintime_get_err"))
 				return beginTime, endTime
 			}
-			brainRecordBeginTime := recordCloudbrainDuration[0].DateTime.AsTime()
+			if len(recordCloudbrainDuration) > 0 && err == nil {
+				brainRecordBeginTime = recordCloudbrainDuration[0].DateTimeUnix.AsTime()
+			} else {
+				brainRecordBeginTime = now
+			}
+
 			beginTime = brainRecordBeginTime
 			endTime = now
 		} else if queryType == "today" {
@@ -1674,7 +1662,11 @@ func getBeginAndEndTime(ctx *context.Context) (time.Time, time.Time) {
 				ctx.Error(http.StatusBadRequest, ctx.Tr("repo.record_begintime_get_err"))
 				return beginTime, endTime
 			}
-			brainRecordBeginTime := recordCloudbrainDuration[0].DateTime.AsTime()
+			if len(recordCloudbrainDuration) > 0 && err == nil {
+				brainRecordBeginTime = recordCloudbrainDuration[0].DateTimeUnix.AsTime()
+			} else {
+				brainRecordBeginTime = now
+			}
 			beginTime = brainRecordBeginTime
 			endTime = now
 		} else {
@@ -1705,7 +1697,7 @@ func getAiCenterUsageDuration(beginTime time.Time, endTime time.Time, cloudbrain
 	usageRate := float64(0)
 
 	for _, cloudbrainStatistic := range cloudbrainStatistics {
-		if int64(cloudbrainStatistic.DateTime) >= beginTime.Unix() && int64(cloudbrainStatistic.DateTime) < endTime.Unix() {
+		if int64(cloudbrainStatistic.DateTimeUnix) >= beginTime.Unix() && int64(cloudbrainStatistic.DateTimeUnix) < endTime.Unix() {
 			totalDuration += cloudbrainStatistic.CardsTotalDuration
 			usageDuration += cloudbrainStatistic.CardsUseDuration
 		}

routers/repo/cloudbrain_statistic.go

@@ -1,6 +1,7 @@
 package repo
 
 import (
+	"fmt"
 	"net/http"
 	"strings"
 	"time"
@@ -8,37 +9,39 @@ import (
 	"code.gitea.io/gitea/models"
 	"code.gitea.io/gitea/modules/context"
 	"code.gitea.io/gitea/modules/log"
+	"code.gitea.io/gitea/modules/setting"
 	"code.gitea.io/gitea/modules/timeutil"
 	cloudbrainService "code.gitea.io/gitea/services/cloudbrain"
 )
 
 func CloudbrainDurationStatisticHour() {
-	var statisticTime time.Time
-	var count int64
-	recordDurationUpdateTime, err := models.GetDurationRecordUpdateTime()
-	if err != nil {
-		log.Error("Can not get GetDurationRecordBeginTime", err)
-	}
-	now := time.Now()
-	currentTime := time.Date(now.Year(), now.Month(), now.Day(), now.Hour(), 0, 0, 0, now.Location())
-	if err == nil && len(recordDurationUpdateTime) > 0 {
-		statisticTime = time.Unix(int64(recordDurationUpdateTime[0].DateTime), 0).Add(+1 * time.Hour)
-	} else {
-		statisticTime = currentTime
-	}
-	deleteBeginTime := time.Unix(int64(recordDurationUpdateTime[0].DateTime), 0)
+	if setting.IsCloudbrainTimingEnabled {
+		var statisticTime time.Time
+		var count int64
+		recordDurationUpdateTime, err := models.GetDurationRecordUpdateTime()
+		if err != nil {
+			log.Error("Can not get GetDurationRecordBeginTime", err)
+		}
+		now := time.Now()
+		currentTime := time.Date(now.Year(), now.Month(), now.Day(), now.Hour(), 0, 0, 0, now.Location())
+		if err == nil && len(recordDurationUpdateTime) > 0 {
+			statisticTime = time.Unix(int64(recordDurationUpdateTime[0].DateTimeUnix), 0).Add(+1 * time.Hour)
+		} else {
+			statisticTime = currentTime
+		}
 
-	err = models.DeleteCloudbrainDurationStatistic(timeutil.TimeStamp(deleteBeginTime.Unix()), timeutil.TimeStamp(currentTime.Unix()))
-	if err != nil {
-		log.Error("DeleteCloudbrainDurationStatistic failed", err)
-	}
+		err = models.DeleteCloudbrainDurationStatistic(timeutil.TimeStamp(statisticTime.Unix()), timeutil.TimeStamp(currentTime.Unix()))
+		if err != nil {
+			log.Error("DeleteCloudbrainDurationStatistic failed", err)
+		}
 
-	for statisticTime.Before(currentTime) || statisticTime.Equal(currentTime) {
-		countEach := summaryDurationStat(statisticTime)
-		count += countEach
-		statisticTime = statisticTime.Add(+1 * time.Hour)
+		for statisticTime.Before(currentTime) || statisticTime.Equal(currentTime) {
+			countEach := summaryDurationStat(statisticTime)
+			count += countEach
+			statisticTime = statisticTime.Add(+1 * time.Hour)
+		}
+		log.Info("summaryDurationStat count: %v", count)
 	}
-	log.Info("summaryDurationStat count: %v", count)
 }
 func UpdateDurationStatisticHistoryData(beginTime time.Time, endTime time.Time) int64 {
 	var count int64
@@ -55,7 +58,7 @@ func UpdateDurationStatisticHistoryData(beginTime time.Time, endTime time.Time)
 //statisticTime是当前的时辰，比如当前是2019-01-01 12:01:01，那么statisticTime就是2019-01-01 12:00:00
 func summaryDurationStat(statisticTime time.Time) int64 {
 	var count int64
-	dateTime := timeutil.TimeStamp(statisticTime.Add(-1 * time.Hour).Unix())
+	dateTimeUnix := timeutil.TimeStamp(statisticTime.Add(-1 * time.Hour).Unix())
 	beginTime := statisticTime.Add(-1 * time.Hour).Unix()
 	dayTime := statisticTime.Add(-1 * time.Hour).Format("2006-01-02")
 	hourTime := statisticTime.Add(-1 * time.Hour).Hour()
@@ -66,27 +69,9 @@ func summaryDurationStat(statisticTime time.Time) int64 {
 		log.Info("GetCloudbrainByTime err: %v", err)
 		return 0
 	}
-	cloudbrainMap := make(map[string]*models.Cloudbrain)
+	fmt.Printf("ciTasks:", ciTasks[0].Cloudbrain.JobName)
 	models.LoadSpecs4CloudbrainInfo(ciTasks)
-
-	for _, cloudbrain := range ciTasks {
-		if cloudbrain.Cloudbrain.StartTime == 0 {
-			cloudbrain.Cloudbrain.StartTime = cloudbrain.Cloudbrain.CreatedUnix
-		}
-		if cloudbrain.Cloudbrain.EndTime == 0 {
-			cloudbrain.Cloudbrain.EndTime = cloudbrain.Cloudbrain.UpdatedUnix
-		}
-		cloudbrain = cloudbrainService.UpdateCloudbrainAiCenter(cloudbrain)
-		if cloudbrain.Cloudbrain.Spec != nil {
-			if _, ok := cloudbrainMap[cloudbrain.Cloudbrain.AiCenter+"/"+cloudbrain.Cloudbrain.Spec.AccCardType]; !ok {
-				if cloudbrain.Cloudbrain.Spec != nil {
-					cloudbrainMap[cloudbrain.Cloudbrain.AiCenter+"/"+cloudbrain.Cloudbrain.Spec.AccCardType] = &cloudbrain.Cloudbrain
-				}
-			}
-		}
-	}
-
-	cloudBrainCenterCodeAndCardTypeInfo := getcloudBrainCenterCodeAndCardTypeInfo(ciTasks, beginTime, endTime)
+	cloudBrainCenterCodeAndCardTypeInfo, cloudbrainMap := getcloudBrainCenterCodeAndCardTypeInfo(ciTasks, beginTime, endTime)
 
 	resourceQueues, err := models.GetCanUseCardInfo()
 	if err != nil {
@@ -111,7 +96,7 @@ func summaryDurationStat(statisticTime time.Time) int64 {
 					cardsTotalDurationMap[cloudbrainTable.Cluster+"/"+centerCode+"/"+cardType] = 0
 				}
 				cloudbrainDurationStat := models.CloudbrainDurationStatistic{
-					DateTime:           dateTime,
+					DateTimeUnix:       dateTimeUnix,
 					DayTime:            dayTime,
 					HourTime:           hourTime,
 					Cluster:            cloudbrainTable.Cluster,
@@ -133,7 +118,7 @@ func summaryDurationStat(statisticTime time.Time) int64 {
 
 	for key, cardsTotalDuration := range cardsTotalDurationMap {
 		cloudbrainDurationStat := models.CloudbrainDurationStatistic{
-			DateTime:           dateTime,
+			DateTimeUnix:       dateTimeUnix,
 			DayTime:            dayTime,
 			HourTime:           hourTime,
 			Cluster:            strings.Split(key, "/")[0],
@@ -170,11 +155,27 @@ func GetAiCenterNameByCode(centerCode string, language string) string {
 	return aiCenterName
 }
 
-func getcloudBrainCenterCodeAndCardTypeInfo(ciTasks []*models.CloudbrainInfo, beginTime int64, endTime int64) map[string]map[string]int {
+func getcloudBrainCenterCodeAndCardTypeInfo(ciTasks []*models.CloudbrainInfo, beginTime int64, endTime int64) (map[string]map[string]int, map[string]*models.Cloudbrain) {
 	var WorkServerNumber int
 	var AccCardsNum int
+	cloudbrainMap := make(map[string]*models.Cloudbrain)
 	cloudBrainCenterCodeAndCardType := make(map[string]map[string]int)
 	for _, cloudbrain := range ciTasks {
+		if cloudbrain.Cloudbrain.StartTime == 0 {
+			cloudbrain.Cloudbrain.StartTime = cloudbrain.Cloudbrain.CreatedUnix
+		}
+		if cloudbrain.Cloudbrain.EndTime == 0 {
+			cloudbrain.Cloudbrain.EndTime = timeutil.TimeStamp(time.Now().Unix())
+		}
+		cloudbrain = cloudbrainService.UpdateCloudbrainAiCenter(cloudbrain)
+		if cloudbrain.Cloudbrain.Spec != nil {
+			if _, ok := cloudbrainMap[cloudbrain.Cloudbrain.AiCenter+"/"+cloudbrain.Cloudbrain.Spec.AccCardType]; !ok {
+				if cloudbrain.Cloudbrain.Spec != nil {
+					cloudbrainMap[cloudbrain.Cloudbrain.AiCenter+"/"+cloudbrain.Cloudbrain.Spec.AccCardType] = &cloudbrain.Cloudbrain
+				}
+			}
+		}
+
 		cloudbrain = cloudbrainService.UpdateCloudbrainAiCenter(cloudbrain)
 		if cloudbrain.Cloudbrain.StartTime == 0 {
 			cloudbrain.Cloudbrain.StartTime = cloudbrain.Cloudbrain.CreatedUnix
@@ -196,7 +197,7 @@ func getcloudBrainCenterCodeAndCardTypeInfo(ciTasks []*models.CloudbrainInfo, be
 			cloudBrainCenterCodeAndCardType[cloudbrain.Cloudbrain.AiCenter] = make(map[string]int)
 		}
 		if cloudbrain.Cloudbrain.Spec != nil {
-			if cloudbrain.Cloudbrain.Status == string(models.ModelArtsRunning) {
+			if cloudbrain.Cloudbrain.Status == string(models.ModelArtsRunning) && cloudbrain.Cloudbrain.DeletedAt.IsZero() {
 				if _, ok := cloudBrainCenterCodeAndCardType[cloudbrain.Cloudbrain.AiCenter][cloudbrain.Cloudbrain.Spec.AccCardType]; !ok {
 					if int64(cloudbrain.Cloudbrain.StartTime) < beginTime {
 						cloudBrainCenterCodeAndCardType[cloudbrain.Cloudbrain.AiCenter][cloudbrain.Cloudbrain.Spec.AccCardType] = AccCardsNum * WorkServerNumber * (int(endTime) - int(beginTime))
@@ -240,7 +241,7 @@ func getcloudBrainCenterCodeAndCardTypeInfo(ciTasks []*models.CloudbrainInfo, be
 		}
 	}
 
-	return cloudBrainCenterCodeAndCardType
+	return cloudBrainCenterCodeAndCardType, cloudbrainMap
 }
 
 func CloudbrainUpdateHistoryData(ctx *context.Context) {
@@ -258,7 +259,7 @@ func CloudbrainUpdateHistoryData(ctx *context.Context) {
 		endTimeUnix := timeutil.TimeStamp(endTime.Unix())
 
 		err = models.DeleteCloudbrainDurationStatistic(beginTimeUnix, endTimeUnix)
-		count = UpdateDurationStatisticHistoryData(beginTime.Add(+1*time.Hour), endTime)
+		count = UpdateDurationStatisticHistoryData(beginTime.Add(+1*time.Hour), endTime.Add(+1*time.Hour))
 	}
 	ctx.JSON(http.StatusOK, map[string]interface{}{
 		"message": 0,

routers/user/auth.go

@@ -1435,7 +1435,7 @@ func UpdateEmailPost(ctx *context.Context, form auth.UpdateEmailForm) {
 		ctx.ServerError("UpdateEmailAddress failed", err)
 		return
 	}
-	ctx.Data["Email"] = newEmailAddress
+	ctx.Data["SignedUser.Email"] = newEmailAddress
 	ctx.User.Email = newEmailAddress
 	Activate(ctx)
 

templates/user/auth/activate.tmpl

@@ -15,7 +15,7 @@
 						{{else if .ResendLimited}}
 							<p class="center">{{.i18n.Tr "auth.resent_limit_prompt"}}</p>
 						{{else}}
-							<p>{{.i18n.Tr "auth.confirmation_mail_sent_prompt" .Email .ActiveCodeLives | Str2html}}</p>
+							<p>{{.i18n.Tr "auth.confirmation_mail_sent_prompt" .SignedUser.Email .ActiveCodeLives | Str2html}}</p>
 						{{end}}
 					{{else}}
 						{{if .IsSendRegisterMail}}
@@ -23,7 +23,11 @@
 						{{else if .IsActivateFailed}}
 							<p>{{.i18n.Tr "auth.invalid_code"}}</p>
 						{{else}}
-							<p>{{.i18n.Tr "auth.has_unconfirmed_mail" .SignedUser.Name .SignedUser.Email | Str2html}}</p>
+							<p style="margin-bottom: 0;">{{.i18n.Tr "auth.has_unconfirmed_mail" .SignedUser.Name .SignedUser.Email | Str2html}}</p>
+							<ul style="margin-top: 0;">
+								<li style="line-height: 30px;">{{.i18n.Tr "auth.has_unconfirmed_mail_resend"}}</li>
+								<li>{{.i18n.Tr "auth.has_unconfirmed_mail_change"}}</li>
+							</ul>
 							<div class="ui divider"></div>
 							<div class="text right">
 								<button type="button" class="ui blue button change">{{.i18n.Tr "auth.change_email"}}</button>
@@ -40,18 +44,19 @@
             <div class="header" style="padding: 1rem;background-color: rgba(240, 240, 240, 100);">
                 <h4>{{.i18n.Tr "auth.change_email_address"}}</h4>
             </div>
-			<form id="formId" action="{{AppSubUrl}}/user/update_email" method="POST" class="ui form">
+			<form id="form-email" class="ui form ignore-dirty" action="{{AppSubUrl}}/user/update_email" method="POST" >
 				<div class="content content-padding">
 						<div class="ui error message">
 						</div>
 						{{$.CsrfTokenHtml}}
 						<div class="inline required field">
 							<label>{{.i18n.Tr "auth.new_email_address"}}</label>
-							<input style="width: 80%;" id="label" name="NewEmail" maxlength="255" value="{{.SignedUser.Email}}">
+							<input type="email" style="width: 80%;" id="email" name="NewEmail" maxlength="255" value="{{.SignedUser.Email}}"
+							pattern="([a-zA-Z0-9_-])+@(163\.com|126\.com|qq\.com|yahoo\.com|sina\.com|sina\.cn|outlook\.com|pcl\.ac\.cn|foxmail\.com|ict\.ac\.cn|21cn\.com|yeah\.net|139\.com)">
 						</div>
 				</div>
 				<div class="center actions">
-					<button class="ui green button">{{.i18n.Tr "repo.confirm_choice"}}</button>
+					<button id="submitBtn" class="ui green button">{{.i18n.Tr "repo.confirm_choice"}}</button>
 					<div class="ui deny button">{{.i18n.Tr "cancel"}}</div>
 				</div>
 			</form>
@@ -61,6 +66,19 @@
 {{template "base/footer" .}}
 <script>
 	$('.ui.blue.button.change').on('click',function(){
-		$('.ui.modal').modal('show')
+		$('.ui.modal')
+		.modal({
+			onShow:function(){
+				$('.ui.dimmer').css({ "background-color": "rgb(136, 136, 136,0.7)" })
+				let emailInput=document.getElementById("email");
+				emailInput.oninvalid = function () {
+					this.setCustomValidity('{{.i18n.Tr "auth.email_domain_blacklisted"}}')
+				}
+				emailInput.oninput = function(){
+					this.setCustomValidity('')
+				}
+			}
+		})
+		.modal('show')
 	})
 </script>