hola-server 0.6.16 → 0.7.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/core/url.js +12 -3
- package/index.js +4 -5
- package/package.json +1 -1
- package/setting.js +5 -0
package/core/url.js
CHANGED
|
@@ -1,13 +1,22 @@
|
|
|
1
1
|
const axios = require('axios');
|
|
2
|
+
const { get_settings } = require("../setting");
|
|
3
|
+
|
|
4
|
+
const url = function (url, method) {
|
|
5
|
+
const settings = get_settings();
|
|
6
|
+
const axios_config = settings.axios;
|
|
7
|
+
|
|
8
|
+
if (axios_config) {
|
|
9
|
+
axios.defaults.retry = axios_config.retry;
|
|
10
|
+
axios.defaults.retryDelay = axios_config.retry_delay;
|
|
11
|
+
}
|
|
2
12
|
|
|
3
|
-
const url = function (url, method, proxy) {
|
|
4
13
|
return function (config) {
|
|
5
14
|
let params = {
|
|
6
15
|
url: url,
|
|
7
16
|
method: method
|
|
8
17
|
};
|
|
9
|
-
if (proxy) {
|
|
10
|
-
params.proxy = proxy;
|
|
18
|
+
if (axios_config.proxy) {
|
|
19
|
+
params.proxy = axios_config.proxy;
|
|
11
20
|
}
|
|
12
21
|
return axios.request({ ...params, ...config });
|
|
13
22
|
}
|
package/index.js
CHANGED
|
@@ -6,8 +6,7 @@ const { init_express_server } = require('./http/express');
|
|
|
6
6
|
const { register_type, get_type } = require('./core/type');
|
|
7
7
|
const { EntityMeta, get_entity_meta } = require('./core/meta');
|
|
8
8
|
const { is_root_role } = require('./core/role');
|
|
9
|
-
|
|
10
|
-
|
|
9
|
+
const { url } = require('./core/url');
|
|
11
10
|
const array = require('./core/array');
|
|
12
11
|
const bash = require('./core/bash');
|
|
13
12
|
const chart = require('./core/chart');
|
|
@@ -28,10 +27,10 @@ const context = require('./http/context');
|
|
|
28
27
|
const gridfs = require('./db/gridfs');
|
|
29
28
|
|
|
30
29
|
const { gen_i18n } = require('./tool/gen_i18n');
|
|
31
|
-
const { log_debug, log_info, log_warn, log_error, is_log_debug, is_log_info, is_log_warn, is_log_error, get_session_userid, oid_queries, oid_query } = require('./db/db');
|
|
30
|
+
const { log_debug, log_info, log_warn, log_error, is_log_debug, is_log_info, is_log_warn, is_log_error, get_session_userid, oid_queries, oid_query, bulk_update } = require('./db/db');
|
|
32
31
|
|
|
33
32
|
module.exports = {
|
|
34
|
-
init_settings, is_root_role, init_express_server, init_router, register_type, get_type, get_db,
|
|
33
|
+
init_settings, is_root_role, init_express_server, init_router, register_type, get_type, get_db, url,
|
|
35
34
|
Entity, EntityMeta, get_entity_meta, array, bash, chart, cron, date, file, lhs, msg, number, obj, random, thread, validate, code, err, params, context, gridfs, gen_i18n,
|
|
36
|
-
log_debug, log_info, log_warn, log_error, is_log_debug, is_log_info, is_log_warn, is_log_error, get_session_userid, oid_queries, oid_query
|
|
35
|
+
log_debug, log_info, log_warn, log_error, is_log_debug, is_log_info, is_log_warn, is_log_error, get_session_userid, oid_queries, oid_query, bulk_update
|
|
37
36
|
};
|
package/package.json
CHANGED