注册加验证码

polaris1119 · polaris1119 · commit bc75141d0506 · 2014-11-01T13:18:56.000+08:00
diff --git a/websites/code/studygolang/src/controller/account.go b/websites/code/studygolang/src/controller/account.go
@@ -7,16 +7,18 @@
 package controller
 
 import (
+	"fmt"
+	"html/template"
+	"net/http"
+	"strings"
+
 	"config"
 	"filter"
-	"fmt"
+	"github.com/dchest/captcha"
 	"github.com/gorilla/sessions"
 	"github.com/studygolang/mux"
-	"html/template"
 	"logger"
-	"net/http"
 	"service"
-	"strings"
 	"util"
 )
 
@@ -27,25 +29,32 @@ func RegisterHandler(rw http.ResponseWriter, req *http.Request) {
 	username := req.PostFormValue("username")
 	// 请求注册页面
 	if username == "" || req.Method != "POST" || vars["json"] == "" {
+		filter.SetData(req, map[string]interface{}{"captchaId": captcha.NewLen(4)})
 		req.Form.Set(filter.CONTENT_TPL_KEY, "/template/register.html")
 		return
 	}
 
+	// 校验验证码
+	if !captcha.VerifyString(req.PostFormValue("captchaid"), req.PostFormValue("captchaSolution")) {
+		fmt.Fprint(rw, `{"errno": 1, "error":"验证码错误"}`)
+		return
+	}
+
 	// 入库
 	errMsg, err := service.CreateUser(req.Form)
 	if err != nil {
 		// bugfix：http://studygolang.com/topics/255
 		if errMsg == "" {
 			errMsg = err.Error()
 		}
-		fmt.Fprint(rw, `{"errno": 1, "error":"`, errMsg, `"}`)
+		fmt.Fprint(rw, `{"errno": 2, "error":"`, errMsg, `"}`)
 		return
 	}
 
 	// 注册成功，自动为其登录
 	setCookie(rw, req, req.PostFormValue("username"))
 	// 发送欢迎邮件
-	go sendWelcomeMail([]string{req.PostFormValue("email")})
+	// go sendWelcomeMail([]string{req.PostFormValue("email")})
 	fmt.Fprint(rw, `{"errno": 0, "error":""}`)
 }
 
diff --git a/websites/code/studygolang/src/server/studygolang/main.go b/websites/code/studygolang/src/server/studygolang/main.go
@@ -9,12 +9,14 @@ package main
 import (
 	. "config"
 	"controller"
+	"github.com/dchest/captcha"
 	"go.net/websocket"
+	"process"
+
 	"log"
 	"math/rand"
 	"net/http"
 	"path/filepath"
-	"process"
 	"runtime"
 	"time"
 )
