- v2 token format changed

- DisableUser
- clear all tokens when disable user
- handle ding ding user leave event

business/model/dao/dao_auth2.go

@@ -15,10 +15,11 @@ func GetAuthBind(db *DaoDB, userID, authType, authID string) (authBind *model.Au
 	sql := `
 	SELECT *
 	FROM auth_bind t1
-	WHERE t1.deleted_at = ?
+	WHERE t1.deleted_at = ? AND t1.status = ?
 	`
 	sqlParams := []interface{}{
 		utils.DefaultTimeValue,
+		model.AuthBindStatusNormal,
 	}
 	if userID != "" {
 		sql += " AND t1.user_id = ?"
@@ -41,9 +42,10 @@ func GetAuthBindsByAuthID2(db *DaoDB, authID2 string, typeList []string) (authBi
 	sql := `
 	SELECT *
 	FROM auth_bind t1
-	WHERE t1.deleted_at = ? AND t1.auth_id2 = ? AND t1.type IN (` + GenQuestionMarks(len(typeList)) + ")"
+	WHERE t1.deleted_at = ? AND t1.status = ? AND t1.auth_id2 = ? AND t1.type IN (` + GenQuestionMarks(len(typeList)) + ")"
 	sqlParams := []interface{}{
 		utils.DefaultTimeValue,
+		model.AuthBindStatusNormal,
 		authID2,
 		typeList,
 	}

business/model/dao/dao_user2.go

@@ -12,10 +12,11 @@ func GetUserByID(db *DaoDB, fieldName, fieldValue string) (user *model.User, err
 	sql := fmt.Sprintf(`
 	SELECT *
 	FROM user t1
-	WHERE t1.deleted_at = ? AND t1.%s = ?
+	WHERE t1.deleted_at = ? AND t1.status = ? AND t1.%s = ?
 	`, fieldName)
 	sqlParams := []interface{}{
 		utils.DefaultTimeValue,
+		model.UserStatusNormal,
 		fieldValue,
 	}
 	globals.SugarLogger.Debugf("GetUserByID sql:%s, sqlParams:%s", sql, utils.Format4Output(sqlParams, false))
@@ -27,8 +28,13 @@ func GetUserBindAuthInfo(db *DaoDB, userID string) (authList []*model.AuthBind,
 	sql := `
 	SELECT *
 	FROM auth_bind t1
-	WHERE t1.deleted_at = ? AND t1.user_id = ?
+	WHERE t1.deleted_at = ? AND t1.status = ? AND t1.user_id = ?
 	`
-	err = GetRows(db, &authList, sql, utils.DefaultTimeValue, userID)
+	sqlParams := []interface{}{
+		utils.DefaultTimeValue,
+		model.UserStatusNormal,
+		userID,
+	}
+	err = GetRows(db, &authList, sql, sqlParams...)
 	return authList, err
 }