Merge branch 'master' of https://git.myitsol.com/hanv/service-campaign

src/main/java/com/viettel/campaign/ServiceCampaignApplication.java

 package com.viettel.campaign;
 
+import com.viettel.campaign.config.DataSourceProperties;
 import com.viettel.campaign.utils.Config;
 import com.viettel.campaign.utils.RedisUtil;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
-@SpringBootApplication(scanBasePackages={"com.viettel.campaign"})
+@SpringBootApplication
 public class ServiceCampaignApplication {
 
+    @Autowired
+    DataSourceProperties dataSourceProperties;
+
     public static void main(String[] args) {
         SpringApplication.run(ServiceCampaignApplication.class, args);
 

src/main/java/com/viettel/campaign/config/ACDFullDatasourceConfig.java

@@ -2,6 +2,7 @@ package com.viettel.campaign.config;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.*;
 import org.springframework.core.env.Environment;
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
@@ -11,6 +12,7 @@ import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
 import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter;
 import org.springframework.transaction.PlatformTransactionManager;
 
+import javax.persistence.criteria.CriteriaBuilder;
 import javax.sql.DataSource;
 import java.util.HashMap;
 
@@ -29,15 +31,30 @@ public class ACDFullDatasourceConfig {
     @Autowired
     private Environment env;
 
-    @Bean("datasource2.datasource")
+    @Value("${datasource-property.acd-full.driver-class-name}")
+    private String driverClassName;
+
+    @Value("${datasource-property.acd-full.url}")
+    private String url;
+
+    @Value("${datasource-property.acd-full.max_pool_size}")
+    private Integer maxPoolSize;
+
+    @Value("${datasource-property.acd-full.password}")
+    private String password;
+
+    @Value("${datasource-property.acd-full.username}")
+    private String username;
+
+    @Bean("datasource.datasource2")
     public DataSource dataSource(){
         OracleDataSource r = new OracleDataSource();
-        r.setDriverClassName(env.getProperty("spring.datasource2.driver-class-name"));
+        r.setDriverClassName(driverClassName);
         r.setPoolName("app.datasource2");
-        r.setJdbcUrl(env.getProperty("spring.datasource2.url"));
-        r.setMaximumPoolSize(env.getProperty("spring.datasource2.max_pool_size", Integer.class));
-        r.setPassword(env.getProperty("spring.datasource2.password"));
-        r.setUsername(env.getProperty("spring.datasource2.username"));
+        r.setJdbcUrl(url);
+        r.setMaximumPoolSize(maxPoolSize);
+        r.setPassword(password);
+        r.setUsername(username);
         return r;
     }
 
@@ -69,8 +86,8 @@ public class ACDFullDatasourceConfig {
     }
 
     @Bean(name = DataSourceQualify.NAMED_JDBC_PARAMETER_TEMPLATE_ACD_FULL)
-    @DependsOn("datasource2.datasource")
-    public NamedParameterJdbcTemplate namedParameterJdbcTemplate(@Qualifier("datasource2.datasource") DataSource abcDataSource) {
+    @DependsOn("datasource.datasource2")
+    public NamedParameterJdbcTemplate namedParameterJdbcTemplate(@Qualifier("datasource.datasource2") DataSource abcDataSource) {
         return new NamedParameterJdbcTemplate(abcDataSource);
     }
 }

src/main/java/com/viettel/campaign/config/CCMSFullDatasourceConfig.java

@@ -2,6 +2,7 @@ package com.viettel.campaign.config;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.DependsOn;
@@ -32,15 +33,30 @@ public class CCMSFullDatasourceConfig {
     @Autowired
     private Environment env;
 
-    @Bean("datasource1.datasource")
+    @Value("${datasource-property.ccms-full.driver-class-name}")
+    private String driverClassName;
+
+    @Value("${datasource-property.ccms-full.url}")
+    private String url;
+
+    @Value("${datasource-property.ccms-full.max_pool_size}")
+    private Integer maxPoolSize;
+
+    @Value("${datasource-property.ccms-full.password}")
+    private String password;
+
+    @Value("${datasource-property.ccms-full.username}")
+    private String username;
+
+    @Bean(name= "datasource.datasource1")
     public DataSource dataSource(){
         OracleDataSource r = new OracleDataSource();
-        r.setDriverClassName(env.getProperty("spring.datasource.driver-class-name"));
+        r.setDriverClassName(driverClassName);
         r.setPoolName("app.datasource1");
-        r.setJdbcUrl(env.getProperty("spring.datasource.url"));
-        r.setMaximumPoolSize(env.getProperty("spring.datasource.max_pool_size", Integer.class));
-        r.setPassword(env.getProperty("spring.datasource.password"));
-        r.setUsername(env.getProperty("spring.datasource.username"));
+        r.setJdbcUrl(url);
+        r.setMaximumPoolSize(maxPoolSize);
+        r.setPassword(password);
+        r.setUsername(username);
         return r;
     }
 
@@ -72,8 +88,8 @@ public class CCMSFullDatasourceConfig {
     }
 
     @Bean(name = DataSourceQualify.NAMED_JDBC_PARAMETER_TEMPLATE_CCMS_FULL)
-    @DependsOn("datasource1.datasource")
-    public NamedParameterJdbcTemplate namedParameterJdbcTemplate(@Qualifier("datasource1.datasource") DataSource abcDataSource) {
+    @DependsOn("datasource.datasource1")
+    public NamedParameterJdbcTemplate namedParameterJdbcTemplate(@Qualifier("datasource.datasource1") DataSource abcDataSource) {
         return new NamedParameterJdbcTemplate(abcDataSource);
     }
 }

src/main/java/com/viettel/campaign/config/DataSourceProperties.java

+package com.viettel.campaign.config;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author anhvd_itsol
+ */
+
+@Component
+@ConfigurationProperties(prefix = "datasource-property")
+public class DataSourceProperties {
+
+    public static class CCMSFull{
+        private String driverClassName;
+        private String url;
+        private String username;
+        private String password;
+        private Integer maxPoolSize;
+
+        public String getDriverClassName() {
+            return driverClassName;
+        }
+
+        public void setDriverClassName(String driverClassName) {
+            this.driverClassName = driverClassName;
+        }
+
+        public String getUrl() {
+            return url;
+        }
+
+        public void setUrl(String url) {
+            this.url = url;
+        }
+
+        public String getUsername() {
+            return username;
+        }
+
+        public void setUsername(String username) {
+            this.username = username;
+        }
+
+        public String getPassword() {
+            return password;
+        }
+
+        public void setPassword(String password) {
+            this.password = password;
+        }
+
+        public Integer getMaxPoolSize() {
+            return maxPoolSize;
+        }
+
+        public void setMaxPoolSize(Integer maxPoolSize) {
+            this.maxPoolSize = maxPoolSize;
+        }
+    }
+
+    public static class ACDFull{
+        private String driverClassName;
+        private String url;
+        private String username;
+        private String password;
+        private Integer maxPoolSize;
+
+        public String getDriverClassName() {
+            return driverClassName;
+        }
+
+        public void setDriverClassName(String driverClassName) {
+            this.driverClassName = driverClassName;
+        }
+
+        public String getUrl() {
+            return url;
+        }
+
+        public void setUrl(String url) {
+            this.url = url;
+        }
+
+        public String getUsername() {
+            return username;
+        }
+
+        public void setUsername(String username) {
+            this.username = username;
+        }
+
+        public String getPassword() {
+            return password;
+        }
+
+        public void setPassword(String password) {
+            this.password = password;
+        }
+
+        public Integer getMaxPoolSize() {
+            return maxPoolSize;
+        }
+
+        public void setMaxPoolSize(Integer maxPoolSize) {
+            this.maxPoolSize = maxPoolSize;
+        }
+    }
+
+}

src/main/java/com/viettel/campaign/config/WebSecurityConfig.java

-package com.viettel.campaign.config;
-
-import com.viettel.campaign.filter.CorsFilter;
-import org.springframework.boot.web.servlet.FilterRegistrationBean;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
-
-/**
- * @author hanv_itsol
- * @project service-campaign
- */
-
-@EnableWebSecurity
-@Configuration
-public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
-
-    @Override
-    protected void configure(HttpSecurity http) throws Exception {
-        http.csrf().disable();
-    }
-
-    @Bean
-    public FilterRegistrationBean filterRegistrationBean() {
-        FilterRegistrationBean registrationBean = new FilterRegistrationBean();
-        registrationBean.setName("CorsFilter");
-        CorsFilter corsFilter = new CorsFilter();
-        registrationBean.setFilter(corsFilter);
-        registrationBean.setOrder(1);
-        return registrationBean;
-    }
-}
+//package com.viettel.campaign.config;
+//
+//import com.viettel.campaign.filter.CorsFilter;
+//import org.springframework.boot.web.servlet.FilterRegistrationBean;
+//import org.springframework.context.annotation.Bean;
+//import org.springframework.context.annotation.Configuration;
+//import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+//import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
+//import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
+//
+///**
+// * @author hanv_itsol
+// * @project service-campaign
+// */
+//
+//@EnableWebSecurity
+//@Configuration
+//public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
+//
+//    @Override
+//    protected void configure(HttpSecurity http) throws Exception {
+//        http.csrf().disable();
+//    }
+//
+//    @Bean
+//    public FilterRegistrationBean filterRegistrationBean() {
+//        FilterRegistrationBean registrationBean = new FilterRegistrationBean();
+//        registrationBean.setName("CorsFilter");
+//        CorsFilter corsFilter = new CorsFilter();
+//        registrationBean.setFilter(corsFilter);
+//        registrationBean.setOrder(1);
+//        return registrationBean;
+//    }
+//}

src/main/java/com/viettel/campaign/config/WebSocketConfig.java

-package com.viettel.campaign.config;
-
-import org.springframework.context.annotation.Configuration;
-import org.springframework.messaging.simp.config.MessageBrokerRegistry;
-import org.springframework.web.socket.config.annotation.EnableWebSocketMessageBroker;
-import org.springframework.web.socket.config.annotation.StompEndpointRegistry;
-import org.springframework.web.socket.config.annotation.WebSocketMessageBrokerConfigurer;
-
-/**
- * @author hanv_itsol
- * @project service-campaign
- */
-@Configuration
-@EnableWebSocketMessageBroker
-public class WebSocketConfig implements WebSocketMessageBrokerConfigurer {
-
-    @Override
-    public void configureMessageBroker(MessageBrokerRegistry registry) {
-        registry.enableSimpleBroker("/topic");
-        registry.setApplicationDestinationPrefixes("/app");
-    }
-
-    @Override
-    public void registerStompEndpoints(StompEndpointRegistry registry) {
-        registry.addEndpoint("/websocket").setAllowedOrigins("*").withSockJS();
-    }
-}
\ No newline at end of file

src/main/java/com/viettel/campaign/filter/CorsFilter.java

@@ -31,27 +31,27 @@ public class CorsFilter implements Filter {
 
         HttpServletRequest request = (HttpServletRequest) req;
 
-        chain.doFilter(req, resp);
-
-//        if ("OPTIONS".equalsIgnoreCase(request.getMethod())) {
-//            chain.doFilter(req, resp);
-//            return;
-//        }
-//        if ("/".equals(request.getRequestURI())) {
-//            chain.doFilter(req, resp);
-//            return;
-//        }
-//        String xAuthToken = request.getHeader("X-Auth-Token");
-//        if (xAuthToken == null || "".equals(xAuthToken)) {
-//            response.sendError(HttpServletResponse.SC_UNAUTHORIZED, "The token is null.");
-//            return;
-//        }
-//        Object obj = RedisUtil.getInstance().get(xAuthToken);
-//        if (obj instanceof UserSession) {
-//            chain.doFilter(req, resp);
-//        } else {
-//            response.sendError(HttpServletResponse.SC_UNAUTHORIZED, "The token is invalid.");
-//        }
+//        chain.doFilter(req, resp);
+
+        if ("OPTIONS".equalsIgnoreCase(request.getMethod())) {
+            chain.doFilter(req, resp);
+            return;
+        }
+        if ("/".equals(request.getRequestURI())) {
+            chain.doFilter(req, resp);
+            return;
+        }
+        String xAuthToken = request.getHeader("X-Auth-Token");
+        if (xAuthToken == null || "".equals(xAuthToken)) {
+            response.sendError(HttpServletResponse.SC_UNAUTHORIZED, "The token is null.");
+            return;
+        }
+        Object obj = RedisUtil.getInstance().get(xAuthToken);
+        if (obj instanceof UserSession) {
+            chain.doFilter(req, resp);
+        } else {
+            response.sendError(HttpServletResponse.SC_UNAUTHORIZED, "The token is invalid.");
+        }
     }
 
     @Override

src/main/java/com/viettel/campaign/service/impl/AgentsServiceImpl.java

@@ -90,7 +90,6 @@ public class AgentsServiceImpl implements AgentsService {
             sb.append("    b.FILTER_TYPE filterType,");
             sb.append("    b.CAMPAIGN_AGENT_ID campaignAgentId");
             sb.append(" FROM VSA_USERS a");
-
             sb.append(" LEFT JOIN CAMPAIGN_AGENT b on a.USER_ID = b.AGENT_ID");
             sb.append(" WHERE 1 = 1");
             sb.append(" AND a.COMPANY_SITE_ID = :p_company_site_id");
@@ -156,6 +155,7 @@ public class AgentsServiceImpl implements AgentsService {
 //            sb.append(SQLBuilder.getSqlQueryById(SQLBuilder.SQL_MODULE_CAMPAIGN_MNG, "campaign-agents-by-params"));
             StringBuilder sb = new StringBuilder();
 
+
             sb.append("SELECT");
             sb.append("    a.USER_ID userId,");
             sb.append("    a.USER_NAME userName,");

src/main/java/com/viettel/campaign/web/rest/CampaignController.java

@@ -11,7 +11,6 @@ import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cloud.sleuth.instrument.reactor.ReactorSleuth;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;

src/main/resources/application.yml

 server:
-  port: 9999
+  port: 1111
 spring:
   application:
     name: campaign
-  datasource:
-    driver-class-name: oracle.jdbc.driver.OracleDriver
-    url: jdbc:oracle:thin:@10.60.157.135:1521:vt
-    username: CCMS_FULL
-    password: CCMS_FULL#123
-    max_pool_size: 32
-  datasource2:
-    driver-class-name: oracle.jdbc.driver.OracleDriver
-    url: jdbc:oracle:thin:@10.60.157.135:1521:vt
-    username: ACD_FULL
-    password: ACD_FULL#123
-    max_pool_size: 32
   jpa:
     database-platform: org.hibernate.dialect.Oracle10gDialect
     show-sql: true
@@ -34,3 +22,22 @@ spring:
 #      bootstrap-servers: 192.168.1.201:9092
 #      key-serializer: org.apache.kafka.common.serialization.StringSerializer
 #      value-serializer: org.apache.kafka.common.serialization.StringSerializer
+
+datasource-property:
+  ccms-full:
+    driver-class-name: oracle.jdbc.driver.OracleDriver
+    url: jdbc:oracle:thin:@10.60.157.135:1521:vt
+    username: CCMS_FULL
+    password: CCMS_FULL#123
+    max_pool_size: 32
+  acd-full:
+    driver-class-name: oracle.jdbc.driver.OracleDriver
+    url: jdbc:oracle:thin:@10.60.157.135:1521:vt
+    username: ACD_FULL
+    password: ACD_FULL#123
+    max_pool_size: 32
+
+
+
+
+