@@ -30,6 +32,9 @@ func main() {
 	// 服务静态文件
 	http.Handle("/static/", http.FileServer(http.Dir(ROOT)))
 
+	// 验证码
+	http.Handle("/captcha/", captcha.Server(100, 40))
+
 	go ServeWebSocket()
 
 	go ServeBackGround()
diff --git a/websites/code/studygolang/template/admin/reading/modify.html b/websites/code/studygolang/template/admin/reading/modify.html
@@ -22,8 +22,8 @@ <h1 class="pagetitle">修改文章</h1>
 				<label for="rtype">晨读类型</label>
 				<span class="field">
 					<select id="rtype" name="rtype" class="uniformselect">
-							<option value="0"{{if and .reading (eq .reading.Rtype 0)}} selected{{end}}>Go晨读</option>
-							<option value="1"{{if and .reading (eq .reading.Rtype 1)}} selected{{end}}>综合晨读</option>
+							<option value="0"{{if .reading }}{{if eq .reading.Rtype 0}} selected{{end}}{{end}}>Go晨读</option>
+							<option value="1"{{if .reading}}{{if eq .reading.Rtype 1}} selected{{end}}{{end}}>综合晨读</option>
 					</select>
 				</span>
 			</p>
diff --git a/websites/code/studygolang/template/readings/list.html b/websites/code/studygolang/template/readings/list.html
@@ -55,6 +55,20 @@
 		</ul>
 	</div>
 	<div class="col-lg-3 col-md-4 col-sm-5">
+		<div class="row box_white sidebar">
+			<div class="top">
+				<h3 class="title"><i class="glyphicon glyphicon-qrcode"></i>&nbsp;&nbsp;关注我们(微信/微博)</h3>
+			</div>
+			<div class="sb-content">
+				<div>
+					<ul class="list-unstyled">
+						<li><img src="http://studygolang.qiniudn.com/wx_studygolang.jpg?imageView2/2/w/286" alt="关注微信"></li>
+						<li><iframe width="100%" height="550" class="share_self"  frameborder="0" scrolling="no" src="http://widget.weibo.com/weiboshow/index.php?language=&width=0&height=550&fansRow=1&ptype=1&speed=0&skin=1&isTitle=1&noborder=1&isWeibo=1&isFans=0&uid=3169236923&verifier=d1997605&dpc=1"></iframe></li>
+					</ul>
+				</div>
+			</div>
+		</div>
+		
 		<div class="row box_white sidebar">
 			<div class="top">
 				<h3 class="title"><i class="glyphicon glyphicon-list"></i>&nbsp;<a href="/articles" target="_blank" title="点击更多">最新博文</a></h3>
diff --git a/websites/code/studygolang/template/register.html b/websites/code/studygolang/template/register.html
@@ -16,6 +16,7 @@
           <div class="control-group email required"><label class="email required control-label" for="email"><abbr title="required">*</abbr> Email</label><div class="controls"><input class="string email required span5" id="email" name="email" placeholder="foo@bar.com" size="50" type="email" value=""><p class="help-block">保存以后就不可以改了哦！</p></div></div>
           <div class="control-group password optional"><label class="password optional control-label" for="passwd">密码</label><div class="controls"><input class="password optional" id="passwd" name="passwd" size="50" placeholder="请填写密码" type="password"></div></div>
           <div class="control-group password optional"><label class="password optional control-label" for="pass2">确认密码</label><div class="controls"><input class="password optional" id="pass2" name="pass2" size="50" type="password" placeholder="请再次输入密码" ></div></div>
+          <div class="control-group optional"><label class="optional control-label">验证码</label><div class="controls"><input type="text" id="captchaSolution" name="captchaSolution" /><img id="captcha_img" src="/captcha/{{.captchaId}}.png" alt="验证码" title="看不清，点击" /><input type="hidden" name="captchaid" value="{{.captchaId}}"></div></div>
           <div class="form-actions">
             <input class="btn btn-primary" data-disable-with="正在提交" name="commit" type="submit" value="提交注册信息">
           </div>
@@ -50,7 +51,13 @@ <h2>已经有帐号了？</h2>
         });
         return false;
     });
-    
+
+    $('#captcha_img').on('click', function(evt){
+	    	evt.preventDefault();
+
+				var origSrc = $(this).attr("src");
+	    	$(this).attr("src", origSrc+"?reload=" + (new Date()).getTime());
+    });
 })
 </script>
 {{end}}
diff --git a/websites/code/thirdparty/getpkg b/websites/code/thirdparty/getpkg
@@ -16,6 +16,7 @@ go get -u github.com/gorilla/sessions
 go get -u github.com/robfig/cron
 go get -u github.com/PuerkitoBio/goquery
 go get -u github.com/qiniu/api
+go get -u github.com/dchest/captcha
 
 hg clone https://code.google.com/p/go.net src/go.net
 go install go.net/websocket
diff --git a/websites/code/thirdparty/getpkg.bat b/websites/code/thirdparty/getpkg.bat
@@ -17,6 +17,7 @@ go get -u github.com/gorilla/sessions
 go get -u github.com/robfig/cron
 go get -u github.com/PuerkitoBio/goquery
 go get -u github.com/qiniu/api
+go get -u github.com/dchest/captcha
 hg clone https://code.google.com/p/go.net src/go.net
 go install go.net/websocket
 
