Merge branch 'master' of http://git.shengws.com/zhangbj/sso into sso_branch

controllers/mobile_regist_controller.go

@@ -187,7 +187,7 @@ func (this *MobileRegistController) CreateOrgSubmit() {
 	orgPhone := this.GetString("org_phone")
 
 	if len(orgPhone) > 0 {
-		if utils.PhoneRegexp().MatchString(orgPhone) == false {
+		if utils.CellPhoneRegexp().MatchString(orgPhone) == false {
 			this.Data["json"] = enums.MakeFailResponseJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 			this.ServeJSON()
 			return

controllers/org_controller.go

@@ -146,7 +146,7 @@ func (this *OrgController) CreateSubmit() {
 	orgPics := this.GetString("org_pics")
 
 	if len(orgPhone) > 0 {
-		if utils.PhoneRegexp().MatchString(orgPhone) == false {
+		if utils.CellPhoneRegexp().MatchString(orgPhone) == false {
 			this.Data["json"] = enums.MakeFailResponseJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 			this.ServeJSON()
 			return