signup add validation code.

junicorn · Apr 21, 2016 · f05984e · f05984e
1 parent ded7c7d
commit f05984e
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 11 deletions.
diff --git a/src/main/java/com/javachina/controller/UserController.java b/src/main/java/com/javachina/controller/UserController.java
@@ -192,21 +192,19 @@ public ModelAndView signup(Request request, Response response){
 		String login_name = request.query("login_name");
 		String email = request.query("email");
 		String pass_word = request.query("pass_word");
+		String auth_code = request.query("auth_code");
 
 		request.attribute("login_name", login_name);
 		request.attribute("email", email);
 
-		if(StringKit.isBlank(login_name) || StringKit.isBlank(pass_word) || StringKit.isBlank(email)){
+		if(StringKit.isBlank(login_name) || StringKit.isBlank(pass_word) 
+				|| StringKit.isBlank(email) || StringKit.isBlank(auth_code) ){
 			request.attribute(this.ERROR, "参数不能为空");
-			request.attribute("login_name", login_name);
-			request.attribute("email", email);
 			return this.getView("signup");
 		}
 
 		if(login_name.length() > 16 || login_name.length() < 4){
 			request.attribute(this.ERROR, "请输入4-16位用户名");
-			request.attribute("login_name", login_name);
-			request.attribute("email", email);
 			return this.getView("signup");
 		}
 
@@ -230,6 +228,12 @@ public ModelAndView signup(Request request, Response response){
 			return this.getView("signup");
 		}
 
+		String patchca = request.session().attribute("patchca");
+		if(StringKit.isNotBlank(patchca) && !patchca.equalsIgnoreCase(auth_code)){
+			request.attribute(this.ERROR, "验证码输入错误");
+			return this.getView("signup");
+		}
+
 		QueryParam queryParam = QueryParam.me();
 		queryParam.eq("login_name", login_name);
 		queryParam.in("status", AR.in(0, 1));

diff --git a/src/main/webapp/WEB-INF/views/home.html b/src/main/webapp/WEB-INF/views/home.html
@@ -7,7 +7,7 @@
 					<div class="box-tab">
 						<ul class="nav nav-tabs">
 							<li #if(null==tab)class="active"#end><a href="${base_url('/')}" data-toggle="tab">热门</a></li>
-							<li #if(tab=='recent')class="active"#end><a href="${base_url('/recent')}" data-toggle="tab">最新</a></li>
+							<li><a href="${base_url('/recent')}" data-toggle="tab">最新</a></li>
 							#for(node : hot_nodes)
 							<li #if(tab==node.slug)class="active"#end><a href="${base_url('/?tab=') + node.slug}" data-toggle="tab">${node.title}</a></li>
 							#end

diff --git a/src/main/webapp/WEB-INF/views/recent.html b/src/main/webapp/WEB-INF/views/recent.html
@@ -1,13 +1,13 @@
-#include("./common/header.html", {active:"home", title : node_name ?! ''})
+#include("./common/header.html", {active:"recent", title : node_name ?! ''})
 <div class="container">
     <div class="row">
         <div class="col-md-9">
 			<div class="panel panel-default">
 				<div class="panel-heading home-panel">
 					<div class="box-tab">
 						<ul class="nav nav-tabs">
-							<li #if(null==tab)class="active"#end><a href="${base_url('/')}" data-toggle="tab">热门</a></li>
-							<li #if(tab=='recent')class="active"#end><a href="${base_url('/recent')}" data-toggle="tab">最新</a></li>
+							<li><a href="${base_url('/')}" data-toggle="tab">热门</a></li>
+							<li #if(null==tab)class="active"#end><a href="${base_url('/recent')}" data-toggle="tab">最新</a></li>
 							#for(node : hot_nodes)
 							<li #if(tab==node.slug)class="active"#end><a href="${base_url('/recent?tab=') + node.slug}" data-toggle="tab">${node.title}</a></li>
 							#end

diff --git a/src/main/webapp/WEB-INF/views/signup.html b/src/main/webapp/WEB-INF/views/signup.html
@@ -28,6 +28,18 @@
 											<span class="input-group-addon">密　码</span>
 											<input type="password" name="pass_word" class="form-control input-lg" placeholder="请输入6-20位密码"  required="required" />
 										</div>
+
+										<div class="input-group mb15">
+											<span class="input-group-addon">验证码&nbsp;</span>
+											<div class="row">
+												<div class="col-sm-6">
+													<input type="text" class="form-control" name="auth_code" placeholder="四位字符验证码" maxlength="4" required="required"/>
+												</div>
+												<div class="col-sm-6">
+													<img id="captcha" src="${base_url('/captcha')}" width="150" height="30"/>
+												</div>
+											</div>
+										</div>
 									</div>
 									<button class="btn btn-success btn-block btn-lg mb15" type="submit">创建账号</button>
 									</p>

diff --git a/src/test/java/TestMain.java b/src/test/java/TestMain.java
@@ -12,9 +12,8 @@ public static void main(String[] args) {
 		System.out.println(Utils.getWeight(20L, 0L, 0L, 0L, DateKit.getUnixTimeLong(DateKit.dateFormat("201604202000","yyyyMMddHHmm"))));
 		System.out.println(Utils.getWeight(20L, 0L, 0L, 0L, DateKit.getUnixTimeLong(DateKit.dateFormat("201604211000","yyyyMMddHHmm"))));
 		System.out.println(Utils.getWeight(2L, 10L, 0L, 0L, DateKit.getUnixTimeLong(DateKit.dateFormat("201604211000","yyyyMMddHHmm"))));
+		System.out.println(Utils.getWeight(0L, 0L, 0L, 0L, DateKit.getUnixTimeLong(DateKit.dateFormat("201604211400","yyyyMMddHHmm"))));
 
-
-		System.out.println("[mp3:10086]".replaceAll("\\[mp3:(\\d+)\\]", "<iframe frameborder='no' border='0' marginwidth='0' marginheight='0' width=330 height=86 src='http://music.163.com/outchain/player?type=2&id=$1&auto=1&height=66'></iframe>"));
 	}
 
 }