quangdn

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

@@ -26,18 +26,19 @@ public class CorsFilter implements Filter {
         response.setHeader("Access-Control-Allow-Origin", "*");
         response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE, PUT");
         response.setHeader("Access-Control-Max-Age", "3600");
-        response.setHeader("Access-Control-Allow-Headers", "Origin, Authorization, X-Requested-With, Content-Type, Accept, token1, X-Auth-Token");
+        response.setHeader("Access-Control-Allow-Headers", "Origin, Authorization, X-Requested-With, Content-Type, Accept, token1, X-Auth-Token, Message");
+        response.setHeader("Access-Control-Expose-Headers", "Message");
 
         HttpServletRequest request = (HttpServletRequest) req;
 
-        chain.doFilter(req, response);
+//        chain.doFilter(req, response);
 
         if ("OPTIONS".equalsIgnoreCase(request.getMethod())) {
-            chain.doFilter(req, resp);
+            chain.doFilter(request, resp);
             return;
         }
         if ("/".equals(request.getRequestURI())) {
-            chain.doFilter(req, resp);
+            chain.doFilter(request, resp);
             return;
         }
         String xAuthToken = request.getHeader("X-Auth-Token");
@@ -47,7 +48,7 @@ public class CorsFilter implements Filter {
         }
         Object obj = RedisUtil.getInstance().get(xAuthToken);
         if (obj instanceof UserSession) {
-            chain.doFilter(req, resp);
+            chain.doFilter(request, resp);
         } else {
             response.sendError(HttpServletResponse.SC_UNAUTHORIZED, "The token is invalid.");
         }

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

@@ -9,7 +9,10 @@ import com.viettel.campaign.repository.ccms_full.*;
 import com.viettel.campaign.service.CustomerService;
 import com.viettel.campaign.utils.*;
 import com.viettel.campaign.web.dto.*;
-import com.viettel.campaign.web.dto.request_dto.*;
+import com.viettel.campaign.web.dto.request_dto.CustomerDetailRequestDTO;
+import com.viettel.campaign.web.dto.request_dto.CustomerQueryDTO;
+import com.viettel.campaign.web.dto.request_dto.CustomerRequestDTO;
+import com.viettel.campaign.web.dto.request_dto.SearchCustomerRequestDTO;
 import com.viettel.econtact.filter.UserSession;
 import cz.jirutka.rsql.parser.RSQLParser;
 import cz.jirutka.rsql.parser.ast.Node;
@@ -44,8 +47,6 @@ import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.nio.file.Files;
-import java.io.FileOutputStream;
-import java.lang.reflect.Array;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -992,7 +993,7 @@ public class CustomerServiceImpl implements CustomerService {
                 Cell cell = row.getCell(i);
                 if (!cell.getStringCellValue().equals(header.get(i).getTitle().split("#")[0])) {
                     result.put("content", Files.readAllBytes(file.toPath()));
-                    result.put("message", BundleUtils.getLangString("customer.invalidTemplate", locale));
+                    result.put("message", "template-invalid");
                     return result;
                 }
             }
@@ -1002,7 +1003,7 @@ public class CustomerServiceImpl implements CustomerService {
 
             //<editor-fold desc="Kiểm tra file dữ liệu rỗng" defaultstate="collapsed">
             if (sheet.getPhysicalNumberOfRows() == 3) {
-                result.put("message", BundleUtils.getLangString("customer.noData", locale));
+                result.put("message", "template-no-data");
                 result.put("content", Files.readAllBytes(file.toPath()));
                 return result;
             } else {
@@ -1046,7 +1047,7 @@ public class CustomerServiceImpl implements CustomerService {
                     if (!str.equals("")) {
                         sb.append(str);
                     }
-                } else sb.append(BundleUtils.getLangString("customer.nameRequired"));
+                } else sb.append(BundleUtils.getLangString("customer.nameRequired", locale));
                 if (rawDataList.get(i).length > 4
                         && rawDataList.get(i)[2] != null
                         && !rawDataList.get(i)[2].toString().trim().equals("")
@@ -1248,21 +1249,21 @@ public class CustomerServiceImpl implements CustomerService {
                 os.close();
                 workbook.close();
                 result.put("content", os.toByteArray());
-                result.put("message", BundleUtils.getLangString("customer.importSuccess", locale));
+                result.put("message", "");
             } else {
                 workbook.write(os);
                 os.flush();
                 os.close();
                 workbook.close();
                 result.put("content", os.toByteArray());
-                result.put("message", BundleUtils.getLangString("customer.importFailed", locale));
+                result.put("message", "import-error");
             }
             //</editor-fold>
 
             return result;
         } catch (Exception e) {
             LOGGER.info(e.getMessage());
-            result.put("message", BundleUtils.getLangString("customer.errorValidate", locale));
+            result.put("message", "validate-error");
             return result;
         }
     }

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

@@ -5,14 +5,11 @@ import com.viettel.campaign.model.ccms_full.CustomizeFieldObject;
 import com.viettel.campaign.model.ccms_full.CustomizeFields;
 import com.viettel.campaign.repository.ccms_full.CustomerQueryRepository;
 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.*;
-import com.viettel.campaign.web.dto.request_dto.CustomerQueryDTO;
 import com.viettel.campaign.web.dto.request_dto.CustomerRequestDTO;
-import com.viettel.campaign.web.dto.request_dto.CustomizeRequestDTo;
 import com.viettel.campaign.web.dto.request_dto.SearchCustomerRequestDTO;
 import com.viettel.econtact.filter.UserSession;
 import org.apache.commons.io.FilenameUtils;
@@ -201,10 +198,10 @@ public class CustomerController {
         try {
             UserSession userSession = (UserSession) RedisUtil.getInstance().get(request.getHeader("X-Auth-Token"));
             if (file.isEmpty()) {
-                return new ResponseEntity<>(BundleUtils.getLangString("customer.fileNotSelected"), HttpStatus.OK);
+                return new ResponseEntity<>("file-empty", HttpStatus.OK);
             }
             if (!Objects.equals(FilenameUtils.getExtension(file.getOriginalFilename()), Constants.FileType.xlsx)) {
-                return new ResponseEntity<>(BundleUtils.getLangString("customer.invalidTemplate", locale), HttpStatus.OK);
+                return new ResponseEntity<>("template-invalid", HttpStatus.OK);
             }
             String path = saveUploadFile(file);
             List<CustomizeFields> dynamicHeaders = customerService.getDynamicHeader(userSession.getCompanySiteId());

src/main/resources/i18n/language_en.properties

@@ -87,7 +87,6 @@ customer.cusType.vip = VIP
 customer.cusType.blacklist = Blacklist
 customer.yes = Yes
 customer.not = No
-customer.invalidTemplate = Invalid Template
 customer.noData = Template empty
 customer.nameRequired = Full name required;
 customer.emailMax50 = Email must less than 50 character;
@@ -102,7 +101,6 @@ customer.notGreaterThan = not greater than
 customer.notLessThan = not less than
 customer.importCustomer = IMPORT CUSTOMER
 customer.notice = Attention: A record is valid when Full Name is not null and one of three fields Main phone, secondary phone or email is not null
-customer.fileNotSelected=Please select a file
 customer.emailInvalid=Invalid email;
 customer.emailExists=Email exists;
 

src/main/resources/i18n/language_vi.properties

@@ -89,7 +89,6 @@ customer.cusType.vip = VIP
 customer.cusType.blacklist = Blacklist
 customer.yes = Có
 customer.not = Không
-customer.invalidTemplate = Template sai định dạng
 customer.noData = Template không có dữ liệu
 customer.nameRequired = Họ và tên không được để trống;
 customer.emailMax50 = Email không được quá 50 kí tự;
@@ -104,7 +103,6 @@ customer.notGreaterThan = không được lớn hơn
 customer.notLessThan = không được nhỏ hơn
 customer.importCustomer = IMPORT KHÁCH HÀNG
 customer.notice = Chú ý: 1 bản ghi được coi là hợp lệ bắt buộc phải có thông tin Họ và Tên và 1 trong 3 thông tin liên lạc (số điện thoại chính, số điện thoại phụ hoặc email)
-customer.fileNotSelected=Bạn chưa chọn file
 customer.emailInvalid=Email không đúng định dạng;
 customer.emailExists=Email đã tồn tại;