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

controllers/mobile_regist_controller.go

@@ -6,7 +6,6 @@ import (
 	"SSO/service"
 	"SSO/utils"
 	"encoding/json"
-	"strings"
 	"time"
 )
 
@@ -67,21 +66,21 @@ func (this *MobileRegistController) RegistSubmit() {
 
 	redisClient := service.RedisClient()
 	defer redisClient.Close()
-	if strings.HasPrefix(mobile, "12") {
-		if code != "123456" {
-			this.Data["json"] = enums.MakeFailResponseJSONWithSGJErrorCode(enums.ErrorCodeVerificationCodeWrong)
-			this.ServeJSON()
-			return
-		}
+	// if strings.HasPrefix(mobile, "12") {
+	// 	if code != "123456" {
+	// 		this.Data["json"] = enums.MakeFailResponseJSONWithSGJErrorCode(enums.ErrorCodeVerificationCodeWrong)
+	// 		this.ServeJSON()
+	// 		return
+	// 	}
 
-	} else {
-		cache_code, _ := redisClient.Get("code_msg_" + mobile).Result()
-		if cache_code != code {
-			this.Data["json"] = enums.MakeFailResponseJSONWithSGJErrorCode(enums.ErrorCodeVerificationCodeWrong)
-			this.ServeJSON()
-			return
-		}
+	// } else {
+	cache_code, _ := redisClient.Get("code_msg_" + mobile).Result()
+	if cache_code != code {
+		this.Data["json"] = enums.MakeFailResponseJSONWithSGJErrorCode(enums.ErrorCodeVerificationCodeWrong)
+		this.ServeJSON()
+		return
 	}
+	// }
 
 	admin, err := service.RegisterSuperAdmin(mobile, pwd)
 	if err != nil {

controllers/verification_code_controller.go

@@ -4,9 +4,6 @@ import (
 	"SSO/enums"
 	"SSO/service"
 	"SSO/utils"
-	"strings"
-
-	"github.com/astaxie/beego"
 )
 
 type CodeController struct {
@@ -54,15 +51,15 @@ func (this *CodeController) RegistCode() {
 		return
 	}
 
-	if beego.AppConfig.String("runmode") == "dev" {
-		if strings.HasPrefix(mobile, "12") {
-			this.Data["json"] = enums.MakeSuccessResponseJSON(map[string]interface{}{
-				"msg": "短信发送成功,有效期为10分钟",
-			})
-			this.ServeJSON()
-			return
-		}
-	}
+	// if beego.AppConfig.String("runmode") == "dev" {
+	// 	if strings.HasPrefix(mobile, "12") {
+	// 		this.Data["json"] = enums.MakeSuccessResponseJSON(map[string]interface{}{
+	// 			"msg": "短信发送成功,有效期为10分钟",
+	// 		})
+	// 		this.ServeJSON()
+	// 		return
+	// 	}
+	// }
 
 	if err := service.SendVerificationCodeSMS(mobile, aespass); err != nil {
 		this.Data["json"] = enums.MakeFailResponseJSON(err.Error(), 600)

controllers/verify_token_controller.go

@@ -416,14 +416,6 @@ func (this *VerifyTokenController) _createAppIfNeeded(adminUserID int, orgID int
 
 	// 自动创建所有应用
 	didCreateNew := false
-	if did_patient_manage_create == false {
-		err := service.CreateOrgApp(adminUserID, orgID, 1, false)
-		if err != nil {
-			utils.ErrorLog("自动创建酷医聚客应用失败:%v", err)
-			return false, &enums.SGJError{Code: enums.ErrorCodeDataException}
-		}
-		didCreateNew = true
-	}
 	if did_dialysis_manage_create == false {
 		err := service.CreateOrgApp(adminUserID, orgID, 3, false)
 		if err != nil {
@@ -440,6 +432,14 @@ func (this *VerifyTokenController) _createAppIfNeeded(adminUserID int, orgID int
 		}
 		didCreateNew = true
 	}
+	if did_patient_manage_create == false {
+		err := service.CreateOrgApp(adminUserID, orgID, 1, false)
+		if err != nil {
+			utils.ErrorLog("自动创建酷医聚客应用失败:%v", err)
+			return false, &enums.SGJError{Code: enums.ErrorCodeDataException}
+		}
+		didCreateNew = true
+	}
 	if did_mall_manage_create == false {
 		err := service.CreateOrgApp(adminUserID, orgID, 5, false)
 		if err != nil {

service/login_service.go

@@ -73,7 +73,7 @@ func GetAdminUserLastLoginLog(adminUserID int, appType int) (*models.AdminUserLo
 }
 
 func GetAdminUserPrioritizedAppType(adminUserID int) (int8, error) {
-	rows, err := readUserDb.Raw("SELECT app.app_type FROM sgj_user_org_app AS app, sgj_user_admin_role AS r WHERE r.admin_user_id = ? AND r.app_id = app.id AND app.status = 1 AND r.status = 1 ORDER BY app.org_id ASC, app.app_type ASC LIMIT 1;", adminUserID).Rows()
+	rows, err := readUserDb.Raw("SELECT app.app_type FROM sgj_user_org_app AS app, sgj_user_admin_role AS r WHERE r.admin_user_id = ? AND r.app_id = app.id AND app.status = 1 AND app.open_status = 1 AND r.status = 1 ORDER BY app.org_id ASC, app.app_type ASC LIMIT 1;", adminUserID).Rows()
 	defer rows.Close()
 	if err != nil {
 		return 0, err

service/org_service.go

@@ -30,15 +30,16 @@ func CreateOrg(org *models.Org, mobile string, openXT bool, openCDM bool, openSC
 		return err
 	}
 
-	if err := createOrgApp(tx_admin, &role, mobile, 1, openSCRM); err != nil {
+	// app 的创建顺序也决定了登录后前往 app 的优先级
+	if err := createOrgApp(tx_admin, &role, mobile, 3, openXT); err != nil {
 		tx_admin.Rollback()
 		return err
 	}
-	if err := createOrgApp(tx_admin, &role, mobile, 3, openXT); err != nil {
+	if err := createOrgApp(tx_admin, &role, mobile, 4, openCDM); err != nil {
 		tx_admin.Rollback()
 		return err
 	}
-	if err := createOrgApp(tx_admin, &role, mobile, 4, openCDM); err != nil {
+	if err := createOrgApp(tx_admin, &role, mobile, 1, openSCRM); err != nil {
 		tx_admin.Rollback()
 		return err
 	}

views/mobile_site/regist.html

@@ -77,17 +77,23 @@
                 aespass: aespass,
             }
             $("#codebtn").attr("disabled", true);
-            changeNum(60);
 
             postRequest("/getregistcode", postData, function(res) {
                 if (res.state == 0) {
-                    serverErrorMsg(res);
+                    if (res.code == 604) {
+                        $('.layer').show();
+                    } else {
+                        serverErrorMsg(res);
+                    }
                     return;
                 }
+                changeNum(60);
                 layer.msg(res.data.msg);
+                $("#codebtn").attr("disabled", false);
 
             }, function(res) {
                 serverErrorMsg(res);
+                $("#codebtn").attr("disabled", false);
             });
         });