diff --git a/README.md b/README.md index 3e56a34..5054d45 100644 --- a/README.md +++ b/README.md @@ -150,7 +150,7 @@ ORACLE_DSN=host:1521/service_name poetry run python src/main.py ``` -A API estará disponível em `http://localhost:8000` +A API estará disponível em `http://localhost:8010` ### Frontend @@ -185,7 +185,7 @@ cp .env.example .env docker-compose up -d ``` -- Backend: `http://localhost:8000` +- Backend: `http://localhost:8010` - Frontend: `http://localhost` ## Endpoints da API @@ -231,8 +231,8 @@ Health check da API. ## Documentação da API Após iniciar o backend, acesse: -- Swagger UI: `http://localhost:8000/docs` -- ReDoc: `http://localhost:8000/redoc` +- Swagger UI: `http://localhost:8010/docs` +- ReDoc: `http://localhost:8010/redoc` ## Desenvolvimento diff --git a/backend/scripts/bootstrap_ranking.sh b/backend/scripts/bootstrap_ranking.sh old mode 100644 new mode 100755 index 8c6afc9..b90bf79 --- a/backend/scripts/bootstrap_ranking.sh +++ b/backend/scripts/bootstrap_ranking.sh @@ -1,6 +1,15 @@ #!/usr/bin/env bash set -euo pipefail +# Escolhe binário do Python (funciona no host ou dentro do container) +if [ -x "./venv/bin/python" ]; then + VENV_PY="./venv/bin/python" +elif command -v python3 >/dev/null 2>&1; then + VENV_PY="python3" +else + VENV_PY="python" +fi + # Configs DSN_CANDIDATES=() if [ -n "${ORACLE_LOCAL_DSN:-}" ]; then @@ -8,7 +17,6 @@ if [ -n "${ORACLE_LOCAL_DSN:-}" ]; then fi DSN_CANDIDATES+=("127.0.0.1:1521/XEPDB1" "oracle18c:1521/XEPDB1" "mqapilc_oracle18c:1521/XEPDB1") API_URL=${API_URL:-"http://localhost:8000"} -VENV_PY="./venv/bin/python" echo "[1/5] Aguardando Oracle..." DSN_HOST="" @@ -44,6 +52,14 @@ cur.close();conn.close() PY ) echo " Registros na TB_RANKING_CONSULTOR: ${COUNT}" +MAX_B=$($VENV_PY - <0"); print("B>0",cur.fetchone()[0]) +cur.execute("select max(componente_b) from tb_ranking_consultor"); print("max B",cur.fetchone()[0]) cur.execute("select max(pontuacao_total) from tb_ranking_consultor"); print("max total",cur.fetchone()[0]) cur.close();conn.close() PY diff --git a/docker-compose.yml b/docker-compose.yml index 6d735c3..4e88af8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -5,7 +5,7 @@ services: context: ./backend dockerfile: Dockerfile ports: - - "8000:8000" + - "8010:8000" env_file: - ./backend/.env environment: diff --git a/start-ngrok.sh b/start-ngrok.sh index e9ea830..6c2e2d6 100755 --- a/start-ngrok.sh +++ b/start-ngrok.sh @@ -8,7 +8,7 @@ echo "[1/5] Parando containers antigos..." docker compose down 2>/dev/null echo "[2/5] Limpando portas ocupadas..." -sudo fuser -k 8000/tcp 2>/dev/null +sudo fuser -k 8010/tcp 2>/dev/null sudo fuser -k 5173/tcp 2>/dev/null echo "[3/5] Matando ngrok antigo..." @@ -57,7 +57,7 @@ echo " URL Publica (ngrok): $NGROK_URL" echo "" echo " URLs Locais:" echo " - Frontend: http://localhost:5173" -echo " - Backend: http://localhost:8000" +echo " - Backend: http://localhost:8010" echo " - Ngrok UI: http://localhost:4040" echo "" echo "==========================================" diff --git a/start.sh b/start.sh new file mode 100755 index 0000000..faa46a7 --- /dev/null +++ b/start.sh @@ -0,0 +1,27 @@ +#!/bin/bash + +echo "=== Ranking CAPES - Iniciando sistema ===" + +cd /home/fred/projetos/ranking + +echo "[1/4] Parando containers antigos..." +docker compose down 2>/dev/null + +echo "[2/4] Limpando portas ocupadas..." +sudo fuser -k 8010/tcp 2>/dev/null +sudo fuser -k 5173/tcp 2>/dev/null + +echo "[3/4] Criando rede Docker..." +docker network create shared_network 2>/dev/null + +echo "[4/4] Subindo containers..." +docker compose up -d backend frontend + +sleep 2 + +echo "" +docker ps --filter "name=ranking" --format "table {{.Names}}\t{{.Status}}\t{{.Ports}}" +echo "" +echo "URLs Locais:" +echo " - Frontend: http://localhost:5173" +echo " - Backend: http://localhost:8010"