hola-server 0.6.15 → 0.6.17

package/core/url.js

@@ -1,13 +1,22 @@
 const axios = require('axios');
+const { get_settings } = require("../setting");
+
+const url = function (url, method) {
+    const settings = get_settings();
+    const axios_config = settings.axios;
+
+    if (axios_config) {
+        axios.defaults.retry = axios_config.retry;
+        axios.defaults.retryDelay = axios_config.retry_delay;
+    }
 
-const url = function (url, method, proxy) {
     return function (config) {
         let params = {
             url: url,
             method: method
         };
-        if (proxy) {
-            params.proxy = proxy;
+        if (axios_config.proxy) {
+            params.proxy = axios_config.proxy;
         }
         return axios.request({ ...params, ...config });
     }

package/index.js

@@ -6,8 +6,7 @@ const { init_express_server } = require('./http/express');
 const { register_type, get_type } = require('./core/type');
 const { EntityMeta, get_entity_meta } = require('./core/meta');
 const { is_root_role } = require('./core/role');
-
-
+const { url } = require('./core/url');
 const array = require('./core/array');
 const bash = require('./core/bash');
 const chart = require('./core/chart');
@@ -31,7 +30,7 @@ const { gen_i18n } = require('./tool/gen_i18n');
 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');
 
 module.exports = {
-    init_settings, is_root_role, init_express_server, init_router, register_type, get_type, get_db,
+    init_settings, is_root_role, init_express_server, init_router, register_type, get_type, get_db, url,
     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,
     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
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hola-server",
-  "version": "0.6.15",
+  "version": "0.6.17",
   "description": "a meta programming framework used to build nodejs restful api",
   "main": "index.js",
   "scripts": {

package/router/update.js

@@ -20,7 +20,7 @@ const init_update_router = function (router, meta) {
 
     router.post('/update', cp_upload, wrap_http(async function (req, res) {
         if (meta.roles) {
-            const has_right = check_user_role(req, meta.roles, "u");
+            const has_right = check_user_role(req, meta, "u");
             if (!has_right) {
                 res.json({ code: NO_RIGHTS, err: "no rights error" });
                 return;

package/setting.js

@@ -1,6 +1,11 @@
 const dev_mode = true;
 
 let settings = {
+    axios: {
+        retry: 3,
+        retry_delay: 1000,
+        proxy: null
+    },
     encrypt: {
         key: "AhBWt15WFj8PrMnnZhX8AF1IM4V2x0A3"
     },