修复登录不跳转最后一次登录的平台的 bug

conf/app.conf

@@ -1,6 +1,6 @@
 appname = 酷医
 httpport = 8091
-runmode = prod
+runmode = dev
 copyrequestbody = true
 
 is_sso_use_session_id_key = true
@@ -101,13 +101,13 @@ readmysqlhost = rm-wz9rg531npf61q03tro.mysql.rds.aliyuncs.com
 readmysqlport = 3306
 readmysqluser = root
 readmysqlpass = 1Q2W3e4r!@#$
-readmysqlname = sgj_xt
+readmysqlname = sgj_patient
 
 writemysqlhost = rm-wz9rg531npf61q03tro.mysql.rds.aliyuncs.com
 writemysqlport = 3306
 writemysqluser = root
 writemysqlpass = 1Q2W3e4r!@#$
-writemysqlname = sgj_xt
+writemysqlname = sgj_patient
 
 readuserhost = rm-wz9rg531npf61q03tro.mysql.rds.aliyuncs.com
 readuserport = 3306

controllers/login_controller.go

@@ -31,7 +31,7 @@ func (this *LoginController) PwdLogin() {
 	}
 
 	if url := service.GetAppURLWithAppType(appType); len(url) == 0 {
-		appType = 1
+		appType = 0
 		returnURL = ""
 	}
 	utils.TraceLog("login token: %v", token)
@@ -62,7 +62,7 @@ func (this *LoginController) CodeLogin() {
 	appType, _ := this.GetInt("app_type")
 
 	if url := service.GetAppURLWithAppType(appType); len(url) == 0 {
-		appType = 1
+		appType = 0
 		returnURL = ""
 	}
 	utils.TraceLog("login token: %v", token)
@@ -102,8 +102,10 @@ func (this *LoginController) CodeLogin() {
 func (this *LoginController) PwdLoginSubmit() {
 	appType, _ := this.GetInt("app_type")
 
+	utils.TraceLog("login app_type=%v", appType)
 	if url := service.GetAppURLWithAppType(appType); len(url) == 0 {
-		appType = 1
+		utils.TraceLog("login app_type not exist")
+		appType = 0
 	}
 	mobile := this.GetString("mobile")
 	password := this.GetString("password")
@@ -158,7 +160,7 @@ func (this *LoginController) PwdLoginSubmit() {
 func (this *LoginController) CodeLoginSubmit() {
 	appType, _ := this.GetInt("app_type")
 	if url := service.GetAppURLWithAppType(appType); len(url) == 0 {
-		appType = 1
+		appType = 0
 	}
 	mobile := this.GetString("mobile")
 	code := this.GetString("code")
@@ -261,6 +263,7 @@ func (this *LoginController) getRedirectURL(app_type int, mobile string, returnU
 			url := this.appendTokenParamToReturnURL(returnURL, token)
 			return url, nil, admin
 		}
+		utils.TraceLog("login redirect url: app_type=%v", app_type)
 		// 普通管理员用户
 		// 如果有登录记录，则前往最近登录记录中的应用
 		lastLoginLog, getLastLoginLogErr := service.GetAdminUserLastLoginLog(admin.Id, app_type)

service/login_service.go

@@ -59,7 +59,13 @@ func DidAdminUserOrgCreateApp(adminUserID int, appType int) (bool, error) {
 
 func GetAdminUserLastLoginLog(adminUserID int, appType int) (*models.AdminUserLoginLog, error) {
 	var record models.AdminUserLoginLog
-	err := readUserDb.Last(&record, "admin_user_id = ? AND operate_type <> 2 AND app_type = ?", adminUserID, appType).Error
+	var err error
+	if appType > 0 {
+		err = readUserDb.Last(&record, "admin_user_id = ? AND operate_type <> 2 AND app_type = ?", adminUserID, appType).Error
+	} else {
+		err = readUserDb.Last(&record, "admin_user_id = ? AND operate_type <> 2", adminUserID).Error
+	}
+
 	if err == gorm.ErrRecordNotFound {
 		return nil, nil
 	}