From 338a61a2843534cb5413ba6b80b9cd084a9e3ee9 Mon Sep 17 00:00:00 2001 From: flashlan Date: Sun, 5 Dec 2021 02:24:32 -0300 Subject: [PATCH] add setup scripts for linux, change data folder, basic working on linux fist time --- "C:\\Librography\\LoggedIn" | 1 + Setup-Linux/DBType | 1 + {Linux Setup => Setup-Linux}/cleanup-linux.sh | 0 {Linux Setup => Setup-Linux}/createmysql.sh | 0 {Windows Setup => Setup-Linux}/script.sql | 0 Setup-Linux/setup-arch.sh | 0 Setup-Linux/setup-files.sh | 13 ++ Setup-Linux/setup-mariadb-arch.sh | 39 ++++ Setup-Linux/setupMysql.bat | 56 ++++++ {Windows Setup => Setup-Windows}/7z.dll | Bin {Windows Setup => Setup-Windows}/7z.exe | Bin .../Install_Files/InnoScript-Win_0.1-beta.iss | 0 .../Install_Files/mysql _install.bat | 0 .../Librography.bat | 0 {Windows Setup => Setup-Windows}/License.txt | 0 .../copyJarToC.bat | 0 {Windows Setup => Setup-Windows}/packData.bat | 2 +- .../postgresql-10.19-1-windows-x64.exe | Bin .../script-postgresql.sql | 0 {Linux Setup => Setup-Windows}/script.sql | 182 +++++++++--------- {Windows Setup => Setup-Windows}/setup.bat | 0 Setup-Windows/setupFiles.bat | 7 + .../setupJava.bat | 0 .../setupMysql.bat | 0 .../setupPostgres.bat | 0 Windows Setup/setupFiles.bat | 7 - .../br/com/projeto/jdbc/ConexaoBanco.class | Bin 3381 -> 3542 bytes nbproject/private/private.properties | 2 +- {Windows Setup => setup}/data | Bin src/br/com/projeto/jdbc/ConexaoBanco.java | 4 + 30 files changed, 216 insertions(+), 98 deletions(-) create mode 100644 "C:\\Librography\\LoggedIn" create mode 100755 Setup-Linux/DBType rename {Linux Setup => Setup-Linux}/cleanup-linux.sh (100%) rename {Linux Setup => Setup-Linux}/createmysql.sh (100%) rename {Windows Setup => Setup-Linux}/script.sql (100%) create mode 100755 Setup-Linux/setup-arch.sh create mode 100755 Setup-Linux/setup-files.sh create mode 100755 Setup-Linux/setup-mariadb-arch.sh create mode 100755 Setup-Linux/setupMysql.bat rename {Windows Setup => Setup-Windows}/7z.dll (100%) rename {Windows Setup => Setup-Windows}/7z.exe (100%) rename {Windows Setup => Setup-Windows}/Install_Files/InnoScript-Win_0.1-beta.iss (100%) rename {Windows Setup => Setup-Windows}/Install_Files/mysql _install.bat (100%) rename {Windows Setup => Setup-Windows}/Librography.bat (100%) rename {Windows Setup => Setup-Windows}/License.txt (100%) rename {Windows Setup => Setup-Windows}/copyJarToC.bat (100%) rename {Windows Setup => Setup-Windows}/packData.bat (59%) rename {Windows Setup => Setup-Windows}/postgresql-10.19-1-windows-x64.exe (100%) rename {Windows Setup => Setup-Windows}/script-postgresql.sql (100%) rename {Linux Setup => Setup-Windows}/script.sql (50%) rename {Windows Setup => Setup-Windows}/setup.bat (100%) create mode 100644 Setup-Windows/setupFiles.bat rename {Windows Setup => Setup-Windows}/setupJava.bat (100%) rename {Windows Setup => Setup-Windows}/setupMysql.bat (100%) rename {Windows Setup => Setup-Windows}/setupPostgres.bat (100%) delete mode 100644 Windows Setup/setupFiles.bat rename {Windows Setup => setup}/data (100%) diff --git "a/C:\\Librography\\LoggedIn" "b/C:\\Librography\\LoggedIn" new file mode 100644 index 0000000..56a6051 --- /dev/null +++ "b/C:\\Librography\\LoggedIn" @@ -0,0 +1 @@ +1 \ No newline at end of file diff --git a/Setup-Linux/DBType b/Setup-Linux/DBType new file mode 100755 index 0000000..0d46ca3 --- /dev/null +++ b/Setup-Linux/DBType @@ -0,0 +1 @@ +mysql \ No newline at end of file diff --git a/Linux Setup/cleanup-linux.sh b/Setup-Linux/cleanup-linux.sh similarity index 100% rename from Linux Setup/cleanup-linux.sh rename to Setup-Linux/cleanup-linux.sh diff --git a/Linux Setup/createmysql.sh b/Setup-Linux/createmysql.sh similarity index 100% rename from Linux Setup/createmysql.sh rename to Setup-Linux/createmysql.sh diff --git a/Windows Setup/script.sql b/Setup-Linux/script.sql similarity index 100% rename from Windows Setup/script.sql rename to Setup-Linux/script.sql diff --git a/Setup-Linux/setup-arch.sh b/Setup-Linux/setup-arch.sh new file mode 100755 index 0000000..e69de29 diff --git a/Setup-Linux/setup-files.sh b/Setup-Linux/setup-files.sh new file mode 100755 index 0000000..ca3789e --- /dev/null +++ b/Setup-Linux/setup-files.sh @@ -0,0 +1,13 @@ +#!/bin/sh + +mkdir /opt +sudo pacman -S 7zip +sudo 7z x ../setup/data -o/opt/ -aoa +sudo chown root -R /opt/Librography +sudo chmod 777 -R /opt/ +cp DBType /opt/Librography/ +#touch /opt/Librography/DBType +#echo "mysql" >> /opt/Librography/DBType +#sed -i 's/^[^0-9]*//' /opt/Librography/DBType + +#pause diff --git a/Setup-Linux/setup-mariadb-arch.sh b/Setup-Linux/setup-mariadb-arch.sh new file mode 100755 index 0000000..7f27fa5 --- /dev/null +++ b/Setup-Linux/setup-mariadb-arch.sh @@ -0,0 +1,39 @@ +#!/bin/sh + + +echo "Script is executed as : `whoami`" + +#var0=$(who am i | awk '{print $1}') +#echo "var0 is $var0" + +server=127.0.0.1 +dbname=applibrography +dbuser=applibrography +dbuserpassword=gowl + + +if nc -z $server 3306 2>/dev/null; then + echo "$server ✓ - MariaDB Server is installed!" + echo "Proceeding to configuration:" + sudo mysql -uroot --execute="CREATE DATABASE $dbname"; #change to variables + sudo mysql -uroot --execute="CREATE USER '$dbuser'@'localhost' IDENTIFIED BY '$dbuserpassword';" + sudo mysql -uroot --execute="GRANT ALL PRIVILEGES ON $dbuser.* TO '$dbuser'@'localhost';" + sudo mysql -uroot --execute="FLUSH PRIVILEGES;" + sudo mysql -uroot --execute="source script.sql" +else + echo "$server ✗ - MariaDb is not Installed!!" + echo "Do tou wanto to install?" + # if else aqui com resposta"" + sudo pacman -Syu + sudo pacman -S mariadb + sudo mariadb-install-db --user=mysql --basedir=/usr --datadir=/var/lib/mysql + sudo systemctl start mariadb.service + sudo systemctl enable mariadb.service +fi + + + +# PS3='Choose your firewal profile: ' + + +#mysql -uroot -p%rootpassword% --execute="CREATE DATABASE %dbname%;" diff --git a/Setup-Linux/setupMysql.bat b/Setup-Linux/setupMysql.bat new file mode 100755 index 0000000..9873c5d --- /dev/null +++ b/Setup-Linux/setupMysql.bat @@ -0,0 +1,56 @@ +@echo off +:start +netstat -o -n -a | findstr 3306 +if %ERRORLEVEL% equ 0 goto FOUND +echo MySql not found or not usisng default port 3306... +ECHO Do you wanto open open browser to download it? +ECHO 1. yes +ECHO 2. no +set /p choice=Choose your option. +if '%choice%'=='' ECHO "%choice%" is not valid please try again +if '%choice%'=='1' goto open +if '%choice%'=='2' goto FIN +ECHO. +goto start +:open +echo opening the Mysql download link.... +pause +START Https://dev.mysql.com/downloads/installer/ +ECHO you can download the setup fromlink now and after install it we will continue the setup +ECHO choose the default options on setup and don`t forget to take a note of the root password +pause +Rem :continue +Rem echo ok +goto start +Rem goto FIN +:FOUND +echo port found. It mean the Mysql is installed +echo we can continue the setup... +pause +:FIN + +echo . +echo . +@echo off +rem ------------------------------------------------ +echo Creating access to user. Waiting ... +echo Enter the MySql root password: +set /p rootpassword= +set dbname=applibrography +set dbuser=applibrography +set userpassword=gowl +Rem "C:\Program Files\MySQL\MySQL Server 5.7\bin\mysql.exe" "--defaults-file=C:\ProgramData\MySQL\MySQL Server 5.7\my.ini" "-uroot" "-p" +SET PATH=%PATH%;C:\Program Files\MySQL\MySQL Server 5.7\bin +mysql -uroot -p%rootpassword% --execute="CREATE DATABASE %dbname%;" +mysql -uroot -p%rootpassword% --execute="CREATE USER '%dbuser%'@'localhost' IDENTIFIED BY '%userpassword%';" +mysql -uroot -p%rootpassword% --execute="GRANT ALL PRIVILEGES ON %dbuser%.* TO '%dbuser%'@'localhost';" + +mysql -uroot -p%rootpassword% --execute="FLUSH PRIVILEGES;" +mysql -uroot -p%rootpassword% --execute="source script.sql" +echo Done. +echo "MySQL user created." +echo "Username: %dbuser%" +echo "Password: %userpassword%" +rem ------------------------------------------------ +echo . +echo . diff --git a/Windows Setup/7z.dll b/Setup-Windows/7z.dll similarity index 100% rename from Windows Setup/7z.dll rename to Setup-Windows/7z.dll diff --git a/Windows Setup/7z.exe b/Setup-Windows/7z.exe similarity index 100% rename from Windows Setup/7z.exe rename to Setup-Windows/7z.exe diff --git a/Windows Setup/Install_Files/InnoScript-Win_0.1-beta.iss b/Setup-Windows/Install_Files/InnoScript-Win_0.1-beta.iss similarity index 100% rename from Windows Setup/Install_Files/InnoScript-Win_0.1-beta.iss rename to Setup-Windows/Install_Files/InnoScript-Win_0.1-beta.iss diff --git a/Windows Setup/Install_Files/mysql _install.bat b/Setup-Windows/Install_Files/mysql _install.bat similarity index 100% rename from Windows Setup/Install_Files/mysql _install.bat rename to Setup-Windows/Install_Files/mysql _install.bat diff --git a/Windows Setup/Librography.bat b/Setup-Windows/Librography.bat similarity index 100% rename from Windows Setup/Librography.bat rename to Setup-Windows/Librography.bat diff --git a/Windows Setup/License.txt b/Setup-Windows/License.txt similarity index 100% rename from Windows Setup/License.txt rename to Setup-Windows/License.txt diff --git a/Windows Setup/copyJarToC.bat b/Setup-Windows/copyJarToC.bat similarity index 100% rename from Windows Setup/copyJarToC.bat rename to Setup-Windows/copyJarToC.bat diff --git a/Windows Setup/packData.bat b/Setup-Windows/packData.bat similarity index 59% rename from Windows Setup/packData.bat rename to Setup-Windows/packData.bat index bda67fa..fc99007 100644 --- a/Windows Setup/packData.bat +++ b/Setup-Windows/packData.bat @@ -3,6 +3,6 @@ copy ..\dist\Librography.jar C:\Librography\ copy Librography.bat C:\Librography\ -7z.exe a -tZip data C:\Librography\ +7z.exe a -tZip ../setup/data C:\Librography\ rename data.zip data \ No newline at end of file diff --git a/Windows Setup/postgresql-10.19-1-windows-x64.exe b/Setup-Windows/postgresql-10.19-1-windows-x64.exe similarity index 100% rename from Windows Setup/postgresql-10.19-1-windows-x64.exe rename to Setup-Windows/postgresql-10.19-1-windows-x64.exe diff --git a/Windows Setup/script-postgresql.sql b/Setup-Windows/script-postgresql.sql similarity index 100% rename from Windows Setup/script-postgresql.sql rename to Setup-Windows/script-postgresql.sql diff --git a/Linux Setup/script.sql b/Setup-Windows/script.sql similarity index 50% rename from Linux Setup/script.sql rename to Setup-Windows/script.sql index 9d8b04d..a501516 100644 --- a/Linux Setup/script.sql +++ b/Setup-Windows/script.sql @@ -1,5 +1,5 @@ -- MySQL Script generated by MySQL Workbench --- Thu Jun 17 00:28:49 2021 +-- 11/01/21 23:54:12 -- Model: New Model Version: 1.0 -- MySQL Workbench Forward Engineering @@ -8,21 +8,21 @@ SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0; SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION'; -- ----------------------------------------------------- --- Schema gowl +-- Schema applibrography -- ----------------------------------------------------- -- ----------------------------------------------------- --- Schema gowl +-- Schema applibrography -- ----------------------------------------------------- -CREATE SCHEMA IF NOT EXISTS `gowl` DEFAULT CHARACTER SET utf8 ; -USE `gowl` ; +CREATE SCHEMA IF NOT EXISTS `applibrography` DEFAULT CHARACTER SET utf8 ; +USE `applibrography` ; -- ----------------------------------------------------- --- Table `gowl`.`tb_leitores` +-- Table `applibrography`.`tb_leitores` -- ----------------------------------------------------- -CREATE TABLE IF NOT EXISTS `gowl`.`tb_leitores` ( - `id` INT(11) NOT NULL AUTO_INCREMENT, - `nome` VARCHAR(100) NOT NULL, +CREATE TABLE IF NOT EXISTS `applibrography`.`tb_leitores` ( + `id` INT(8) ZEROFILL NOT NULL AUTO_INCREMENT, + `nome` VARCHAR(100) NULL, `rg` VARCHAR(30) NULL DEFAULT NULL, `cpf` VARCHAR(20) NULL DEFAULT NULL, `email` VARCHAR(200) NULL DEFAULT NULL, @@ -44,14 +44,15 @@ CREATE TABLE IF NOT EXISTS `gowl`.`tb_leitores` ( `observacoes` VARCHAR(225) NULL, PRIMARY KEY (`id`)) ENGINE = InnoDB +AUTO_INCREMENT = 00000100 DEFAULT CHARACTER SET = utf8; -- ----------------------------------------------------- --- Table `gowl`.`tb_fornecedores` +-- Table `applibrography`.`tb_fornecedores` -- ----------------------------------------------------- -CREATE TABLE IF NOT EXISTS `gowl`.`tb_fornecedores` ( - `id` INT(11) NOT NULL AUTO_INCREMENT, +CREATE TABLE IF NOT EXISTS `applibrography`.`tb_fornecedores` ( + `id` INT(8) NOT NULL AUTO_INCREMENT, `nome` VARCHAR(100) NULL DEFAULT NULL, `cnpj` VARCHAR(100) NULL DEFAULT NULL, `email` VARCHAR(200) NULL DEFAULT NULL, @@ -70,10 +71,10 @@ DEFAULT CHARACTER SET = utf8; -- ----------------------------------------------------- --- Table `gowl`.`tb_funcionarios` +-- Table `applibrography`.`tb_funcionarios` -- ----------------------------------------------------- -CREATE TABLE IF NOT EXISTS `gowl`.`tb_funcionarios` ( - `id` INT(11) NOT NULL AUTO_INCREMENT, +CREATE TABLE IF NOT EXISTS `applibrography`.`tb_funcionarios` ( + `id` INT(8) NOT NULL AUTO_INCREMENT, `nome` VARCHAR(100) NOT NULL, `rg` VARCHAR(30) NULL, `cpf` VARCHAR(20) NULL, @@ -96,10 +97,10 @@ DEFAULT CHARACTER SET = utf8; -- ----------------------------------------------------- --- Table `gowl`.`tb_livros` +-- Table `applibrography`.`tb_livros` -- ----------------------------------------------------- -CREATE TABLE IF NOT EXISTS `gowl`.`tb_livros` ( - `id` INT(11) NOT NULL AUTO_INCREMENT, +CREATE TABLE IF NOT EXISTS `applibrography`.`tb_livros` ( + `id` INT(8) NOT NULL AUTO_INCREMENT, `titulo` VARCHAR(100) NOT NULL, `autor` VARCHAR(45) NOT NULL, `editora` VARCHAR(45) NOT NULL, @@ -108,7 +109,7 @@ CREATE TABLE IF NOT EXISTS `gowl`.`tb_livros` ( `serie` VARCHAR(45) NULL, `edicao` VARCHAR(45) NULL, `idioma` VARCHAR(25) NOT NULL, - `tb_fornecedores_id` INT(11) NULL, + `tb_fornecedores_id` INT(8) NULL, `piso` VARCHAR(45) NULL, `corredor` VARCHAR(45) NULL, `posicao` VARCHAR(45) NULL, @@ -120,7 +121,7 @@ CREATE TABLE IF NOT EXISTS `gowl`.`tb_livros` ( INDEX `fk_tb_livros_tb_fornecedores1_idx` (`tb_fornecedores_id` ASC), CONSTRAINT `fk_tb_livros_tb_fornecedores1` FOREIGN KEY (`tb_fornecedores_id`) - REFERENCES `gowl`.`tb_fornecedores` (`id`) + REFERENCES `applibrography`.`tb_fornecedores` (`id`) ON DELETE NO ACTION ON UPDATE NO ACTION) ENGINE = InnoDB @@ -128,20 +129,20 @@ DEFAULT CHARACTER SET = utf8; -- ----------------------------------------------------- --- Table `gowl`.`tb_emprestimos` +-- Table `applibrography`.`tb_emprestimos` -- ----------------------------------------------------- -CREATE TABLE IF NOT EXISTS `gowl`.`tb_emprestimos` ( - `id` INT(11) NOT NULL AUTO_INCREMENT, +CREATE TABLE IF NOT EXISTS `applibrography`.`tb_emprestimos` ( + `id` INT(8) ZEROFILL NOT NULL AUTO_INCREMENT, `data_emprestimo` DATETIME NULL, `data_devolucao` DATETIME NULL DEFAULT NULL, `observacoes` TEXT NULL DEFAULT NULL, - `tb_funcionarios_id` INT(11) NULL, - `tb_livros_id` INT(11) NULL, - `tb_livros_tb_fornecedores_id` INT(11) NULL, - `tb_leitores_id` INT(11) NULL, + `tb_funcionarios_id` INT(8) NULL, + `tb_livros_id` INT(8) NULL, + `tb_livros_tb_fornecedores_id` INT(8) NULL, + `tb_leitores_id` INT(8) ZEROFILL NULL, `data_entrega_agendada` DATETIME NULL, - `tb_funcionarios_iddevol` INT(11) NULL, - `static_id_emprestimo` INT NULL, + `tb_funcionarios_iddevol` INT(8) NULL, + `static_id_emprestimo` INT(8) NULL, PRIMARY KEY (`id`), INDEX `fk_tb_emprestimos_tb_funcionarios1_idx` (`tb_funcionarios_id` ASC), INDEX `fk_tb_emprestimos_tb_livros1_idx` (`tb_livros_id` ASC, `tb_livros_tb_fornecedores_id` ASC), @@ -149,58 +150,59 @@ CREATE TABLE IF NOT EXISTS `gowl`.`tb_emprestimos` ( INDEX `fk_tb_emprestimos_tb_funcionarios2_idx` (`tb_funcionarios_iddevol` ASC), CONSTRAINT `fk_tb_emprestimos_tb_funcionarios1` FOREIGN KEY (`tb_funcionarios_id`) - REFERENCES `gowl`.`tb_funcionarios` (`id`) + REFERENCES `applibrography`.`tb_funcionarios` (`id`) ON DELETE NO ACTION ON UPDATE NO ACTION, CONSTRAINT `fk_tb_emprestimos_tb_livros1` FOREIGN KEY (`tb_livros_id`) - REFERENCES `gowl`.`tb_livros` (`id`) + REFERENCES `applibrography`.`tb_livros` (`id`) ON DELETE NO ACTION ON UPDATE NO ACTION, CONSTRAINT `fk_tb_emprestimos_tb_leitores1` FOREIGN KEY (`tb_leitores_id`) - REFERENCES `gowl`.`tb_leitores` (`id`) + REFERENCES `applibrography`.`tb_leitores` (`id`) ON DELETE NO ACTION ON UPDATE NO ACTION, CONSTRAINT `fk_tb_emprestimos_tb_funcionarios2` FOREIGN KEY (`tb_funcionarios_iddevol`) - REFERENCES `gowl`.`tb_funcionarios` (`id`) + REFERENCES `applibrography`.`tb_funcionarios` (`id`) ON DELETE NO ACTION ON UPDATE NO ACTION) ENGINE = InnoDB +AUTO_INCREMENT = 10000000 DEFAULT CHARACTER SET = utf8; -- ----------------------------------------------------- --- Table `gowl`.`tb_multa` +-- Table `applibrography`.`tb_multa` -- ----------------------------------------------------- -CREATE TABLE IF NOT EXISTS `gowl`.`tb_multa` ( - `idmulta` INT NOT NULL AUTO_INCREMENT, +CREATE TABLE IF NOT EXISTS `applibrography`.`tb_multa` ( + `idmulta` INT(8) NOT NULL AUTO_INCREMENT, `dias_atraso` INT(6) NOT NULL, `valor_multa` DECIMAL(10,2) NULL, `esta_pago` TINYINT NULL, - `tb_leitores_id` INT(11) NOT NULL, - `tb_emprestimos_id` INT(11) NOT NULL, + `tb_leitores_id` INT(8) ZEROFILL NOT NULL, + `tb_emprestimos_id` INT(8) ZEROFILL NOT NULL, PRIMARY KEY (`idmulta`, `tb_emprestimos_id`), INDEX `fk_multa_tb_leitores1_idx` (`tb_leitores_id` ASC), INDEX `fk_tb_multa_tb_emprestimos1_idx` (`tb_emprestimos_id` ASC), CONSTRAINT `fk_multa_tb_leitores1` FOREIGN KEY (`tb_leitores_id`) - REFERENCES `gowl`.`tb_leitores` (`id`) + REFERENCES `applibrography`.`tb_leitores` (`id`) ON DELETE NO ACTION ON UPDATE NO ACTION, CONSTRAINT `fk_tb_multa_tb_emprestimos1` FOREIGN KEY (`tb_emprestimos_id`) - REFERENCES `gowl`.`tb_emprestimos` (`id`) + REFERENCES `applibrography`.`tb_emprestimos` (`id`) ON DELETE NO ACTION ON UPDATE NO ACTION) ENGINE = InnoDB; -- ----------------------------------------------------- --- Table `gowl`.`tb_opcoes` +-- Table `applibrography`.`tb_opcoes` -- ----------------------------------------------------- -CREATE TABLE IF NOT EXISTS `gowl`.`tb_opcoes` ( +CREATE TABLE IF NOT EXISTS `applibrography`.`tb_opcoes` ( `id` INT NOT NULL AUTO_INCREMENT, `data` VARCHAR(45) NOT NULL, `parentid` INT NULL, @@ -208,18 +210,18 @@ CREATE TABLE IF NOT EXISTS `gowl`.`tb_opcoes` ( INDEX `fk_Opcoes_Opcoes1_idx` (`parentid` ASC), CONSTRAINT `fk_Opcoes_Opcoes1` FOREIGN KEY (`parentid`) - REFERENCES `gowl`.`tb_opcoes` (`id`) + REFERENCES `applibrography`.`tb_opcoes` (`id`) ON DELETE NO ACTION ON UPDATE NO ACTION) ENGINE = InnoDB; -- ----------------------------------------------------- --- Table `gowl`.`tb_recibos` +-- Table `applibrography`.`tb_recibos` -- ----------------------------------------------------- -CREATE TABLE IF NOT EXISTS `gowl`.`tb_recibos` ( - `id` INT NOT NULL AUTO_INCREMENT, - `emprestimo_id` INT NULL, +CREATE TABLE IF NOT EXISTS `applibrography`.`tb_recibos` ( + `id` INT(8) NOT NULL AUTO_INCREMENT, + `emprestimo_id` INT(8) NULL, `data_emprestimo` VARCHAR(45) NULL, `data_devolucao_agendada` VARCHAR(45) NULL, `data_entrega` VARCHAR(45) NULL, @@ -238,78 +240,80 @@ SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS; SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS; -- ----------------------------------------------------- --- Data for table `gowl`.`tb_leitores` +-- Data for table `applibrography`.`tb_leitores` -- ----------------------------------------------------- START TRANSACTION; -USE `gowl`; -INSERT INTO `gowl`.`tb_leitores` (`id`, `nome`, `rg`, `cpf`, `email`, `telefone`, `celular`, `cep`, `endereco`, `numero`, `complemento`, `bairro`, `cidade`, `estado`, `tipo`, `is_locked`, `curso`, `curso_ano`, `qtd_emprestimos`, `emprestmax`, `observacoes`) VALUES (1, 'Leitor 1', '111.111.111-1', '111.111.111-11', 'leitor@test.com', '(42)99999-9999', '(42)99999-9999', '84570-000', 'Rua Tal', '100', 'casa', 'Centro', 'Mallet', 'PR', 'Estudante', 0, 'Letras Ingles / Noturno', '4', 0, 3, 'leitor ok - primeiro cadastro - cadastro completo'); -INSERT INTO `gowl`.`tb_leitores` (`id`, `nome`, `rg`, `cpf`, `email`, `telefone`, `celular`, `cep`, `endereco`, `numero`, `complemento`, `bairro`, `cidade`, `estado`, `tipo`, `is_locked`, `curso`, `curso_ano`, `qtd_emprestimos`, `emprestmax`, `observacoes`) VALUES (2, 'Leitor numero 2', '123.123.123-3', '123.123.123-23', 'leitor2@leitor2.com', '(42)98988-8989', '(42)45355-6666', '84570-000', 'Rua 2', '1212', 'Casa', 'Centro', 'Mallet', 'PR', 'Professor', 0, 'Letras', '0', 0, 0, 'Professor - emprestimos ilimitados'); +USE `applibrography`; +INSERT INTO `applibrography`.`tb_leitores` (`id`, `nome`, `rg`, `cpf`, `email`, `telefone`, `celular`, `cep`, `endereco`, `numero`, `complemento`, `bairro`, `cidade`, `estado`, `tipo`, `is_locked`, `curso`, `curso_ano`, `qtd_emprestimos`, `emprestmax`, `observacoes`) VALUES (00000101, 'Leitor Teste', '5.432.234-1', '099.999.345-23', 'leitor@mail.com', '(42)98877-2299', '(42)98877-2299', '854670-000', 'Rua 1 de abril', '13', 'casa', 'Centro', 'Mallet', 'PR', 'Estudante', 0, 'Letras', '1', 0, 123, 'Ok'); COMMIT; -- ----------------------------------------------------- --- Data for table `gowl`.`tb_fornecedores` +-- Data for table `applibrography`.`tb_fornecedores` -- ----------------------------------------------------- START TRANSACTION; -USE `gowl`; -INSERT INTO `gowl`.`tb_fornecedores` (`id`, `nome`, `cnpj`, `email`, `telefone`, `celular`, `cep`, `endereco`, `numero`, `complemento`, `bairro`, `cidade`, `estado`) VALUES (1, 'Fornecedor Teste', '111.111.111/0001-11', 'teste@test', '423232123123', NULL, '84570-000', 'Rua Fccinal', '00', 'Predio', NULL, 'Mallet', 'PR'); +USE `applibrography`; +INSERT INTO `applibrography`.`tb_fornecedores` (`id`, `nome`, `cnpj`, `email`, `telefone`, `celular`, `cep`, `endereco`, `numero`, `complemento`, `bairro`, `cidade`, `estado`) VALUES (1, 'Fornecedor Teste', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); COMMIT; -- ----------------------------------------------------- --- Data for table `gowl`.`tb_funcionarios` +-- Data for table `applibrography`.`tb_funcionarios` -- ----------------------------------------------------- START TRANSACTION; -USE `gowl`; -INSERT INTO `gowl`.`tb_funcionarios` (`id`, `nome`, `rg`, `cpf`, `email`, `senha`, `cargo`, `nivel_acesso`, `telefone`, `celular`, `cep`, `endereco`, `numero`, `complemento`, `bairro`, `cidade`, `estado`) VALUES (1, 'Administrador', '7.275.275-1', '033.330.003-13', 'admin@admin', 'admin', 'Administrador', 'Administrador', '(42)99987-6543', '123123123123', '84570-000', 'rua Miguel Grenteski', '13', 'Casa', 'Eldorado', 'Mallet', 'PR'); +USE `applibrography`; +INSERT INTO `applibrography`.`tb_funcionarios` (`id`, `nome`, `rg`, `cpf`, `email`, `senha`, `cargo`, `nivel_acesso`, `telefone`, `celular`, `cep`, `endereco`, `numero`, `complemento`, `bairro`, `cidade`, `estado`) VALUES (1, 'Administrador', NULL, NULL, 'admin@admin', 'admin', 'Administrador', 'Administrador', NULL, NULL, '84570-000', NULL, NULL, NULL, NULL, 'Mallet', 'PR'); COMMIT; -- ----------------------------------------------------- --- Data for table `gowl`.`tb_livros` +-- Data for table `applibrography`.`tb_livros` -- ----------------------------------------------------- START TRANSACTION; -USE `gowl`; -INSERT INTO `gowl`.`tb_livros` (`id`, `titulo`, `autor`, `editora`, `isbn`, `ano`, `serie`, `edicao`, `idioma`, `tb_fornecedores_id`, `piso`, `corredor`, `posicao`, `secao`, `disponibilidade`, `observacoes`, `is_emprestado`) VALUES (1, 'Alice no Pais das Maravilhas', 'Lewis Carrol', 'Dumi Edit', '1234567890123', '1894', 'Especial', '25', 'Portugues', 1, '1', 'b', 'a3', 'Literatura Universal', '1', 'ok', 0); -INSERT INTO `gowl`.`tb_livros` (`id`, `titulo`, `autor`, `editora`, `isbn`, `ano`, `serie`, `edicao`, `idioma`, `tb_fornecedores_id`, `piso`, `corredor`, `posicao`, `secao`, `disponibilidade`, `observacoes`, `is_emprestado`) VALUES (2, 'A Revolução dos Bichos', 'George Orwell', 'Dumi Edit', '0987654321234', '1934', 'Must be Read Books', '2', 'Portugues', 1, '1', 'b', 'a3', 'Literatura Universal', '3', 'ok', 0); +USE `applibrography`; +INSERT INTO `applibrography`.`tb_livros` (`id`, `titulo`, `autor`, `editora`, `isbn`, `ano`, `serie`, `edicao`, `idioma`, `tb_fornecedores_id`, `piso`, `corredor`, `posicao`, `secao`, `disponibilidade`, `observacoes`, `is_emprestado`) VALUES (1, 'Alice no Pis das maravilhas', 'Lewis Carrol', 'Nope', '1231231231231', '1894', '1', '1', 'Portugues', 1, NULL, NULL, NULL, 'Literatura Universal', '5', 'ok', 0); COMMIT; -- ----------------------------------------------------- --- Data for table `gowl`.`tb_opcoes` +-- Data for table `applibrography`.`tb_opcoes` -- ----------------------------------------------------- START TRANSACTION; -USE `gowl`; -INSERT INTO `gowl`.`tb_opcoes` (`id`, `data`, `parentid`) VALUES (1, 'piso', NULL); -INSERT INTO `gowl`.`tb_opcoes` (`id`, `data`, `parentid`) VALUES (2, 'corredor', NULL); -INSERT INTO `gowl`.`tb_opcoes` (`id`, `data`, `parentid`) VALUES (3, 'secao', NULL); -INSERT INTO `gowl`.`tb_opcoes` (`id`, `data`, `parentid`) VALUES (4, 'posicao', NULL); -INSERT INTO `gowl`.`tb_opcoes` (`id`, `data`, `parentid`) VALUES (5, 'disponibilidade', NULL); -INSERT INTO `gowl`.`tb_opcoes` (`id`, `data`, `parentid`) VALUES (6, 'printerurl', NULL); -INSERT INTO `gowl`.`tb_opcoes` (`id`, `data`, `parentid`) VALUES (7, 'instituicaonome', NULL); -INSERT INTO `gowl`.`tb_opcoes` (`id`, `data`, `parentid`) VALUES (8, 'instiuicaoendereco', NULL); -INSERT INTO `gowl`.`tb_opcoes` (`id`, `data`, `parentid`) VALUES (17, 'piso 1', 1); -INSERT INTO `gowl`.`tb_opcoes` (`id`, `data`, `parentid`) VALUES (20, 'corredor 1', 2); -INSERT INTO `gowl`.`tb_opcoes` (`id`, `data`, `parentid`) VALUES (21, '1A', 3); -INSERT INTO `gowl`.`tb_opcoes` (`id`, `data`, `parentid`) VALUES (22, 'Literatura Universal', 4); -INSERT INTO `gowl`.`tb_opcoes` (`id`, `data`, `parentid`) VALUES (13, '0', 5); -INSERT INTO `gowl`.`tb_opcoes` (`id`, `data`, `parentid`) VALUES (14, '3', 5); -INSERT INTO `gowl`.`tb_opcoes` (`id`, `data`, `parentid`) VALUES (15, 'Biblioteca de Hogwarts', 7); -INSERT INTO `gowl`.`tb_opcoes` (`id`, `data`, `parentid`) VALUES (16, 'Rua Epsilon, 888, Cidade Imaginaria, LA ', 8); -INSERT INTO `gowl`.`tb_opcoes` (`id`, `data`, `parentid`) VALUES (9, 'tiposdeusuarios', NULL); -INSERT INTO `gowl`.`tb_opcoes` (`id`, `data`, `parentid`) VALUES (18, 'Estudante', 9); -INSERT INTO `gowl`.`tb_opcoes` (`id`, `data`, `parentid`) VALUES (19, 'Professor', 9); -INSERT INTO `gowl`.`tb_opcoes` (`id`, `data`, `parentid`) VALUES (10, 'server url', NULL); -INSERT INTO `gowl`.`tb_opcoes` (`id`, `data`, `parentid`) VALUES (11, 'libraryname', NULL); -INSERT INTO `gowl`.`tb_opcoes` (`id`, `data`, `parentid`) VALUES (12, 'libraryAddress', NULL); -INSERT INTO `gowl`.`tb_opcoes` (`id`, `data`, `parentid`) VALUES (23, '127.0.0.1', 12); -INSERT INTO `gowl`.`tb_opcoes` (`id`, `data`, `parentid`) VALUES (24, 'Nome da Biblioteca', NULL); -INSERT INTO `gowl`.`tb_opcoes` (`id`, `data`, `parentid`) VALUES (25, 'valor_multa', NULL); -INSERT INTO `gowl`.`tb_opcoes` (`id`, `data`, `parentid`) VALUES (26, '300', 25); +USE `applibrography`; +INSERT INTO `applibrography`.`tb_opcoes` (`id`, `data`, `parentid`) VALUES (1, 'piso', NULL); +INSERT INTO `applibrography`.`tb_opcoes` (`id`, `data`, `parentid`) VALUES (2, 'corredor', NULL); +INSERT INTO `applibrography`.`tb_opcoes` (`id`, `data`, `parentid`) VALUES (3, 'secao', NULL); +INSERT INTO `applibrography`.`tb_opcoes` (`id`, `data`, `parentid`) VALUES (4, 'posicao', NULL); +INSERT INTO `applibrography`.`tb_opcoes` (`id`, `data`, `parentid`) VALUES (5, 'disponibilidade', NULL); +INSERT INTO `applibrography`.`tb_opcoes` (`id`, `data`, `parentid`) VALUES (6, 'printerurl', NULL); +INSERT INTO `applibrography`.`tb_opcoes` (`id`, `data`, `parentid`) VALUES (7, 'instituicaonome', NULL); +INSERT INTO `applibrography`.`tb_opcoes` (`id`, `data`, `parentid`) VALUES (8, 'instiuicaoendereco', NULL); +INSERT INTO `applibrography`.`tb_opcoes` (`id`, `data`, `parentid`) VALUES (17, 'piso 1', 1); +INSERT INTO `applibrography`.`tb_opcoes` (`id`, `data`, `parentid`) VALUES (20, 'corredor 1', 2); +INSERT INTO `applibrography`.`tb_opcoes` (`id`, `data`, `parentid`) VALUES (21, '1A', 3); +INSERT INTO `applibrography`.`tb_opcoes` (`id`, `data`, `parentid`) VALUES (22, 'Literatura Universal', 4); +INSERT INTO `applibrography`.`tb_opcoes` (`id`, `data`, `parentid`) VALUES (13, '0', 5); +INSERT INTO `applibrography`.`tb_opcoes` (`id`, `data`, `parentid`) VALUES (14, '3', 5); +INSERT INTO `applibrography`.`tb_opcoes` (`id`, `data`, `parentid`) VALUES (15, 'Biblioteca de Hogwarts', 7); +INSERT INTO `applibrography`.`tb_opcoes` (`id`, `data`, `parentid`) VALUES (16, 'Rua Epsilon, 888, Cidade Imaginaria, LA ', 8); +INSERT INTO `applibrography`.`tb_opcoes` (`id`, `data`, `parentid`) VALUES (9, 'tiposdeusuarios', NULL); +INSERT INTO `applibrography`.`tb_opcoes` (`id`, `data`, `parentid`) VALUES (18, 'Estudante', 9); +INSERT INTO `applibrography`.`tb_opcoes` (`id`, `data`, `parentid`) VALUES (19, 'Professor', 9); +INSERT INTO `applibrography`.`tb_opcoes` (`id`, `data`, `parentid`) VALUES (10, 'server url', NULL); +INSERT INTO `applibrography`.`tb_opcoes` (`id`, `data`, `parentid`) VALUES (11, 'libraryname', NULL); +INSERT INTO `applibrography`.`tb_opcoes` (`id`, `data`, `parentid`) VALUES (12, 'libraryAddress', NULL); +INSERT INTO `applibrography`.`tb_opcoes` (`id`, `data`, `parentid`) VALUES (23, '127.0.0.1', 12); +INSERT INTO `applibrography`.`tb_opcoes` (`id`, `data`, `parentid`) VALUES (24, 'Nome da Biblioteca', NULL); +INSERT INTO `applibrography`.`tb_opcoes` (`id`, `data`, `parentid`) VALUES (25, 'valor_multa', NULL); +INSERT INTO `applibrography`.`tb_opcoes` (`id`, `data`, `parentid`) VALUES (26, '300', 25); +INSERT INTO `applibrography`.`tb_opcoes` (`id`, `data`, `parentid`) VALUES (27, 'MsgReceipt', NULL); +INSERT INTO `applibrography`.`tb_opcoes` (`id`, `data`, `parentid`) VALUES (28, 'Obrigado!!', 27); +INSERT INTO `applibrography`.`tb_opcoes` (`id`, `data`, `parentid`) VALUES (29, 'theme', NULL); +INSERT INTO `applibrography`.`tb_opcoes` (`id`, `data`, `parentid`) VALUES (30, 'dark', 29); COMMIT; diff --git a/Windows Setup/setup.bat b/Setup-Windows/setup.bat similarity index 100% rename from Windows Setup/setup.bat rename to Setup-Windows/setup.bat diff --git a/Setup-Windows/setupFiles.bat b/Setup-Windows/setupFiles.bat new file mode 100644 index 0000000..2e2436b --- /dev/null +++ b/Setup-Windows/setupFiles.bat @@ -0,0 +1,7 @@ + + +Rem extract files +7z.exe x ../setup/data -oC:\ -aoa + + +pause \ No newline at end of file diff --git a/Windows Setup/setupJava.bat b/Setup-Windows/setupJava.bat similarity index 100% rename from Windows Setup/setupJava.bat rename to Setup-Windows/setupJava.bat diff --git a/Windows Setup/setupMysql.bat b/Setup-Windows/setupMysql.bat similarity index 100% rename from Windows Setup/setupMysql.bat rename to Setup-Windows/setupMysql.bat diff --git a/Windows Setup/setupPostgres.bat b/Setup-Windows/setupPostgres.bat similarity index 100% rename from Windows Setup/setupPostgres.bat rename to Setup-Windows/setupPostgres.bat diff --git a/Windows Setup/setupFiles.bat b/Windows Setup/setupFiles.bat deleted file mode 100644 index e33c9a2..0000000 --- a/Windows Setup/setupFiles.bat +++ /dev/null @@ -1,7 +0,0 @@ - - -Rem extract files -7z.exe x data -oC:\ -aoa - - -pause \ No newline at end of file diff --git a/build/classes/br/com/projeto/jdbc/ConexaoBanco.class b/build/classes/br/com/projeto/jdbc/ConexaoBanco.class index 04189f2a863397d8b657a1927f5d3fa1f47bc9af..3063cd21ac0bd2c425b0572df7886b0cb95d3af7 100644 GIT binary patch delta 1306 zcmZ{j-BVRn7{-6=aL!rlZ1%CkMuZKdh*S{BF~rafr0MCy0z~2?(#&I$U?2!ak>oM^ z{?2w~_MN5lWuYW6I5kd}b7ySXzyUAu^%9%ayde-wk>s`-&*IE|}e<{lR z@aNojKrJ&CYw6P5Z4sg?Mh)GDdt#E=5imO~?q!$ZKErN9+OWrPzhSST$MAq*pP|># zXV|ZK(4wCKivtW=xAqjn5mJH*HSv)>K|rwaOGHlY>KtlF6pNJ;Q_hhSNj6W65OS&`8hlXwR^s@c+`O z%^i}zVzMpBg>b39jutNImda0>-UFT zzb&#N`z%wMZ)`3wJvAPw2p84JX@hhoXpqE^VCkDg&%YE~SywMyaPE*#7?%b?_JTe^ zBR9!Rv5`%I9s%wjDVIM1?YMS z(^Ptv8}+hX?b*tUyOx{n+Ot$$VztcTlTGTMT2)EWONlkIW|kY&q%^aa!yJ)jqUu!x z)npO0`3x2Qc=nb|jl8h6?3Nd|mvy4`MBOO*dX7r_k8?ApNioN*{KW12%vOHo4u0cK zey52)XjLU_S7o%RaynEcooWN!vd<3H$WGPHu7yK9MMCQ3NVUyG2`P^)QdKTgM%8hP zzz{~&$|fnXXR9^bCMZloRmr9)B4Xl%Y@L$Da~u-`DYO_G5F06s*y<2Gl@TjpoyIW_ZmOZE3N zKb-)U@q^D|`ZYKCBOY&6_rxYcl*;da9vhC2;+8Sd8H<8v>Y zeD33Zp8^kPHftXAd5A4OLp+?}5w<$D&9L1?>@YlP=y}ZWxaJ9;Hu?=a-MGu}q~R&U z({A>R&$CoDyEV@l_BhvGpXYf&^P=V@&C5ssXh@`&afzZW{w>|sV!4Qm6Lyy4RgO#J8GJ%XfT#?2Ol*surcS zAV`i(Y(lgEi(M|WRU{|Z@*QKSj&Tx$V^H0K_=G>N+8E?2!L+{MyeJjqBX5M{IEBH^VMLTG~4Nrw*3k22%5$8Zp5!d?swfxw zVK%gN7XCuJ%yLJ{>fc%}Ti#AdsngY}jz}vv$~D}|bZJwUD$*hCcTL{U{Mg!_>T+3K zDeEiPF3sM{m_t2oKk{K*1fti%8R`qbFmgm5T{a;8HLxK^qsBy*{Zfv6=i Nk~i{SN$`3p{0AFJz1jc( diff --git a/nbproject/private/private.properties b/nbproject/private/private.properties index 2da6e95..e348c36 100644 --- a/nbproject/private/private.properties +++ b/nbproject/private/private.properties @@ -3,4 +3,4 @@ do.depend=false do.jar=true javac.debug=true javadoc.preview=true -user.properties.file=C:\\Users\\flash\\AppData\\Roaming\\NetBeans\\8.2\\build.properties +user.properties.file=/home/sandman/.netbeans/8.2/build.properties diff --git a/Windows Setup/data b/setup/data similarity index 100% rename from Windows Setup/data rename to setup/data diff --git a/src/br/com/projeto/jdbc/ConexaoBanco.java b/src/br/com/projeto/jdbc/ConexaoBanco.java index 737429f..56caea1 100644 --- a/src/br/com/projeto/jdbc/ConexaoBanco.java +++ b/src/br/com/projeto/jdbc/ConexaoBanco.java @@ -47,6 +47,10 @@ public class ConexaoBanco { dbTypePath = "//Applications//Librography.app//config//DBType"; break; case LINUX: + ipserverPath = "//opt//Librography//ipserver"; + dbuserpPath = "//opt//Librography//DBUser"; + dbpassPath = "//opt//Librography//DBPass"; + dbTypePath = "//opt//Librography//DBType"; // some stuff break; }