Subversion Repositories SmartDukaan

Rev

Rev 32608 | Rev 32661 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 32608 Rev 32659
Line 47... Line 47...
47 
import com.spice.profitmandi.dao.util.ContentPojoPopulator;
 47 
import com.spice.profitmandi.dao.util.ContentPojoPopulator;
48 
import com.spice.profitmandi.service.integrations.samsung.upgradeoffer.UpgradeOfferService;
 48 
import com.spice.profitmandi.service.integrations.samsung.upgradeoffer.UpgradeOfferService;
49 
 
 49 
 
50 
@SpringBootApplication
 50 
@SpringBootApplication
51 
//@EnableCaching
 51 
//@EnableCaching
52 
@EnableScheduling
 52 
//@EnableScheduling
53 
@ComponentScan("com.smartdukaan.cron.*, com.spice.profitmandi.common.*")
 53 
@ComponentScan("com.smartdukaan.cron.*, com.spice.profitmandi.common.*")
54 
public class Application implements ApplicationRunner {
 54 
public class Application implements ApplicationRunner {
55 
 
 55 
 
56 
    private static final Logger LOGGER = LogManager.getLogger(Application.class);
 56 
    private static final Logger LOGGER = LogManager.getLogger(Application.class);
57 
 
 57 
 
Line 122... Line 122...
122 
 
 122 
 
123 
        return factory.createVelocityEngine();
 123 
        return factory.createVelocityEngine();
124 
 
 124 
 
125 
    }
 125 
    }
126 
 
 126 
 
127 
    @Bean(name = "mailSender")
 127 
/*    @Bean(name = "mailSender")
128 
    @Primary
 128 
    @Primary
129 
    public JavaMailSender sendGridMailSender() {
 129 
    public JavaMailSender sendGridMailSender() {
130 
        JavaMailSenderImpl mailSender = new JavaMailSenderImpl();
 130 
        JavaMailSenderImpl mailSender = new JavaMailSenderImpl();
131 
 
 131 
 
132 
        // Using gmail
 132 
        // Using gmail
Line 140... Line 140...
140 
        javaMailProperties.put("mail.smtp.auth", "true");
 140 
        javaMailProperties.put("mail.smtp.auth", "true");
141 
        javaMailProperties.put("mail.transport.protocol", "smtp");
 141 
        javaMailProperties.put("mail.transport.protocol", "smtp");
142 
 
 142 
 
143 
        mailSender.setJavaMailProperties(javaMailProperties);
 143 
        mailSender.setJavaMailProperties(javaMailProperties);
144 
        return mailSender;
 144 
        return mailSender;
- 
 
 145 
    }*/
- 
 
 146 
 
- 
 
 147 
    @Bean(name = "mailSender")
- 
 
 148 
    @Primary
- 
 
 149 
    public JavaMailSender sendGridMailSender() {
- 
 
 150 
        return googleMailSender();
145 
    }
 151 
    }
146 
 
 152 
 
147 
    @Bean
 153 
    @Bean
148 
    public JavaMailSender googleMailSender() {
 154 
    public JavaMailSender googleMailSender() {
149 
        JavaMailSenderImpl mailSender = new JavaMailSenderImpl();
 155 
        JavaMailSenderImpl mailSender = new JavaMailSenderImpl();