Merge branch 'V20210927-patch' into web

README.md

@@ -2,7 +2,7 @@
 
 <h1><img src="public/img/favicon.png" alt="logo" width="30" height="30">AiForge - 启智AI开发协作平台</h1>
 
-[![release](https://img.shields.io/badge/release-V1.21.8-blue)](https://git.openi.org.cn/OpenI/aiforge/releases/latest)
+[![release](https://img.shields.io/badge/release-1.21.9.2-blue)](https://git.openi.org.cn/OpenI/aiforge/releases/latest)
 [![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](https://opensource.org/licenses/MIT)
 
 

models/user.go

@@ -1556,6 +1556,18 @@ func GetUserByActivateEmail(email string) (*User, error) {
 	if len(users) >= 1 {
 		return &users[0],nil
 	}else {
+		// Finally, if email address is the protected email address:用户邮件地址设置为隐藏电子邮件地址
+		if strings.HasSuffix(email, fmt.Sprintf("@%s", setting.Service.NoReplyAddress)) {
+			username := strings.TrimSuffix(email, fmt.Sprintf("@%s", setting.Service.NoReplyAddress))
+			user := &User{LowerName: username}
+			has, err := ctx.e.Get(user)
+			if err != nil {
+				return nil, err
+			}
+			if has {
+				return user, nil
+			}
+		}
 		return nil, errors.New("cannot find user by email")
 	}
 }

templates/repo/cloudbrain/index.tmpl

@@ -433,6 +433,7 @@
 
     // 加载任务状态
     var timeid = window.setInterval(loadJobStatus, 15000);
+    $(document).ready(loadJobStatus);
     function loadJobStatus() {
         $(".job-status").each((index, job) => {
             const jobID = job.dataset.jobid;