delete unused

app/controllers/UserController.go

@@ -93,21 +93,6 @@ func (c User) ReSendActiveEmail() revel.Result {
 	return c.RenderJson(re)
 }
 
-// 修改Email发送激活邮箱
-func (c User) updateEmailSendActiveEmail(email, pwd string) revel.Result {
-	re := info.NewRe()
-	if c.GetUserId() == configService.GetGlobalStringConfig("demoUserId") {
-		re.Msg = "cannotUpdateDemo"
-		return c.RenderJson(re)
-	}
-	if re.Ok, re.Msg = Vd("email", email); !re.Ok {
-		return c.RenderRe(re)
-	}
-
-	re.Ok, re.Msg = emailService.UpdateEmailSendActiveEmail(c.GetUserInfo(), email)
-	return c.RenderRe(re)
-}
-
 // 通过点击链接
 // 修改邮箱
 func (c User) UpdateEmail(token string) revel.Result {
@@ -147,27 +132,6 @@ func (c User) ActiveEmail(token string) revel.Result {
 	return c.RenderTemplate("user/active_email.html")
 }
 
-//------------
-// 第三方账号添加leanote账号
-func (c User) AddAccount(email, pwd string) revel.Result {
-	re := info.NewRe()
-
-	if re.Ok, re.Msg = Vd("email", email); !re.Ok {
-		return c.RenderRe(re)
-	}
-	if re.Ok, re.Msg = Vd("password", pwd); !re.Ok {
-		return c.RenderRe(re)
-	}
-
-	re.Ok, re.Msg = userService.ThirdAddUser(c.GetUserId(), email, pwd)
-
-	if re.Ok {
-		c.UpdateSession("Email", email)
-	}
-
-	return c.RenderRe(re)
-}
-
 //-----------------
 // 用户偏爱
 func (c User) UpdateColumnWidth(notebookWidth, noteListWidth, mdEditorWidth int) revel.Result {

app/controllers/member/MemberUserController.go

@@ -38,9 +38,3 @@ func (c MemberUser) Avatar() revel.Result {
 	c.RenderArgs["globalConfigs"] = configService.GetGlobalConfigForUser()
 	return c.RenderTemplate("member/user/avatar.html")
 }
-func (c MemberUser) AddAccount() revel.Result {
-	c.SetUserInfo()
-	c.SetLocale()
-	c.RenderArgs["title"] = "Add Account"
-	return c.RenderTemplate("member/user/add_account.html")
-}

app/controllers/member/个人中心.md

@@ -1,2 +0,0 @@
-包括基本信息设置
-博客设置

app/service/UserService.go

@@ -47,7 +47,7 @@ func (this *UserService) AddUser(user info.User) bool {
 		go func() {
 			emailService.RegisterSendActiveEmail(user, user.Email)
 			// 发送给我 life@leanote.com
-			emailService.SendEmail("life@leanote.com", "新增用户", "{header}用户名"+user.Email+"{footer}")
+			// emailService.SendEmail("life@leanote.com", "新增用户", "{header}用户名"+user.Email+"{footer}")
 		}()
 	}
 
@@ -412,26 +412,6 @@ func (this *UserService) UpdateEmail(token string) (ok bool, msg, email string)
 	return
 }
 
-//---------
-// 第三方添加账号
-func (this *UserService) ThirdAddUser(userId, email, pwd string) (ok bool, msg string) {
-	// 判断该用户是否已有了帐户
-	userInfo := this.GetUserInfo(userId)
-	if userInfo.Email != "" {
-		msg = "你已有帐户"
-		return
-	}
-
-	// 判断email是否存在
-	if this.IsExistsUser(email) {
-		msg = "该用户已存在"
-		return
-	}
-
-	ok = db.UpdateByQMap(db.Users, bson.M{"_id": bson.ObjectIdHex(userId)}, bson.M{"Email": email, "Pwd": Md5(pwd)})
-	return
-}
-
 //------------
 // 偏好设置
 

app/views/member/nav.html

@@ -39,7 +39,6 @@
 					</a>
 				</li>
 				
-				{{if $.userInfo.Email}}
 				<li>
 					<a href="/member/user/username">
 						<span>
@@ -62,15 +61,7 @@
 						</span>
 					</a>
 				</li>
-				{{else}}
+				
-				<li>
-					<a href="/member/user/addAccount">
-						<span>
-							{{msg . "addLeanoteAccount"}}
-						</span>
-					</a>
-				</li>
-				{{end}}
 			</ul>
 		</li>