diff --git a/.claude/project.json b/.claude/project.json index da3f657..88a55ed 100644 --- a/.claude/project.json +++ b/.claude/project.json @@ -1,8 +1,8 @@ { - "name": "dal-license-server", - "description": "Univerzalni licencni server za sve DAL proizvode (ESIR, ARV, Light-Ticket).", - "binary": "dal-license-server", + "name": "licence-server", + "description": "Univerzalni licencni server za vise proizvoda i klijenata (ESIR, ARV, Light-Ticket).", + "binary": "licence-server", "start_cmd": "", - "work_dir": "/root/projects/dal-license-server", + "work_dir": "/root/projects/licence-server", "ports": {} } \ No newline at end of file diff --git a/.env.example b/.env.example index 4a7eb58..3912c8f 100644 --- a/.env.example +++ b/.env.example @@ -3,7 +3,7 @@ APP_ENV=development DB_HOST=localhost DB_PORT=3306 -DB_NAME=dal_license_db +DB_NAME=licence_db DB_USER=license DB_PASS=OBAVEZNO-PROMENITI diff --git a/.gitignore b/.gitignore index 46d6251..724362b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,6 @@ .env *.exe -dal-license-server +licence-server crypto/private.pem log/*.log data/ diff --git a/API.md b/API.md index 3c4b69b..886b092 100644 --- a/API.md +++ b/API.md @@ -1,4 +1,4 @@ -# DAL License Server — API Dokumentacija +# Licence Server — API Dokumentacija Bazni URL: `http://localhost:8090` diff --git a/CLAUDE.md b/CLAUDE.md index 41e6b7a..a898279 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -1,14 +1,14 @@ -# DAL License Server — CLAUDE.md +# Licence Server — CLAUDE.md ## Pregled -Univerzalni licencni server za **sve DAL proizvode**: ESIR, ARV, Light-Ticket, i buduće aplikacije. +Univerzalni licencni server za **više proizvoda i klijenata**: ESIR, ARV, Light-Ticket, i buduće aplikacije. Zamenjuje stari `esir-license-server` (koji niko ne koristi u produkciji). Arhitektura prema ARV licencnoj dokumentaciji (`/root/projects/arv/TASKS/Licenciranje-Starter.md`), ali univerzalna — podržava N proizvoda. -**Princip:** License Server je jedini koji ima RSA private key. Klijentske aplikacije imaju samo public key. Server potpisuje licence, klijenti verifikuju potpis. Niko osim servera ne može da kreira validnu licencu. +**Princip:** Licence Server je jedini koji ima RSA private key. Klijentske aplikacije imaju samo public key. Server potpisuje licence, klijenti verifikuju potpis. Niko osim servera ne može da kreira validnu licencu. -**KRITIČNO — Testiranje:** Ova aplikacija je osnova budućeg poslovanja DAL-a. Mora biti **rigorozno testirana** svim poznatim tipovima testova: +**KRITIČNO — Testiranje:** Ova aplikacija je osnova budućeg poslovanja. Mora biti **rigorozno testirana** svim poznatim tipovima testova: - **Unit testovi** — svaki servis, model, helper, middleware - **Integration testovi** — kompletni API flow-ovi (activate → validate → deactivate → re-activate) - **Security testovi** — SQL injection, brute force, API key bypass, tampered signatures, invalid inputs @@ -23,7 +23,7 @@ Zamenjuje stari `esir-license-server` (koji niko ne koristi u produkciji). Arhit ``` ┌─────────────────────────────────────────────────────┐ -│ DAL LICENSE SERVER │ +│ LICENCE SERVER │ │ port: 8090 │ │ │ │ ┌──────────┐ ┌──────────┐ ┌──────────────────┐ │ @@ -114,7 +114,7 @@ Jednom dnevno (ako ima internet): ## Go struktura projekta ``` -dal-license-server/ +licence-server/ ├── cmd/ │ └── server/ │ └── main.go @@ -496,7 +496,7 @@ Primeri: Pošto stari server niko ne koristi u produkciji, migracija je jednostavna: -1. Kreiraj novi `dal-license-server` projekat +1. Kreiraj novi `licence-server` projekat 2. Kopiraj korisnu logiku iz `esir-license-server` (keygen, verify flow, helpers) 3. Proširi model (product, features, limits, RSA) 4. Zameni port 8090 (isti port, drop-in replacement) @@ -578,7 +578,7 @@ APP_ENV=development # MySQL DB_HOST=localhost DB_PORT=3306 -DB_NAME=dal_license_db +DB_NAME=licence_db DB_USER=license DB_PASS=OBAVEZNO-PROMENITI @@ -632,7 +632,7 @@ LOG_FILE=./log/server.log ### Implementirano - ✅ Go projekat inicijalizovan (go.mod, go.sum) -- ✅ MySQL baza `dal_license_db` kreirana, user `license` +- ✅ MySQL baza `licence_db` kreirana, user `license` - ✅ Migracije (001_create_tables.sql, 002_seed_products.sql) - ✅ RSA-2048 ključevi generisani (crypto/private.pem, crypto/public.pem) - ✅ Seed podaci: 3 proizvoda (ESIR, ARV, LIGHT_TICKET) @@ -695,7 +695,7 @@ crypto/public.pem — RSA javni ključ ``` APP_PORT=8090 DB_HOST=localhost / DB_PORT=3306 -DB_NAME=dal_license_db +DB_NAME=licence_db DB_USER=license / DB_PASS=license_pass_2026 ADMIN_API_KEY=dal-admin-key-2026-supersecret-change-me ADMIN_PASSWORD=DalAdmin2026! @@ -790,4 +790,6 @@ sudare; `devices.license_id` referencira licencu iz tog paketa. *Kreirano: mart 2026* *Ažurirano: 04.03.2026 — Kompletna implementacija, 22/22 testova* -*Autor: Nenad Đukić / DAL d.o.o.* +*Autor: Nenad Đukić* +*Preimenovano 2026-07-25: dal-license-server → licence-server (samostalan +proizvod, izlazi iz DAL priče); baza `dal_license_db` → `licence_db`.* diff --git a/README.md b/README.md index 4392149..09ae0c5 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ -# DAL License Server +# Licence Server -Univerzalni licencni server za sve DAL proizvode (ESIR, ARV, Light-Ticket). +Univerzalni licencni server za više proizvoda i klijenata (ESIR, ARV, Light-Ticket). ## Funkcionalnosti @@ -27,9 +27,9 @@ cp .env.example .env # Uredi .env sa pravim vrednostima # 2. Kreiraj MySQL bazu -mysql -u root -e "CREATE DATABASE dal_license_db CHARACTER SET utf8mb4;" +mysql -u root -e "CREATE DATABASE licence_db CHARACTER SET utf8mb4;" mysql -u root -e "CREATE USER 'license'@'localhost' IDENTIFIED BY 'TVOJA_LOZINKA';" -mysql -u root -e "GRANT ALL ON dal_license_db.* TO 'license'@'localhost';" +mysql -u root -e "GRANT ALL ON licence_db.* TO 'license'@'localhost';" # 3. Generiši RSA ključeve (ako ne postoje) openssl genrsa -out crypto/private.pem 2048 @@ -55,4 +55,4 @@ Server radi na portu **8090** (konfigurisano u `.env`). --- -*DAL d.o.o. | Mart 2026* +*Nenad Đukić | Mart 2026* diff --git a/TESTING.md b/TESTING.md index e2912e0..7756880 100644 --- a/TESTING.md +++ b/TESTING.md @@ -1,4 +1,4 @@ -# DAL License Server — Test Checklista +# Licence Server — Test Checklista ## Ukupno testova: 182 - Go unit testovi: 46 diff --git a/cmd/server/main.go b/cmd/server/main.go index dc8c6e0..a3df121 100644 --- a/cmd/server/main.go +++ b/cmd/server/main.go @@ -1,12 +1,12 @@ package main import ( - "dal-license-server/internal/config" - "dal-license-server/internal/handler" - "dal-license-server/internal/model" - "dal-license-server/internal/repository" - "dal-license-server/internal/router" - "dal-license-server/internal/service" + "licence-server/internal/config" + "licence-server/internal/handler" + "licence-server/internal/model" + "licence-server/internal/repository" + "licence-server/internal/router" + "licence-server/internal/service" "database/sql" "fmt" "log" diff --git a/docs/ARCHITECTURE.md b/docs/ARCHITECTURE.md index f4a748a..bc25c66 100644 --- a/docs/ARCHITECTURE.md +++ b/docs/ARCHITECTURE.md @@ -1,10 +1,10 @@ -# DAL License Server — Arhitektura +# Licence Server — Arhitektura ## Dijagram sistema ``` ┌─────────────────────────────────────────────────────┐ -│ DAL LICENSE SERVER │ +│ LICENCE SERVER │ │ port: 8090 │ │ │ │ ┌──────────┐ ┌──────────┐ ┌──────────────────┐ │ @@ -16,7 +16,7 @@ │ │ │ │ ┌────────┴────────┐ │ │ │ MySQL baza │ │ -│ │ dal_license_db │ │ +│ │ licence_db │ │ │ └─────────────────┘ │ │ │ │ RSA-2048 Private Key (samo ovde, nikad ne izlazi) │ @@ -33,7 +33,7 @@ ## Struktura projekta ``` -dal-license-server/ +licence-server/ ├── cmd/server/main.go — Entry point, MySQL konekcija, migracije ├── internal/ │ ├── config/config.go — .env loading, DSN builder diff --git a/docs/SETUP.md b/docs/SETUP.md index 3317bf5..8a9ca5a 100644 --- a/docs/SETUP.md +++ b/docs/SETUP.md @@ -1,4 +1,4 @@ -# DAL License Server — Setup i Deployment +# Licence Server — Setup i Deployment ## Preduslovi @@ -12,8 +12,8 @@ ```bash cd /root/projects -git clone http://localhost:3000/dal/dal-license-server.git -cd dal-license-server +git clone https://git.terminia.net/djuka/licence-server.git +cd licence-server ``` ### 2. Instaliraj Go zavisnosti @@ -25,9 +25,9 @@ go mod download ### 3. Kreiraj MySQL bazu ```sql -CREATE DATABASE dal_license_db CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; +CREATE DATABASE licence_db CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; CREATE USER 'license'@'localhost' IDENTIFIED BY 'TVOJA_LOZINKA'; -GRANT ALL PRIVILEGES ON dal_license_db.* TO 'license'@'localhost'; +GRANT ALL PRIVILEGES ON licence_db.* TO 'license'@'localhost'; FLUSH PRIVILEGES; ``` @@ -56,7 +56,7 @@ APP_ENV=production DB_HOST=localhost DB_PORT=3306 -DB_NAME=dal_license_db +DB_NAME=licence_db DB_USER=license DB_PASS=tvoja_lozinka @@ -85,26 +85,34 @@ Server se pokrece na `http://localhost:8090`. Migracije se izvrsavaju automatski ### Build ```bash -go build -o dal-license-server cmd/server/main.go +go build -o licence-server cmd/server/main.go ``` ### Systemd servis -Kreiraj `/etc/systemd/system/dal-license-server.service`: +Kreiraj `/etc/systemd/system/licence-server.service` (obrazac po `terminia.service` +na 151 — journal log + graceful shutdown, ne stariji minimalni predložak): ```ini [Unit] -Description=DAL License Server +Description=Licence Server After=network.target mysql.service +Wants=mysql.service [Service] Type=simple User=root -WorkingDirectory=/root/projects/dal-license-server -ExecStart=/root/projects/dal-license-server/dal-license-server +WorkingDirectory=/root/projects/licence-server +ExecStart=/root/projects/licence-server/licence-server +EnvironmentFile=/root/projects/licence-server/.env Restart=always RestartSec=5 -EnvironmentFile=/root/projects/dal-license-server/.env +StandardOutput=journal +StandardError=journal +SyslogIdentifier=licence-server +KillMode=mixed +KillSignal=SIGTERM +TimeoutStopSec=15 [Install] WantedBy=multi-user.target @@ -112,18 +120,26 @@ WantedBy=multi-user.target ```bash systemctl daemon-reload -systemctl enable dal-license-server -systemctl start dal-license-server +systemctl enable --now licence-server +journalctl -u licence-server -f ``` ### HTTPS (reverse proxy) -Preporuceno: Caddy ili Nginx kao reverse proxy sa TLS: +Nginx kao reverse proxy sa TLS (Let's Encrypt/Certbot) — primer sa produkcije: ``` -# Caddy primer -license.dal.rs { - reverse_proxy localhost:8090 +# licenca.terminia.net -> licence-server (127.0.0.1:8090) +server { + server_name licenca.terminia.net; + location / { + proxy_pass http://127.0.0.1:8090/; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + } + listen 443 ssl; # managed by Certbot } ``` @@ -132,7 +148,7 @@ license.dal.rs { ### MySQL backup ```bash -mysqldump -u license -p dal_license_db > backup_$(date +%Y%m%d).sql +mysqldump -u license -p licence_db > backup_$(date +%Y%m%d).sql ``` ### RSA kljucevi diff --git a/docs/SPEC.md b/docs/SPEC.md index 831597d..b777228 100644 --- a/docs/SPEC.md +++ b/docs/SPEC.md @@ -1,8 +1,8 @@ -# DAL License Server — Specifikacija +# Licence Server — Specifikacija ## Cilj -Univerzalni licencni server koji zamenjuje stari `esir-license-server` i podržava sve DAL proizvode: ESIR, ARV, Light-Ticket, i buduće aplikacije. +Univerzalni licencni server koji zamenjuje stari `esir-license-server` i podržava više proizvoda: ESIR, ARV, Light-Ticket, i buduće aplikacije. ## Principi diff --git a/docs/asp-terminia/01-postojece-stanje.md b/docs/asp-terminia/01-postojece-stanje.md index b9cef61..73d6976 100644 --- a/docs/asp-terminia/01-postojece-stanje.md +++ b/docs/asp-terminia/01-postojece-stanje.md @@ -10,9 +10,9 @@ - Gitea; - ESIR backend (fiskalizacija). -## 2. `dal-license-server` (naš deo) +## 2. `licence-server` (naš deo) -- **Kod:** `/root/projects/dal-license-server` — Go, bez frameworka, MySQL. +- **Kod:** `/root/projects/licence-server` — Go, bez frameworka, MySQL. - **Port:** 8090 lokalno; javno preko nginx sajta **`arv`**. - **Javni URL (ovo firmware već koristi):** `https://157.180.119.151/license/api/v1/` - HTTPS 443, cert `/etc/nginx/ssl/arv.crt`, `server_name` = IP → **self-signed** diff --git a/docs/asp-terminia/README.md b/docs/asp-terminia/README.md index e4cc10c..a93bb65 100644 --- a/docs/asp-terminia/README.md +++ b/docs/asp-terminia/README.md @@ -1,7 +1,7 @@ # ASP-Terminia — licenciranje (radni paket) > **Misija:** dovesti licenciranje ASP‑Terminia terminala do produkcije na -> postojećem `dal-license-server`-u (server 151), bez lomljenja ijednog +> postojećem `licence-server`-u (server 151), bez lomljenja ijednog > postojećeg klijenta (ESIR/ARV/LIGHT_TICKET su ŽIVI u produkciji). > > **Jezik projekta:** srpski (ekavica), latinica. Kod/komentari na serveru su Go — @@ -27,7 +27,7 @@ 1. **Šta se licencira:** ESP32‑S3 terminal za kontrolu prolaza (bazeni/spa), proizvod **„ASP‑Terminia"** (Autonomni Sistem Prolaza). Licenca je vezana za **MAC** čipa (eFuse, nepromenljiv) preko `machine_fingerprint`. -2. **Server već postoji:** `dal-license-server` (Go, MySQL, RSA‑2048/SHA‑256) na +2. **Server već postoji:** `licence-server` (Go, MySQL, RSA‑2048/SHA‑256) na `157.180.119.151`, u produkciji sa 3 proizvoda / ~140 licenci / ~19 aktivacija. 3. **Firmware klijent je GOTOV** (modul `licenca.h/.cpp` u firmveru, od verzije 0.10.0): aktivacija, offline verifikacija potpisa javnim ključem, UI. Čeka samo proizvod diff --git a/docs/loggerservice/00-vizija-i-mvp.md b/docs/loggerservice/00-vizija-i-mvp.md index a0fbe9e..2d8e4bb 100644 --- a/docs/loggerservice/00-vizija-i-mvp.md +++ b/docs/loggerservice/00-vizija-i-mvp.md @@ -31,7 +31,7 @@ Za sada **najosnovnije**, sa dve tvrde odrednice od vlasnika: parking, garderoba…) — modul zna koji proizvod/verzija ide na koji uređaj i omogućava podešavanje/dodelu FW (naslanja se na katalog `fw.terminia.net`, vidi `03-provisioning-i-fw-katalog.md`). -2. **Direktno vezan za licencni server** (`dal-license-server`): modul +2. **Direktno vezan za licencni server** (`licence-server`): modul komunicira sa njim (proizvodi, licence po MAC-u, entitlements) — NE gradi svoju paralelnu evidenciju licenci. Vidi paket [`docs/asp-terminia/`](../asp-terminia/README.md). diff --git a/docs/loggerservice/05-pravila-rada.md b/docs/loggerservice/05-pravila-rada.md index c30c74f..59ae322 100644 --- a/docs/loggerservice/05-pravila-rada.md +++ b/docs/loggerservice/05-pravila-rada.md @@ -1,7 +1,7 @@ # Pravila rada — PROČITATI PRE PRVOG SSH-a > Server 151 (`157.180.119.151`, SSH `root@`, ključ `~/.ssh/id_ed25519`) je -> **PRODUKCIJA**: dal-license-server (3 proizvoda, ~140 licenci), terminia SaaS +> **PRODUKCIJA**: licence-server (3 proizvoda, ~140 licenci), terminia SaaS > (8091/8092), ESIR, Gitea. Greška košta prave korisnike. ## Tvrda pravila (identična paketu [`docs/asp-terminia/04-pravila-rada.md`](../asp-terminia/04-pravila-rada.md)) diff --git a/docs/loggerservice/README.md b/docs/loggerservice/README.md index cafbe30..44de033 100644 --- a/docs/loggerservice/README.md +++ b/docs/loggerservice/README.md @@ -2,7 +2,7 @@ > **Misija:** izgraditi serversku kontrolnu ravan za flote terminala — RBAC stablo > organizacija, uređaji + heartbeat, servisni grantovi, provisioning i katalog -> firmvera — kao **proširenje postojećeg `dal-license-server`-a** (server 151). +> firmvera — kao **proširenje postojećeg `licence-server`-a** (server 151). > Jedan backend, **dva lica**: `terminia.net` = vendor (licence/fw), > **`loggerservice.com` = serviserski brend** (isti mozak, drugi izgled). > @@ -34,7 +34,7 @@ **DAL = KUPAC** (org pod Terminijom) — ne vendor. 3. **Serviseri NISU nivo u stablu** nego **grant preko stabla** (razdvaja vlasništvo od servisnog pristupa) — detalji u 01. -4. **Server:** isti `dal-license-server` (Go/MySQL, produkcija!) — RBAC se DODAJE +4. **Server:** isti `licence-server` (Go/MySQL, produkcija!) — RBAC se DODAJE migracijama; koordinacija sa paketom [`docs/asp-terminia/`](../asp-terminia/README.md) (deli bazu i admin sloj). 5. **Uređaj već emituje:** LAN discovery (UDP 46464, upit `TERMINIA?` → JSON identitet), heartbeat (UDP JSON na podesiv interval), dbg dnevnik (UDP) — diff --git a/go.mod b/go.mod index 92c6879..b2c4908 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module dal-license-server +module licence-server go 1.24.0 diff --git a/internal/config/config.go b/internal/config/config.go index 73a210e..1a2e041 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -31,7 +31,7 @@ func Load() *Config { Env: getEnv("APP_ENV", "development"), DBHost: getEnv("DB_HOST", "localhost"), DBPort: getEnv("DB_PORT", "3306"), - DBName: getEnv("DB_NAME", "dal_license_db"), + DBName: getEnv("DB_NAME", "licence_db"), DBUser: getEnv("DB_USER", "license"), DBPass: getEnv("DB_PASS", ""), AdminAPIKey: getEnv("ADMIN_API_KEY", ""), diff --git a/internal/config/config_test.go b/internal/config/config_test.go index eed4604..00daf84 100644 --- a/internal/config/config_test.go +++ b/internal/config/config_test.go @@ -38,8 +38,8 @@ func TestLoad_Defaults(t *testing.T) { if cfg.DBPort != "3306" { t.Errorf("DBPort default: ocekivano '3306', dobijeno %q", cfg.DBPort) } - if cfg.DBName != "dal_license_db" { - t.Errorf("DBName default: ocekivano 'dal_license_db', dobijeno %q", cfg.DBName) + if cfg.DBName != "licence_db" { + t.Errorf("DBName default: ocekivano 'licence_db', dobijeno %q", cfg.DBName) } if cfg.DBUser != "license" { t.Errorf("DBUser default: ocekivano 'license', dobijeno %q", cfg.DBUser) diff --git a/internal/handler/admin_handler.go b/internal/handler/admin_handler.go index 02816d1..68f93fe 100644 --- a/internal/handler/admin_handler.go +++ b/internal/handler/admin_handler.go @@ -1,9 +1,9 @@ package handler import ( - "dal-license-server/internal/model" - "dal-license-server/internal/repository" - "dal-license-server/internal/service" + "licence-server/internal/model" + "licence-server/internal/repository" + "licence-server/internal/service" "encoding/json" "net/http" "strconv" diff --git a/internal/handler/client_handler.go b/internal/handler/client_handler.go index ddedc31..371bba5 100644 --- a/internal/handler/client_handler.go +++ b/internal/handler/client_handler.go @@ -1,8 +1,8 @@ package handler import ( - "dal-license-server/internal/model" - "dal-license-server/internal/service" + "licence-server/internal/model" + "licence-server/internal/service" "encoding/json" "net/http" ) diff --git a/internal/handler/dashboard_handler.go b/internal/handler/dashboard_handler.go index 9fa1df0..2525b6f 100644 --- a/internal/handler/dashboard_handler.go +++ b/internal/handler/dashboard_handler.go @@ -2,9 +2,9 @@ package handler import ( "crypto/rand" - "dal-license-server/internal/model" - "dal-license-server/internal/repository" - "dal-license-server/internal/service" + "licence-server/internal/model" + "licence-server/internal/repository" + "licence-server/internal/service" "encoding/hex" "encoding/json" "html/template" diff --git a/internal/handler/helpers.go b/internal/handler/helpers.go index 419c610..8fa786d 100644 --- a/internal/handler/helpers.go +++ b/internal/handler/helpers.go @@ -1,8 +1,8 @@ package handler import ( - "dal-license-server/internal/model" - "dal-license-server/internal/service" + "licence-server/internal/model" + "licence-server/internal/service" "encoding/json" "net/http" ) diff --git a/internal/handler/helpers_test.go b/internal/handler/helpers_test.go index 5a3bf78..073470e 100644 --- a/internal/handler/helpers_test.go +++ b/internal/handler/helpers_test.go @@ -1,8 +1,8 @@ package handler import ( - "dal-license-server/internal/model" - "dal-license-server/internal/service" + "licence-server/internal/model" + "licence-server/internal/service" "encoding/json" "net/http" "net/http/httptest" diff --git a/internal/repository/activation_repo.go b/internal/repository/activation_repo.go index 8726e97..31f84b6 100644 --- a/internal/repository/activation_repo.go +++ b/internal/repository/activation_repo.go @@ -1,7 +1,7 @@ package repository import ( - "dal-license-server/internal/model" + "licence-server/internal/model" "database/sql" "fmt" ) diff --git a/internal/repository/audit_repo.go b/internal/repository/audit_repo.go index 94d9c30..40c1ad4 100644 --- a/internal/repository/audit_repo.go +++ b/internal/repository/audit_repo.go @@ -1,7 +1,7 @@ package repository import ( - "dal-license-server/internal/model" + "licence-server/internal/model" "database/sql" "encoding/json" "fmt" diff --git a/internal/repository/license_repo.go b/internal/repository/license_repo.go index 8467c72..4cf5ce2 100644 --- a/internal/repository/license_repo.go +++ b/internal/repository/license_repo.go @@ -1,7 +1,7 @@ package repository import ( - "dal-license-server/internal/model" + "licence-server/internal/model" "database/sql" "fmt" ) diff --git a/internal/repository/user_repo.go b/internal/repository/user_repo.go index 25d7840..cd9fd9b 100644 --- a/internal/repository/user_repo.go +++ b/internal/repository/user_repo.go @@ -1,7 +1,7 @@ package repository import ( - "dal-license-server/internal/model" + "licence-server/internal/model" "database/sql" "fmt" ) diff --git a/internal/router/router.go b/internal/router/router.go index d01bca2..9a9c6e2 100644 --- a/internal/router/router.go +++ b/internal/router/router.go @@ -1,8 +1,8 @@ package router import ( - "dal-license-server/internal/handler" - "dal-license-server/internal/middleware" + "licence-server/internal/handler" + "licence-server/internal/middleware" "net/http" "strconv" ) diff --git a/internal/service/activation_service.go b/internal/service/activation_service.go index 763f728..bf9fa67 100644 --- a/internal/service/activation_service.go +++ b/internal/service/activation_service.go @@ -1,8 +1,8 @@ package service import ( - "dal-license-server/internal/model" - "dal-license-server/internal/repository" + "licence-server/internal/model" + "licence-server/internal/repository" "database/sql" "encoding/json" "fmt" diff --git a/internal/service/license_service.go b/internal/service/license_service.go index a9abf09..bd6f0c2 100644 --- a/internal/service/license_service.go +++ b/internal/service/license_service.go @@ -1,8 +1,8 @@ package service import ( - "dal-license-server/internal/model" - "dal-license-server/internal/repository" + "licence-server/internal/model" + "licence-server/internal/repository" "database/sql" "encoding/json" "fmt" diff --git a/package-lock.json b/package-lock.json index 36b0dcb..28f7e7e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,11 +1,11 @@ { - "name": "dal-license-server", + "name": "licence-server", "version": "1.0.0", "lockfileVersion": 3, "requires": true, "packages": { "": { - "name": "dal-license-server", + "name": "licence-server", "version": "1.0.0", "license": "ISC", "devDependencies": { diff --git a/package.json b/package.json index 408eaca..3b8fbe1 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { - "name": "dal-license-server", + "name": "licence-server", "version": "1.0.0", - "description": "Univerzalni licencni server za sve DAL proizvode (ESIR, ARV, Light-Ticket).", + "description": "Univerzalni licencni server za vise proizvoda i klijenata (ESIR, ARV, Light-Ticket).", "main": "index.js", "directories": { "doc": "docs" @@ -11,7 +11,7 @@ }, "repository": { "type": "git", - "url": "http://djuka:dzabulan1@localhost:3000/djuka/dal-license-server.git" + "url": "https://git.terminia.net/djuka/licence-server.git" }, "keywords": [], "author": "", diff --git a/templates/layout/base.html b/templates/layout/base.html index e465c39..234f8f5 100644 --- a/templates/layout/base.html +++ b/templates/layout/base.html @@ -3,14 +3,14 @@ - {{block "page-title" .}}DAL License Server{{end}} + {{block "page-title" .}}Licence Server{{end}}