diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 0000000..41fbf1d --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,79 @@ +{ + "configurations": [ + { + "type": "java", + "name": "Spring Boot-EctemplateServiceConfigServerApplication", + "request": "launch", + "cwd": "${workspaceFolder}", + "mainClass": "net.ectemplate.app.config.EctemplateServiceConfigServerApplication", + "projectName": "etctemplate-service-config-server", + "args": "", + "envFile": "${workspaceFolder}/.env", + "vmArgs": " -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=37071 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Dspring.jmx.enabled=true -Djava.rmi.server.hostname=localhost -Dspring.application.admin.enabled=true -Dspring.boot.project.name=etctemplate-service-config-server" + }, + { + "type": "java", + "name": "Spring Boot-EctemplateServicioEurekaServerApplication", + "request": "launch", + "cwd": "${workspaceFolder}", + "mainClass": "net.ostemplate.app.eureka.EctemplateServicioEurekaServerApplication", + "projectName": "ectemplate-servicio-eureka-server", + "args": "", + "envFile": "${workspaceFolder}/.env", + "vmArgs": " -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=39435 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Dspring.jmx.enabled=true -Djava.rmi.server.hostname=localhost -Dspring.application.admin.enabled=true -Dspring.boot.project.name=ectemplate-servicio-eureka-server" + }, + { + "type": "java", + "name": "Spring Boot-EctemplateServiceOauthApplication", + "request": "launch", + "cwd": "${workspaceFolder}", + "mainClass": "net.ectemplate.app.oauth.EctemplateServiceOauthApplication", + "projectName": "etctemplate-service-oauth", + "args": "", + "envFile": "${workspaceFolder}/.env", + "vmArgs": " -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=34949 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Dspring.jmx.enabled=true -Djava.rmi.server.hostname=localhost -Dspring.application.admin.enabled=true -Dspring.boot.project.name=etctemplate-service-oauth" + }, + { + "type": "java", + "name": "Spring Boot-EctemplateServicioPersonasApplication", + "request": "launch", + "cwd": "${workspaceFolder}", + "mainClass": "net.ectemplate.app.personas.EctemplateServicioPersonasApplication", + "projectName": "etctemplate-servicio-personas", + "args": "", + "envFile": "${workspaceFolder}/.env", + "vmArgs": " -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=45735 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Dspring.jmx.enabled=true -Djava.rmi.server.hostname=localhost -Dspring.application.admin.enabled=true -Dspring.boot.project.name=etctemplate-servicio-personas" + }, + { + "type": "java", + "name": "Spring Boot-EctemplateServicioProductosApplication", + "request": "launch", + "cwd": "${workspaceFolder}", + "mainClass": "net.ostemplate.app.productos.EctemplateServicioProductosApplication", + "projectName": "ectemplate-servicio-productos", + "args": "", + "envFile": "${workspaceFolder}/.env", + "vmArgs": " -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=35889 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Dspring.jmx.enabled=true -Djava.rmi.server.hostname=localhost -Dspring.application.admin.enabled=true -Dspring.boot.project.name=ectemplate-servicio-productos" + }, + { + "type": "java", + "name": "Spring Boot-EctemplateServiceZuulServerApplication", + "request": "launch", + "cwd": "${workspaceFolder}", + "mainClass": "net.ectemplate.app.zuul.EctemplateServiceZuulServerApplication", + "projectName": "etctemplate-service-zuul-server", + "args": "", + "envFile": "${workspaceFolder}/.env" + }, + { + "type": "java", + "name": "Spring Boot-EctemplateServiceZuulServerApplication", + "request": "launch", + "cwd": "${workspaceFolder}", + "mainClass": "net.ectemplate.app.zuul.EctemplateServiceZuulServerApplication", + "projectName": "springboot-servicio-zuul-server", + "args": "", + "envFile": "${workspaceFolder}/.env" + } + ] +} \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json index fdb4ea7..f857050 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,5 +1,6 @@ { "boot-java.change-detection.on": true, "maven.terminal.useJavaHome": true, - "java.configuration.updateBuildConfiguration": "automatic" + "java.configuration.updateBuildConfiguration": "automatic", + "java.compile.nullAnalysis.mode": "automatic" } \ No newline at end of file diff --git a/clientes-app/package-lock.json b/clientes-app/package-lock.json index a0b8137..96da0a9 100644 --- a/clientes-app/package-lock.json +++ b/clientes-app/package-lock.json @@ -74,15 +74,15 @@ } }, "node_modules/@angular-devkit/build-angular": { - "version": "16.2.9", - "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-16.2.9.tgz", - "integrity": "sha512-S1C4UYxRVyNt3C0wCxbT2jZ1dN5i37kS0mol3PQjbR8gQ0GQzHmzhjTBl1oImo8aouET9yhrk9etk65oat4mBQ==", + "version": "16.2.10", + "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-16.2.10.tgz", + "integrity": "sha512-msB/qjIsAOySDxdU5DpcX2sWGUEJOFIO03O9+HbtLwf3NDfe74mFfejxuKlHJXIJdgpM2Zc948M6+618QKpUYA==", "dev": true, "dependencies": { "@ampproject/remapping": "2.2.1", - "@angular-devkit/architect": "0.1602.9", - "@angular-devkit/build-webpack": "0.1602.9", - "@angular-devkit/core": "16.2.9", + "@angular-devkit/architect": "0.1602.10", + "@angular-devkit/build-webpack": "0.1602.10", + "@angular-devkit/core": "16.2.10", "@babel/core": "7.22.9", "@babel/generator": "7.22.9", "@babel/helper-annotate-as-pure": "7.22.5", @@ -94,7 +94,7 @@ "@babel/runtime": "7.22.6", "@babel/template": "7.22.5", "@discoveryjs/json-ext": "0.5.7", - "@ngtools/webpack": "16.2.9", + "@ngtools/webpack": "16.2.10", "@vitejs/plugin-basic-ssl": "1.0.1", "ansi-colors": "4.1.3", "autoprefixer": "10.4.14", @@ -195,6 +195,48 @@ } } }, + "node_modules/@angular-devkit/build-angular/node_modules/@angular-devkit/architect": { + "version": "0.1602.10", + "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1602.10.tgz", + "integrity": "sha512-FwemQXh3edqA/S6zPpsqKei5v7gt0R0WpjJoAJaz+FOpfDwij1fwnKr88XINY8xcefTcQaTDQxJZheJShA/hHw==", + "dev": true, + "dependencies": { + "@angular-devkit/core": "16.2.10", + "rxjs": "7.8.1" + }, + "engines": { + "node": "^16.14.0 || >=18.10.0", + "npm": "^6.11.0 || ^7.5.6 || >=8.0.0", + "yarn": ">= 1.13.0" + } + }, + "node_modules/@angular-devkit/build-angular/node_modules/@angular-devkit/core": { + "version": "16.2.10", + "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-16.2.10.tgz", + "integrity": "sha512-eo7suLDjyu5bSlEr4TluYkFm4v2PVLSAPgnau8XHHlN5Yg4P/BZ00ve7LA7C9S1gzRSCrxQhK5ki4rnoFTo5zg==", + "dev": true, + "dependencies": { + "ajv": "8.12.0", + "ajv-formats": "2.1.1", + "jsonc-parser": "3.2.0", + "picomatch": "2.3.1", + "rxjs": "7.8.1", + "source-map": "0.7.4" + }, + "engines": { + "node": "^16.14.0 || >=18.10.0", + "npm": "^6.11.0 || ^7.5.6 || >=8.0.0", + "yarn": ">= 1.13.0" + }, + "peerDependencies": { + "chokidar": "^3.5.2" + }, + "peerDependenciesMeta": { + "chokidar": { + "optional": true + } + } + }, "node_modules/@angular-devkit/build-angular/node_modules/@babel/core": { "version": "7.22.9", "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.9.tgz", @@ -366,12 +408,12 @@ } }, "node_modules/@angular-devkit/build-webpack": { - "version": "0.1602.9", - "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.1602.9.tgz", - "integrity": "sha512-+3IxovfBPR2Vy730mGa0SVKkd5LQVom85gjXOs7WcnnnZmfc1q/BtFlqTgW1UWvTxP8IQdm7UYWVclQfL/WExw==", + "version": "0.1602.10", + "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.1602.10.tgz", + "integrity": "sha512-H7HiFKbZl/xVxpr1RH05SGawTpA1417wvr2nFGRu2OiePd0lPr6pIhcq8F8gt7JcA8yZKKaqjn2gU+6um2MFLg==", "dev": true, "dependencies": { - "@angular-devkit/architect": "0.1602.9", + "@angular-devkit/architect": "0.1602.10", "rxjs": "7.8.1" }, "engines": { @@ -384,6 +426,48 @@ "webpack-dev-server": "^4.0.0" } }, + "node_modules/@angular-devkit/build-webpack/node_modules/@angular-devkit/architect": { + "version": "0.1602.10", + "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1602.10.tgz", + "integrity": "sha512-FwemQXh3edqA/S6zPpsqKei5v7gt0R0WpjJoAJaz+FOpfDwij1fwnKr88XINY8xcefTcQaTDQxJZheJShA/hHw==", + "dev": true, + "dependencies": { + "@angular-devkit/core": "16.2.10", + "rxjs": "7.8.1" + }, + "engines": { + "node": "^16.14.0 || >=18.10.0", + "npm": "^6.11.0 || ^7.5.6 || >=8.0.0", + "yarn": ">= 1.13.0" + } + }, + "node_modules/@angular-devkit/build-webpack/node_modules/@angular-devkit/core": { + "version": "16.2.10", + "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-16.2.10.tgz", + "integrity": "sha512-eo7suLDjyu5bSlEr4TluYkFm4v2PVLSAPgnau8XHHlN5Yg4P/BZ00ve7LA7C9S1gzRSCrxQhK5ki4rnoFTo5zg==", + "dev": true, + "dependencies": { + "ajv": "8.12.0", + "ajv-formats": "2.1.1", + "jsonc-parser": "3.2.0", + "picomatch": "2.3.1", + "rxjs": "7.8.1", + "source-map": "0.7.4" + }, + "engines": { + "node": "^16.14.0 || >=18.10.0", + "npm": "^6.11.0 || ^7.5.6 || >=8.0.0", + "yarn": ">= 1.13.0" + }, + "peerDependencies": { + "chokidar": "^3.5.2" + }, + "peerDependenciesMeta": { + "chokidar": { + "optional": true + } + } + }, "node_modules/@angular-devkit/build-webpack/node_modules/rxjs": { "version": "7.8.1", "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz", @@ -3089,9 +3173,9 @@ "dev": true }, "node_modules/@ngtools/webpack": { - "version": "16.2.9", - "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-16.2.9.tgz", - "integrity": "sha512-rOclD7FfT4OSwVA0nDnULbJS6TORJ0+sQiuT2ebaNFErYr3LOm6Zut05tnmzFw8q1cePrILbG+xpnbggNr9Pyw==", + "version": "16.2.10", + "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-16.2.10.tgz", + "integrity": "sha512-XAVn59zP3ztuKDtw92Xc9+64RK4u4c9g8y5GgtjIWeOwgNXl8bYhAo3uTZzrSrOu96DFZGjsmghFab/7/C2pDg==", "dev": true, "engines": { "node": "^16.14.0 || >=18.10.0", @@ -3511,9 +3595,9 @@ } }, "node_modules/@types/body-parser": { - "version": "1.19.4", - "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.4.tgz", - "integrity": "sha512-N7UDG0/xiPQa2D/XrVJXjkWbpqHCd2sBaB32ggRF2l83RhPfamgKGF8gwwqyksS95qUS5ZYF9aF+lLPRlwI2UA==", + "version": "1.19.5", + "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.5.tgz", + "integrity": "sha512-fB3Zu92ucau0iQ0JMCFQE7b/dv8Ot07NI3KaZIkIUNXq82k4eBAqUaneXfleGY9JWskeS9y+u0nXMyspcuQrCg==", "dev": true, "dependencies": { "@types/connect": "*", @@ -3521,27 +3605,27 @@ } }, "node_modules/@types/bonjour": { - "version": "3.5.12", - "resolved": "https://registry.npmjs.org/@types/bonjour/-/bonjour-3.5.12.tgz", - "integrity": "sha512-ky0kWSqXVxSqgqJvPIkgFkcn4C8MnRog308Ou8xBBIVo39OmUFy+jqNe0nPwLCDFxUpmT9EvT91YzOJgkDRcFg==", + "version": "3.5.13", + "resolved": "https://registry.npmjs.org/@types/bonjour/-/bonjour-3.5.13.tgz", + "integrity": "sha512-z9fJ5Im06zvUL548KvYNecEVlA7cVDkGUi6kZusb04mpyEFKCIZJvloCcmpmLaIahDpOQGHaHmG6imtPMmPXGQ==", "dev": true, "dependencies": { "@types/node": "*" } }, "node_modules/@types/connect": { - "version": "3.4.37", - "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.37.tgz", - "integrity": "sha512-zBUSRqkfZ59OcwXon4HVxhx5oWCJmc0OtBTK05M+p0dYjgN6iTwIL2T/WbsQZrEsdnwaF9cWQ+azOnpPvIqY3Q==", + "version": "3.4.38", + "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.38.tgz", + "integrity": "sha512-K6uROf1LD88uDQqJCktA4yzL1YYAK6NgfsI0v/mTgyPKWsX1CnJ0XPSDhViejru1GcRkLWb8RlzFYJRqGUbaug==", "dev": true, "dependencies": { "@types/node": "*" } }, "node_modules/@types/connect-history-api-fallback": { - "version": "1.5.2", - "resolved": "https://registry.npmjs.org/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.5.2.tgz", - "integrity": "sha512-gX2j9x+NzSh4zOhnRPSdPPmTepS4DfxES0AvIFv3jGv5QyeAJf6u6dY5/BAoAJU9Qq1uTvwOku8SSC2GnCRl6Q==", + "version": "1.5.4", + "resolved": "https://registry.npmjs.org/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.5.4.tgz", + "integrity": "sha512-n6Cr2xS1h4uAulPRdlw6Jl6s1oG8KrVilPN2yUITEs+K48EzMJJ3W1xy8K5eWuFvjp3R74AOIGSmp2UfBJ8HFw==", "dev": true, "dependencies": { "@types/express-serve-static-core": "*", @@ -3555,9 +3639,9 @@ "dev": true }, "node_modules/@types/cors": { - "version": "2.8.13", - "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.13.tgz", - "integrity": "sha512-RG8AStHlUiV5ysZQKq97copd2UmVYw3/pRMLefISZ3S1hK104Cwm7iLQ3fTKx+lsUH2CE8FlLaYeEA2LSeqYUA==", + "version": "2.8.17", + "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.17.tgz", + "integrity": "sha512-8CGDvrBj1zgo2qE+oS3pOCyYNqCPryMWY2bGfwA0dcfopWGgxs+78df0Rs3rc9THP4JkOhLsAa+15VdpAqkcUA==", "dev": true, "dependencies": { "@types/node": "*" @@ -3590,9 +3674,9 @@ "dev": true }, "node_modules/@types/express": { - "version": "4.17.20", - "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.20.tgz", - "integrity": "sha512-rOaqlkgEvOW495xErXMsmyX3WKBInbhG5eqojXYi3cGUaLoRDlXa5d52fkfWZT963AZ3v2eZ4MbKE6WpDAGVsw==", + "version": "4.17.21", + "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.21.tgz", + "integrity": "sha512-ejlPM315qwLpaQlQDTjPdsUFSc6ZsP4AN6AlWnogPjQ7CVi7PYF3YVz+CY3jE2pwYf7E/7HlDAN0rV2GxTG0HQ==", "dev": true, "dependencies": { "@types/body-parser": "*", @@ -3602,9 +3686,9 @@ } }, "node_modules/@types/express-serve-static-core": { - "version": "4.17.39", - "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.39.tgz", - "integrity": "sha512-BiEUfAiGCOllomsRAZOiMFP7LAnrifHpt56pc4Z7l9K6ACyN06Ns1JLMBxwkfLOjJRlSf06NwWsT7yzfpaVpyQ==", + "version": "4.17.41", + "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.41.tgz", + "integrity": "sha512-OaJ7XLaelTgrvlZD8/aa0vvvxZdUmlCn6MtWeB7TkiKW70BQLc9XEPpDLPdbo52ZhXUCrznlWdCHWxJWtdyajA==", "dev": true, "dependencies": { "@types/node": "*", @@ -3614,15 +3698,15 @@ } }, "node_modules/@types/http-errors": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.3.tgz", - "integrity": "sha512-pP0P/9BnCj1OVvQR2lF41EkDG/lWWnDyA203b/4Fmi2eTyORnBtcDoKDwjWQthELrBvWkMOrvSOnZ8OVlW6tXA==", + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.4.tgz", + "integrity": "sha512-D0CFMMtydbJAegzOyHjtiKPLlvnm3iTZyZRSZoLq2mRhDdmLfIWOCYPfQJ4cu2erKghU++QvjcUjp/5h7hESpA==", "dev": true }, "node_modules/@types/http-proxy": { - "version": "1.17.13", - "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.13.tgz", - "integrity": "sha512-GkhdWcMNiR5QSQRYnJ+/oXzu0+7JJEPC8vkWXK351BkhjraZF+1W13CUYARUvX9+NqIU2n6YHA4iwywsc/M6Sw==", + "version": "1.17.14", + "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.14.tgz", + "integrity": "sha512-SSrD0c1OQzlFX7pGu1eXxSEjemej64aaNPRhhVYUGqXh0BtldAAx37MG8btcumvpgKyZp1F5Gn3JkktdxiFv6w==", "dev": true, "dependencies": { "@types/node": "*" @@ -3641,9 +3725,9 @@ "dev": true }, "node_modules/@types/mime": { - "version": "1.3.4", - "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.4.tgz", - "integrity": "sha512-1Gjee59G25MrQGk8bsNvC6fxNiRgUlGn2wlhGf95a59DrprnnHk80FIMMFG9XHMdrfsuA119ht06QPDXA1Z7tw==", + "version": "1.3.5", + "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.5.tgz", + "integrity": "sha512-/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w==", "dev": true }, "node_modules/@types/node": { @@ -3653,24 +3737,24 @@ "dev": true }, "node_modules/@types/node-forge": { - "version": "1.3.8", - "resolved": "https://registry.npmjs.org/@types/node-forge/-/node-forge-1.3.8.tgz", - "integrity": "sha512-vGXshY9vim9CJjrpcS5raqSjEfKlJcWy2HNdgUasR66fAnVEYarrf1ULV4nfvpC1nZq/moA9qyqBcu83x+Jlrg==", + "version": "1.3.10", + "resolved": "https://registry.npmjs.org/@types/node-forge/-/node-forge-1.3.10.tgz", + "integrity": "sha512-y6PJDYN4xYBxwd22l+OVH35N+1fCYWiuC3aiP2SlXVE6Lo7SS+rSx9r89hLxrP4pn6n1lBGhHJ12pj3F3Mpttw==", "dev": true, "dependencies": { "@types/node": "*" } }, "node_modules/@types/qs": { - "version": "6.9.9", - "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.9.tgz", - "integrity": "sha512-wYLxw35euwqGvTDx6zfY1vokBFnsK0HNrzc6xNHchxfO2hpuRg74GbkEW7e3sSmPvj0TjCDT1VCa6OtHXnubsg==", + "version": "6.9.10", + "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.10.tgz", + "integrity": "sha512-3Gnx08Ns1sEoCrWssEgTSJs/rsT2vhGP+Ja9cnnk9k4ALxinORlQneLXFeFKOTJMOeZUFD1s7w+w2AphTpvzZw==", "dev": true }, "node_modules/@types/range-parser": { - "version": "1.2.6", - "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.6.tgz", - "integrity": "sha512-+0autS93xyXizIYiyL02FCY8N+KkKPhILhcUSA276HxzreZ16kl+cmwvV2qAM/PuCCwPXzOXOWhiPcw20uSFcA==", + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.7.tgz", + "integrity": "sha512-hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ==", "dev": true }, "node_modules/@types/retry": { @@ -3680,9 +3764,9 @@ "dev": true }, "node_modules/@types/send": { - "version": "0.17.3", - "resolved": "https://registry.npmjs.org/@types/send/-/send-0.17.3.tgz", - "integrity": "sha512-/7fKxvKUoETxjFUsuFlPB9YndePpxxRAOfGC/yJdc9kTjTeP5kRCTzfnE8kPUKCeyiyIZu0YQ76s50hCedI1ug==", + "version": "0.17.4", + "resolved": "https://registry.npmjs.org/@types/send/-/send-0.17.4.tgz", + "integrity": "sha512-x2EM6TJOybec7c52BX0ZspPodMsQUd5L6PRwOunVyVUhXiBSKf3AezDL8Dgvgt5o0UfKNfuA0eMLr2wLT4AiBA==", "dev": true, "dependencies": { "@types/mime": "^1", @@ -3690,18 +3774,18 @@ } }, "node_modules/@types/serve-index": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/@types/serve-index/-/serve-index-1.9.3.tgz", - "integrity": "sha512-4KG+yMEuvDPRrYq5fyVm/I2uqAJSAwZK9VSa+Zf+zUq9/oxSSvy3kkIqyL+jjStv6UCVi8/Aho0NHtB1Fwosrg==", + "version": "1.9.4", + "resolved": "https://registry.npmjs.org/@types/serve-index/-/serve-index-1.9.4.tgz", + "integrity": "sha512-qLpGZ/c2fhSs5gnYsQxtDEq3Oy8SXPClIXkW5ghvAvsNuVSA8k+gCONcUCS/UjLEYvYps+e8uBtfgXgvhwfNug==", "dev": true, "dependencies": { "@types/express": "*" } }, "node_modules/@types/serve-static": { - "version": "1.15.4", - "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.4.tgz", - "integrity": "sha512-aqqNfs1XTF0HDrFdlY//+SGUxmdSUbjeRXb5iaZc3x0/vMbYmdw9qvOgHWOyyLFxSSRnUuP5+724zBgfw8/WAw==", + "version": "1.15.5", + "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.5.tgz", + "integrity": "sha512-PDRk21MnK70hja/YF8AHfC7yIsiQHn1rcXx7ijCFBX/k+XQJhQT/gw3xekXKJvx+5SXaMMS8oqQy09Mzvz2TuQ==", "dev": true, "dependencies": { "@types/http-errors": "*", @@ -3710,18 +3794,18 @@ } }, "node_modules/@types/sockjs": { - "version": "0.3.35", - "resolved": "https://registry.npmjs.org/@types/sockjs/-/sockjs-0.3.35.tgz", - "integrity": "sha512-tIF57KB+ZvOBpAQwSaACfEu7htponHXaFzP7RfKYgsOS0NoYnn+9+jzp7bbq4fWerizI3dTB4NfAZoyeQKWJLw==", + "version": "0.3.36", + "resolved": "https://registry.npmjs.org/@types/sockjs/-/sockjs-0.3.36.tgz", + "integrity": "sha512-MK9V6NzAS1+Ud7JV9lJLFqW85VbC9dq3LmwZCuBe4wBDgKC0Kj/jd8Xl+nSviU+Qc3+m7umHHyHg//2KSa0a0Q==", "dev": true, "dependencies": { "@types/node": "*" } }, "node_modules/@types/ws": { - "version": "8.5.8", - "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.8.tgz", - "integrity": "sha512-flUksGIQCnJd6sZ1l5dqCEG/ksaoAg/eUwiLAGTJQcfgvZJKF++Ta4bJA6A5aPSJmsr+xlseHn4KLgVlNnvPTg==", + "version": "8.5.10", + "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.10.tgz", + "integrity": "sha512-vmQSUcfalpIq0R9q7uTo2lXs6eGIpt9wtnLdMv9LVpIjCA/+ufZRozlVoVelIYixx1ugCBKDhn89vnsEGOCx9A==", "dev": true, "dependencies": { "@types/node": "*" @@ -5118,9 +5202,9 @@ } }, "node_modules/cookie": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz", - "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==", + "version": "0.4.2", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz", + "integrity": "sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==", "dev": true, "engines": { "node": ">= 0.6" @@ -5743,9 +5827,9 @@ } }, "node_modules/engine.io": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.2.1.tgz", - "integrity": "sha512-ECceEFcAaNRybd3lsGQKas3ZlMVjN3cyWwMP25D2i0zWfyiytVbTpRPa34qrr+FHddtpBVOmq4H/DCv1O0lZRA==", + "version": "6.5.4", + "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.5.4.tgz", + "integrity": "sha512-KdVSDKhVKyOi+r5uEabrDLZw2qXStVvCsEB/LN3mw4WFi6Gx50jTyuxYVCwAAC0U46FdnzP/ScKRBTXb/NiEOg==", "dev": true, "dependencies": { "@types/cookie": "^0.4.1", @@ -5756,35 +5840,26 @@ "cookie": "~0.4.1", "cors": "~2.8.5", "debug": "~4.3.1", - "engine.io-parser": "~5.0.3", - "ws": "~8.2.3" + "engine.io-parser": "~5.2.1", + "ws": "~8.11.0" }, "engines": { - "node": ">=10.0.0" + "node": ">=10.2.0" } }, "node_modules/engine.io-parser": { - "version": "5.0.4", - "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.0.4.tgz", - "integrity": "sha512-+nVFp+5z1E3HcToEnO7ZIj3g+3k9389DvWtvJZz0T6/eOCPIyyxehFcedoYrZQrp0LgQbD9pPXhpMBKMd5QURg==", + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.2.1.tgz", + "integrity": "sha512-9JktcM3u18nU9N2Lz3bWeBgxVgOKpw7yhRaoxQA3FUDZzzw+9WlA6p4G4u0RixNkg14fH7EfEc/RhpurtiROTQ==", "dev": true, "engines": { "node": ">=10.0.0" } }, - "node_modules/engine.io/node_modules/cookie": { - "version": "0.4.2", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz", - "integrity": "sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==", - "dev": true, - "engines": { - "node": ">= 0.6" - } - }, "node_modules/engine.io/node_modules/ws": { - "version": "8.2.3", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.2.3.tgz", - "integrity": "sha512-wBuoj1BDpC6ZQ1B7DWQBYVLphPWkm8i9Y0/3YdHjHKHiohOJ1ws+3OccDWtH+PoC9DZD5WOTrJvNbWvjS6JWaA==", + "version": "8.11.0", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.11.0.tgz", + "integrity": "sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg==", "dev": true, "engines": { "node": ">=10.0.0" @@ -6161,6 +6236,15 @@ "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==", "dev": true }, + "node_modules/express/node_modules/cookie": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz", + "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==", + "dev": true, + "engines": { + "node": ">= 0.6" + } + }, "node_modules/express/node_modules/debug": { "version": "2.6.9", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", @@ -7572,9 +7656,9 @@ } }, "node_modules/istanbul-lib-instrument/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true, "bin": { "semver": "bin/semver.js" @@ -8110,9 +8194,9 @@ } }, "node_modules/less/node_modules/semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", "dev": true, "optional": true, "bin": { @@ -8342,9 +8426,9 @@ } }, "node_modules/make-dir/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true, "bin": { "semver": "bin/semver.js" @@ -11233,32 +11317,57 @@ } }, "node_modules/socket.io": { - "version": "4.5.4", - "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.5.4.tgz", - "integrity": "sha512-m3GC94iK9MfIEeIBfbhJs5BqFibMtkRk8ZpKwG2QwxV0m/eEhPIV4ara6XCF1LWNAus7z58RodiZlAH71U3EhQ==", + "version": "4.7.2", + "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.7.2.tgz", + "integrity": "sha512-bvKVS29/I5fl2FGLNHuXlQaUH/BlzX1IN6S+NKLNZpBsPZIDH+90eQmCs2Railn4YUiww4SzUedJ6+uzwFnKLw==", "dev": true, "dependencies": { "accepts": "~1.3.4", "base64id": "~2.0.0", + "cors": "~2.8.5", "debug": "~4.3.2", - "engine.io": "~6.2.1", - "socket.io-adapter": "~2.4.0", - "socket.io-parser": "~4.2.1" + "engine.io": "~6.5.2", + "socket.io-adapter": "~2.5.2", + "socket.io-parser": "~4.2.4" }, "engines": { - "node": ">=10.0.0" + "node": ">=10.2.0" } }, "node_modules/socket.io-adapter": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.4.0.tgz", - "integrity": "sha512-W4N+o69rkMEGVuk2D/cvca3uYsvGlMwsySWV447y99gUPghxq42BxqLNMndb+a1mm/5/7NeXVQS7RLa2XyXvYg==", - "dev": true + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.5.2.tgz", + "integrity": "sha512-87C3LO/NOMc+eMcpcxUBebGjkpMDkNBS9tf7KJqcDsmL936EChtVva71Dw2q4tQcuVC+hAUy4an2NO/sYXmwRA==", + "dev": true, + "dependencies": { + "ws": "~8.11.0" + } + }, + "node_modules/socket.io-adapter/node_modules/ws": { + "version": "8.11.0", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.11.0.tgz", + "integrity": "sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg==", + "dev": true, + "engines": { + "node": ">=10.0.0" + }, + "peerDependencies": { + "bufferutil": "^4.0.1", + "utf-8-validate": "^5.0.2" + }, + "peerDependenciesMeta": { + "bufferutil": { + "optional": true + }, + "utf-8-validate": { + "optional": true + } + } }, "node_modules/socket.io-parser": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.2.1.tgz", - "integrity": "sha512-V4GrkLy+HeF1F/en3SpUaM+7XxYXpuMUWLGde1kSSh5nQMN4hLrbPIkD+otwh6q9R6NOQBN4AMaOZ2zVjui82g==", + "version": "4.2.4", + "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.2.4.tgz", + "integrity": "sha512-/GbIKmo8ioc+NIWIhwdecY0ge+qVBSMdgxGygevmdHj24bsfgtCmcUUcQ5ZzcylGFHsN3k4HB4Cgkl96KVnuew==", "dev": true, "dependencies": { "@socket.io/component-emitter": "~3.1.0", @@ -12046,9 +12155,9 @@ } }, "node_modules/ua-parser-js": { - "version": "0.7.32", - "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.32.tgz", - "integrity": "sha512-f9BESNVhzlhEFf2CHMSj40NWOjYPl1YKYbrvIr/hFTDEmLq7SRbWvm7FcdcpCYT95zrOhC7gZSxjdnnTpBcwVw==", + "version": "0.7.37", + "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.37.tgz", + "integrity": "sha512-xV8kqRKM+jhMvcHWUKthV9fNebIzrNy//2O9ZwWcfiBFR5f25XVZPLlEajk/sf3Ra15V92isyQqnIEXRDaZWEA==", "dev": true, "funding": [ { @@ -12058,6 +12167,10 @@ { "type": "paypal", "url": "https://paypal.me/faisalman" + }, + { + "type": "github", + "url": "https://github.com/sponsors/faisalman" } ], "engines": { @@ -12252,7 +12365,7 @@ "node_modules/vary": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", - "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=", + "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==", "dev": true, "engines": { "node": ">= 0.8" @@ -12487,9 +12600,9 @@ } }, "node_modules/webpack-dev-server/node_modules/ws": { - "version": "8.14.2", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.14.2.tgz", - "integrity": "sha512-wEBG1ftX4jcglPxgFCMJmZ2PLtSbJ2Peg6TmpJFTbe9GZYOQCDPdMYu/Tm0/bGZkw8paZnJY45J4K2PZrLYq8g==", + "version": "8.15.1", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.15.1.tgz", + "integrity": "sha512-W5OZiCjXEmk0yZ66ZN82beM5Sz7l7coYxpRkzS+p9PP+ToQry8szKh+61eNktr7EA9DOwvFGhfC605jDHbP6QQ==", "dev": true, "engines": { "node": ">=10.0.0" diff --git a/clientes-app/src/app/pedido/pedido.service.ts b/clientes-app/src/app/pedido/pedido.service.ts index 3ef09a1..35a6f60 100644 --- a/clientes-app/src/app/pedido/pedido.service.ts +++ b/clientes-app/src/app/pedido/pedido.service.ts @@ -1,12 +1,12 @@ -import { ProductoService } from './../producto/producto.service'; import { HttpClient, HttpHeaders } from '@angular/common/http'; import { Injectable } from '@angular/core'; import { Router } from '@angular/router'; import { Observable, throwError } from 'rxjs'; +import { catchError } from 'rxjs/operators'; +import swal from 'sweetalert2'; import { PersonaServices } from '../persona/persona.service'; +import { ProductoService } from './../producto/producto.service'; import { Pedido } from './pedido.model'; -import swal from 'sweetalert2'; -import { catchError } from 'rxjs/operators'; @Injectable({ providedIn: 'root', diff --git a/config/application.properties b/config/application.properties index 70a26d5..4c29dfe 100644 --- a/config/application.properties +++ b/config/application.properties @@ -1,14 +1,3 @@ config.security.oauth.client.id=frontendapp config.security.oauth.client.secret=12345 -config.security.oauth.jwt.key=12345 - -spring.datasource.url=jdbc:postgresql://localhost:5432/db_ecommerce -spring.datasource.username=postgres -spring.datasource.password=ruben -spring.datasource.driver-class-name=org.postgresql.Driver -spring.jpa.database-platform=org.hibernate.dialect.PostgreSQL95Dialect -spring.jpa.hibernate.ddl-auto=create - -logging.level.org.hibernate.SQL=debug - -spring.jpa.properties.hibernate.jdbc.lob.non_contextual_creation=true \ No newline at end of file +config.security.oauth.jwt.key=12345 \ No newline at end of file diff --git a/ectemplate-service-config-server/.gitignore b/ectemplate-service-config-server/.gitignore deleted file mode 100644 index 549e00a..0000000 --- a/ectemplate-service-config-server/.gitignore +++ /dev/null @@ -1,33 +0,0 @@ -HELP.md -target/ -!.mvn/wrapper/maven-wrapper.jar -!**/src/main/**/target/ -!**/src/test/**/target/ - -### STS ### -.apt_generated -.classpath -.factorypath -.project -.settings -.springBeans -.sts4-cache - -### IntelliJ IDEA ### -.idea -*.iws -*.iml -*.ipr - -### NetBeans ### -/nbproject/private/ -/nbbuild/ -/dist/ -/nbdist/ -/.nb-gradle/ -build/ -!**/src/main/**/build/ -!**/src/test/**/build/ - -### VS Code ### -.vscode/ diff --git a/ectemplate-service-config-server/pom.xml b/ectemplate-service-config-server/pom.xml index a27e933..7ce83a4 100644 --- a/ectemplate-service-config-server/pom.xml +++ b/ectemplate-service-config-server/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.7.7 + 2.5.3 net.ectemplate.app.config @@ -14,10 +14,16 @@ ectemplate-service-config-server Cloud Config for ecommerce - 11 + 8 2020.0.6 + + + org.springframework.boot + spring-boot-starter-actuator + + org.springframework.cloud spring-cloud-config-server @@ -34,6 +40,21 @@ spring-boot-starter-test test + + javax.xml.bind + jaxb-api + 2.3.0 + + + com.sun.xml.bind + jaxb-core + 2.3.0 + + + com.sun.xml.bind + jaxb-impl + 2.3.0 + diff --git a/ectemplate-service-config-server/src/main/resources/application.properties b/ectemplate-service-config-server/src/main/resources/application.properties index 999b7d4..34984b2 100644 --- a/ectemplate-service-config-server/src/main/resources/application.properties +++ b/ectemplate-service-config-server/src/main/resources/application.properties @@ -4,3 +4,6 @@ server.port:8888 #spring.cloud.config.server.git.uri=file:///C:/config #spring.cloud.config.server.git.uri=file:///C:/Users/Andres/Desktop/config spring.cloud.config.server.git.uri=https://github.com/rpuigm/ecommercewebtemplate.git/config + +# spring.cloud.config.server.git.uri= file://${user.home}/desarrollo/workspace02/ecommercewebtemplate/config +#spring.cloud.config.server.git.uri= file:///C:/desarrollo/workspace01/ecommercewebtemplate/config diff --git a/ectemplate-service-oauth/.gitignore b/ectemplate-service-oauth/.gitignore deleted file mode 100644 index 549e00a..0000000 --- a/ectemplate-service-oauth/.gitignore +++ /dev/null @@ -1,33 +0,0 @@ -HELP.md -target/ -!.mvn/wrapper/maven-wrapper.jar -!**/src/main/**/target/ -!**/src/test/**/target/ - -### STS ### -.apt_generated -.classpath -.factorypath -.project -.settings -.springBeans -.sts4-cache - -### IntelliJ IDEA ### -.idea -*.iws -*.iml -*.ipr - -### NetBeans ### -/nbproject/private/ -/nbbuild/ -/dist/ -/nbdist/ -/.nb-gradle/ -build/ -!**/src/main/**/build/ -!**/src/test/**/build/ - -### VS Code ### -.vscode/ diff --git a/ectemplate-service-oauth/pom.xml b/ectemplate-service-oauth/pom.xml index a53ebc8..b4fa949 100644 --- a/ectemplate-service-oauth/pom.xml +++ b/ectemplate-service-oauth/pom.xml @@ -6,7 +6,7 @@ org.springframework.boot spring-boot-starter-parent - 2.7.7 + 2.5.3 net.ectemplate.app.oauth @@ -15,10 +15,16 @@ ectemplate-service-oauth Cloud Config for ecommerce - 11 + 8 2020.0.6 + + + org.springframework.boot + spring-boot-starter-actuator + + org.springframework.boot spring-boot-starter-web @@ -70,6 +76,21 @@ org.springframework.cloud spring-cloud-starter-bootstrap + + javax.xml.bind + jaxb-api + 2.3.0 + + + com.sun.xml.bind + jaxb-core + 2.3.0 + + + com.sun.xml.bind + jaxb-impl + 2.3.0 + diff --git a/ectemplate-service-oauth/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/ectemplate-service-oauth/src/main/resources/META-INF/additional-spring-configuration-metadata.json new file mode 100644 index 0000000..b8d1885 --- /dev/null +++ b/ectemplate-service-oauth/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -0,0 +1,19 @@ +{"properties": [ + { + "name": "management.endpoints.web.exposure.include", + "type": "java.lang.String", + "description": "A description for 'management.endpoints.web.exposure.include'" + }, + { + "name": "config.security.oauth.jwt.key", + "type": "java.lang.String", + "description": "A description for 'config.security.oauth.jwt.key'" + } +]} "description": "A description for 'management.endpoints.web.exposure.include'" + }, + { + "name": "config.security.oauth.client.secret", + "type": "java.lang.String", + "description": "A description for 'config.security.oauth.client.secret'" + } +]} \ No newline at end of file diff --git a/ectemplate-service-oauth/src/main/resources/application.properties b/ectemplate-service-oauth/src/main/resources/application.properties index b754721..b552a3e 100644 --- a/ectemplate-service-oauth/src/main/resources/application.properties +++ b/ectemplate-service-oauth/src/main/resources/application.properties @@ -1,4 +1,6 @@ spring.application.name=servicio-oauth server.port=9100 eureka.client.serviceUrl.defaultZone=http://localhost:8761/eureka/ - +config.security.oauth.client.id=frontendapp +config.security.oauth.client.secret=12345 +config.security.oauth.jwt.key=12345 diff --git a/ectemplate-service-oauth/src/main/resources/bootstrap.properties b/ectemplate-service-oauth/src/main/resources/bootstrap.properties index 988ce23..fdc40db 100644 --- a/ectemplate-service-oauth/src/main/resources/bootstrap.properties +++ b/ectemplate-service-oauth/src/main/resources/bootstrap.properties @@ -1,3 +1,3 @@ -spring.application.name=servicio-oauth +spring.application.name=service-oauth spring.cloud.config.uri=http://localhost:8888 management.endpoints.web.exposure.include=* \ No newline at end of file diff --git a/ectemplate-service-zuul-server/pom.xml b/ectemplate-service-zuul-server/pom.xml index 149187c..cdbe0f9 100644 --- a/ectemplate-service-zuul-server/pom.xml +++ b/ectemplate-service-zuul-server/pom.xml @@ -6,18 +6,20 @@ org.springframework.boot spring-boot-starter-parent - 2.7.7 + 2.3.12.RELEASE - net.ectemplate.app.zuul - etctemplate-service-zuul-server - 0.3.0-SNAPSHOT - ectemplate-service-zuul-server - Cloud Config for ecommerce + com.formacionbdi.springboot.app.zuul + springboot-servicio-zuul-server + 0.0.1-SNAPSHOT + springboot-servicio-zuul-server + Demo project for Spring Boot + - 11 + 8 Hoxton.SR12 + org.springframework.boot @@ -31,6 +33,7 @@ org.springframework.cloud spring-cloud-starter-netflix-zuul + org.springframework.boot spring-boot-devtools @@ -45,7 +48,7 @@ org.springframework.security.oauth spring-security-oauth2 - 2.5.2.RELEASE + 2.3.8.RELEASE org.springframework.security @@ -79,9 +82,8 @@ org.springframework.boot spring-boot-maven-plugin - ${project.parent.version} - + \ No newline at end of file diff --git a/ectemplate-service-zuul-server/src/main/java/net/ectemplate/app/zuul/oauth/ResourceServerConfig.java b/ectemplate-service-zuul-server/src/main/java/net/ectemplate/app/zuul/oauth/ResourceServerConfig.java index 009f591..84924e0 100644 --- a/ectemplate-service-zuul-server/src/main/java/net/ectemplate/app/zuul/oauth/ResourceServerConfig.java +++ b/ectemplate-service-zuul-server/src/main/java/net/ectemplate/app/zuul/oauth/ResourceServerConfig.java @@ -35,18 +35,17 @@ public void configure(ResourceServerSecurityConfigurer resources) throws Excepti @Override public void configure(HttpSecurity http) throws Exception { - http.authorizeRequests().antMatchers(HttpMethod.GET, "/api/productos/lista").permitAll() - .antMatchers("/api/security/oauth/**").permitAll() - .antMatchers(HttpMethod.GET,"/api/productos/producto/**").permitAll() - .antMatchers(HttpMethod.POST,"/api/personas/crea-cliente").permitAll() - .antMatchers(HttpMethod.GET,"/api/productos/tienda/nombre").permitAll() - .antMatchers("/api/productos/cesta/**").permitAll() - .antMatchers("/api/productos/producto/nuevo").hasRole("ADMIN") - .antMatchers("/api/productos/producto/imagen").hasRole("ADMIN") - .antMatchers(HttpMethod.POST, "/api/productos/tienda/cambia-tienda").hasRole("ADMIN") - .anyRequest().authenticated() - .and().cors() - .configurationSource(corsConfigurationSource()); + http.authorizeRequests(requests -> requests.antMatchers(HttpMethod.GET, "/api/productos/lista").permitAll() + .antMatchers("/api/security/oauth/**").permitAll() + .antMatchers(HttpMethod.GET, "/api/productos/producto/**").permitAll() + .antMatchers(HttpMethod.POST, "/api/personas/crea-cliente").permitAll() + .antMatchers(HttpMethod.GET, "/api/productos/tienda/nombre").permitAll() + .antMatchers("/api/productos/cesta/**").permitAll() + .antMatchers("/api/productos/producto/nuevo").hasRole("ADMIN") + .antMatchers("/api/productos/producto/imagen").hasRole("ADMIN") + .antMatchers(HttpMethod.POST, "/api/productos/tienda/cambia-tienda").hasRole("ADMIN") + .anyRequest().authenticated()).cors(cors -> cors + .configurationSource(corsConfigurationSource())); } @Bean diff --git a/ectemplate-service-zuul-server/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/ectemplate-service-zuul-server/src/main/resources/META-INF/additional-spring-configuration-metadata.json new file mode 100644 index 0000000..0f522c0 --- /dev/null +++ b/ectemplate-service-zuul-server/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -0,0 +1,42 @@ +{"properties": [ + { + "name": "hystrix.command.default.execution.isolation.thread.timeoutInMilliseconds", + "type": "java.lang.String", + "description": "A description for 'hystrix.command.default.execution.isolation.thread.timeoutInMilliseconds'" + }, + { + "name": "ribbon.ConnectTimeout", + "type": "java.lang.String", + "description": "A description for 'ribbon.ConnectTimeout'" + }, + { + "name": "ribbon.ReadTimeout", + "type": "java.lang.String", + "description": "A description for 'ribbon.ReadTimeout'" + }, + { + "name": "config.security.oauth.client.id", + "type": "java.lang.String", + "description": "A description for 'config.security.oauth.client.id'" + }, + { + "name": "config.security.oauth.jwt.key", + "type": "java.lang.String", + "description": "A description for 'config.security.oauth.jwt.key'" + }, + { + "name": "config.security.oauth.client.secret", + "type": "java.lang.String", + "description": "A description for 'config.security.oauth.client.secret'" + }, + { + "name": "ribbon.ReadTimeout", + "type": "java.lang.String", + "description": "A description for 'ribbon.ReadTimeout'" + }, + { + "name": "ribbon.ConnectTimeout", + "type": "java.lang.String", + "description": "A description for 'ribbon.ConnectTimeout'" + } +]} \ No newline at end of file diff --git a/ectemplate-service-zuul-server/src/main/resources/application.properties b/ectemplate-service-zuul-server/src/main/resources/application.properties index 1dd3fb6..45ade03 100644 --- a/ectemplate-service-zuul-server/src/main/resources/application.properties +++ b/ectemplate-service-zuul-server/src/main/resources/application.properties @@ -19,3 +19,7 @@ zuul.routes.security.sensitive-headers=Cookie,Set-Cookie hystrix.command.default.execution.isolation.thread.timeoutInMilliseconds: 60000 ribbon.ConnectTimeout: 3000 ribbon.ReadTimeout: 10000 + +config.security.oauth.client.id=frontendapp +config.security.oauth.client.secret=12345 +config.security.oauth.jwt.key=12345 diff --git a/ectemplate-servicio-eureka-server/.gitignore b/ectemplate-servicio-eureka-server/.gitignore deleted file mode 100644 index 549e00a..0000000 --- a/ectemplate-servicio-eureka-server/.gitignore +++ /dev/null @@ -1,33 +0,0 @@ -HELP.md -target/ -!.mvn/wrapper/maven-wrapper.jar -!**/src/main/**/target/ -!**/src/test/**/target/ - -### STS ### -.apt_generated -.classpath -.factorypath -.project -.settings -.springBeans -.sts4-cache - -### IntelliJ IDEA ### -.idea -*.iws -*.iml -*.ipr - -### NetBeans ### -/nbproject/private/ -/nbbuild/ -/dist/ -/nbdist/ -/.nb-gradle/ -build/ -!**/src/main/**/build/ -!**/src/test/**/build/ - -### VS Code ### -.vscode/ diff --git a/ectemplate-servicio-eureka-server/pom.xml b/ectemplate-servicio-eureka-server/pom.xml index fbdd10a..97d1a41 100644 --- a/ectemplate-servicio-eureka-server/pom.xml +++ b/ectemplate-servicio-eureka-server/pom.xml @@ -1,13 +1,13 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.springframework.boot spring-boot-starter-parent - 2.7.7 - + 2.5.3 + + net.ectemplate.app.eureka ectemplate-servicio-eureka-server @@ -15,7 +15,7 @@ ectemplate-servicio-eureka-server Servicio de clientes - 11 + 8 2020.0.6 @@ -35,6 +35,29 @@ spring-boot-starter-test test + + + com.h2database + h2 + runtime + + + + javax.xml.bind + jaxb-api + 2.3.0 + + + com.sun.xml.bind + jaxb-core + 2.3.0 + + + com.sun.xml.bind + jaxb-impl + 2.3.0 + + @@ -66,4 +89,4 @@ - + \ No newline at end of file diff --git a/ectemplate-servicio-gateway/pom.xml b/ectemplate-servicio-gateway/pom.xml index b958297..35daf38 100644 --- a/ectemplate-servicio-gateway/pom.xml +++ b/ectemplate-servicio-gateway/pom.xml @@ -6,7 +6,7 @@ org.springframework.boot spring-boot-starter-parent - 2.7.7 + 2.5.6 net.ectemplate.app.gateway diff --git a/ectemplate-servicio-personas/pom.xml b/ectemplate-servicio-personas/pom.xml index cddb587..97c4448 100644 --- a/ectemplate-servicio-personas/pom.xml +++ b/ectemplate-servicio-personas/pom.xml @@ -1,13 +1,13 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.springframework.boot spring-boot-starter-parent - 2.7.7 - + 2.5.3 + + net.ectemplate.app.personas etctemplate-servicio-personas @@ -15,7 +15,7 @@ ectemplate-servicio-personas People information service - 11 + 8 2020.0.6 @@ -39,11 +39,13 @@ true - - org.projectlombok - lombok - true - + + + org.projectlombok + lombok + 1.18.30 + provided + org.springframework.boot spring-boot-starter-test @@ -81,6 +83,26 @@ 0.8.8 maven-plugin + + javax.xml.bind + jaxb-api + 2.3.0 + + + com.sun.xml.bind + jaxb-core + 2.3.0 + + + com.sun.xml.bind + jaxb-impl + 2.3.0 + + + com.h2database + h2 + runtime + @@ -134,4 +156,4 @@ - + \ No newline at end of file diff --git a/ectemplate-servicio-personas/src/main/resources/application.properties b/ectemplate-servicio-personas/src/main/resources/application.properties index 1fc4a6c..0079c91 100644 --- a/ectemplate-servicio-personas/src/main/resources/application.properties +++ b/ectemplate-servicio-personas/src/main/resources/application.properties @@ -1,4 +1,23 @@ spring.application.name=servicio-personas server.port=${PORT:0} eureka.instance.instance-id=${spring.application.name}:${spring.application.instance_id:${random.value}} -eureka.client.service-url.defaultZone=http://localhost:8761/eureka \ No newline at end of file +eureka.client.service-url.defaultZone=http://localhost:8761/eureka/ + +# spring.datasource.url=jdbc:postgresql://localhost:5432/db_ecommerce +# spring.datasource.username=postgres +# spring.datasource.password=ruben +# spring.datasource.driver-class-name=org.postgresql.Driver +# spring.jpa.database-platform=org.hibernate.dialect.PostgreSQL95Dialect +# spring.jpa.hibernate.ddl-auto=create + +spring.datasource.url=jdbc:h2:mem:ecommerce +spring.datasource.username=sa +spring.datasource.password= +spring.datasource.driver-class-name=org.h2.Driver +spring.jpa.database-platform=org.hibernate.dialect.H2Dialect +spring.jpa.hibernate.ddl-auto=create + + +logging.level.org.hibernate.SQL=debug + +spring.jpa.properties.hibernate.jdbc.lob.non_contextual_creation=true \ No newline at end of file diff --git a/ectemplate-servicio-productos/.gitignore b/ectemplate-servicio-productos/.gitignore deleted file mode 100644 index 549e00a..0000000 --- a/ectemplate-servicio-productos/.gitignore +++ /dev/null @@ -1,33 +0,0 @@ -HELP.md -target/ -!.mvn/wrapper/maven-wrapper.jar -!**/src/main/**/target/ -!**/src/test/**/target/ - -### STS ### -.apt_generated -.classpath -.factorypath -.project -.settings -.springBeans -.sts4-cache - -### IntelliJ IDEA ### -.idea -*.iws -*.iml -*.ipr - -### NetBeans ### -/nbproject/private/ -/nbbuild/ -/dist/ -/nbdist/ -/.nb-gradle/ -build/ -!**/src/main/**/build/ -!**/src/test/**/build/ - -### VS Code ### -.vscode/ diff --git a/ectemplate-servicio-productos/pom.xml b/ectemplate-servicio-productos/pom.xml index 07b10b7..12f9336 100644 --- a/ectemplate-servicio-productos/pom.xml +++ b/ectemplate-servicio-productos/pom.xml @@ -1,13 +1,13 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.springframework.boot spring-boot-starter-parent - 2.7.7 - + 2.5.3 + + net.ectemplate.app.productos ectemplate-servicio-productos @@ -15,11 +15,11 @@ ectemplate-servicio-productos Demo project for Spring Boot - 11 + 8 2020.0.6 UTF-8 - 11 - 11 + 8 + 8 @@ -81,11 +81,14 @@ spring-cloud-starter-bootstrap - - org.projectlombok - lombok - provided - + + + org.projectlombok + lombok + 1.18.30 + provided + + org.jacoco @@ -101,6 +104,26 @@ test + + javax.xml.bind + jaxb-api + 2.3.0 + + + com.sun.xml.bind + jaxb-core + 2.3.0 + + + com.sun.xml.bind + jaxb-impl + 2.3.0 + + + com.h2database + h2 + runtime + @@ -195,4 +218,4 @@ - + \ No newline at end of file diff --git a/ectemplate-servicio-productos/src/main/resources/application.properties b/ectemplate-servicio-productos/src/main/resources/application.properties index 3e87506..c6529a2 100644 --- a/ectemplate-servicio-productos/src/main/resources/application.properties +++ b/ectemplate-servicio-productos/src/main/resources/application.properties @@ -5,4 +5,29 @@ eureka.client.service-url.defautlZone=http://localhost:8761/eureka spring.servlet.multipart.max-file-size=10MB -spring.servlet.multipart.max-request-size=10MB \ No newline at end of file +spring.servlet.multipart.max-request-size=10MB + +# spring.datasource.url=jdbc:postgresql://localhost:5432/db_ecommerce +# spring.datasource.username=postgres +# spring.datasource.password=ruben +# spring.datasource.driver-class-name=org.postgresql.Driver +# spring.jpa.database-platform=org.hibernate.dialect.PostgreSQL95Dialect +# spring.jpa.hibernate.ddl-auto=create + +# spring.datasource.url=jdbc:postgresql://localhost:5432/db_ecommerce +# spring.datasource.username=postgres +# spring.datasource.password=ruben +# spring.datasource.driver-class-name=org.postgresql.Driver +# spring.jpa.database-platform=org.hibernate.dialect.PostgreSQL95Dialect +# spring.jpa.hibernate.ddl-auto=create + +spring.datasource.url=jdbc:h2:mem:ecommerce +spring.datasource.username=sa +spring.datasource.password= +spring.datasource.driver-class-name=org.h2.Driver +spring.jpa.database-platform=org.hibernate.dialect.H2Dialect +spring.jpa.hibernate.ddl-auto=create + +logging.level.org.hibernate.SQL=debug + +spring.jpa.properties.hibernate.jdbc.lob.non_contextual_creation=true \ No newline at end of file diff --git a/ectemplate-servicio-productos/src/main/resources/import.sql b/ectemplate-servicio-productos/src/main/resources/import.sql index f05c8f2..59ed9b7 100644 --- a/ectemplate-servicio-productos/src/main/resources/import.sql +++ b/ectemplate-servicio-productos/src/main/resources/import.sql @@ -1,7 +1,18 @@ -ALTER TABLE productos DISABLE TRIGGER ALL; -ALTER TABLE productos_caracteristicas DISABLE TRIGGER ALL; -ALTER TABLE productos_especificaciones DISABLE TRIGGER ALL; -ALTER TABLE imagenes_productos DISABLE TRIGGER ALL; +-- ALTER TABLE productos DISABLE TRIGGER ALL; +-- ALTER TABLE productos_caracteristicas DISABLE TRIGGER ALL; +-- ALTER TABLE productos_especificaciones DISABLE TRIGGER ALL; +-- ALTER TABLE imagenes_productos DISABLE TRIGGER ALL; + +INSERT INTO productos_caracteristicas (id_producto_caracteristicas,descripcion) VALUES (1,'Bolas de papel para decorar el árbol de navidad o la estancia'); +INSERT INTO productos_caracteristicas (id_producto_caracteristicas,descripcion) VALUES (7,'Estrellas de papel en 3D para decorar el árbol o la estancia'); +INSERT INTO productos_caracteristicas (id_producto_caracteristicas,descripcion) VALUES (11,'Estrellas de papel en 2D para decorar el árbol o la estancia'); +INSERT INTO productos_caracteristicas (id_producto_caracteristicas,descripcion) VALUES (15,'Corazones de papel para decorar el árbol'); +INSERT INTO productos_caracteristicas (id_producto_caracteristicas,descripcion) VALUES (20,'Servilleteros para decorar la mesa de Navidad'); +INSERT INTO productos_caracteristicas (id_producto_caracteristicas,descripcion) VALUES (26,'Posavasos para la mesa de Navidad'); +INSERT INTO productos_caracteristicas (id_producto_caracteristicas,descripcion) VALUES (31,'Copos de nieve de resina con efecto de perla, para decoración de árbol o estancia'); +INSERT INTO productos_caracteristicas (id_producto_caracteristicas,descripcion) VALUES (36,'Magnífico árbol para recrear una estancia navideña, con set de adornos de bolas y guirnaldas'); + + INSERT INTO productos (categoria,create_at,nombre,precio,valoracion,fk_id_producto_caracteristicas) VALUES ('Decoración',NOW(),'Bolas de Papel para árbol',3.99,NULL,1); INSERT INTO productos (categoria,create_at,nombre,precio,valoracion,fk_id_producto_caracteristicas) VALUES('Decoracion',NOW(),'Estrellas de Papel 3D',5.99,NULL,7); @@ -12,14 +23,6 @@ INSERT INTO productos (categoria,create_at,nombre,precio,valoracion,fk_id_produc INSERT INTO productos (categoria,create_at,nombre,precio,valoracion,fk_id_producto_caracteristicas) VALUES('Decoración',NOW(),'Copos de Nieve',9.99,NULL,31); INSERT INTO productos (categoria,create_at,nombre,precio,valoracion,fk_id_producto_caracteristicas) VALUES('Arboles',NOW(),'Arbol Delux',25.99,NULL,36); -INSERT INTO productos_caracteristicas (id_producto_caracteristicas,descripcion) VALUES (1,'Bolas de papel para decorar el árbol de navidad o la estancia'); -INSERT INTO productos_caracteristicas (id_producto_caracteristicas,descripcion) VALUES (7,'Estrellas de papel en 3D para decorar el árbol o la estancia'); -INSERT INTO productos_caracteristicas (id_producto_caracteristicas,descripcion) VALUES (11,'Estrellas de papel en 2D para decorar el árbol o la estancia'); -INSERT INTO productos_caracteristicas (id_producto_caracteristicas,descripcion) VALUES (15,'Corazones de papel para decorar el árbol'); -INSERT INTO productos_caracteristicas (id_producto_caracteristicas,descripcion) VALUES (20,'Servilleteros para decorar la mesa de Navidad'); -INSERT INTO productos_caracteristicas (id_producto_caracteristicas,descripcion) VALUES (26,'Posavasos para la mesa de Navidad'); -INSERT INTO productos_caracteristicas (id_producto_caracteristicas,descripcion) VALUES (31,'Copos de nieve de resina con efecto de perla, para decoración de árbol o estancia'); -INSERT INTO productos_caracteristicas (id_producto_caracteristicas,descripcion) VALUES (36,'Magnífico árbol para recrear una estancia navideña, con set de adornos de bolas y guirnaldas'); INSERT INTO productos_especificaciones (id_producto_especificacion,clave_especificacion,descripcion_especificacion,fk_id_producto_especificacion) VALUES(2,'Pack','6 bolas',1); @@ -41,26 +44,42 @@ INSERT INTO productos_especificaciones (id_producto_especificacion,clave_especif INSERT INTO productos_especificaciones (id_producto_especificacion,clave_especificacion,descripcion_especificacion,fk_id_producto_especificacion) VALUES (39,'Complementos','Bolas y Guirnaldas',36); -INSERT INTO imagenes_productos (id_imagen_producto,descripcion_imagen,imagen,nombre_imagen,fk_id_imagen_producto) VALUES (4,'undefined','cc64c31a-6b3e-4bd3-953b-f287e9d4479f_adornoPapel.jfif','adornoPapel.jfif',1); -INSERT INTO imagenes_productos (id_imagen_producto,descripcion_imagen,imagen,nombre_imagen,fk_id_imagen_producto) VALUES (6,'undefined','7f7d0d92-8ff6-47a7-b0cb-65d6b9c0662e_adornoPapel2.jfif','adornoPapel2.jfif',1); -INSERT INTO imagenes_productos (id_imagen_producto,descripcion_imagen,imagen,nombre_imagen,fk_id_imagen_producto) VALUES (9,'undefined','20622252-1cf3-4286-a96a-de81d9740819_adornoPapel3.jfif','adornoPapel3.jfif',7); -INSERT INTO imagenes_productos (id_imagen_producto,descripcion_imagen,imagen,nombre_imagen,fk_id_imagen_producto) VALUES (10,'undefined','37d48f86-344a-4518-b40f-c3c9b4db9cb4_adornoPapel4.jfif','adornoPapel4.jfif',7); -INSERT INTO imagenes_productos (id_imagen_producto,descripcion_imagen,imagen,nombre_imagen,fk_id_imagen_producto) VALUES (13,'undefined','1614516f-183d-4fb2-89af-254085d8f636_adornoPapel5.jfif','adornoPapel5.jfif',11); -INSERT INTO imagenes_productos (id_imagen_producto,descripcion_imagen,imagen,nombre_imagen,fk_id_imagen_producto) VALUES (14,'undefined','40f2a96b-1005-4fb2-bdb0-f33a9fb93cf5_adornoPapel6.jfif','adornoPapel6.jfif',11); -INSERT INTO imagenes_productos (id_imagen_producto,descripcion_imagen,imagen,nombre_imagen,fk_id_imagen_producto) VALUES (18,'undefined','f4ca8c6b-e835-47d1-a1e7-163d4f0348e5_adornoPapel9.jfif','adornoPapel9.jfif',15); -INSERT INTO imagenes_productos (id_imagen_producto,descripcion_imagen,imagen,nombre_imagen,fk_id_imagen_producto) VALUES (19,'undefined','b671f1b8-5f0f-46d3-b64d-6a6aaa57d68f_adornoPapel10.jfif','adornoPapel10.jfif',15); -INSERT INTO imagenes_productos (id_imagen_producto,descripcion_imagen,imagen,nombre_imagen,fk_id_imagen_producto) VALUES (24,'undefined','6ecaf9ab-a282-4e83-9579-bd9ce256ddaa_adornoPapel11.jfif','adornoPapel11.jfif',20); -INSERT INTO imagenes_productos (id_imagen_producto,descripcion_imagen,imagen,nombre_imagen,fk_id_imagen_producto) VALUES (25,'undefined','13cb64ed-54f8-464c-952f-3fc3cae8c4dd_adornoPapel12.jfif','adornoPapel12.jfif',20); -INSERT INTO imagenes_productos (id_imagen_producto,descripcion_imagen,imagen,nombre_imagen,fk_id_imagen_producto) VALUES (29,'undefined','2cfb9b32-2345-4c35-9d0b-f348f2ee6f97_adornoPapel13.jfif','adornoPapel13.jfif',26); -INSERT INTO imagenes_productos (id_imagen_producto,descripcion_imagen,imagen,nombre_imagen,fk_id_imagen_producto) VALUES (30,'undefined','cfcccfcd-246b-48bb-a3dd-2f5d71544c8f_adornoPapel14.jfif','adornoPapel14.jfif',26); -INSERT INTO imagenes_productos (id_imagen_producto,descripcion_imagen,imagen,nombre_imagen,fk_id_imagen_producto) VALUES (34,'undefined','5014395c-8f4f-49b6-ab8f-9f5e1a85e55b_adornoPapel16.jfif','adornoPapel16.jfif',31); -INSERT INTO imagenes_productos (id_imagen_producto,descripcion_imagen,imagen,nombre_imagen,fk_id_imagen_producto) VALUES (35,'undefined','43ab089c-01f4-415f-82ba-bd077f8e2921_adornoPapel15.jfif','adornoPapel15.jfif',31); -INSERT INTO imagenes_productos (id_imagen_producto,descripcion_imagen,imagen,nombre_imagen,fk_id_imagen_producto) VALUES (43,'undefined','1cc05574-e1be-4b93-ac91-2c72d9bea9e7_arbol20_reducido.jpg','arbol20_reducido.jpg',36); -INSERT INTO imagenes_productos (id_imagen_producto,descripcion_imagen,imagen,nombre_imagen,fk_id_imagen_producto) VALUES (44,'undefined','b8983ff0-bc82-4250-9324-d6715e4bb898_arbol22reducido.jpg','arbol22reducido.jpg',36); +INSERT INTO imagenes_productos (id_imagen_producto,descripcion_imagen,imagen,nombre_imagen,fk_id_imagen_producto) VALUES (4,'undefined','5877141_3013686.jpg','5877141_3013686.jpg',1); +INSERT INTO imagenes_productos (id_imagen_producto,descripcion_imagen,imagen,nombre_imagen,fk_id_imagen_producto) VALUES (6,'undefined','5877141_3013686.jpg','5877141_3013686.jpg',1); +INSERT INTO imagenes_productos (id_imagen_producto,descripcion_imagen,imagen,nombre_imagen,fk_id_imagen_producto) VALUES (9,'undefined','5877141_3013686.jpg','5877141_3013686.jpg',7); +INSERT INTO imagenes_productos (id_imagen_producto,descripcion_imagen,imagen,nombre_imagen,fk_id_imagen_producto) VALUES (10,'undefined','5877141_3013686.jpg','5877141_3013686.jpg',7); +INSERT INTO imagenes_productos (id_imagen_producto,descripcion_imagen,imagen,nombre_imagen,fk_id_imagen_producto) VALUES (13,'undefined','5877141_3013686.jpg','5877141_3013686.jpg',11); +INSERT INTO imagenes_productos (id_imagen_producto,descripcion_imagen,imagen,nombre_imagen,fk_id_imagen_producto) VALUES (14,'undefined','5877141_3013686.jpg','5877141_3013686.jpg',11); +INSERT INTO imagenes_productos (id_imagen_producto,descripcion_imagen,imagen,nombre_imagen,fk_id_imagen_producto) VALUES (18,'undefined','5877141_3013686.jpg','5877141_3013686.jpg',15); +INSERT INTO imagenes_productos (id_imagen_producto,descripcion_imagen,imagen,nombre_imagen,fk_id_imagen_producto) VALUES (19,'undefined','5877141_3013686.jpg','5877141_3013686.jpg',15); +INSERT INTO imagenes_productos (id_imagen_producto,descripcion_imagen,imagen,nombre_imagen,fk_id_imagen_producto) VALUES (24,'undefined','5877141_3013686.jpg','5877141_3013686.jpg',20); +INSERT INTO imagenes_productos (id_imagen_producto,descripcion_imagen,imagen,nombre_imagen,fk_id_imagen_producto) VALUES (25,'undefined','5877141_3013686.jpg','5877141_3013686.jpg',20); +INSERT INTO imagenes_productos (id_imagen_producto,descripcion_imagen,imagen,nombre_imagen,fk_id_imagen_producto) VALUES (29,'undefined','5877141_3013686.jpg','5877141_3013686.jpg',26); +INSERT INTO imagenes_productos (id_imagen_producto,descripcion_imagen,imagen,nombre_imagen,fk_id_imagen_producto) VALUES (30,'undefined','5877141_3013686.jpg','5877141_3013686.jpg',26); +INSERT INTO imagenes_productos (id_imagen_producto,descripcion_imagen,imagen,nombre_imagen,fk_id_imagen_producto) VALUES (34,'undefined','5877141_3013686.jpg','5877141_3013686.jpg',31); +INSERT INTO imagenes_productos (id_imagen_producto,descripcion_imagen,imagen,nombre_imagen,fk_id_imagen_producto) VALUES (35,'undefined','5877141_3013686.jpg','5877141_3013686.jpg',31); +INSERT INTO imagenes_productos (id_imagen_producto,descripcion_imagen,imagen,nombre_imagen,fk_id_imagen_producto) VALUES (43,'undefined','5877141_3013686.jpg','5877141_3013686.jpg',36); +INSERT INTO imagenes_productos (id_imagen_producto,descripcion_imagen,imagen,nombre_imagen,fk_id_imagen_producto) VALUES (44,'undefined','5877141_3013686.jpg','5877141_3013686.jpg',36); +-- INSERT INTO imagenes_productos (id_imagen_producto,descripcion_imagen,imagen,nombre_imagen,fk_id_imagen_producto) VALUES (4,'undefined','cc64c31a-6b3e-4bd3-953b-f287e9d4479f_adornoPapel.jfif','adornoPapel.jfif',1); +-- INSERT INTO imagenes_productos (id_imagen_producto,descripcion_imagen,imagen,nombre_imagen,fk_id_imagen_producto) VALUES (6,'undefined','7f7d0d92-8ff6-47a7-b0cb-65d6b9c0662e_adornoPapel2.jfif','adornoPapel2.jfif',1); +-- INSERT INTO imagenes_productos (id_imagen_producto,descripcion_imagen,imagen,nombre_imagen,fk_id_imagen_producto) VALUES (9,'undefined','20622252-1cf3-4286-a96a-de81d9740819_adornoPapel3.jfif','adornoPapel3.jfif',7); +-- INSERT INTO imagenes_productos (id_imagen_producto,descripcion_imagen,imagen,nombre_imagen,fk_id_imagen_producto) VALUES (10,'undefined','37d48f86-344a-4518-b40f-c3c9b4db9cb4_adornoPapel4.jfif','adornoPapel4.jfif',7); +-- INSERT INTO imagenes_productos (id_imagen_producto,descripcion_imagen,imagen,nombre_imagen,fk_id_imagen_producto) VALUES (13,'undefined','1614516f-183d-4fb2-89af-254085d8f636_adornoPapel5.jfif','adornoPapel5.jfif',11); +-- INSERT INTO imagenes_productos (id_imagen_producto,descripcion_imagen,imagen,nombre_imagen,fk_id_imagen_producto) VALUES (14,'undefined','40f2a96b-1005-4fb2-bdb0-f33a9fb93cf5_adornoPapel6.jfif','adornoPapel6.jfif',11); +-- INSERT INTO imagenes_productos (id_imagen_producto,descripcion_imagen,imagen,nombre_imagen,fk_id_imagen_producto) VALUES (18,'undefined','f4ca8c6b-e835-47d1-a1e7-163d4f0348e5_adornoPapel9.jfif','adornoPapel9.jfif',15); +-- INSERT INTO imagenes_productos (id_imagen_producto,descripcion_imagen,imagen,nombre_imagen,fk_id_imagen_producto) VALUES (19,'undefined','b671f1b8-5f0f-46d3-b64d-6a6aaa57d68f_adornoPapel10.jfif','adornoPapel10.jfif',15); +-- INSERT INTO imagenes_productos (id_imagen_producto,descripcion_imagen,imagen,nombre_imagen,fk_id_imagen_producto) VALUES (24,'undefined','6ecaf9ab-a282-4e83-9579-bd9ce256ddaa_adornoPapel11.jfif','adornoPapel11.jfif',20); +-- INSERT INTO imagenes_productos (id_imagen_producto,descripcion_imagen,imagen,nombre_imagen,fk_id_imagen_producto) VALUES (25,'undefined','13cb64ed-54f8-464c-952f-3fc3cae8c4dd_adornoPapel12.jfif','adornoPapel12.jfif',20); +-- INSERT INTO imagenes_productos (id_imagen_producto,descripcion_imagen,imagen,nombre_imagen,fk_id_imagen_producto) VALUES (29,'undefined','2cfb9b32-2345-4c35-9d0b-f348f2ee6f97_adornoPapel13.jfif','adornoPapel13.jfif',26); +-- INSERT INTO imagenes_productos (id_imagen_producto,descripcion_imagen,imagen,nombre_imagen,fk_id_imagen_producto) VALUES (30,'undefined','cfcccfcd-246b-48bb-a3dd-2f5d71544c8f_adornoPapel14.jfif','adornoPapel14.jfif',26); +-- INSERT INTO imagenes_productos (id_imagen_producto,descripcion_imagen,imagen,nombre_imagen,fk_id_imagen_producto) VALUES (34,'undefined','5014395c-8f4f-49b6-ab8f-9f5e1a85e55b_adornoPapel16.jfif','adornoPapel16.jfif',31); +-- INSERT INTO imagenes_productos (id_imagen_producto,descripcion_imagen,imagen,nombre_imagen,fk_id_imagen_producto) VALUES (35,'undefined','43ab089c-01f4-415f-82ba-bd077f8e2921_adornoPapel15.jfif','adornoPapel15.jfif',31); +-- INSERT INTO imagenes_productos (id_imagen_producto,descripcion_imagen,imagen,nombre_imagen,fk_id_imagen_producto) VALUES (43,'undefined','1cc05574-e1be-4b93-ac91-2c72d9bea9e7_arbol20_reducido.jpg','arbol20_reducido.jpg',36); +-- INSERT INTO imagenes_productos (id_imagen_producto,descripcion_imagen,imagen,nombre_imagen,fk_id_imagen_producto) VALUES (44,'undefined','b8983ff0-bc82-4250-9324-d6715e4bb898_arbol22reducido.jpg','arbol22reducido.jpg',36); -ALTER TABLE productos ENABLE TRIGGER ALL; -ALTER TABLE productos_caracteristicas ENABLE TRIGGER ALL; -ALTER TABLE productos_especificaciones ENABLE TRIGGER ALL; -ALTER TABLE imagenes_productos ENABLE TRIGGER ALL; \ No newline at end of file +-- ALTER TABLE productos ENABLE TRIGGER ALL; +-- ALTER TABLE productos_caracteristicas ENABLE TRIGGER ALL; +-- ALTER TABLE productos_especificaciones ENABLE TRIGGER ALL; +-- ALTER TABLE imagenes_productos ENABLE TRIGGER ALL; \ No newline at end of file diff --git a/ectemplate-servicio-productos/src/main/resources/uploaded/5877141_3013686.jpg b/ectemplate-servicio-productos/src/main/resources/uploaded/5877141_3013686.jpg new file mode 100644 index 0000000..9c548f8 Binary files /dev/null and b/ectemplate-servicio-productos/src/main/resources/uploaded/5877141_3013686.jpg differ diff --git a/pom.xml b/pom.xml index bdc51d0..08f8503 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ rpuigmorganitation - https://sonarcloud.io + https://sonarcloud.io