Merge branch 'master' of archives.plil.fr:LeClubInfo/etunicorn-server

Geoffrey PREUD'HOMME
2 parents 8799baa6 7836b1e6
Showing 6 changed files with 22 additions and 52 deletions Show diff stats
.idea/dataSources.local.xml
.idea/dataSources.xml
etunicorn-server.iml
pom.xml
src/main/java/etunicorn/Application.java
src/main/ressources/application.yml
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="dataSourceStorageLocal">
-    <data-source name="etunicorn.db" uuid="7ff25d0f-17b0-48bb-a8e6-be9293e5e8dc">
-      <database-info product="SQLite" version="3.8.11" jdbc-version="2.1" driver-name="SQLiteJDBC" driver-version="native" />
-      <case-sensitivity plain-identifiers="mixed" quoted-identifiers="mixed" />
-      <secret-storage>master_key</secret-storage>
-      <auth-required>false</auth-required>
-    </data-source>
-  </component>
-</project>
 \ No newline at end of file
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="DataSourceManagerImpl" format="xml" multifile-model="true">
-    <data-source source="LOCAL" name="etunicorn.db" uuid="7ff25d0f-17b0-48bb-a8e6-be9293e5e8dc">
-      <driver-ref>sqlite.xerial</driver-ref>
-      <synchronize>true</synchronize>
-      <jdbc-driver>org.sqlite.JDBC</jdbc-driver>
-      <jdbc-url>jdbc:sqlite:$PROJECT_DIR$/etunicorn.db</jdbc-url>
-      <driver-properties>
-        <property name="enable_load_extension" value="true" />
-      </driver-properties>
-    </data-source>
-  </component>
-</project>
 \ No newline at end of file
@@ -82,9 +82,8 @@
     <orderEntry type="library" name="Maven: net.minidev:accessors-smart:1.1" level="project" />
     <orderEntry type="library" name="Maven: org.ow2.asm:asm:5.0.3" level="project" />
     <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.22" level="project" />
-    <orderEntry type="library" name="Maven: mysql:mysql-connector-java:5.1.40" level="project" />
+    <orderEntry type="library" name="Maven: mysql:mysql-connector-java:5.1.6" level="project" />
     <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.3" level="project" />
-    <orderEntry type="library" name="Maven: com.h2database:h2:1.4.193" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:1.4.4.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:1.4.4.RELEASE" level="project" />
   </component>
@@ -34,6 +34,7 @@
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
+            <version>5.1.6</version>
         </dependency>
         <dependency>
@@ -42,10 +43,6 @@
             <version>2.3</version>
         </dependency>
         <dependency>
-            <groupId>com.h2database</groupId>
-            <artifactId>h2</artifactId>
-        </dependency>
-        <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-autoconfigure</artifactId>
             <version>1.4.4.RELEASE</version>
 package etunicorn;
 import etunicorn.entity.Permission;
-import etunicorn.entity.Personne;
-import etunicorn.entity.Role;
-import etunicorn.entity.Session;
 import etunicorn.repository.PermissionRepository;
 import etunicorn.repository.PersonneRepository;
 import etunicorn.repository.RoleRepository;
@@ -13,18 +10,15 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
+import org.springframework.jdbc.datasource.DriverManagerDataSource;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import javax.sql.DataSource;
 /**
  * etunicorn-server
  * Copyright © 2017 Le Club Info Polytech Lille
  * Tous droits réservés
  */
-@Configuration
 @SpringBootApplication
 @EnableAutoConfiguration
 public class Application {
@@ -52,23 +46,23 @@ public class Application {
             permissionRepository.save(new Permission("ROLE_PERMISSION_REMOVE"));
             // ...
-            roleRepository.save(new Role("admin", (List<Permission>) permissionRepository.findAll()));
-            roleRepository.save(new Role("etudiant", new ArrayList<>()));
-            personneRepository.save(new Personne("carte", new Date(), "gbontoux", roleRepository.findByNom("admin")));
-            sessionRepository.save(new Session(personneRepository.findByLogin("gbontoux"), "A", new Date(new Date().getTime() + 1000 * 60 * 10)));
+            //roleRepository.save(new Role("admin", (List<Permission>) permissionRepository.findAll()));
+            //roleRepository.save(new Role("etudiant", new ArrayList<>()));
+            //personneRepository.save(new Personne("546848", new Date(), "bverhaeg", roleRepository.findByNom("admin")));
+            //sessionRepository.save(new Session(personneRepository.findByLogin("bverhaeg"), "B", new Date(new Date().getTime() + 1000 * 60 * 10)));
         };
     }
-    // @Bean
-    // public DataSource dataSource() {
-    //     DriverManagerDataSource dataSource = new DriverManagerDataSource();
-    //     dataSource.setDriverClassName("com.mysql.jdbc.Driver");
-    //     dataSource.setUrl("jdbc:mysql://localhost/etunicorn");
-    //     dataSource.setUsername("etunicorn");
-    //     dataSource.setPassword("etunicorn");
-    //     return dataSource;
-    // }
+     @Bean
+     public DataSource dataSource() {
+         DriverManagerDataSource dataSource = new DriverManagerDataSource();
+         dataSource.setDriverClassName("com.mysql.jdbc.Driver");
+         dataSource.setUrl("jdbc:mysql://192.168.0.28:3306/bade");
+         dataSource.setUsername("bade");
+         dataSource.setPassword("bade");
+         return dataSource;
+     }
     // Properties additionalProperties() {
     //     Properties properties = new Properties();
@@ -0,0 +1,5 @@
+spring:
+  jpa:
+    database-platform: org.hibernate.dialect.MySQL5Dialect
+    hibernate:
+      ddl-auto: update
 \ No newline at end of file