From 4c43776528a605f8b74cda8d0028847ee71036e2 Mon Sep 17 00:00:00 2001
From: Anton Romanov <romanov73@gmail.com>
Date: Thu, 8 Nov 2018 20:08:26 +0400
Subject: [PATCH] add config parameter

---
 .../configuration/ApplicationProperties.java    | 10 ++++++++++
 .../configuration/SecurityConfiguration.java    | 17 ++++++++++-------
 .../api/StrategyEntityCreateExecutor.java       |  3 +--
 src/main/resources/application.properties       |  3 ++-
 .../db/changelog-20181108_000000-data.xml       | 11 +++++++++++
 src/main/resources/db/changelog-master.xml      |  1 +
 6 files changed, 35 insertions(+), 10 deletions(-)
 create mode 100644 src/main/resources/db/changelog-20181108_000000-data.xml

diff --git a/src/main/java/ru/ulstu/configuration/ApplicationProperties.java b/src/main/java/ru/ulstu/configuration/ApplicationProperties.java
index b89641a..8615cb2 100644
--- a/src/main/java/ru/ulstu/configuration/ApplicationProperties.java
+++ b/src/main/java/ru/ulstu/configuration/ApplicationProperties.java
@@ -15,6 +15,16 @@ public class ApplicationProperties {
     private String undeadUserLogin;
     private boolean devMode;
 
+    private boolean useHttps;
+
+    public boolean isUseHttps() {
+        return useHttps;
+    }
+
+    public void setUseHttps(boolean useHttps) {
+        this.useHttps = useHttps;
+    }
+
     public String getBaseUrl() {
         return baseUrl;
     }
diff --git a/src/main/java/ru/ulstu/configuration/SecurityConfiguration.java b/src/main/java/ru/ulstu/configuration/SecurityConfiguration.java
index c0f34d6..da498fa 100644
--- a/src/main/java/ru/ulstu/configuration/SecurityConfiguration.java
+++ b/src/main/java/ru/ulstu/configuration/SecurityConfiguration.java
@@ -86,13 +86,16 @@ public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
                     .deleteCookies(Constants.COOKIES_NAME)
                     .permitAll();
         }
-        http.portMapper()
-                .http(httpPort)
-                .mapsTo(httpsPort)
-                .and()
-                .requiresChannel()
-                .anyRequest()
-                .requiresSecure();
+        if (applicationProperties.isUseHttps()) {
+            http.portMapper()
+                    .http(httpPort)
+                    .mapsTo(httpsPort)
+                    .and()
+                    .requiresChannel()
+                    .anyRequest()
+                    .requiresSecure();
+        }
+
     }
 
     @Override
diff --git a/src/main/java/ru/ulstu/strategy/api/StrategyEntityCreateExecutor.java b/src/main/java/ru/ulstu/strategy/api/StrategyEntityCreateExecutor.java
index 97cd5ef..c3d4d95 100644
--- a/src/main/java/ru/ulstu/strategy/api/StrategyEntityCreateExecutor.java
+++ b/src/main/java/ru/ulstu/strategy/api/StrategyEntityCreateExecutor.java
@@ -18,8 +18,7 @@ public class StrategyEntityCreateExecutor {
     }
 
 
-    //@Scheduled(cron = "0 0 8 * * *")
-    @Scheduled(cron = "0 */5 * * * *")
+    @Scheduled(cron = "0 0 8 * * *")
     public void scheduleExecuteStrategies() {
         entityCreateStrategies.forEach(strategy -> strategy.createEntityIfNeed(userService.findAll()));
     }
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 9544a7e..e696ccd 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -34,4 +34,5 @@ liquibase.change-log=classpath:db/changelog-master.xml
 # Application Settings
 ng-tracker.base-url=https://127.0.0.1:8443
 ng-tracker.undead-user-login=admin
-ng-tracker.dev-mode=true
\ No newline at end of file
+ng-tracker.dev-mode=true
+ng-tracker.use-https=false
\ No newline at end of file
diff --git a/src/main/resources/db/changelog-20181108_000000-data.xml b/src/main/resources/db/changelog-20181108_000000-data.xml
new file mode 100644
index 0000000..834bb58
--- /dev/null
+++ b/src/main/resources/db/changelog-20181108_000000-data.xml
@@ -0,0 +1,11 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd">
+    <changeSet author="orion" id="20181108_000000-1">
+        <sql>
+            update users
+            set email = 'romanov73@gmail.com' where id = 1;
+        </sql>
+    </changeSet>
+</databaseChangeLog>
diff --git a/src/main/resources/db/changelog-master.xml b/src/main/resources/db/changelog-master.xml
index bd52f71..fe8d7d6 100644
--- a/src/main/resources/db/changelog-master.xml
+++ b/src/main/resources/db/changelog-master.xml
@@ -13,4 +13,5 @@
     <include file="db/changelog-20180505_000000-schema.xml"/>
     <include file="db/changelog-20181027_000000-schema.xml"/>
     <include file="db/changelog-20181030_000000-schema.xml"/>
+    <include file="db/changelog-20181108_000000-data.xml"/>
 </databaseChangeLog>
\ No newline at end of file