From 8be8c6f1fade778ad99ad106b4909486dbb51189 Mon Sep 17 00:00:00 2001
From: Mark Struchkov <upagge@icloud.com>
Date: Sat, 22 Dec 2018 01:38:29 +0300
Subject: [PATCH] MinnorUpdate
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Перенес настройки базы и hibernate в properties
---
 .../org/sadtech/vkbot/config/DataConfig.java  | 33 +++++++++++--------
 .../vkbot/service/impl/UserServiceImpl.java   |  2 ++
 2 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/vk-bot/src/main/java/org/sadtech/vkbot/config/DataConfig.java b/vk-bot/src/main/java/org/sadtech/vkbot/config/DataConfig.java
index 1acd9af..e529826 100644
--- a/vk-bot/src/main/java/org/sadtech/vkbot/config/DataConfig.java
+++ b/vk-bot/src/main/java/org/sadtech/vkbot/config/DataConfig.java
@@ -1,9 +1,11 @@
 package org.sadtech.vkbot.config;
 
 import org.hibernate.jpa.HibernatePersistenceProvider;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.PropertySource;
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 import org.springframework.jdbc.datasource.DriverManagerDataSource;
 import org.springframework.orm.jpa.JpaTransactionManager;
@@ -17,23 +19,26 @@ import java.util.Properties;
 @EnableTransactionManagement
 @ComponentScan("org.sadtech.vkbot")
 @EnableJpaRepositories("org.sadtech.vkbot.repo")
+@PropertySource("classpath:app.properties")
 public class DataConfig {
 
-    private static final String PROPERTY_NAME_DATABASE_DRIVER = "com.mysql.jdbc.Driver";
-    private static final String PROPERTY_NAME_DATABASE_URL = "jdbc:mysql://localhost:3306/testbd"+
-            "?verifyServerCertificate=false"+
-            "&useSSL=false"+
-            "&requireSSL=false"+
-            "&useLegacyDatetimeCode=false"+
-            "&amp"+
-            "&serverTimezone=UTC";
-    private static final String PROPERTY_NAME_DATABASE_USERNAME = "root";
-    private static final String PROPERTY_NAME_DATABASE_PASSWORD = "121314185398MAmaPApa";
+    @Value("${db.driver}")
+    private String PROPERTY_NAME_DATABASE_DRIVER;
+    @Value("${db.url}")
+    private String PROPERTY_NAME_DATABASE_URL;
+    @Value("${db.username}")
+    private String PROPERTY_NAME_DATABASE_USERNAME;
+    @Value("${db.password}")
+    private String PROPERTY_NAME_DATABASE_PASSWORD;
 
-    private static final String PROPERTY_NAME_HIBERNATE_DIALECT = "org.hibernate.dialect.MySQL5Dialect";
-    private static final String PROPERTY_NAME_HIBERNATE_SHOW_SQL = "true";
-    private static final String PROPERTY_NAME_ENTITYMANAGER_PACKAGES_TO_SCAN = "org.sadtech.vkbot";
-    private static final String PROPERTY_NAME_HIBERNATE_HBM2DDL_AUTO = "create-drop";
+    @Value("${db.hibernate.dialect}")
+    private String PROPERTY_NAME_HIBERNATE_DIALECT;
+    @Value("${db.hibernate.show_sql}")
+    private String PROPERTY_NAME_HIBERNATE_SHOW_SQL;
+    @Value("${db.entitymanager.packages.to.scan}")
+    private String PROPERTY_NAME_ENTITYMANAGER_PACKAGES_TO_SCAN;
+    @Value("${db.hibernate.hbm2ddl.auto}")
+    private String PROPERTY_NAME_HIBERNATE_HBM2DDL_AUTO;
 
     @Bean
     public LocalContainerEntityManagerFactoryBean entityManagerFactory() {
diff --git a/vk-bot/src/main/java/org/sadtech/vkbot/service/impl/UserServiceImpl.java b/vk-bot/src/main/java/org/sadtech/vkbot/service/impl/UserServiceImpl.java
index e3f8e70..1484ff6 100644
--- a/vk-bot/src/main/java/org/sadtech/vkbot/service/impl/UserServiceImpl.java
+++ b/vk-bot/src/main/java/org/sadtech/vkbot/service/impl/UserServiceImpl.java
@@ -4,8 +4,10 @@ import org.sadtech.vkbot.dao.User;
 import org.sadtech.vkbot.repo.UserRepository;
 import org.sadtech.vkbot.service.UserService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
 
+@Service
 public class UserServiceImpl implements UserService {
 
     @Autowired