Subversion Repositories SmartDukaan

Rev

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

Rev 34632 Rev 34668
Line 10... Line 10...
10
import com.spice.profitmandi.dao.enumuration.cs.EscalationType;
10
import com.spice.profitmandi.dao.enumuration.cs.EscalationType;
11
import com.spice.profitmandi.dao.repository.cs.CsService;
11
import com.spice.profitmandi.dao.repository.cs.CsService;
12
import com.spice.profitmandi.dao.repository.fofo.FofoOrderItemRepository;
12
import com.spice.profitmandi.dao.repository.fofo.FofoOrderItemRepository;
13
import com.spice.profitmandi.dao.util.ContentPojoPopulator;
13
import com.spice.profitmandi.dao.util.ContentPojoPopulator;
14
import com.spice.profitmandi.service.integrations.samsung.upgradeoffer.UpgradeOfferService;
14
import com.spice.profitmandi.service.integrations.samsung.upgradeoffer.UpgradeOfferService;
15
import io.micrometer.core.instrument.MeterRegistry;
-
 
16
import io.micrometer.core.instrument.config.MeterFilter;
-
 
17
import org.apache.logging.log4j.LogManager;
15
import org.apache.logging.log4j.LogManager;
18
import org.apache.logging.log4j.Logger;
16
import org.apache.logging.log4j.Logger;
19
import org.apache.velocity.app.VelocityEngine;
17
import org.apache.velocity.app.VelocityEngine;
20
import org.apache.velocity.exception.VelocityException;
18
import org.apache.velocity.exception.VelocityException;
21
import org.springframework.beans.factory.annotation.Autowired;
19
import org.springframework.beans.factory.annotation.Autowired;
22
import org.springframework.boot.ApplicationArguments;
20
import org.springframework.boot.ApplicationArguments;
23
import org.springframework.boot.ApplicationRunner;
21
import org.springframework.boot.ApplicationRunner;
24
import org.springframework.boot.WebApplicationType;
22
import org.springframework.boot.WebApplicationType;
25
import org.springframework.boot.actuate.autoconfigure.metrics.MeterRegistryCustomizer;
-
 
26
import org.springframework.boot.autoconfigure.SpringBootApplication;
23
import org.springframework.boot.autoconfigure.SpringBootApplication;
27
import org.springframework.boot.builder.SpringApplicationBuilder;
24
import org.springframework.boot.builder.SpringApplicationBuilder;
28
import org.springframework.context.annotation.Bean;
25
import org.springframework.context.annotation.Bean;
29
import org.springframework.context.annotation.ComponentScan;
26
import org.springframework.context.annotation.ComponentScan;
30
import org.springframework.context.annotation.EnableAspectJAutoProxy;
27
import org.springframework.context.annotation.EnableAspectJAutoProxy;
Line 121... Line 118...
121
 
118
 
122
        return factory.createVelocityEngine();
119
        return factory.createVelocityEngine();
123
 
120
 
124
    }
121
    }
125
 
122
 
126
   /* @Bean(name = "mailSender")
123
    @Bean(name = "mailSender")
127
    @Primary
124
    @Primary
128
    public JavaMailSender sendGridMailSender() {
125
    public JavaMailSender sendGridMailSender() {
129
        JavaMailSenderImpl mailSender = new JavaMailSenderImpl();
126
        JavaMailSenderImpl mailSender = new JavaMailSenderImpl();
130
 
127
 
131
        // Using gmail
128
        // Using gmail
132
        mailSender.setHost("smtp.sendgrid.net");
129
        mailSender.setHost("smtp.sendgrid.net");
133
        mailSender.setPort(587);
130
        mailSender.setPort(587);
134
        mailSender.setUsername("apikey");
131
        mailSender.setUsername("apikey");
135
        mailSender.setPassword("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");
132
        mailSender.setPassword("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");
136
 
133
 
137
        Properties javaMailProperties = new Properties();
134
        Properties javaMailProperties = new Properties();
138
        javaMailProperties.put("mail.smtp.starttls.enable", "false");
135
        javaMailProperties.put("mail.smtp.starttls.enable", "false");
139
        javaMailProperties.put("mail.smtp.auth", "true");
136
        javaMailProperties.put("mail.smtp.auth", "true");
140
        javaMailProperties.put("mail.transport.protocol", "smtp");
137
        javaMailProperties.put("mail.transport.protocol", "smtp");
141
 
138
 
142
        mailSender.setJavaMailProperties(javaMailProperties);
139
        mailSender.setJavaMailProperties(javaMailProperties);
143
        return mailSender;
140
        return mailSender;
144
    }*/
-
 
145
 
-
 
146
    @Bean(name = "mailSender")
-
 
147
    @Primary
-
 
148
    public JavaMailSender sendGridMailSender() {
-
 
149
        return googleMailSender();
-
 
150
    }
141
    }
151
 
142
 
152
    @Bean
143
    @Bean
153
    public JavaMailSender googleMailSender() {
144
    public JavaMailSender googleMailSender() {
154
        JavaMailSenderImpl mailSender = new JavaMailSenderImpl();
145
        JavaMailSenderImpl mailSender = new JavaMailSenderImpl();
Line 166... Line 157...
166
        props.put("mail.debug", "true");
157
        props.put("mail.debug", "true");
167
 
158
 
168
        return mailSender;
159
        return mailSender;
169
    }
160
    }
170
 
161
 
171
 
-
 
172
    /*public JavaMailSender googleMailSender() {
-
 
173
        JavaMailSenderImpl mailSender = new JavaMailSenderImpl();
-
 
174
        // Using gmail
-
 
175
        mailSender.setHost("smtp.gmail.com");
-
 
176
        mailSender.setPort(587);
-
 
177
        //mailSender.setUsername("build@shop2020.in");
-
 
178
        //mailSender.setPassword("cafe@nes");
-
 
179
        mailSender.setUsername("sdtech@smartdukaan.com");
-
 
180
        mailSender.setPassword("gpdschroalhhirox");
-
 
181
 
-
 
182
        Properties javaMailProperties = new Properties();
-
 
183
        javaMailProperties.put("mail.smtp.starttls.enable", "true");
-
 
184
        javaMailProperties.put("mail.smtp.auth", "true");
-
 
185
//        javaMailProperties.put("mail.transport.protocol", "smtp");
-
 
186
        javaMailProperties.put("mail.smtp.starttls.required", "true");
-
 
187
        javaMailProperties.put("mail.smtp.ssl.protocols", "TLSv1.2"); // Still force TLSv1.2
-
 
188
        javaMailProperties.put("mail.debug", "true");// Prints out everything on screen
-
 
189
        mailSender.setJavaMailProperties(javaMailProperties);
-
 
190
        return mailSender;
-
 
191
 
-
 
192
    }*/
-
 
193
 
-
 
194
    @Autowired
162
    @Autowired
195
    private RunOnceTasks runOnceTasks;
163
    private RunOnceTasks runOnceTasks;
196
 
164
 
197
    @Autowired
165
    @Autowired
198
    private ScheduledTasks scheduledTasks;
166
    private ScheduledTasks scheduledTasks;