Merge branch 'V20211115' into fix-674

models/user_business_analysis.go

@@ -5,7 +5,9 @@ import (
 	"time"
 
 	"code.gitea.io/gitea/modules/log"
+	"code.gitea.io/gitea/modules/setting"
 	"code.gitea.io/gitea/modules/timeutil"
+	"xorm.io/builder"
 )
 
 type UserBusinessAnalysis struct {
@@ -71,6 +73,14 @@ type UserBusinessAnalysis struct {
 	Name string `xorm:"NOT NULL"`
 }
 
+type UserBusinessAnalysisQueryOptions struct {
+	ListOptions
+	UserName  string
+	SortType  string
+	StartTime int64
+	EndTime   int64
+}
+
 func QueryUserStaticData(startTime int64, endTime int64) []*UserBusinessAnalysis {
 	log.Info("query startTime =" + fmt.Sprint(startTime) + " endTime=" + fmt.Sprint(endTime))
 	statictisSess := xStatistic.NewSession()
@@ -114,11 +124,114 @@ func QueryUserStaticData(startTime int64, endTime int64) []*UserBusinessAnalysis
 	return userBusinessAnalysisReturnList
 }
 
+func QueryUserStaticDataPage(opts *UserBusinessAnalysisQueryOptions) ([]*UserBusinessAnalysis, int64) {
+
+	log.Info("query startTime =" + fmt.Sprint(opts.StartTime) + " endTime=" + fmt.Sprint(opts.EndTime))
+	statictisSess := xStatistic.NewSession()
+	defer statictisSess.Close()
+
+	currentTimeNow := time.Now()
+	pageStartTime := time.Date(currentTimeNow.Year(), currentTimeNow.Month(), currentTimeNow.Day(), 0, 0, 0, 0, currentTimeNow.Location())
+	pageEndTime := time.Date(currentTimeNow.Year(), currentTimeNow.Month(), currentTimeNow.Day(), 23, 59, 59, 0, currentTimeNow.Location())
+
+	var cond = builder.NewCond()
+	if len(opts.UserName) > 0 {
+		cond = cond.And(
+			builder.Eq{"name": opts.UserName},
+		)
+	}
+	cond = cond.And(
+		builder.Gte{"count_date": fmt.Sprint(pageStartTime)},
+	)
+	cond = cond.And(
+		builder.Lte{"count_date": fmt.Sprint(pageEndTime)},
+	)
+
+	count, err := statictisSess.Where(cond).Count(new(UserBusinessAnalysis))
+	if err != nil {
+		log.Info("query error." + err.Error())
+		return nil, 0
+	}
+
+	if opts.Page >= 0 && opts.PageSize > 0 {
+		var start int
+		if opts.Page == 0 {
+			start = 0
+		} else {
+			start = (opts.Page - 1) * opts.PageSize
+		}
+		statictisSess.Limit(opts.PageSize, start)
+	}
+	statictisSess.OrderBy("count_date desc")
+
+	userBusinessAnalysisList := make([]*UserBusinessAnalysis, 0, setting.UI.IssuePagingNum)
+	if err := statictisSess.Table("user_business_analysis").Where(cond).
+		Find(&userBusinessAnalysisList); err != nil {
+		return nil, 0
+	}
+
+	resultMap := make(map[int64]*UserBusinessAnalysis)
+
+	var newAndCond = builder.NewCond()
+	var newOrCond = builder.NewCond()
+	for _, userRecord := range userBusinessAnalysisList {
+		newOrCond.Or(
+			builder.Eq{"id": userRecord.ID},
+		)
+	}
+	newAndCond = newAndCond.And(
+		newOrCond,
+	)
+	newAndCond = newAndCond.And(
+		builder.Gte{"count_date": fmt.Sprint(opts.StartTime)},
+	)
+	newAndCond = newAndCond.And(
+		builder.Lte{"count_date": fmt.Sprint(opts.EndTime)},
+	)
+
+	userBusinessAnalysisList = make([]*UserBusinessAnalysis, 0)
+	if err := statictisSess.Table("user_business_analysis").Where(newAndCond).
+		Find(&userBusinessAnalysisList); err != nil {
+		return nil, 0
+	}
+
+	log.Info("query result size=" + fmt.Sprint(len(userBusinessAnalysisList)))
+	for _, userRecord := range userBusinessAnalysisList {
+		if _, ok := resultMap[userRecord.ID]; !ok {
+			resultMap[userRecord.ID] = userRecord
+		} else {
+			resultMap[userRecord.ID].CodeMergeCount += userRecord.CodeMergeCount
+			resultMap[userRecord.ID].CommitCount += userRecord.CommitCount
+			resultMap[userRecord.ID].IssueCount += userRecord.IssueCount
+			resultMap[userRecord.ID].CommentCount += userRecord.CommentCount
+			resultMap[userRecord.ID].FocusRepoCount += userRecord.FocusRepoCount
+			resultMap[userRecord.ID].StarRepoCount += userRecord.StarRepoCount
+			resultMap[userRecord.ID].WatchedCount += userRecord.WatchedCount
+			resultMap[userRecord.ID].CommitCodeSize += userRecord.CommitCodeSize
+			resultMap[userRecord.ID].CommitDatasetSize += userRecord.CommitDatasetSize
+			resultMap[userRecord.ID].CommitModelCount += userRecord.CommitModelCount
+			resultMap[userRecord.ID].SolveIssueCount += userRecord.SolveIssueCount
+			resultMap[userRecord.ID].EncyclopediasCount += userRecord.EncyclopediasCount
+			resultMap[userRecord.ID].CreateRepoCount += userRecord.CreateRepoCount
+			resultMap[userRecord.ID].LoginCount += userRecord.LoginCount
+		}
+	}
+
+	userBusinessAnalysisReturnList := make([]*UserBusinessAnalysis, len(resultMap))
+	index := 0
+	for _, v := range resultMap {
+		userBusinessAnalysisReturnList[index] = v
+		index += 1
+	}
+	log.Info("return size=" + fmt.Sprint(len(userBusinessAnalysisReturnList)))
+	return userBusinessAnalysisReturnList, count
+}
+
 func CounDataByDate(wikiCountMap map[string]int, startTime time.Time, endTime time.Time) {
 	log.Info("start to count other user info data")
 	sess := x.NewSession()
 	defer sess.Close()
-	sess.Select("`user`.*").Table("user")
+	sess.Select("`user`.*").Table("user").Where("type != 1 and is_active=true")
 	userList := make([]*User, 0)
 	sess.Find(&userList)
 

package.json

@@ -19,11 +19,13 @@
     "cssnano": "4.1.10",
     "domino": "2.1.5",
     "dropzone": "5.7.2",
+    "echarts": "3.8.5",
     "element-ui": "2.15.5",
     "esdk-obs-browserjs": "3.20.7",
     "esdk-obs-nodejs": "3.20.11",
     "fast-glob": "3.2.2",
     "file-loader": "6.0.0",
+    "file-saver": "2.0.5",
     "fomantic-ui": "2.8.4",
     "fs": "0.0.1-security",
     "highlight.js": "10.4.1",
@@ -55,13 +57,15 @@
     "webpack": "4.43.0",
     "webpack-cli": "3.3.11",
     "webpack-fix-style-only-entries": "0.4.0",
-    "worker-loader": "2.0.0"
+    "worker-loader": "2.0.0",
+    "xlsx": "0.17.3"
   },
   "devDependencies": {
     "eslint": "6.8.0",
     "eslint-config-airbnb-base": "14.1.0",
     "eslint-plugin-import": "2.20.2",
     "eslint-plugin-vue": "6.2.2",
+    "script-loader": "0.7.2",
     "stylelint": "13.3.3",
     "stylelint-config-standard": "20.0.0",
     "updates": "10.2.11"

routers/repo/user_data_analysis.go

@@ -9,6 +9,7 @@ import (
 	"code.gitea.io/gitea/modules/context"
 	"code.gitea.io/gitea/modules/git"
 	"code.gitea.io/gitea/modules/log"
+	"code.gitea.io/gitea/modules/setting"
 )
 
 func QueryUserStaticData(ctx *context.Context) {
@@ -19,7 +20,36 @@ func QueryUserStaticData(ctx *context.Context) {
 	endTime, _ := time.Parse("2006-01-02", endDate)
 	log.Info("startTime=" + fmt.Sprint(startTime.Unix()) + "  endDate=" + fmt.Sprint(endTime.Unix()))
 	ctx.JSON(http.StatusOK, models.QueryUserStaticData(startTime.Unix(), endTime.Unix()))
+}
+
+func QueryUserStaticDataPage(ctx *context.Context) {
+	startDate := ctx.Query("startDate")
+	endDate := ctx.Query("endDate")
+	page := ctx.QueryInt("page")
+	if page <= 0 {
+		page = 1
+	}
+	userName := ctx.Query("userName")
 
+	log.Info("startDate=" + startDate + "  endDate=" + endDate + " userName=" + userName + " page=" + fmt.Sprint(page))
+	startTime, _ := time.Parse("2006-01-02", startDate)
+	endTime, _ := time.Parse("2006-01-02", endDate)
+	log.Info("startTime=" + fmt.Sprint(startTime.Unix()) + "  endDate=" + fmt.Sprint(endTime.Unix()))
+
+	pageOpts := &models.UserBusinessAnalysisQueryOptions{
+		ListOptions: models.ListOptions{
+			Page:     page,
+			PageSize: setting.UI.IssuePagingNum,
+		},
+		UserName:  userName,
+		StartTime: startTime.Unix(),
+		EndTime:   endTime.Unix(),
+	}
+	mapInterface := make(map[string]interface{})
+	re, count := models.QueryUserStaticDataPage(pageOpts)
+	mapInterface["data"] = re
+	mapInterface["count"] = count
+	ctx.JSON(http.StatusOK, mapInterface)
 }
 
 func TimingCountDataByDate(date string) {

routers/repo/view.go

@@ -15,6 +15,7 @@ import (
 	"net/http"
 	"net/url"
 	"path"
+	"sort"
 	"strings"
 	"time"
 
@@ -918,6 +919,7 @@ func Forks(ctx *context.Context) {
 }
 
 func Contributors(ctx *context.Context) {
+	ctx.Data["PageIsViewCode"] = true
 	ctx.HTML(http.StatusOK, tplContributors)
 }
 
@@ -964,6 +966,9 @@ func ContributorsAPI(ctx *context.Context) {
 				}
 			}
 		}
+		sort.Slice(contributorInfos, func(i, j int) bool {
+			return contributorInfos[i].CommitCnt > contributorInfos[j].CommitCnt
+		})
 	} else {
 		log.Error("GetContributors failed: %v", err)
 		errorCode = -1

routers/routes/routes.go

@@ -793,6 +793,7 @@ func RegisterRoutes(m *macaron.Macaron) {
 
 	m.Post("/:username/:reponame/action/:action", reqSignIn, context.RepoAssignment(), context.UnitTypes(), repo.Action)
 	m.Get("/tool/query_user_static", repo.QueryUserStaticData)
+	m.Get("/tool/query_user_static_page", repo.QueryUserStaticDataPage)
 	// Grouping for those endpoints not requiring authentication
 	m.Group("/:username/:reponame", func() {
 		m.Get("/contributors", repo.Contributors)

templates/home.tmpl

@@ -37,7 +37,11 @@
                         <p class="am-lh-18">在这里为你和你的团队创建项目，基于Git工具，提交记录或者回滚代码修改。<br>
                         不论是公开或者私有仓库，都可免费使用所有功能。<br>
                         尽情将你喜欢的代码都放在这里，仓库数量、存储容量不受限</p>
-                        <a class="ui blue basic button am-mt-20" href="{{AppSubUrl}}/user/sign_up">立即使用</a>
+                        {{if .IsSigned}}
+                        <a class="ui blue basic button am-mt-20" href="{{AppSubUrl}}/dashboard">立即使用 </a>
+                        {{else}}
+                        <a class="ui blue basic button am-mt-20" href="{{AppSubUrl}}/user/login">立即使用 </a>
+                        {{end}}
                     </div>
                     <div class="ten wide column computer only i-code-pic am-pt-30">
                         <img class="ui fluid rounded image am-shadow-2 am-mt-10" src="/img/i-code-pic.jpg" style="position: absolute;">
@@ -188,7 +192,12 @@
                         开发者可以根据使用需求，自由选择相应计算资源，可以测试模型在不同硬件环境下的适配能力、性能、稳定性等<br>
                         如果您的模型需要更多的计算资源，也可以单独申请<br>               
                         </p>
-                        <a class="ui blue basic button am-mt-20" href="{{AppSubUrl}}/user/sign_up">马上使用</a> <a class="ui grey basic button am-mt-20" href="mailto:aiforge@openi.org.cn">单独申请</a>
+                        {{if .IsSigned}}
+                        <a class="ui blue basic button am-mt-20" href="{{AppSubUrl}}/dashboard">立即使用 </a><a class="ui grey basic button am-mt-20" href="mailto:aiforge@openi.org.cn">单独申请</a>
+                        {{else}}
+                        <a class="ui blue basic button am-mt-20" href="{{AppSubUrl}}/user/login">立即使用 </a><a class="ui grey basic button am-mt-20" href="mailto:aiforge@openi.org.cn">单独申请</a>
+                        {{end}}
+                        
                     </div>
                 </div>
             </div>

templates/repo/header.tmpl

@@ -93,7 +93,7 @@
 			<div class="ui tabular stackable menu navbar">
 				{{if .Permission.CanRead $.UnitTypeCode}}
 				<div class="dropdown-menu">
-					<a class="{{if or .PageIsViewCode .PageIsReleaseList .PageIsWiki .PageIsActivity}}active{{end}} item" href="{{.RepoLink}}{{if (ne .BranchName .Repository.DefaultBranch)}}/src/{{.BranchNameSubURL | EscapePound}}{{end}}">
+					<a class="{{if or .PageIsViewCode .PageIsReleaseList .PageIsWiki .PageIsActivity .PageIsViewCode}}active{{end}} item" href="{{.RepoLink}}{{if (ne .BranchName .Repository.DefaultBranch)}}/src/{{.BranchNameSubURL | EscapePound}}{{end}}">
 							<span>{{svg "octicon-code" 16}} {{.i18n.Tr "repo.code"}} <i class="dropdown icon"></i></span>
 					</a>
 					<div class="dropdown-content">

templates/repo/issue/labels.tmpl

@@ -4,7 +4,7 @@
 	<div class="ui container">
 			<div class="ui two column stackable grid">
 					<div class="column" style="display: flex;align-items: center;">
-							<div class="ui large breadcrumb">
+							<div class="ui breadcrumb">
 									<a class="section" href="{{.RepoLink}}/issues">{{.i18n.Tr "repo.issues"}}</a>
 									<div class="divider"> / </div>
 									<div class="action section">{{.Title | RenderEmoji}}</div>

templates/repo/issue/milestone_issues.tmpl

@@ -4,7 +4,7 @@
 	<div class="ui container">
 		<div class="ui three column stackable grid">
 			<div class="column" style="display: flex;align-items: center;">
-					<div class="ui large breadcrumb">
+					<div class="ui  breadcrumb">
 							<a class="section" href="{{.RepoLink}}/issues">{{.i18n.Tr "repo.issues"}}</a>
 							<div class="divider"> / </div>
 							<a class="section" href="{{.RepoLink}}/milestones">{{.i18n.Tr "repo.milestones"}}</a>

templates/repo/issue/milestone_new.tmpl

@@ -4,7 +4,7 @@
 	<div class="ui container">
 		<div class="ui two column stackable grid">
 				<div class="column" style="display: flex;align-items: center;">
-						<div class="ui large breadcrumb">
+						<div class="ui breadcrumb">
 								<a class="section" href="{{.RepoLink}}/issues">{{.i18n.Tr "repo.issues"}}</a>
 								<div class="divider"> / </div>
 								<a class="section" href="{{.RepoLink}}/milestones">{{.i18n.Tr "repo.milestones"}}</a>

templates/repo/issue/milestones.tmpl

@@ -4,7 +4,7 @@
 	<div class="ui container">
 			<div class="ui two column stackable grid">
 					<div class="column" style="display: flex;align-items: center;">
-							<div class="ui large breadcrumb">
+							<div class="ui  breadcrumb">
 									<a class="section" href="{{.RepoLink}}/issues">{{.i18n.Tr "repo.issues"}}</a>
 									<div class="divider"> / </div>
 									<div class="action section">{{.Title | RenderEmoji}}</div>

templates/repo/issue/new.tmpl

@@ -4,7 +4,7 @@
 	<div class="ui container">
 			<div class="ui two column stackable grid">
 					<div class="column" style="display: flex;align-items: center;">
-							<div class="ui large breadcrumb">
+							<div class="ui breadcrumb">
 									<a class="section" href="{{.RepoLink}}/issues">{{.i18n.Tr "repo.issues"}}</a>
 									<div class="divider"> / </div>
 									<div class="action section">{{.i18n.Tr "repo.issues.new"}}</div>

templates/repo/issue/view.tmpl

@@ -5,13 +5,13 @@
 		<div class="ui two column stackable grid">
 			<div class="column" style="display: flex;align-items: center;">
 					{{if .PageIsIssueList}}
-					<div class="ui large breadcrumb">
+					<div class="ui breadcrumb">
 							<a class="section" href="{{.RepoLink}}/issues">{{.i18n.Tr "repo.issues"}}</a>
 							<div class="divider"> / </div>
 							<div class="action section">{{.i18n.Tr "repo.issues_detail"}}</div>
 					</div>
 					{{else}}
-					<div class="ui large breadcrumb">
+					<div class="ui breadcrumb">
 						<a class="section" href="{{.RepoLink}}/pulls">{{.i18n.Tr "repo.pulls"}}</a>
 						<div class="divider"> / </div>
 						<div class="action section">{{.i18n.Tr "repo.issues_detail"}}</div>

templates/repo/pulls/commits.tmpl

@@ -10,7 +10,7 @@
 		</div> -->
 		<div class="ui two column stackable grid">
 			<div class="column" style="display: flex;align-items: center;">
-					<div class="ui large breadcrumb">
+					<div class="ui breadcrumb">
 						<a class="section" href="{{.RepoLink}}/pulls">{{.i18n.Tr "repo.pulls"}}</a>
 						<div class="divider"> / </div>
 						<div class="action section">{{.i18n.Tr "repo.issues_detail"}}</div>

templates/repo/pulls/files.tmpl

@@ -10,7 +10,7 @@
 		</div> -->
 		<div class="ui two column stackable grid">
 			<div class="column" style="display: flex;align-items: center;">
-					<div class="ui large breadcrumb">
+					<div class="ui  breadcrumb">
 						<a class="section" href="{{.RepoLink}}/pulls">{{.i18n.Tr "repo.pulls"}}</a>
 						<div class="divider"> / </div>
 						<div class="action section">{{.i18n.Tr "repo.issues_detail"}}</div>

web_src/js/components/Contributors.vue

@@ -3,9 +3,9 @@
         <div class="row git-user-content">
                 <h3 class="ui header">
                     <div class="ui breadcrumb">
-                        <a class="section" href="/">代码</a>
+                        <a class="section" :href="url_code">代码</a>
                         <div class="divider"> / </div>
-                        <div class="active section" >贡献者({{totalNum}})</div>
+                        <div class="active section" >贡献者&nbsp;({{totalNum}})</div>
                     </div>
                 </h3>
                 <div class="ui horizontal relaxed list">
@@ -56,7 +56,7 @@ export default {
 methods: {
 
     getContributorsList(){
-        this.$axios.get(this.url+'/contributors/list').then((res)=>{
+        this.$axios.get(this.url+'/list').then((res)=>{
             this.contributors_list = res.data.contributor_info
             this.totalNum = this.contributors_list.length
             this.contributors_list_page = this.contributors_list.slice(0,this.pageSize)
@@ -74,7 +74,10 @@ watch: {
 
 },
 created(){
-    this.url=document.head.querySelector("[property~='og:url'][content]").content
+    const url = window.location.pathname;
+    this.url = url;
+    let strIndex = this.url.indexOf("contributors")
+    this.url_code = this.url.substr(0,strIndex)
     this.getContributorsList()
     
 },