From 28b182d432c6344a299ec033bebce10b47e630f7 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Wed, 28 Sep 2022 09:27:01 +0800
Subject: [PATCH 01/18] =?UTF-8?q?=E4=BF=AE=E6=AD=A3GPU=E6=8E=A8=E7=90=86?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=97=A5=E5=BF=97=E4=B8=8B=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/api/v1/repo/cloudbrain.go | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/routers/api/v1/repo/cloudbrain.go b/routers/api/v1/repo/cloudbrain.go
index d6b7bb076..439190121 100755
--- a/routers/api/v1/repo/cloudbrain.go
+++ b/routers/api/v1/repo/cloudbrain.go
@@ -379,7 +379,11 @@ func CloudbrainDownloadLogFile(ctx *context.Context) {
 		return
 	}
 
-	prefix := "/" + setting.CBCodePathPrefix + job.JobName + "/model"
+	logDir := "/model"
+	if job.JobType == string(models.JobTypeInference) {
+		logDir = cloudbrain.ResultPath
+	}
+	prefix := "/" + setting.CBCodePathPrefix + job.JobName + logDir
 	files, err := storage.GetOneLevelAllObjectUnderDirMinio(setting.Attachment.Minio.Bucket, prefix, "")
 	if err != nil {
 		log.Error("query cloudbrain model failed: %v", err)

From 60cb3f8dc804ea229108959612f01e1aa290bcfd Mon Sep 17 00:00:00 2001
From: chenshihai <chenshh@pcl.ac.cn>
Date: Wed, 28 Sep 2022 09:52:17 +0800
Subject: [PATCH 02/18] update invitation page

---
 options/locale/locale_zh-CN.ini              |  2 +-
 web_src/vuepages/langs/config/zh-CN.js       |  4 ++--
 web_src/vuepages/pages/user/invite/index.vue | 11 +++++++++--
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini
index 2d75c2d05..cdba8c290 100755
--- a/options/locale/locale_zh-CN.ini
+++ b/options/locale/locale_zh-CN.ini
@@ -72,7 +72,7 @@ your_starred=已点赞
 your_settings=设置
 invite_friends=邀请好友
 your_friend=您的好友
-invite_you_to_join_the_OpenI_AI_Collaboration_Platform_and_enjoy_abundant_free_computing_resources=邀请你加入启智社区AI协作平台，畅享充沛的免费算力资源！
+invite_you_to_join_the_OpenI_AI_Collaboration_Platform_and_enjoy_abundant_free_computing_resources=邀请您加入启智社区AI协作平台，畅享充沛的免费算力资源！
 recommender=推荐人
 
 all=所有
diff --git a/web_src/vuepages/langs/config/zh-CN.js b/web_src/vuepages/langs/config/zh-CN.js
index e48e61e3a..2b451e2db 100644
--- a/web_src/vuepages/langs/config/zh-CN.js
+++ b/web_src/vuepages/langs/config/zh-CN.js
@@ -164,9 +164,9 @@ const zh = {
   },
   user: {
     inviteFriends: '邀请好友',
-    inviteFriendsTips: '复制二维码或者邀请注册链接分享给好友',
+    inviteFriendsTips: '复制二维码或者注册邀请链接分享给好友',
     clickToViewTheEventDetails: '点击查看活动详情',
-    copyRegistrationInvitationLink: '复制邀请注册链接',
+    copyRegistrationInvitationLink: '复制注册邀请链接',
     registrationAdress: '注册地址：',
     recommender: '推荐人：',
     invitedFriends: '已邀请好友',
diff --git a/web_src/vuepages/pages/user/invite/index.vue b/web_src/vuepages/pages/user/invite/index.vue
index 37a39b8fe..6d75aa25f 100644
--- a/web_src/vuepages/pages/user/invite/index.vue
+++ b/web_src/vuepages/pages/user/invite/index.vue
@@ -22,7 +22,7 @@
         <div class="txt-2"><span>{{ $t('user.registrationAdress') }}</span><span>{{ invitationLink + invitationCode
         }}</span></div>
         <div class="txt-3"><span>{{ $t('user.recommender') }}</span><span>{{ invitationCode }}</span></div>
-        <el-button class="__copy_link_btn__" type="primary" style="background:rgb(21, 114, 255);">{{ $t('user.copyRegistrationInvitationLink') }}</el-button>
+        <el-button class="__copy_link_btn__" type="primary">{{ $t('user.copyRegistrationInvitationLink') }}</el-button>
       </div>
       <div class="qr-code">
         <div id="__qr-code__" style="width:120px;height:120px;"></div>
@@ -31,7 +31,7 @@
     <div class="table-container">
       <div>
         <el-table border :data="tableData" style="width:100%" v-loading="loading" stripe>
-          <el-table-column prop="ID" :label="$t('user.invitedFriends')" align="left" header-align="left">
+          <el-table-column prop="ID" :label="$t('user.invitedFriends')" align="left" header-align="center">
             <template slot-scope="scope">
               <div style="display:flex;align-items:center;padding-left:20px;">
                 <img :src="scope.row.avatarSrc" alt="" style="height:45px;width:45px;margin-right:10px;" />
@@ -271,6 +271,13 @@ export default {
     }
   }
 
+  .__copy_link_btn__ {
+    font-size: 14px;
+    padding: 11px 15px;
+    background: rgb(21, 114, 255);
+    border-radius: 0;
+  }
+
   .qr-code {
     width: 150px;
     display: flex;

From c71a9d6102d8409213121ac80f22077eae715415 Mon Sep 17 00:00:00 2001
From: chenshihai <chenshh@pcl.ac.cn>
Date: Wed, 28 Sep 2022 10:03:27 +0800
Subject: [PATCH 03/18] update invitation page

---
 web_src/vuepages/pages/user/invite/index.vue | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/web_src/vuepages/pages/user/invite/index.vue b/web_src/vuepages/pages/user/invite/index.vue
index 6d75aa25f..c48cc75ef 100644
--- a/web_src/vuepages/pages/user/invite/index.vue
+++ b/web_src/vuepages/pages/user/invite/index.vue
@@ -47,7 +47,7 @@
           <el-table-column prop="regTime" :label="$t('user.registrationTime')" align="center" header-align="center">
           </el-table-column>
           <template slot="empty">
-            <span style="font-size: 12px">{{
+            <span>{{
             loading ? $t('loading') : $t('noData')
             }}</span>
           </template>
@@ -292,14 +292,15 @@ export default {
   /deep/ .el-table__header {
     th {
       background: rgb(245, 245, 246);
-      font-size: 12px;
+      font-size: 14px;
       color: rgb(36, 36, 36);
+      font-weight: 400;
     }
   }
 
   /deep/ .el-table__body {
     td {
-      font-size: 12px;
+      font-size: 14px;
     }
   }
 

From 821a302d9076abc96d8a44f4f3a6ef9724ad132a Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Wed, 28 Sep 2022 11:05:08 +0800
Subject: [PATCH 04/18] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 models/user_invitation.go       |  12 +++
 routers/api/v1/api.go           |   2 +
 routers/repo/user_invitation.go | 152 ++++++++++++++++++++++++++++++--
 3 files changed, 158 insertions(+), 8 deletions(-)

diff --git a/models/user_invitation.go b/models/user_invitation.go
index 7b0ca1cf9..2d37bcb23 100644
--- a/models/user_invitation.go
+++ b/models/user_invitation.go
@@ -64,6 +64,18 @@ func QueryInvitaionPage(start int, pageSize int) ([]*Invitation, int64) {
 	return invitationList, allCount
 }
 
+func QueryInvitaionByTime(startTime int64, endTime int64) []*Invitation {
+	statictisSess := xStatistic.NewSession()
+	defer statictisSess.Close()
+	cond := "created_unix >=" + fmt.Sprint(startTime) + " and created_unix <=" + fmt.Sprint(endTime)
+	invitationList := make([]*Invitation, 0)
+	if err := statictisSess.Table(new(Invitation)).Where(cond).OrderBy("created_unix desc").
+		Find(&invitationList); err != nil {
+		return nil
+	}
+	return invitationList
+}
+
 func InsertInvitaion(invitationUser *Invitation) error {
 	statictisSess := xStatistic.NewSession()
 	defer statictisSess.Close()
diff --git a/routers/api/v1/api.go b/routers/api/v1/api.go
index f430460f6..6dd1cb32f 100755
--- a/routers/api/v1/api.go
+++ b/routers/api/v1/api.go
@@ -581,6 +581,8 @@ func RegisterRoutes(m *macaron.Macaron) {
 		m.Get("/query_invitation_last_month", operationReq, repo_ext.QueryInvitationLastMonth)
 		m.Get("/query_invitation_yesterday", operationReq, repo_ext.QueryInvitationYesterday)
 		m.Get("/query_invitation_all", operationReq, repo_ext.QueryInvitationAll)
+		m.Get("/query_invitation_userdefine", operationReq, repo_ext.QueryUserDefineInvitationPage)
+
 		m.Get("/download_invitation_detail", operationReq, repo_ext.DownloadInvitationDetail)
 
 		//cloudbrain board
diff --git a/routers/repo/user_invitation.go b/routers/repo/user_invitation.go
index b0aac4eed..e926f6936 100644
--- a/routers/repo/user_invitation.go
+++ b/routers/repo/user_invitation.go
@@ -4,6 +4,8 @@ import (
 	"fmt"
 	"net/http"
 	"net/url"
+	"sort"
+	"time"
 
 	"code.gitea.io/gitea/models"
 	"code.gitea.io/gitea/modules/context"
@@ -271,14 +273,148 @@ func QueryInvitationAll(ctx *context.Context) {
 	queryDataFromStaticTable(ctx, "public.user_business_analysis_all", new(models.UserBusinessAnalysisAll))
 }
 
-// func queryData(ctx *context.Context, startTime int64, endTime int64) {
-// 	page, pageSize := getPageInfo(ctx)
-// 	result, count := models.QueryInvitaionPage(startTime, endTime, (page-1)*pageSize, pageSize)
-// 	mapInterface := make(map[string]interface{})
-// 	mapInterface["data"] = result
-// 	mapInterface["count"] = count
-// 	ctx.JSON(http.StatusOK, mapInterface)
-// }
+func QueryUserDefineInvitationPage(ctx *context.Context) {
+	startDate := ctx.Query("startDate")
+	endDate := ctx.Query("endDate")
+	startTime, _ := time.ParseInLocation("2006-01-02", startDate, time.Local)
+	//startTime = startTime.UTC()
+	endTime, _ := time.ParseInLocation("2006-01-02", endDate, time.Local)
+
+	queryData(ctx, startTime, endTime)
+}
+
+func queryData(ctx *context.Context, startTime time.Time, endTime time.Time) {
+	page, pageSize := getPageInfo(ctx)
+	IsReturnFile := ctx.QueryBool("IsReturnFile")
+
+	dbResult := models.QueryInvitaionByTime(startTime.Unix(), endTime.Unix())
+
+	invitaionNumMap := make(map[int64]int, 0)
+	allUserIds := make([]int64, 0)
+	for _, record := range dbResult {
+		if _, ok := invitaionNumMap[record.SrcUserID]; !ok {
+			invitaionNumMap[record.SrcUserID] = 1
+		} else {
+			invitaionNumMap[record.SrcUserID] = invitaionNumMap[record.SrcUserID] + 1
+		}
+	}
+	invitaionNumList := make([]models.Invitation, 0)
+	for key, value := range invitaionNumMap {
+		invi := models.Invitation{
+			SrcUserID:         key,
+			InvitationUserNum: value,
+		}
+		invitaionNumList = append(invitaionNumList, invi)
+		allUserIds = append(allUserIds, key)
+	}
+	sort.Slice(invitaionNumList, func(i, j int) bool {
+		return invitaionNumList[i].InvitationUserNum > invitaionNumList[j].InvitationUserNum
+	})
+	if IsReturnFile {
+		xlsx := excelize.NewFile()
+		sheetName := ctx.Tr("user.static.invitationsheetname")
+		index := xlsx.NewSheet(sheetName)
+		xlsx.DeleteSheet("Sheet1")
+		excelHeader := getInvitationExcelHeader(ctx)
+		for k, v := range excelHeader {
+			//设置单元格的值
+			xlsx.SetCellValue(sheetName, k, v)
+		}
+		end := 100
+		userMap := make(map[int64]*models.User, 0)
+		for i := 0; i < len(allUserIds); i += 100 {
+			if end >= len(allUserIds) {
+				end = len(allUserIds) - 1
+			}
+			if i == end {
+				break
+			}
+			userList, err := models.GetUsersByIDs(allUserIds[i:end])
+			if err == nil {
+				for _, tmp := range userList {
+					userMap[tmp.ID] = tmp
+				}
+			}
+			end = end + 100
+		}
+		row := 1
+		for _, userRecord := range invitaionNumList {
+			row++
+			rows := fmt.Sprint(row)
+			var tmp byte
+			tmp = 0
+
+			xlsx.SetCellValue(sheetName, getColumn(tmp)+rows, userRecord.SrcUserID)
+			tmp = tmp + 1
+			name := ""
+			if userMap[userRecord.SrcUserID] != nil {
+				name = userMap[userRecord.SrcUserID].Name
+			}
+			xlsx.SetCellValue(sheetName, getColumn(tmp)+rows, name)
+			tmp = tmp + 1
+
+			xlsx.SetCellValue(sheetName, getColumn(tmp)+rows, userRecord.InvitationUserNum)
+			tmp = tmp + 1
+			Phone := ""
+			if userMap[userRecord.SrcUserID] != nil {
+				Phone = userMap[userRecord.SrcUserID].PhoneNumber
+			}
+			xlsx.SetCellValue(sheetName, getColumn(tmp)+rows, Phone)
+			tmp = tmp + 1
+
+			formatTime := ""
+			if userMap[userRecord.SrcUserID] != nil {
+				formatTime = userMap[userRecord.SrcUserID].CreatedUnix.Format("2006-01-02 15:04:05")
+			}
+			xlsx.SetCellValue(sheetName, getColumn(tmp)+rows, formatTime[0:len(formatTime)-3])
+		}
+		//设置默认打开的表单
+		xlsx.SetActiveSheet(index)
+		filename := sheetName + "_" + getTimeFileName(startTime) + "_" + getTimeFileName(endTime) + ".xlsx"
+		//filename := sheetName + "_" + ctx.Tr("user.static."+tableName) + ".xlsx"
+		ctx.Resp.Header().Set("Content-Disposition", "attachment; filename="+url.QueryEscape(filename))
+		ctx.Resp.Header().Set("Content-Type", "application/octet-stream")
+		if _, err := xlsx.WriteTo(ctx.Resp); err != nil {
+			log.Info("writer exel error." + err.Error())
+		}
+	} else {
+		result := make([]models.Invitation, 0)
+		userIds := make([]int64, 0)
+		end := len(invitaionNumList) - 1
+		for start := (page - 1) * pageSize; start <= end; start++ {
+			invi := invitaionNumList[start]
+			//todo name phone,createunix
+			result = append(result, invi)
+			userIds = append(userIds, invi.SrcUserID)
+			if len(result) == pageSize {
+				break
+			}
+		}
+		userList, err := models.GetUsersByIDs(userIds)
+		if err == nil {
+			for _, invi := range result {
+				tmpUser := userList[0]
+				for _, tmp := range userList {
+					if tmp.ID == invi.SrcUserID {
+						tmpUser = tmp
+						break
+					}
+				}
+				if invi.SrcUserID == tmpUser.ID {
+					invi.Name = tmpUser.Name
+					invi.Phone = tmpUser.PhoneNumber
+					invi.CreatedUnix = tmpUser.CreatedUnix
+				}
+			}
+		} else {
+			log.Info("query user error." + err.Error())
+		}
+		mapInterface := make(map[string]interface{})
+		mapInterface["data"] = result
+		mapInterface["count"] = len(invitaionNumList)
+		ctx.JSON(http.StatusOK, mapInterface)
+	}
+}
 
 func getPageInfo(ctx *context.Context) (int, int) {
 	page := ctx.QueryInt("page")

From 665cc4e0bbc620dc613b66286104b160f78309ed Mon Sep 17 00:00:00 2001
From: chenyifan01 <cyf_uestc@outlook.com>
Date: Wed, 28 Sep 2022 11:16:28 +0800
Subject: [PATCH 05/18] #2967 add log

---
 services/task/task.go | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/services/task/task.go b/services/task/task.go
index 194a43649..f13dfa5ad 100644
--- a/services/task/task.go
+++ b/services/task/task.go
@@ -61,7 +61,7 @@ func Accomplish(action models.Action) {
 			actions = append(actions, models.Action{
 				ID:        action.ID,
 				OpType:    models.ActionDatasetRecommended,
-				ActUserID: action.UserID,
+				ActUserID: action.ActUserID,
 				UserID:    user.ID,
 				RepoID:    action.RepoID,
 				Content:   action.Content,
@@ -85,7 +85,11 @@ func accomplish(action models.Action, taskType models.TaskType) error {
 			log.Error("PANIC:%v", combinedErr)
 		}
 	}()
+	log.Info("accomplish start.   actionId=%d  userId= %d", action.ID, action.UserID)
 	userId := action.UserID
+	if !isUserAvailable(userId) {
+		return nil
+	}
 
 	//get task config
 	config, err := GetTaskConfig(string(taskType))
@@ -143,3 +147,17 @@ func isLimited(userId int64, config *models.TaskConfig, rejectPolicy models.Limi
 	return false
 
 }
+
+func isUserAvailable(userId int64) bool {
+	if userId < 1 {
+		return false
+	}
+	user, err := models.GetUserByID(userId)
+	if err != nil || user == nil {
+		return false
+	}
+	if user.IsOrganization() {
+		return false
+	}
+	return true
+}

From fcf6a5e13137423715920b209a5d43d7ac196292 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Wed, 28 Sep 2022 11:33:26 +0800
Subject: [PATCH 06/18] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/user_invitation.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/routers/repo/user_invitation.go b/routers/repo/user_invitation.go
index e926f6936..686d490d2 100644
--- a/routers/repo/user_invitation.go
+++ b/routers/repo/user_invitation.go
@@ -401,6 +401,7 @@ func queryData(ctx *context.Context, startTime time.Time, endTime time.Time) {
 					}
 				}
 				if invi.SrcUserID == tmpUser.ID {
+					log.Info("find name........")
 					invi.Name = tmpUser.Name
 					invi.Phone = tmpUser.PhoneNumber
 					invi.CreatedUnix = tmpUser.CreatedUnix

From 11ddfe89b2090dec62ce1a0f033aea959110bca3 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Wed, 28 Sep 2022 11:37:43 +0800
Subject: [PATCH 07/18] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/user_invitation.go | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/routers/repo/user_invitation.go b/routers/repo/user_invitation.go
index 686d490d2..75d416346 100644
--- a/routers/repo/user_invitation.go
+++ b/routers/repo/user_invitation.go
@@ -378,13 +378,13 @@ func queryData(ctx *context.Context, startTime time.Time, endTime time.Time) {
 			log.Info("writer exel error." + err.Error())
 		}
 	} else {
-		result := make([]models.Invitation, 0)
+		result := make([]*models.Invitation, 0)
 		userIds := make([]int64, 0)
 		end := len(invitaionNumList) - 1
 		for start := (page - 1) * pageSize; start <= end; start++ {
 			invi := invitaionNumList[start]
 			//todo name phone,createunix
-			result = append(result, invi)
+			result = append(result, &invi)
 			userIds = append(userIds, invi.SrcUserID)
 			if len(result) == pageSize {
 				break
@@ -401,7 +401,6 @@ func queryData(ctx *context.Context, startTime time.Time, endTime time.Time) {
 					}
 				}
 				if invi.SrcUserID == tmpUser.ID {
-					log.Info("find name........")
 					invi.Name = tmpUser.Name
 					invi.Phone = tmpUser.PhoneNumber
 					invi.CreatedUnix = tmpUser.CreatedUnix

From 741456b0e814706b55c5ab550b9de6bf7db391d8 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Wed, 28 Sep 2022 11:43:28 +0800
Subject: [PATCH 08/18] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/user_invitation.go | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/routers/repo/user_invitation.go b/routers/repo/user_invitation.go
index 75d416346..e63907afe 100644
--- a/routers/repo/user_invitation.go
+++ b/routers/repo/user_invitation.go
@@ -346,7 +346,7 @@ func queryData(ctx *context.Context, startTime time.Time, endTime time.Time) {
 
 			xlsx.SetCellValue(sheetName, getColumn(tmp)+rows, userRecord.SrcUserID)
 			tmp = tmp + 1
-			name := ""
+			name := "已注销"
 			if userMap[userRecord.SrcUserID] != nil {
 				name = userMap[userRecord.SrcUserID].Name
 			}
@@ -365,8 +365,9 @@ func queryData(ctx *context.Context, startTime time.Time, endTime time.Time) {
 			formatTime := ""
 			if userMap[userRecord.SrcUserID] != nil {
 				formatTime = userMap[userRecord.SrcUserID].CreatedUnix.Format("2006-01-02 15:04:05")
+				formatTime = formatTime[0 : len(formatTime)-3]
 			}
-			xlsx.SetCellValue(sheetName, getColumn(tmp)+rows, formatTime[0:len(formatTime)-3])
+			xlsx.SetCellValue(sheetName, getColumn(tmp)+rows, formatTime)
 		}
 		//设置默认打开的表单
 		xlsx.SetActiveSheet(index)
@@ -404,6 +405,8 @@ func queryData(ctx *context.Context, startTime time.Time, endTime time.Time) {
 					invi.Name = tmpUser.Name
 					invi.Phone = tmpUser.PhoneNumber
 					invi.CreatedUnix = tmpUser.CreatedUnix
+				} else {
+					invi.Name = "已注销"
 				}
 			}
 		} else {

From 3db04cdaa658fa3c5ad260db1ed266d4609ebd1b Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Wed, 28 Sep 2022 11:47:10 +0800
Subject: [PATCH 09/18] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/user_invitation.go | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/routers/repo/user_invitation.go b/routers/repo/user_invitation.go
index e63907afe..52d985235 100644
--- a/routers/repo/user_invitation.go
+++ b/routers/repo/user_invitation.go
@@ -333,11 +333,13 @@ func queryData(ctx *context.Context, startTime time.Time, endTime time.Time) {
 			if err == nil {
 				for _, tmp := range userList {
 					userMap[tmp.ID] = tmp
+					log.Info("userMap  key=" + fmt.Sprint(tmp.ID))
 				}
 			}
 			end = end + 100
 		}
 		row := 1
+		log.Info("len(userMap)=" + fmt.Sprint(len(userMap)))
 		for _, userRecord := range invitaionNumList {
 			row++
 			rows := fmt.Sprint(row)

From 5dcef74c9ad92dbb4c7c1b6c6157448bd3d63d5d Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Wed, 28 Sep 2022 11:50:18 +0800
Subject: [PATCH 10/18] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/user_invitation.go | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/routers/repo/user_invitation.go b/routers/repo/user_invitation.go
index 52d985235..c5a5195a8 100644
--- a/routers/repo/user_invitation.go
+++ b/routers/repo/user_invitation.go
@@ -322,10 +322,12 @@ func queryData(ctx *context.Context, startTime time.Time, endTime time.Time) {
 		}
 		end := 100
 		userMap := make(map[int64]*models.User, 0)
+		log.Info("len(allUserIds)=" + fmt.Sprint(len(allUserIds)))
 		for i := 0; i < len(allUserIds); i += 100 {
 			if end >= len(allUserIds) {
 				end = len(allUserIds) - 1
 			}
+			log.Info("i=" + fmt.Sprint(i) + " end=" + fmt.Sprint(end))
 			if i == end {
 				break
 			}

From 49e24592f47898d8ee80486696b6097161a056ee Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Wed, 28 Sep 2022 11:54:02 +0800
Subject: [PATCH 11/18] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/user_invitation.go | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/routers/repo/user_invitation.go b/routers/repo/user_invitation.go
index c5a5195a8..79cb3b48d 100644
--- a/routers/repo/user_invitation.go
+++ b/routers/repo/user_invitation.go
@@ -325,7 +325,7 @@ func queryData(ctx *context.Context, startTime time.Time, endTime time.Time) {
 		log.Info("len(allUserIds)=" + fmt.Sprint(len(allUserIds)))
 		for i := 0; i < len(allUserIds); i += 100 {
 			if end >= len(allUserIds) {
-				end = len(allUserIds) - 1
+				end = len(allUserIds)
 			}
 			log.Info("i=" + fmt.Sprint(i) + " end=" + fmt.Sprint(end))
 			if i == end {
@@ -337,6 +337,8 @@ func queryData(ctx *context.Context, startTime time.Time, endTime time.Time) {
 					userMap[tmp.ID] = tmp
 					log.Info("userMap  key=" + fmt.Sprint(tmp.ID))
 				}
+			} else {
+
 			}
 			end = end + 100
 		}

From beeaab76182172ee2f2f5b5a37a6d9419a9dcbdf Mon Sep 17 00:00:00 2001
From: chenyifan01 <cyf_uestc@outlook.com>
Date: Wed, 28 Sep 2022 11:57:45 +0800
Subject: [PATCH 12/18] #2967 fix bug

---
 services/task/task.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/task/task.go b/services/task/task.go
index f13dfa5ad..f9a6d0c0c 100644
--- a/services/task/task.go
+++ b/services/task/task.go
@@ -131,7 +131,7 @@ func accomplish(action models.Action, taskType models.TaskType) error {
 			Type:   models.GetRewardTypeInstance(config.AwardType),
 		},
 		TargetUserId: userId,
-		RequestId:    fmt.Sprint(action.ID),
+		RequestId:    fmt.Sprintf("%d_%d", action.ID, userId),
 		OperateType:  models.OperateTypeIncrease,
 		RejectPolicy: models.FillUp,
 	})

From 1b37c8e08f918d961f3e16f25b4c7c2d779e6b7c Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Wed, 28 Sep 2022 14:08:13 +0800
Subject: [PATCH 13/18] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E3=80=82=E8=A7=A3=E5=86=B3=E8=87=AA=E5=AE=9A=E4=B9=89=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E6=9F=A5=E8=AF=A2=E5=8A=9F=E8=83=BD=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zouap <zouap@pcl.ac.cn>
---
 routers/repo/user_invitation.go | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/routers/repo/user_invitation.go b/routers/repo/user_invitation.go
index 79cb3b48d..a2752a481 100644
--- a/routers/repo/user_invitation.go
+++ b/routers/repo/user_invitation.go
@@ -125,6 +125,9 @@ func DownloadInvitationDetail(ctx *context.Context) {
 		for _, userRecord := range re {
 			row++
 			userRecord.Name = userNameMap[userRecord.UserID]
+			if userRecord.Name == "" {
+				userRecord.Name = "已注销"
+			}
 			writeInvitationDetailExcel(row, xlsx, sheetName, userRecord)
 		}
 		indexTotal += PAGE_SIZE
@@ -335,7 +338,6 @@ func queryData(ctx *context.Context, startTime time.Time, endTime time.Time) {
 			if err == nil {
 				for _, tmp := range userList {
 					userMap[tmp.ID] = tmp
-					log.Info("userMap  key=" + fmt.Sprint(tmp.ID))
 				}
 			} else {
 

From c412b6ac35a7d92607b92741f363876f4b5ca2e9 Mon Sep 17 00:00:00 2001
From: chenyifan01 <cyf_uestc@outlook.com>
Date: Wed, 28 Sep 2022 14:23:53 +0800
Subject: [PATCH 14/18] #2967 fix bug

---
 models/reward_operate_record.go | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/models/reward_operate_record.go b/models/reward_operate_record.go
index da1b6a589..f201be646 100644
--- a/models/reward_operate_record.go
+++ b/models/reward_operate_record.go
@@ -3,6 +3,7 @@ package models
 import (
 	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/timeutil"
+	"fmt"
 	"strconv"
 	"strings"
 	"xorm.io/builder"
@@ -130,21 +131,27 @@ func (l RewardRecordShowList) loadAction() error {
 		return nil
 	}
 	actionIds := make([]int64, 0)
-	actionIdMap := make(map[int64]*RewardOperateRecordShow, 0)
 	for _, r := range l {
 		if r.SourceType != SourceTypeAccomplishTask.Name() {
 			continue
 		}
 		i, _ := strconv.ParseInt(r.SourceId, 10, 64)
 		actionIds = append(actionIds, i)
-		actionIdMap[i] = r
 	}
 	actions, err := GetActionByIds(actionIds)
 	if err != nil {
 		return err
 	}
+	actionIdMap := make(map[string]*Action, 0)
 	for _, v := range actions {
-		actionIdMap[v.ID].Action = v.ToShow()
+		actionIdMap[fmt.Sprint(v.ID)] = v
+	}
+
+	for i, r := range l {
+		act := actionIdMap[r.SourceId]
+		if act != nil {
+			l[i].Action = act.ToShow()
+		}
 	}
 	return nil
 }

From c6e116f3b16e70b4ac1e6e6a76d347ed5c3ed3f2 Mon Sep 17 00:00:00 2001
From: chenshihai <chenshh@pcl.ac.cn>
Date: Wed, 28 Sep 2022 14:55:06 +0800
Subject: [PATCH 15/18] update lang

---
 options/locale/locale_zh-CN.ini | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini
index 29e9811d5..470dd9d32 100755
--- a/options/locale/locale_zh-CN.ini
+++ b/options/locale/locale_zh-CN.ini
@@ -3092,9 +3092,9 @@ task_gputrainjob=`创建了CPU/GPU类型训练任务 <a href="%s/cloudbrain/trai
 task_c2netnputrainjob=`创建了NPU类型训练任务 <a href="%s/grampus/train-job/%s">%s</a>`
 task_c2netgputrainjob=`创建了CPU/GPU类型训练任务 <a href="%s/grampus/train-job/%s">%s</a>`
 binded_wechat=绑定微信
-dataset_recommended=`创建的数据集<a href="%s/datasets">%s</a>被设置为推荐数据集`
-create_image=`提交了镜像<span style="font-weight:bold;">%s</span>`
-image_recommended=`提交的镜像<span style="font-weight:bold;">%s</span>被设置为推荐镜像`
+dataset_recommended=`创建的数据集 <a href="%s/datasets">%s</a> 被设置为推荐数据集`
+create_image=`提交了镜像 <span style="font-weight:bold;">%s</span>`
+image_recommended=`提交的镜像 <span style="font-weight:bold;">%s</span> 被设置为推荐镜像`
 update_user_avatar=更新了头像
 
 [tool]

From 11652bf8cd5963cb232fb9ce469d71b8db9f73b3 Mon Sep 17 00:00:00 2001
From: zhoupzh <zhoupzh@pcl.ac.cn>
Date: Wed, 28 Sep 2022 15:52:21 +0800
Subject: [PATCH 16/18] fix issue

---
 options/locale/locale_en-US.ini              | 1 +
 options/locale/locale_zh-CN.ini              | 1 +
 templates/repo/grampus/trainjob/npu/new.tmpl | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index 34973abcd..b83fb6369 100755
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -3245,6 +3245,7 @@ load_code_failed=Fail to load code, please check if the right branch is selected
 
 error.dataset_select = dataset select error：the count exceed the limit or has same name
 new_train_gpu_tooltips = The code is storaged in <strong style="color:#010101">%s</strong>, the dataset is storaged in <strong style="color:#010101">%s</strong>, the pre-trained model is storaged in the environment <strong style="color:#010101">%s</strong>, and please put your model into <strong style="color:#010101">%s</strong> then you can download it online
+new_train_npu_tooltips = The code is storaged in <strong style="color:#010101">%s</strong>, the pre-trained model is storaged in the environment <strong style="color:#010101">%s</strong>, and please put your model into <strong style="color:#010101">%s</strong> then you can download it online
 new_infer_gpu_tooltips = The dataset is stored in <strong style="color:#010101">%s</strong>, the model file is stored in <strong style="color:#010101">%s</strong>, please store the inference output in <strong style="color:#010101">%s</strong> for subsequent downloads.
 
 [points]
diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini
index 2d75c2d05..1327133c3 100755
--- a/options/locale/locale_zh-CN.ini
+++ b/options/locale/locale_zh-CN.ini
@@ -3264,6 +3264,7 @@ load_code_failed=代码加载失败，请确认选择了正确的分支。
 
 error.dataset_select = 数据集选择错误：数量超过限制或者有同名数据集
 new_train_gpu_tooltips =训练脚本存储在<strong style="color:#010101">%s</strong>中，数据集存储在<strong style="color:#010101">%s</strong>中，预训练模型存放在环境变量<strong style="color:#010101">%s</strong>中，训练输出请存储在<strong style="color:#010101">%s</strong>中以供后续下载。
+new_train_npu_tooltips =训练脚本存储在<strong style="color:#010101">%s</strong>中，预训练模型存放在环境变量<strong style="color:#010101">%s</strong>中，训练输出请存储在<strong style="color:#010101">%s</strong>中以供后续下载。
 new_infer_gpu_tooltips = 数据集存储在<strong style="color:#010101">%s</strong>中，模型文件存储在<strong style="color:#010101">%s</strong>中，推理输出请存储在<strong style="color:#010101">%s</strong>中以供后续下载。
 
 [points]
diff --git a/templates/repo/grampus/trainjob/npu/new.tmpl b/templates/repo/grampus/trainjob/npu/new.tmpl
index 92dca5bae..51a561d3d 100755
--- a/templates/repo/grampus/trainjob/npu/new.tmpl
+++ b/templates/repo/grampus/trainjob/npu/new.tmpl
@@ -106,7 +106,7 @@
                     {{template "custom/task_wait_count" .}}
                     <div style="display: flex;align-items: center;margin-left: 156px;margin-top: 0.5rem;">
                         <i class="ri-error-warning-line" style="color: #f2711c;margin-right: 0.5rem;"></i>
-                        <span style="color: #888;font-size: 12px;">{{.i18n.Tr "cloudbrain.new_train_gpu_tooltips" "/cache/code" "/cache/dataset" "ckpt_url" "/cache/output" | Safe}}</span>
+                        <span style="color: #888;font-size: 12px;">{{.i18n.Tr "cloudbrain.new_train_npu_tooltips" "/cache/code"  "ckpt_url" "/cache/output" | Safe}}</span>
                     </div>
                 </div>
                 <div class="required min_title inline field" style="margin-bottom: 0rem !important;">

From a42651a7d24f7003c68e785a688d1b137edb28f9 Mon Sep 17 00:00:00 2001
From: chenshihai <chenshh@pcl.ac.cn>
Date: Wed, 28 Sep 2022 16:12:52 +0800
Subject: [PATCH 17/18] update point rule tmpl

---
 templates/reward/point/rule.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/reward/point/rule.tmpl b/templates/reward/point/rule.tmpl
index 6e7a0a8cc..9b9a354f2 100644
--- a/templates/reward/point/rule.tmpl
+++ b/templates/reward/point/rule.tmpl
@@ -73,7 +73,7 @@
             <td class="t-center">数据集被平台推荐</td>
             <td class="t-center point">-</td>
             <td class="t-center"><span class="typ">每日</span>积分获取上限<span class="limit"> - </span></td>
-            <td>仅统计属于个人的数据集，属于组织的数据集暂不统计。</td>
+            <td>数据集被推荐时，所有文件上传者都可获得奖励积分。</td>
         </tr>
         <tr key="CreateNewModelTask">
             <td class="t-center">导入新模型</td>

From 42a60d946c25684fd8281a1915e32e01d267e8c6 Mon Sep 17 00:00:00 2001
From: ychao_1983 <ychao_1983@sina.com>
Date: Sat, 8 Oct 2022 10:48:38 +0800
Subject: [PATCH 18/18] fix-2940

---
 options/locale/locale_en-US.ini | 1 +
 options/locale/locale_zh-CN.ini | 1 +
 routers/repo/cloudbrain.go      | 6 ++++++
 3 files changed, 8 insertions(+)

diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index b83fb6369..a20797df3 100755
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -1058,6 +1058,7 @@ modify_image=Modify Image
 image_exist=Image name has been used, please use a new one.
 image_committing=Image is submitting, please try again later.
 image_commit_fail=Failed to submit image, please try again later.
+image_over_20g=Failed to submit image, the size of image can not be over 20GB.
 image_not_exist=Image does not exits.
 image_edit_fail=Failed to edit image, please try again later.
 image_delete_fail=Failed to delete image, please try again later.
diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini
index c6f7e51fd..5a9d02dff 100755
--- a/options/locale/locale_zh-CN.ini
+++ b/options/locale/locale_zh-CN.ini
@@ -1059,6 +1059,7 @@ modify_image=修改镜像
 image_exist=镜像Tag已被使用，请修改镜像Tag。
 image_committing=镜像正在提交中，请稍后再试。
 image_commit_fail=提交镜像失败，请稍后再试。
+image_over_20g=提交镜像失败，镜像大小不能超过20GB。
 image_not_exist=镜像不存在。
 image_edit_fail=编辑镜像失败，请稍后再试。
 image_delete_fail=删除镜像失败，请稍后再试。
diff --git a/routers/repo/cloudbrain.go b/routers/repo/cloudbrain.go
index 73aa9b791..9311ddeac 100755
--- a/routers/repo/cloudbrain.go
+++ b/routers/repo/cloudbrain.go
@@ -1147,6 +1147,8 @@ func CloudBrainCommitImage(ctx *context.Context, form auth.CommitImageCloudBrain
 
 		} else if models.IsErrorImageCommitting(err) {
 			ctx.JSON(200, models.BaseErrorMessage(ctx.Tr("repo.image_committing")))
+		} else if isOver20GError(err) {
+			ctx.JSON(200, models.BaseErrorMessage(ctx.Tr("repo.image_over_20g")))
 		} else {
 			ctx.JSON(200, models.BaseErrorMessage(ctx.Tr("repo.image_commit_fail")))
 		}
@@ -1156,6 +1158,10 @@ func CloudBrainCommitImage(ctx *context.Context, form auth.CommitImageCloudBrain
 	ctx.JSON(200, models.BaseOKMessage)
 }
 
+func isOver20GError(err error) bool {
+	return strings.Contains(err.Error(), "over max image size 20GB")
+}
+
 func checkTopics(Topics string) ([]string, string) {
 	var topics = make([]string, 0)
 	var topicsStr = strings.TrimSpace(Topics)