merge

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

 package com.viettel.campaign;
 //
 //import com.viettel.campaign.utils.Config;
+import com.viettel.campaign.utils.Config;
 import com.viettel.campaign.utils.RedisUtil;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;

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/utils/Config.java

 package com.viettel.campaign.utils;
 
-import com.viettel.security.PassTranformer;
+//import com.viettel.security.PassTranformer;
 import org.apache.log4j.Logger;
 
 import java.io.File;
@@ -60,7 +60,7 @@ public class Config {
         } catch (IOException ex) {
             Logger.getLogger(Config.class.getName()).error(ex.getMessage(), ex);
         }
-        PassTranformer.setInputKey("Ipcc#987654321#@!");
+//        PassTranformer.setInputKey("Ipcc#987654321#@!");
 
 //        rabbitConnection = properties.getProperty("rabbit_connection_string");
 //        fbGatewayUser = PassTranformer.decrypt(properties.getProperty("rabbit_user", "").trim());