quangdn

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

 package com.viettel.campaign.filter;
 
-import com.viettel.campaign.utils.RedisUtil;
-import com.viettel.econtact.filter.UserSession;
-import org.apache.log4j.Logger;
 import org.springframework.stereotype.Component;
 
 import javax.servlet.*;
@@ -31,7 +28,7 @@ public class CorsFilter implements Filter {
 
         HttpServletRequest request = (HttpServletRequest) req;
 
-        chain.doFilter(req, resp);
+        chain.doFilter(req, response);
 
 //        if ("OPTIONS".equalsIgnoreCase(request.getMethod())) {
 //            chain.doFilter(req, resp);

src/main/java/com/viettel/campaign/utils/Config.java

 package com.viettel.campaign.utils;
 
-import com.viettel.security.PassTranformer;
 import org.apache.log4j.Logger;
 
 import java.io.File;
@@ -16,6 +15,7 @@ public class Config {
 
     public static final String APP_CONF_FILE_PATH = System.getProperty("user.dir") + File.separator + "etc" + File.separator + "app.conf";
     public static final String LOG_CONF_FILE_PATH = System.getProperty("user.dir") + File.separator + "etc" + File.separator + "log.conf";
+    public static final String EXCEL_DIR = System.getProperty("user.dir") + File.separator + "etc";
 
     public static String amcd_xmlrpc_url;
     public static int num_client_amcd_xmlprc;

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

@@ -5,6 +5,7 @@ import com.viettel.campaign.model.ccms_full.CustomizeFieldObject;
 import com.viettel.campaign.model.ccms_full.CustomizeFields;
 import com.viettel.campaign.service.CustomerService;
 import com.viettel.campaign.utils.BundleUtils;
+import com.viettel.campaign.utils.Config;
 import com.viettel.campaign.utils.Constants;
 import com.viettel.campaign.utils.RedisUtil;
 import com.viettel.campaign.web.dto.*;
@@ -187,12 +188,17 @@ public class CustomerController {
 
     @PostMapping(value = "/importFile")
     public ResponseEntity<?> importFile(@RequestParam("file") MultipartFile file,
-                                        @RequestParam("customerListId") Long customerListId,
-                                        @RequestHeader("X-Auth-Token") String authToken) {
+                                        @RequestParam("customerListId") String customerListId,
+                                        HttpServletRequest request) {
         LOGGER.info("------------IMPORT FILE TEMPLATE--------------");
         Locale locale = new Locale("vi", "VN");
         try {
-            UserSession userSession = (UserSession) RedisUtil.getInstance().get(authToken);
+            UserSession userSession = (UserSession) RedisUtil.getInstance().get(request.getHeader("X-Auth-Token"));
+            if (userSession == null) {
+                userSession = new UserSession();
+                userSession.setSiteId(662691L);
+                userSession.setUserName("its3");
+            }
             if (file.isEmpty()) {
                 return new ResponseEntity<>(BundleUtils.getLangString("customer.fileNotSelected"), HttpStatus.OK);
             }
@@ -201,7 +207,7 @@ public class CustomerController {
             }
             String path = saveUploadFile(file);
             List<CustomizeFields> dynamicHeaders = customerService.getDynamicHeader(userSession.getCompanySiteId());
-            Map<String, Object> map = customerService.readAndValidateCustomer(path, dynamicHeaders, userSession, customerListId);
+            Map<String, Object> map = customerService.readAndValidateCustomer(path, dynamicHeaders, userSession, Long.parseLong(customerListId));
             File fileExport = (File) map.get("file");
             String message = (String) map.get("message");
             return ResponseEntity.ok()
@@ -239,11 +245,13 @@ public class CustomerController {
             String currentTime = new SimpleDateFormat("yyyy_MM_dd_hh_mm_ss").format(new Date());
             String fileName = FilenameUtils.getBaseName(file.getOriginalFilename()) + "_" + currentTime + "." + FilenameUtils.getExtension(file.getOriginalFilename());
             byte[] content = file.getBytes();
-            File uploadFolder = new File(BundleUtils.getGlobalConfig("import.uploadFolder"));
+//            File uploadFolder = new File(BundleUtils.getGlobalConfig("import.uploadFolder"));
+            File uploadFolder = new File(Config.EXCEL_DIR);
             if (!uploadFolder.exists()) {
                 uploadFolder.mkdir();
             }
-            Path path = Paths.get(BundleUtils.getGlobalConfig("import.uploadFolder"), fileName);
+//            Path path = Paths.get(BundleUtils.getGlobalConfig("import.uploadFolder"), fileName);
+            Path path = Paths.get(Config.EXCEL_DIR, fileName);
             Files.write(path, content);
             return path.toString();
         } catch (Exception e) {

src/main/resources/application.yml

@@ -11,6 +11,11 @@ spring:
       ddl-auto: none
       naming:
         physical-strategy: org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl
+  servlet:
+    multipart:
+      enabled: true
+      max-file-size: 3MB
+      max-request-size: 3MB
 #  kafka:
 #    consumer:
 #      bootstrap-servers: 192.168.1.201:9092
@@ -40,4 +45,3 @@ datasource-property:
 
 
 
-