Merge branch 'dev'

This commit is contained in:
Salman Manoe 2024-01-25 17:28:27 +07:00
commit 434c003039

View File

@ -27,8 +27,8 @@ import org.springframework.context.annotation.Configuration;
@EncryptablePropertySource("classpath:jdbc.sdm.properties"), @EncryptablePropertySource("classpath:jdbc.sdm.properties"),
@EncryptablePropertySource("classpath:jdbc.web.properties")}) @EncryptablePropertySource("classpath:jdbc.web.properties")})
public class JasyptConfig { public class JasyptConfig {
@Bean(initMethod = "jasyptStringEncryptor") @Bean
public StringEncryptor stringEncryptor() { public StringEncryptor jasyptStringEncryptor() {
String password = System.getProperty("jasypt.encryptor.password"); String password = System.getProperty("jasypt.encryptor.password");
PooledPBEStringEncryptor encryptor = new PooledPBEStringEncryptor(); PooledPBEStringEncryptor encryptor = new PooledPBEStringEncryptor();
SimpleStringPBEConfig config = new SimpleStringPBEConfig(); SimpleStringPBEConfig config = new SimpleStringPBEConfig();