aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/com/juick/server/configuration
diff options
context:
space:
mode:
authorGravatar Vitaly Takmazov2019-03-29 15:25:14 +0300
committerGravatar Vitaly Takmazov2019-03-29 15:25:14 +0300
commit094ba10354418ada0cea5f9e22f4487d950bbcd2 (patch)
treedd6c68f6c0e62b5e9355481558a53ec3caeaec56 /src/main/java/com/juick/server/configuration
parent650534477174e4159f1e3fc5a2db01abcec6b1f1 (diff)
load test key from resources in default configuration
Diffstat (limited to 'src/main/java/com/juick/server/configuration')
-rw-r--r--src/main/java/com/juick/server/configuration/BaseWebConfiguration.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/main/java/com/juick/server/configuration/BaseWebConfiguration.java b/src/main/java/com/juick/server/configuration/BaseWebConfiguration.java
index c8b88cd1..976602e6 100644
--- a/src/main/java/com/juick/server/configuration/BaseWebConfiguration.java
+++ b/src/main/java/com/juick/server/configuration/BaseWebConfiguration.java
@@ -23,6 +23,7 @@ import com.overzealous.remark.Remark;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
+import org.springframework.core.io.Resource;
import org.springframework.scheduling.annotation.SchedulingConfigurer;
import org.springframework.scheduling.config.ScheduledTaskRegistrar;
import org.springframework.web.servlet.config.annotation.PathMatchConfigurer;
@@ -40,8 +41,8 @@ import java.util.concurrent.Executors;
@Configuration
public class BaseWebConfiguration implements WebMvcConfigurer, SchedulingConfigurer {
- @Value("${keystore:juick.p12}")
- private String keystore;
+ @Value("${keystore:classpath:juick-test-key.p12}")
+ private Resource keystore;
@Value("${keystore_password:secret}")
private String keystorePassword;