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

pom.xml

@@ -49,8 +49,8 @@
         <dependency>
             <groupId>com.oracle</groupId>
             <artifactId>ojdbc7</artifactId>
-            <scope>system</scope>
-            <systemPath>${project.basedir}/lib/ojdbc7.jar</systemPath>
+<!--            <scope>system</scope>-->
+<!--            <systemPath>${project.basedir}/lib/ojdbc7.jar</systemPath>-->
             <version>1.0</version>
         </dependency>
         <dependency>

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/repository/ccms_full/impl/CampaignRepositoryImpl.java

@@ -159,7 +159,7 @@ public class CampaignRepositoryImpl implements CampaignRepositoryCustom {
                 sb.append(" AND a.CUSTOMER_NUMBER <= :p_cusNumTo");
             }
 
-            sb.append(" ORDER BY a.START_TIME DESC ");
+            sb.append(" ORDER BY a.CREATE_TIME DESC ");
 
             SQLQuery query = session.createSQLQuery(sb.toString());
             if (!DataUtil.isNullOrEmpty(requestDto.getCampaignCode())) {

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

@@ -156,7 +156,7 @@ public class CampaignController {
         return new ResponseEntity<byte[]>(contentReturn, headers, HttpStatus.OK);
     }
 
-    @RequestMapping(value = "/changeCampaignStatus", method = RequestMethod.PUT)
+    @RequestMapping(value = "/changeCampaignStatus", method = RequestMethod.POST)
     public ResultDTO changeCampaignStatus(@RequestBody CampaignDTO dto, HttpServletRequest request) {
         dto.setSessionId(request.getSession().getId());
         return campaignService.changeCampaignStatus(dto);