diff --git a/.gitignore b/.gitignore index b55f03fb..715e4415 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,7 @@ selenium-debug.log package-lock.json yarn.lock /bin/ +config/local.json +config/certs/*.pem +.classpath +.project diff --git a/config/config.json b/config/config.json deleted file mode 100644 index d38cbaa0..00000000 --- a/config/config.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "adempiereApi": { - "images": { - "protocol": "http:", - "baseUrl": "//localhost", - "port": 9527 - } - }, - "adempiereStore": { - "images": { - "protocol": "http:", - "baseUrl": "//0.0.0.0:", - "port": 8085 - } - }, - "service": "/adempiere-api" -} diff --git a/config/default.json b/config/default.json new file mode 100644 index 00000000..3efb3646 --- /dev/null +++ b/config/default.json @@ -0,0 +1,16 @@ +{ + "server": { + "host": "localhost", + "port": 9527 + }, + "adempiere": { + "api": { + "url": "http://localhost:8085", + "service": "/adempiere-api" + }, + "images": { + "url": "http://localhost:8085", + "service": "/adempiere-api" + } + } +} diff --git a/src/api/ADempiere/instances.js b/src/api/ADempiere/instances.js index 833dd720..88ef5e73 100644 --- a/src/api/ADempiere/instances.js +++ b/src/api/ADempiere/instances.js @@ -1,3 +1,4 @@ +import { getConfig } from '@/utils/ADempiere/config' /** * Instance for connection to API RESTful with axios * @author EdwinBetanc0urt @@ -24,8 +25,8 @@ export function ApiRest({ }) return request.interceptors } - const config = require('../../../config/config.json') - const apiRestAddress = config.adempiereStore.images.protocol + config.adempiereStore.images.baseUrl + config.adempiereStore.images.port + config.service + var config = getConfig() + const apiRestAddress = config.adempiere.api.url + config.adempiere.api.service const axios = require('axios') const request = axios.create({ baseURL: apiRestAddress, diff --git a/src/utils/ADempiere/config.js b/src/utils/ADempiere/config.js new file mode 100644 index 00000000..db31f2a8 --- /dev/null +++ b/src/utils/ADempiere/config.js @@ -0,0 +1,5 @@ +// Get Config based on default or local +export function getConfig() { + const config = require('../../../config/default.json') + return config +} diff --git a/src/utils/ADempiere/resource.js b/src/utils/ADempiere/resource.js index c0ff19ac..db556632 100644 --- a/src/utils/ADempiere/resource.js +++ b/src/utils/ADempiere/resource.js @@ -1,7 +1,7 @@ // This file allows generate util functions for handle arrays, resources and all // related to upload to server side and downdload from server side to client side. // Please add the necessary functions here: - +import { getConfig } from '@/utils/ADempiere/config' // Merge two arrays and return merged array export function mergeByteArray(currentArray, arrayToMerge) { const mergedArray = new currentArray.constructor(currentArray.length + arrayToMerge.length) @@ -58,9 +58,8 @@ export function getImagePath({ height = 300, operation = 'fit' }) { - // TODO: Evaluate path url 'http://domain:port/adempiere-api', 'adempiere-api' is part of urn - const config = require('../../../config/config.json') - const url = config.adempiereStore.images.protocol + config.adempiereStore.images.baseUrl + config.adempiereStore.images.port + config.service + var config = getConfig() + const url = config.adempiere.images.url + config.adempiere.images.service const urn = `/img?action=${operation}&width=${width}&height=${height}&url=${file}` const uri = `${url}${urn}`