Merge branch 'develop' into feature/app_dev

* develop:
  add wxpay for app

go/gopath/src/fohow.com/apps/controllers/user_controller/user_controller.go

@@ -299,11 +299,11 @@ func (self *UserController) BindingIdCard() {
 		self.ReturnError(403, apps.BindingIdCardLengthError, "", nil)
 	}
 
-	userWithIdCard := user_model.GetUserByIdCardNo(idCard, false)
-	if userWithIdCard != nil {
-		self.ReturnError(403, apps.BindingIdCardExist, "", nil)
-	}
-
+	/*	userWithIdCard := user_model.GetUserByIdCardNo(idCard, false)
+		if userWithIdCard != nil {
+			self.ReturnError(403, apps.BindingIdCardExist, "", nil)
+		}
+	*/
 	birth, err := time.Parse("20060102", idCard[6:14])
 	if err == nil {
 		user.Birthday = birth
@@ -315,7 +315,7 @@ func (self *UserController) BindingIdCard() {
 		self.ReturnError(403, apps.BindingIdCardEmpty, "", nil)
 	}
 	if age >= 0 && age < 18 {
-		self.ReturnError(403, apps.IdCardAgeNotBeAdult, "", nil)
+		//self.ReturnError(403, apps.IdCardAgeNotBeAdult, "", nil)
 	}
 
 	user.Age = age