aboutsummaryrefslogtreecommitdiff
path: root/juick-www/src/main/java/com/juick/www
diff options
context:
space:
mode:
authorGravatar Vitaly Takmazov2018-02-22 14:26:09 +0300
committerGravatar Vitaly Takmazov2018-02-22 14:26:09 +0300
commit445efce2abf8310acc5b7bb652feef7968c86a2a (patch)
tree04ef8712a014a2f75b8bd96cf68c8bd3a5af6dc6 /juick-www/src/main/java/com/juick/www
parentb74b92f124f6d31a7ee48deaf48f0604886836f8 (diff)
default database is h2
Diffstat (limited to 'juick-www/src/main/java/com/juick/www')
-rw-r--r--juick-www/src/main/java/com/juick/www/configuration/SapeConfiguration.java2
-rw-r--r--juick-www/src/main/java/com/juick/www/configuration/WebSecurityConfig.java2
-rw-r--r--juick-www/src/main/java/com/juick/www/controllers/SocialLogin.java14
3 files changed, 9 insertions, 9 deletions
diff --git a/juick-www/src/main/java/com/juick/www/configuration/SapeConfiguration.java b/juick-www/src/main/java/com/juick/www/configuration/SapeConfiguration.java
index 006c159c..68ff28d2 100644
--- a/juick-www/src/main/java/com/juick/www/configuration/SapeConfiguration.java
+++ b/juick-www/src/main/java/com/juick/www/configuration/SapeConfiguration.java
@@ -27,7 +27,7 @@ import ru.sape.Sape;
*/
@Configuration
public class SapeConfiguration {
- @Value("${sape_user}")
+ @Value("${sape_user:secret}")
private String token;
@Bean
diff --git a/juick-www/src/main/java/com/juick/www/configuration/WebSecurityConfig.java b/juick-www/src/main/java/com/juick/www/configuration/WebSecurityConfig.java
index bde85ee4..19329dad 100644
--- a/juick-www/src/main/java/com/juick/www/configuration/WebSecurityConfig.java
+++ b/juick-www/src/main/java/com/juick/www/configuration/WebSecurityConfig.java
@@ -41,7 +41,7 @@ import javax.annotation.Resource;
*/
@EnableWebSecurity
public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
- @Value("${auth_remember_me_key}")
+ @Value("${auth_remember_me_key:secret}")
private String rememberMeKey;
@Value("${web_domain:localhost}")
private String webDomain;
diff --git a/juick-www/src/main/java/com/juick/www/controllers/SocialLogin.java b/juick-www/src/main/java/com/juick/www/controllers/SocialLogin.java
index 64d59b9f..674be157 100644
--- a/juick-www/src/main/java/com/juick/www/controllers/SocialLogin.java
+++ b/juick-www/src/main/java/com/juick/www/controllers/SocialLogin.java
@@ -66,9 +66,9 @@ public class SocialLogin {
private static final Logger logger = LoggerFactory.getLogger(SocialLogin.class);
- @Value("${facebook_appid}")
+ @Value("${facebook_appid:appid}")
private String FACEBOOK_APPID;
- @Value("${facebook_secret}")
+ @Value("${facebook_secret:secret}")
private String FACEBOOK_SECRET;
private static final String FACEBOOK_REDIRECT = "http://juick.com/_fblogin";
private static final String VK_REDIRECT = "http://juick.com/_vklogin";
@@ -77,15 +77,15 @@ public class SocialLogin {
private ObjectMapper jsonMapper;
private ServiceBuilder facebookBuilder, twitterBuilder, vkBuilder;
- @Value("${twitter_consumer_key}")
+ @Value("${twitter_consumer_key:appid}")
private String twitterConsumerKey;
- @Value("${twitter_consumer_secret}")
+ @Value("${twitter_consumer_secret:secret}")
private String twitterConsumerSecret;
- @Value("${vk_appid}")
+ @Value("${vk_appid:appid}")
private String VK_APPID;
- @Value("${vk_secret}")
+ @Value("${vk_secret:secret}")
private String VK_SECRET;
- @Value("${telegram_token}")
+ @Value("${telegram_token:secret}")
private String telegramToken;
@Inject