Skip to content

Commit

Permalink
重构⛑: utils文字改变
Browse files Browse the repository at this point in the history
  • Loading branch information
bubao committed Nov 26, 2019
1 parent c371f81 commit 05b4239
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 15 deletions.
4 changes: 1 addition & 3 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,4 @@
* @Last Modified time: 2018-06-11 10:31:47
*/

const api = require("./src/api");

module.exports = api;
module.exports = require("./src/api");
2 changes: 1 addition & 1 deletion src/api/Post.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ const { request } = require("../config/commonModules");
const API = require("../config/api");
const assign = require("lodash/assign");
const template = require("lodash/template");
const { loopMethod, rateMethod } = require("../config/utils");
const { loopMethod, rateMethod } = require("../module/utils");

/**
* 通用方法
Expand Down
2 changes: 1 addition & 1 deletion src/api/Topic.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ const template = require("lodash/template");
const capitalize = require("lodash/capitalize");
const API = require("../config/api");
const { request, console } = require("../config/commonModules");
const { loopGet, requestOpts } = require("../config/utils");
const { loopGet, requestOpts } = require("../module/utils");

const questions = (topicID, options) => {
options.uri = template(API.topic.topQuestion)({ topicID });
Expand Down
7 changes: 3 additions & 4 deletions src/api/User.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,16 @@
const { request } = require("../config/commonModules");
const template = require("lodash/template");
const API = require("../config/api");
const { requestOpts, loopGet } = require("../config/utils");
const { requestOpts, loopGet } = require("../module/utils");

const followers = async (urlToken, options) => {
options.uri = template(API.user.followers)({ url_token: urlToken });
const v = await loopGet(options);
return v;
};
const follower = async (urlToken, options) => {
const follower = (urlToken, options) => {
options.uri = template(API.user.followers)({ url_token: urlToken });
const v = await loopGet(options);
return v;
return loopGet(options);
};
/**
* 通用方法
Expand Down
12 changes: 6 additions & 6 deletions src/config/utils.js → src/module/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* @Last Modified time: 2018-06-11 11:47:11
*/

const { request, timeout } = require("./commonModules");
const { request, timeout } = require("../config/commonModules");
const { URL, URLSearchParams } = require("url");
const url = require("url");
const forEach = require("lodash/forEach");
Expand All @@ -19,16 +19,16 @@ const concat = require("lodash/concat");
const clamp = require("lodash/clamp");
const compact = require("lodash/compact");

const loopGet = async (options, v) => {
const loopGet = async (options, results) => {
const { body } = await request(options);
const value = JSON.parse(body);
v = uniq(compact(concat(value.data, v)));
results = uniq(compact(concat(value.data, results)));
if (!value.paging.is_end) {
await timeout(options.timeout || 10000, v);
await timeout(options.timeout || 10000, results);
options.uri = value.paging.next;
v = await loopGet(options, v);
results = await loopGet(options, results);
}
return v;
return results;
};
/**
* 获取url的参数
Expand Down

0 comments on commit 05b4239

Please sign in to comment.