+ 本项目是群体化方法与技术的开源实现案例，在基于Gitea的基础上，进一步支持社交化的协同开发、协同学习、协同研究等群体创新实践服务，特别是针对新一代人工智能技术特点，重点支持项目管理、git代码管理、大数据集存储管理与智能计算平台接入。
+
+
+
+ 
+
+
+ */
+
+ }
+ console.log("html=" + html)
+ output.innerHTML = html;
+ swiperNewMessage.updateSlides();
+ swiperNewMessage.updateProgress();
+};
+
+function getMsg(record){
+ var html ="";
+ html += "
+
+ ";
+ html += " ![\"\"](\"/user/avatar/")
"
+ html += "
- {{.i18n.Tr "custom.Platform_Tutorial"}}
- {{if .EnableSwagger}}API{{end}}
+
+
+ {{if .EnableSwagger}} {{end}}
{{if .IsSigned}}
- {{.i18n.Tr "custom.foot.advice_feedback"}}
+
{{else}}
- {{.i18n.Tr "custom.foot.advice_feedback"}}
+
{{end}}
{{template "custom/extra_links_footer" .}}
diff --git a/templates/base/footer_content_fluid.tmpl b/templates/base/footer_content_fluid.tmpl
index 8d9f2ba40..6d3cada9e 100644
--- a/templates/base/footer_content_fluid.tmpl
+++ b/templates/base/footer_content_fluid.tmpl
@@ -26,12 +26,12 @@
{{end}}
- {{.i18n.Tr "custom.Platform_Tutorial"}}
- {{if .EnableSwagger}}API{{end}}
+
+ {{if .EnableSwagger}} {{end}}
{{if .IsSigned}}
- {{.i18n.Tr "custom.foot.advice_feedback"}}
+
{{else}}
- {{.i18n.Tr "custom.foot.advice_feedback"}}
+
{{end}}
{{template "custom/extra_links_footer" .}}
diff --git a/templates/base/head.tmpl b/templates/base/head.tmpl
index 1239292ce..75496aed5 100755
--- a/templates/base/head.tmpl
+++ b/templates/base/head.tmpl
@@ -174,6 +174,7 @@
{{else if ne DefaultTheme "gitea"}}
{{end}}
+
{{template "custom/header" .}}
-
{{template "custom/body_outer_pre" .}}
@@ -206,7 +206,7 @@ var _hmt = _hmt || [];
{{.notice.Title}}
- {{svg "octicon-x" 16}}
+
{{end}}
{{/*
@@ -231,7 +231,7 @@ var _hmt = _hmt || [];
}else{
isNewNotice=false;
}
- if ("{{.notice.Visible}}"){
+ if (JSON.parse("{{.notice.Visible}}")){
if(isNewNotice){
document.getElementById("notic_content").style.display='block'
}else{
diff --git a/templates/base/head_fluid.tmpl b/templates/base/head_fluid.tmpl
index 227c50211..5878bfb13 100644
--- a/templates/base/head_fluid.tmpl
+++ b/templates/base/head_fluid.tmpl
@@ -174,6 +174,7 @@
{{else if ne DefaultTheme "gitea"}}
{{end}}
+
{{template "custom/header" .}}
+
+
+
+
+
+
{{template "custom/body_outer_pre" .}}
"
+ html += " "
+ html += " " + record.ActUser.Name + ""
+ return html;
+}
+
+function getRepoLink(record){
+ return "/" + record.Repo.OwnerName + "/" + record.Repo.Name;
+}
+function getRepoLink(record){
+ return record.Repo.OwnerName + "/" + record.Repo.Name;
+}
+
+function getTime(UpdatedUnix,currentTime){
+ UpdatedUnix = UpdatedUnix;
+ currentTime = currentTime / 1000;
+ var timeEscSecond = currentTime - UpdatedUnix;
+ if( timeEscSecond < 0){
+ timeEscSecond = 1;
+ }
+ console.log("currentTime=" + currentTime + " updateUnix=" + UpdatedUnix);
+
+ var hours= Math.floor(timeEscSecond / 3600);
+ //计算相差分钟数
+ var leave2 = Math.floor(timeEscSecond % (3600)); //计算小时数后剩余的秒数
+ var minutes= Math.floor(leave2 / 60);//计算相差分钟数
+
+ var leave3=Math.floor(leave2 % 60); //计算分钟数后剩余的秒数
+ var seconds= leave3;
+
+ if(hours == 0 && minutes == 0){
+ return seconds + getRepoOrOrg(6,isZh);
+ }else{
+ if(hours > 0){
+ return hours + getRepoOrOrg(4,isZh);
+ }else{
+ return minutes + getRepoOrOrg(5,isZh);
+ }
+ }
+}
+
+function getPRLink(record){
+ return "/" + record.Repo.OwnerName + "/" + record.Repo.Name + "/pulls/" + getIssueId(record);
+}
+function getPRText(record){
+ return record.Repo.OwnerName + "/" + record.Repo.Name + "#" + getIssueId(record);
+}
+
+function getIssueLink(record){
+
+ return "/" + record.Repo.OwnerName + "/" + record.Repo.Name + "/issues/" + getIssueId(record);
+}
+
+function getIssueId(record){
+ var Id = "1";
+ if(!isEmpty(record.Comment) && !isEmpty(record.Comment.Issue)){
+ Id = record.Comment.Issue.Index;
+ }else{
+ if(!isEmpty(record.Content)){
+ var content = record.Content;
+ var index = content.indexOf("|");
+ if(index != -1){
+ Id = content.substring(0,index);
+ }
+ }
+ }
+ return Id;
+}
+
+function getIssueText(record){
+ return record.Repo.OwnerName + "/" + record.Repo.Name + "#" + getIssueId(record);
+}
+
+/*
+ ActionCreateRepo ActionType = iota + 1 // 1
+ ActionRenameRepo // 2
+ ActionStarRepo // 3
+ ActionWatchRepo // 4
+ ActionCommitRepo // 5
+ ActionCreateIssue // 6
+ ActionCreatePullRequest // 7
+ ActionTransferRepo // 8
+ ActionPushTag // 9
+ ActionCommentIssue // 10
+ ActionMergePullRequest // 11
+ ActionCloseIssue // 12
+ ActionReopenIssue // 13
+ ActionClosePullRequest // 14
+ ActionReopenPullRequest // 15
+ ActionDeleteTag // 16
+ ActionDeleteBranch // 17
+ ActionMirrorSyncPush // 18
+ ActionMirrorSyncCreate // 19
+ ActionMirrorSyncDelete // 20
+ ActionApprovePullRequest // 21
+ ActionRejectPullRequest // 22
+ ActionCommentPull // 23
+*/
+
+var actionNameZH={
+ "1":"创建了项目",
+ "2":"重命名项目 {oldRepoName} 为",
+ "5":"推送了 {branch} 分支的代码到",
+ "6":"创建了任务",
+ "7":"创建了合并请求",
+ "9":"推送了 {branch} 分支的代码到",
+ "10":"评论了任务",
+ "11":"合并了合并请求",
+ "12":"关闭了任务",
+ "13":"重新开启了任务",
+ "14":"关闭了合并请求",
+ "15":"重新开启了合并请求",
+ "17":"从 {repoName} 删除分支 {deleteBranchName}",
+ "22":"拒绝了合并请求",
+ "23":"评论了合并请求"
+};
+
+var actionNameEN={
+ "1":" created repository",
+ "2":" renamed repository from {oldRepoName} to ",
+ "5":" pushed to {branch} at",
+ "6":" opened issue",
+ "7":" created pull request",
+ "9":" pushed to {branch} at",
+ "10":" commented on issue",
+ "11":" merged pull request",
+ "12":" closed issue",
+ "13":" reopened issue",
+ "14":" closed pull request",
+ "15":" reopened pull request",
+ "17":" deleted branch {deleteBranchName} from {repoName}",
+ "22":" rejected pull request",
+ "23":" commented on pull request"
+};
+
+var repoAndOrgZH={
+ "1":"项目",
+ "2":"成员",
+ "3":"团队",
+ "4":"小时前",
+ "5":"分钟前",
+ "6":"秒前"
+};
+
+var repoAndOrgEN={
+ "1":"repository",
+ "2":"Members ",
+ "3":"Teams",
+ "4":" hours ago",
+ "5":" minutes ago",
+ "6":" seconds ago"
+};
+
+
+function getAction(opType,isZh){
+ if(isZh){
+ return actionNameZH[opType]
+ }else{
+ return actionNameEN[opType]
+ }
+}
+
+queryRecommendData();
+
+function queryRecommendData(){
+ $.ajax({
+ type:"GET",
+ url:"/recommend/org",
+ headers: {
+ authorization:token,
+ },
+ dataType:"json",
+ async:false,
+ success:function(json){
+ console.log(json);
+ displayOrg(json);
+ },
+ error:function(response) {
+ console.log(response);
+ }
+ });
+
+ $.ajax({
+ type:"GET",
+ url:"/recommend/repo",
+ headers: {
+ authorization:token,
+ },
+ dataType:"json",
+ async:false,
+ success:function(json){
+ console.log(json);
+ displayRepo(json);
+ },
+ error:function(response) {
+ console.log(response);
+ }
+ });
+
+}
+
+/*
+
+
+*/
+function displayRepo(json){
+ var orgRepo = document.getElementById("recommendrepo");
+ var html = "";
+ if (json != null && json.length > 0){
+ for(var i = 0; i < json.length;i++){
+ var record = json[i]
+ html += "
+
+
+
+ 
+ aiforge
+
+
+";
+ html += "
";
+ }
+ }
+ orgRepo.innerHTML = html;
+ swiperRepo.updateSlides();
+ swiperRepo.updateProgress();
+}
+
+/**
+ *
+ * ";
+ html += "
";
+ html += "";
+ html += " ";
+ html += " " + record["NumStars"] + "" + record["NumForks"];
+ html += " ";
+ html += " ![](\"")
";
+ html += " " + record["Name"] +"";
+ html += "
";
+ html += " " + record["Description"] + "
";
+ html += " "
+ if(record["Topics"] != null){
+ for(var j = 0; j < record["Topics"].length; j++){
+ topic = record["Topics"][j];
+ url = "/explore/repos?q=" + (topic) + "&topic="
+ html += "" + topic + "";
+ }
+ }
+ html += "
";
+ html += "
+
+
+ */
+
+//var repoAndOrgZH = new Map([['1', "项目"], ['2', "成员"], ['3', "团队"]]);
+//var repoAndOrgEN = new Map([['1', "Repository"], ['2', "Members"], ['3', "Teams"]]);
+
+
+function getRepoOrOrg(key,isZhLang){
+ if(isZhLang){
+ return repoAndOrgZH[key];
+ }else{
+ return repoAndOrgEN[key];
+ }
+}
+
+function displayOrg(json){
+ var orgDiv = document.getElementById("recommendorg");
+ var html = "";
+ if (json != null && json.length > 0){
+ for(var i = 0; i < json.length;i++){
+ var record = json[i]
+ html += "";
+ }
+ }
+ orgDiv.innerHTML = html;
+}
\ No newline at end of file
diff --git a/routers/actionnotification.go b/routers/actionnotification.go
index b3e151c1c..31e25a65e 100644
--- a/routers/actionnotification.go
+++ b/routers/actionnotification.go
@@ -1,6 +1,8 @@
package routers
import (
+ "net/http"
+
"code.gitea.io/gitea/models"
"code.gitea.io/gitea/modules/context"
"code.gitea.io/gitea/modules/log"
@@ -11,6 +13,9 @@ import (
var upgrader = websocket.Upgrader{
ReadBufferSize: 1024,
WriteBufferSize: 1024,
+ CheckOrigin: func(r *http.Request) bool {
+ return true
+ },
}
var SocketManager = socketwrap.NewClientsManager()
@@ -24,7 +29,7 @@ func ActionNotification(ctx *context.Context) {
}
client := &socketwrap.Client{Manager: SocketManager, Conn: conn, Send: make(chan *models.Action, 256)}
- WriteLastTenActionsIfHave(conn)
+ WriteLastActionsIfHave(conn)
client.Manager.Register <- client
@@ -32,22 +37,20 @@ func ActionNotification(ctx *context.Context) {
}
-func WriteLastTenActionsIfHave(conn *websocket.Conn) {
- socketwrap.LastTenActionsQueue.Mutex.RLock()
+func WriteLastActionsIfHave(conn *websocket.Conn) {
+ socketwrap.LastActionsQueue.Mutex.RLock()
{
- size := socketwrap.LastTenActionsQueue.Queue.Len()
+ size := socketwrap.LastActionsQueue.Queue.Len()
if size > 0 {
- tempE := socketwrap.LastTenActionsQueue.Queue.Front()
- conn.WriteJSON(tempE)
+ tempE := socketwrap.LastActionsQueue.Queue.Front()
+ conn.WriteJSON(tempE.Value)
for i := 1; i < size; i++ {
tempE = tempE.Next()
- conn.WriteJSON(tempE)
+ conn.WriteJSON(tempE.Value)
}
}
}
- socketwrap.LastTenActionsQueue.Mutex.RUnlock()
+ socketwrap.LastActionsQueue.Mutex.RUnlock()
}
-
-
diff --git a/routers/home.go b/routers/home.go
index 7cc353ed8..24de1a10c 100755
--- a/routers/home.go
+++ b/routers/home.go
@@ -44,9 +44,52 @@ const (
func Home(ctx *context.Context) {
ctx.Data["PageIsHome"] = true
ctx.Data["IsRepoIndexerEnabled"] = setting.Indexer.RepoIndexerEnabled
+ setRecommendURL(ctx)
ctx.HTML(200, tplHome)
}
+func setRecommendURL(ctx *context.Context) {
+ addr := setting.RecommentRepoAddr[10:]
+ start := strings.Index(addr, "/")
+ end := strings.Index(addr, "raw")
+ if start != -1 && end != -1 {
+ ctx.Data["RecommendURL"] = addr[start:end]
+ } else {
+ ctx.Data["RecommendURL"] = setting.RecommentRepoAddr
+ }
+
+ ctx.Data["page_title"] = ctx.Tr("home.page_title")
+ ctx.Data["page_small_title"] = ctx.Tr("home.page_small_title")
+ ctx.Data["page_description"] = ctx.Tr("home.page_description")
+ ctx.Data["page_use"] = ctx.Tr("home.page_use")
+ ctx.Data["page_only_dynamic"] = ctx.Tr("home.page_only_dynamic")
+ ctx.Data["page_recommend_org"] = ctx.Tr("home.page_recommend_org")
+ ctx.Data["page_recommend_org_desc"] = ctx.Tr("home.page_recommend_org_desc")
+ ctx.Data["page_recommend_org_commit"] = ctx.Tr("home.page_recommend_org_commit")
+ ctx.Data["page_recommend_org_more"] = ctx.Tr("home.page_recommend_org_more")
+ ctx.Data["page_recommend_repo"] = ctx.Tr("home.page_recommend_repo")
+ ctx.Data["page_recommend_repo_desc"] = ctx.Tr("home.page_recommend_repo_desc")
+ ctx.Data["page_recommend_repo_commit"] = ctx.Tr("home.page_recommend_repo_commit")
+ ctx.Data["page_recommend_repo_go"] = ctx.Tr("home.page_recommend_repo_go")
+ ctx.Data["page_recommend_repo_more"] = ctx.Tr("home.page_recommend_repo_more")
+ ctx.Data["page_dev_env"] = ctx.Tr("home.page_dev_env")
+ ctx.Data["page_dev_env_desc"] = ctx.Tr("home.page_dev_env_desc")
+ ctx.Data["page_dev_env_desc_title"] = ctx.Tr("home.page_dev_env_desc_title")
+ ctx.Data["page_dev_env_desc_desc"] = ctx.Tr("home.page_dev_env_desc_desc")
+ ctx.Data["page_dev_env_desc1_title"] = ctx.Tr("home.page_dev_env_desc1_title")
+ ctx.Data["page_dev_env_desc1_desc"] = ctx.Tr("home.page_dev_env_desc1_desc")
+ ctx.Data["page_dev_env_desc2_title"] = ctx.Tr("home.page_dev_env_desc2_title")
+ ctx.Data["page_dev_env_desc2_desc"] = ctx.Tr("home.page_dev_env_desc2_desc")
+ ctx.Data["page_dev_env_desc3_title"] = ctx.Tr("home.page_dev_env_desc3_title")
+ ctx.Data["page_dev_env_desc3_desc"] = ctx.Tr("home.page_dev_env_desc3_desc")
+ ctx.Data["page_dev_yunlao"] = ctx.Tr("home.page_dev_yunlao")
+ ctx.Data["page_dev_yunlao_desc1"] = ctx.Tr("home.page_dev_yunlao_desc1")
+ ctx.Data["page_dev_yunlao_desc2"] = ctx.Tr("home.page_dev_yunlao_desc2")
+ ctx.Data["page_dev_yunlao_desc3"] = ctx.Tr("home.page_dev_yunlao_desc3")
+ ctx.Data["page_dev_yunlao_desc4"] = ctx.Tr("home.page_dev_yunlao_desc4")
+ ctx.Data["page_dev_yunlao_apply"] = ctx.Tr("home.page_dev_yunlao_apply")
+}
+
func Dashboard(ctx *context.Context) {
if ctx.IsSigned {
if !ctx.User.IsActive && setting.Service.RegisterEmailConfirm {
@@ -77,7 +120,7 @@ func Dashboard(ctx *context.Context) {
ctx.Redirect(setting.AppSubURL + "/user/login")
return
}
-
+ setRecommendURL(ctx)
ctx.Data["PageIsHome"] = true
ctx.Data["IsRepoIndexerEnabled"] = setting.Indexer.RepoIndexerEnabled
ctx.HTML(200, tplHome)
@@ -513,43 +556,92 @@ func NotFound(ctx *context.Context) {
ctx.Data["Title"] = "Page Not Found"
ctx.NotFound("home.NotFound", nil)
}
+
func RecommendOrgFromPromote(ctx *context.Context) {
url := setting.RecommentRepoAddr + "organizations"
- recommendFromPromote(ctx, url)
+ result, err := recommendFromPromote(url)
+ if err != nil {
+ ctx.ServerError("500", err)
+ return
+ }
+ resultOrg := make([]map[string]interface{}, 0)
+ for _, userName := range result {
+ user, err := models.GetUserByName(userName)
+ if err == nil {
+ userMap := make(map[string]interface{})
+ userMap["Name"] = user.Name
+ userMap["Description"] = user.Description
+ userMap["FullName"] = user.FullName
+ userMap["ID"] = user.ID
+ userMap["Avatar"] = user.RelAvatarLink()
+ userMap["NumRepos"] = user.NumRepos
+ userMap["NumTeams"] = user.NumTeams
+ userMap["NumMembers"] = user.NumMembers
+ resultOrg = append(resultOrg, userMap)
+ } else {
+ log.Info("query user error," + err.Error())
+ }
+ }
+
+ ctx.JSON(200, resultOrg)
}
-func recommendFromPromote(ctx *context.Context, url string) {
+func recommendFromPromote(url string) ([]string, error) {
resp, err := http.Get(url)
- if err != nil {
+ if err != nil || resp.StatusCode != 200 {
log.Info("Get organizations url error=" + err.Error())
- ctx.ServerError("QueryTrainJobList:", err)
- return
+ return nil, err
}
bytes, err := ioutil.ReadAll(resp.Body)
resp.Body.Close()
if err != nil {
log.Info("Get organizations url error=" + err.Error())
- ctx.ServerError("QueryTrainJobList:", err)
- return
+ return nil, err
}
allLineStr := string(bytes)
lines := strings.Split(allLineStr, "\n")
result := make([]string, len(lines))
for i, line := range lines {
-
- tmpIndex := strings.Index(line, ".")
- log.Info("i=" + fmt.Sprint(i) + " line=" + line + " tmpIndex=" + fmt.Sprint(tmpIndex))
- if tmpIndex == -1 {
- result[i] = strings.Trim(line, " ")
- } else {
- result[i] = strings.Trim(line[tmpIndex+1:], " ")
- }
+ log.Info("i=" + fmt.Sprint(i) + " line=" + line)
+ result[i] = strings.Trim(line, " ")
}
- ctx.JSON(http.StatusOK, result)
+ return result, nil
}
func RecommendRepoFromPromote(ctx *context.Context) {
url := setting.RecommentRepoAddr + "projects"
- recommendFromPromote(ctx, url)
+ result, err := recommendFromPromote(url)
+ if err != nil {
+ ctx.ServerError("500", err)
+ return
+ }
+ resultRepo := make([]map[string]interface{}, 0)
+ //resultRepo := make([]*models.Repository, 0)
+ for _, repoName := range result {
+ tmpIndex := strings.Index(repoName, "/")
+ if tmpIndex == -1 {
+ log.Info("error repo name format.")
+ } else {
+ ownerName := strings.Trim(repoName[0:tmpIndex], " ")
+ repoName := strings.Trim(repoName[tmpIndex+1:], " ")
+ repo, err := models.GetRepositoryByOwnerAndName(ownerName, repoName)
+ if err == nil {
+ repoMap := make(map[string]interface{})
+ repoMap["ID"] = fmt.Sprint(repo.ID)
+ repoMap["Name"] = repo.Name
+ repoMap["OwnerName"] = repo.OwnerName
+ repoMap["NumStars"] = repo.NumStars
+ repoMap["NumForks"] = repo.NumForks
+ repoMap["Description"] = repo.Description
+ repoMap["NumWatchs"] = repo.NumWatches
+ repoMap["Topics"] = repo.Topics
+ repoMap["Avatar"] = repo.RelAvatarLink()
+ resultRepo = append(resultRepo, repoMap)
+ } else {
+ log.Info("query repo error," + err.Error())
+ }
+ }
+ }
+ ctx.JSON(200, resultRepo)
}
diff --git a/routers/repo/cloudbrain.go b/routers/repo/cloudbrain.go
index c8818d9ba..ca1d08101 100755
--- a/routers/repo/cloudbrain.go
+++ b/routers/repo/cloudbrain.go
@@ -219,7 +219,7 @@ func CloudBrainCreate(ctx *context.Context, form auth.CreateCloudBrainForm) {
gpuType = gpuInfo.Value
}
}
- downloadRateCode(repo, jobName, setting.BenchmarkOwner, setting.BrainScoreName, benchmarkPath, form.BenchmarkCategory, gpuType)
+ downloadRateCode(repo, jobName, setting.BenchmarkOwner, setting.BenchmarkName, benchmarkPath, form.BenchmarkCategory, gpuType)
uploadCodeToMinio(benchmarkPath+"/", jobName, cloudbrain.BenchMarkMountPath+"/")
}
diff --git a/services/socketwrap/client.go b/services/socketwrap/client.go
index ce8dbb5e8..7d354453c 100644
--- a/services/socketwrap/client.go
+++ b/services/socketwrap/client.go
@@ -14,6 +14,11 @@ type Client struct {
Send chan *models.Action
}
+func (c *Client) Close() {
+ close(c.Send)
+ c.Conn.Close()
+}
+
func (c *Client) WritePump() {
defer func() {
diff --git a/services/socketwrap/clientManager.go b/services/socketwrap/clientManager.go
index ac6ca0bed..eeb496108 100644
--- a/services/socketwrap/clientManager.go
+++ b/services/socketwrap/clientManager.go
@@ -1,11 +1,17 @@
package socketwrap
import (
+ "os"
+ "os/signal"
+ "syscall"
+
"code.gitea.io/gitea/models"
+ "code.gitea.io/gitea/modules/log"
+ "github.com/elliotchance/orderedmap"
)
type ClientsManager struct {
- Clients map[*Client]bool
+ Clients *orderedmap.OrderedMap
Register chan *Client
Unregister chan *Client
}
@@ -14,32 +20,69 @@ func NewClientsManager() *ClientsManager {
return &ClientsManager{
Register: make(chan *Client),
Unregister: make(chan *Client),
- Clients: make(map[*Client]bool),
+ Clients: orderedmap.NewOrderedMap(),
}
}
-var LastTenActionsQueue = NewSyncQueue(10)
+const MaxClients = 100
+
+var LastActionsQueue = NewSyncQueue(15)
func (h *ClientsManager) Run() {
+ initActionQueue()
+ sig := make(chan os.Signal, 1)
+ signal.Notify(sig, os.Interrupt, syscall.SIGTERM)
+ var signalsReceived uint
for {
select {
case client := <-h.Register:
- h.Clients[client] = true
+ h.Clients.Set(client, true)
+ if h.Clients.Len() > MaxClients {
+ h.Clients.Delete(h.Clients.Front().Key)
+ }
+
case client := <-h.Unregister:
- if _, ok := h.Clients[client]; ok {
- delete(h.Clients, client)
+ if _, ok := h.Clients.Get(client); ok {
+ h.Clients.Delete(client)
close(client.Send)
}
case message := <-models.ActionChan:
- LastTenActionsQueue.Push(message)
- for client := range h.Clients {
+ LastActionsQueue.Push(message)
+ for _, client := range h.Clients.Keys() {
select {
- case client.Send <- message:
+ case client.(*Client).Send <- message:
default:
- close(client.Send)
- delete(h.Clients, client)
+ close(client.(*Client).Send)
+ h.Clients.Delete(client)
}
}
+ case s := <-sig:
+ log.Info("received signal", s)
+ signalsReceived++
+ if signalsReceived < 2 {
+ for _, client := range h.Clients.Keys() {
+ h.Clients.Delete(client)
+ client.(*Client).Close()
+ }
+ break
+
+ }
+ }
+ }
+}
+
+func initActionQueue() {
+ actions, err := models.GetLast20PublicFeeds()
+ if err == nil {
+ for i := len(actions) - 1; i >= 0; i-- {
+
+ user, err := models.GetUserByID(actions[i].UserID)
+ if err == nil {
+ if !user.IsOrganization() {
+ LastActionsQueue.Push(actions[i])
+ }
+
+ }
}
}
diff --git a/templates/base/footer_content.tmpl b/templates/base/footer_content.tmpl
index 9a708fc2c..42084b871 100755
--- a/templates/base/footer_content.tmpl
+++ b/templates/base/footer_content.tmpl
@@ -26,12 +26,13 @@
{{end}}
+
+
+
+
+ 
+
+
+
+ OpenI 启智社区
+
+ 39 项目 ･ 60 成员 ･ 23 团队
+
-
- {{template "custom/body_inner_pre" .}}
- {{if not .PageIsInstall}}
-
-
-
- {{end}}
+ {{template "custom/body_inner_pre" .}}
+
+ {{if not .PageIsInstall}}
+
+
+
+
+
+
+
+ {{end}}
{{/*
-