@@ -2,7 +2,7 @@ const _ = require('underscore');
22const debug = require ( 'debug' ) ( 'leancloud:query' ) ;
33const Promise = require ( './promise' ) ;
44const AVError = require ( './error' ) ;
5- const { _request } = require ( './request' ) ;
5+ const { _request, request } = require ( './request' ) ;
66const { ensureArray, transformFetchOptions } = require ( './utils' ) ;
77
88const requires = ( value , message ) => {
@@ -249,27 +249,36 @@ module.exports = function(AV) {
249249 }
250250 return obj ;
251251 } ,
252- _createRequest ( params = this . toJSON ( ) , options ) {
253- if ( JSON . stringify ( params ) . length > 2000 ) {
252+ _createRequest ( params = this . toJSON ( ) , options , path = `/classes/ ${ this . className } ` ) {
253+ if ( encodeURIComponent ( JSON . stringify ( params ) ) . length > 2000 ) {
254254 const body = {
255255 requests : [ {
256256 method : 'GET' ,
257- path : `/1.1/classes/ ${ this . className } ` ,
257+ path : `/1.1${ path } ` ,
258258 params,
259259 } ] ,
260260 } ;
261- return _request ( 'batch' , null , null , 'POST' , body , options )
262- . then ( response => {
263- const result = response [ 0 ] ;
264- if ( result . success ) {
265- return result . success ;
266- }
267- const error = new Error ( result . error . error || 'Unknown batch error' ) ;
268- error . code = result . error . code ;
269- throw error ;
270- } ) ;
261+ return request ( {
262+ path : '/batch' ,
263+ method : 'POST' ,
264+ data : body ,
265+ authOptions : options ,
266+ } ) . then ( response => {
267+ const result = response [ 0 ] ;
268+ if ( result . success ) {
269+ return result . success ;
270+ }
271+ const error = new Error ( result . error . error || 'Unknown batch error' ) ;
272+ error . code = result . error . code ;
273+ throw error ;
274+ } ) ;
271275 }
272- return _request ( 'classes' , this . className , null , "GET" , params , options ) ;
276+ return request ( {
277+ method : 'GET' ,
278+ path,
279+ query : params ,
280+ authOptions : options ,
281+ } ) ;
273282 } ,
274283
275284 _parseResponse ( response ) {
0 commit comments