From 2e88ed2902f0acd0958bc1075bddc28ef60b2edd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eudes=20In=C3=A1cio?= Date: Wed, 7 Jun 2023 16:18:36 +0100 Subject: [PATCH] envirement change to oapr --- src/environments/environment.prod.ts | 2 +- src/environments/environment.ts | 2 +- src/environments/suport/dev.ts | 6 +++--- version/git-version.ts | 12 ++++++------ 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts index 38a854fa6..53f31b337 100644 --- a/src/environments/environment.prod.ts +++ b/src/environments/environment.prod.ts @@ -3,4 +3,4 @@ import { oaprProd } from './suport/oapr' import { doneITProd } from './suport/doneIt' -export const environment: Environment = doneITProd; \ No newline at end of file +export const environment: Environment = oaprProd; \ No newline at end of file diff --git a/src/environments/environment.ts b/src/environments/environment.ts index ee55c1414..e2d79dff9 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -4,4 +4,4 @@ import { doneITDev } from './suport/doneIt' import { DevDev } from './suport/dev' -export const environment: Environment = doneITDev \ No newline at end of file +export const environment: Environment = oaprDev \ No newline at end of file diff --git a/src/environments/suport/dev.ts b/src/environments/suport/dev.ts index b70957006..b28ff83ae 100644 --- a/src/environments/suport/dev.ts +++ b/src/environments/suport/dev.ts @@ -26,9 +26,9 @@ export const DevProd: Environment = { export const DevDev: Environment = { id:'3', - apiURL: 'https://gdapi-dev.dyndns.info/GabineteDigital.Services/V5/api/', - apiChatUrl: 'https://gdchat-dev.dyndns.info/api/v1/', - apiWsChatUrl: 'wss://gdchat-dev.dyndns.info/websocket', + apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V5/api/', + apiChatUrl: 'https://chat.doneit.co.ao/api/v1/', + apiWsChatUrl: 'wss://chat.doneit.co.ao/websocket', production: true, domain: 'gabinetedigital.local', defaultuser: 'paulo.pinto@gabinetedigital.local', diff --git a/version/git-version.ts b/version/git-version.ts index 7ce55086c..59177755a 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "06583abd2", - "SHA": "06583abd285d7c16db59d878736eecc02240d689", + "shortSHA": "affb73a60", + "SHA": "affb73a6072d318e3f7e3fca5c5e48cf86cee3fa", "branch": "feature/gabinete-search", "lastCommitAuthor": "'Eudes InĂ¡cio'", - "lastCommitTime": "'Mon Jun 5 11:15:30 2023 +0100'", - "lastCommitMessage": "changes Peter", - "lastCommitNumber": "4956", + "lastCommitTime": "'Mon Jun 5 11:35:04 2023 +0100'", + "lastCommitMessage": "Peter changes 05/06", + "lastCommitNumber": "4959", "change": "", - "changeStatus": "On branch feature/gabinete-search\nYour branch and 'origin/feature/gabinete-search' have diverged,\nand have 7 and 2 different commits each, respectively.\n (use \"git pull\" to merge the remote branch into yours)\n\nAll conflicts fixed but you are still merging.\n (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified: jest-puppeteer.config.js\n\tmodified: package-lock.json\n\tmodified: package.json\n\tmodified: src/app/pages/events/events.page.ts\n\tmodified: src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts\n\tmodified: src/app/services/aesencrypt.service.ts\n\tmodified: src/app/services/auth.service.ts\n\tmodified: src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.ts\n\tmodified: src/app/shared/gabinete-digital/despachos/despachos.page.ts\n\tmodified: src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts\n\tmodified: src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.page.ts\n\tmodified: src/app/shared/gabinete-digital/diplomas/diplomas.page.ts\n\tmodified: src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts\n\tmodified: src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts\n\tmodified: src/app/shared/gabinete-digital/expedients/expedients.page.ts\n\tmodified: src/environments/suport/doneIt.ts", + "changeStatus": "On branch feature/gabinete-search\nYour branch and 'origin/feature/gabinete-search' have diverged,\nand have 8 and 2 different commits each, respectively.\n (use \"git pull\" to merge the remote branch into yours)\n\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/environments/environment.prod.ts\n\tmodified: src/environments/environment.ts\n\tmodified: src/environments/suport/dev.ts", "changeAuthor": "eudes.inacio" } \ No newline at end of file