diff --git a/Dockerfile b/Dockerfile index be09da3..86e93d4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,5 +20,5 @@ COPY --from=builder /app/dist ./dist COPY --from=builder /app/package*.json ./ COPY --from=builder /app/node_modules ./node_modules -EXPOSE 8066 +EXPOSE 8068 CMD ["npm", "run", "start:prod"] \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 98f333c..0e40510 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,20 +4,15 @@ services: vendaweb-api: image: 10.1.1.124:8082/library/vendaweb-api:latest ports: - - target: 8066 - published: 8066 - protocol: tcp - mode: host + - "8068:8068" networks: - - juru-network + - simplifique-network deploy: - replicas: 1 + replicas: 4 update_config: - order: stop-first + order: start-first parallelism: 1 - failure_action: rollback - delay: 5s networks: - juru-network: + simplifique-network: external: true \ No newline at end of file diff --git a/src/app.controller.ts b/src/app.controller.ts index 086ecea..bc525f5 100644 --- a/src/app.controller.ts +++ b/src/app.controller.ts @@ -14,7 +14,7 @@ export class AppController { @Get('health') @ApiOperation({ summary: 'Health check' }) healthCheck() { - return { status: ':ok 3 ' }; + return { status: ':Jurunense homecenter ' }; } } diff --git a/src/configs/typeorm.config.ts b/src/configs/typeorm.config.ts index 3b30a6b..098bb0a 100644 --- a/src/configs/typeorm.config.ts +++ b/src/configs/typeorm.config.ts @@ -7,12 +7,12 @@ export const typeOrmConfig: TypeOrmModuleOptions = { // username: "LIVIA", // password: "LIVIA", host: "10.1.1.241", - username: "SEVEN", - password: "USR54SEV", + username: "teste", + password: "teste", // username: "API", // password: "E05H5KIEQV3YKDJR", port: 1521, - sid: "WINT", + sid: "BDTESTE", synchronize: false, logging: false, entities: [__dirname + '/../**/*.entity.{js,ts}'], @@ -22,10 +22,10 @@ export const typeOrmConfig: TypeOrmModuleOptions = { export const connectionOptions: ConnectionOptions = { type: "oracle", host: "10.1.1.241", - username: "SEVEN", - password: "USR54SEV", + username: "teste", + password: "teste", port: 1521, - sid: "WINT", + sid: "BDTESTE", synchronize: false, logging: false, entities: [__dirname + '/../**/*.entity.{js,ts}'], diff --git a/src/main.ts b/src/main.ts index e02e706..84a238b 100644 --- a/src/main.ts +++ b/src/main.ts @@ -20,6 +20,6 @@ async function bootstrap() { .build(); const document = SwaggerModule.createDocument(app, options); SwaggerModule.setup("docs", app, document); -await app.listen(8066, '0.0.0.0');} +await app.listen(8068, '0.0.0.0');} console.log('API rodando na porta 8066 test 3'); bootstrap(); diff --git a/src/sales/sales/sales.service.ts b/src/sales/sales/sales.service.ts index 0022357..d4b8be6 100644 --- a/src/sales/sales/sales.service.ts +++ b/src/sales/sales/sales.service.ts @@ -1503,6 +1503,7 @@ export class SalesService { async calculateDeliveryTaxOrder(dataDeliveryTax: any) { let cityId = await this.customerService.findCity(dataDeliveryTax.ibgeCode); + await this.updatePriorityDelivery(dataDeliveryTax.cartId, dataDeliveryTax.priorityDelivery); if (cityId == 0) {