Skip to content

Commit

Permalink
Merge pull request #62 from Devs-Com/dev
Browse files Browse the repository at this point in the history
Actualización de la rama master para la versión 0.5 del proyecto
  • Loading branch information
AnderMendoza authored Nov 22, 2022
2 parents 621f2b6 + 3e8b9c4 commit 4f92ad8
Show file tree
Hide file tree
Showing 109 changed files with 34,016 additions and 1,609 deletions.
17 changes: 14 additions & 3 deletions bin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,24 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>2.3.0.RELEASE</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
<groupId>com.example</groupId>
<artifactId>stose</artifactId>
<version>0.0.1-SNAPSHOT</version>
<name>stose</name>
<description>Demo project for Spring Boot</description>

<properties>
<java.version>17</java.version>
<java.version>1.8</java.version>
</properties>

<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-jpa</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-thymeleaf</artifactId>
Expand All @@ -32,6 +38,11 @@
<scope>runtime</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
Expand Down Expand Up @@ -101,4 +112,4 @@
</pluginRepository>
</pluginRepositories>

</project>
</project>
Binary file not shown.
Binary file modified bin/src/main/java/com/example/stose/StoseApplication.class
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
20 changes: 19 additions & 1 deletion bin/src/main/resources/application.properties
Original file line number Diff line number Diff line change
@@ -1 +1,19 @@
spring.data.mongodb.uri=mongodb+srv://stose:[email protected]/?retryWrites=true&w=majority
spring.datasource.url=jdbc:mysql://containers-us-west-83.railway.app:5698/railway
spring.datasource.username=root
spring.datasource.password=6fhdLolOUa470wABwWSn

spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL5Dialect
spring.jpa.hibernate.ddl-auto=none

spring.jpa.show-sql=true
spring.jpa.properties.hibernate.format_sql=true

spring.data.mongodb.uri=mongodb+srv://stose:[email protected]/stose?retryWrites=true&w=majority

title.index = .Stose | Inicio
title.detallelibro = .Stose | Detalle del Libro
title.librooferta = .Stose | Libro en Oferta
title.carritocompras = .Stose | Carrito de compras
title.nosotros = .Stose | Nosotros
title.libros = .Stose | Gestion de Libros
title.listadeseos = .Stose | Lista de Deseos
Loading

0 comments on commit 4f92ad8

Please sign in to comment.