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

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;
 

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

-package com.viettel.campaign.filter;
-
-import lombok.Getter;
-import lombok.Setter;
-
-import java.io.Serializable;
-
-/**
- * @author hanv_itsol
- * @project service-campaign
- */
-
-@Getter
-@Setter
-public class UserSession implements Serializable {
-    String authToken;
-    String ownserId;
-    String accountId;
-    Long userId;
-    String userName;
-    String role;
-    Long siteId;
-    Long companySiteId;
-    Long expTime;
-}

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

 package com.viettel.campaign.utils;
 
+import org.apache.commons.lang3.SerializationUtils;
 import org.apache.log4j.Logger;
 import redis.clients.jedis.JedisCluster;
 import redis.clients.jedis.HostAndPort;
@@ -86,7 +87,7 @@ public class RedisUtil {
 //        Jedis jedis = null;
         try {
             JedisCluster jedis = getRedis();
-            jedis.set(key.getBytes(), org.springframework.util.SerializationUtils.serialize(value));
+            jedis.set(key.getBytes(), SerializationUtils.serialize(value));
             jedis.expire(key.getBytes(), 60); // exprire
         } catch (Exception ex) {
             logger.error(ex.getMessage(), ex);
@@ -104,7 +105,7 @@ public class RedisUtil {
             JedisCluster jedis = getRedis();
             byte[] value = jedis.get(key.getBytes());
             if (value != null && value.length > 0) {
-                object = (Object) org.springframework.util.SerializationUtils.deserialize(value);
+                object = SerializationUtils.deserialize(value);
             }
         } catch (Exception ex) {
             logger.error(ex.getMessage(), ex);

src/main/java/com/viettel/econtact/filter/UserSession.java

+package com.viettel.econtact.filter;
+
+
+import java.io.Serializable;
+
+/**
+ * @author hanv_itsol
+ * @project service-campaign
+ */
+
+public class UserSession implements Serializable{
+
+    String authToken;
+    String ownserId;
+    String accountId;
+    Long userId;
+    String userName;
+    String role;
+    Long siteId;
+    Long companySiteId;
+    long expTime;
+
+    public String getAuthToken() {
+        return authToken;
+    }
+
+    public void setAuthToken(String authToken) {
+        this.authToken = authToken;
+    }
+
+    public String getOwnserId() {
+        return ownserId;
+    }
+
+    public void setOwnserId(String ownserId) {
+        this.ownserId = ownserId;
+    }
+
+    public String getAccountId() {
+        return accountId;
+    }
+
+    public void setAccountId(String accountId) {
+        this.accountId = accountId;
+    }
+
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public String getRole() {
+        return role;
+    }
+
+    public void setRole(String role) {
+        this.role = role;
+    }
+
+    public Long getSiteId() {
+        return siteId;
+    }
+
+    public void setSiteId(Long siteId) {
+        this.siteId = siteId;
+    }
+
+    public Long getCompanySiteId() {
+        return companySiteId;
+    }
+
+    public void setCompanySiteId(Long companySiteId) {
+        this.companySiteId = companySiteId;
+    }
+
+    public long getExpTime() {
+        return expTime;
+    }
+
+    public void setExpTime(long expTime) {
+        this.expTime = expTime;
+    }
+}

src/main/java/com/viettel/econtact/package-info.java

+/**
+ * @project campaign
+ * @author hanv_itsol
+ */
+package com.viettel.econtact;
\ No newline at end of file

src/main/resources/application.yml

@@ -23,14 +23,14 @@ spring:
       ddl-auto: none
       naming:
         physical-strategy: org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl
-  kafka:
-    consumer:
-      bootstrap-servers: 192.168.1.201:9092
-      group-id: group_id
-      auto-offset-reset: earliest
-      key-deserializer: org.apache.kafka.common.serialization.StringDeserializer
-      value-deserializer: org.apache.kafka.common.serialization.StringDeserializer
-    producer:
-      bootstrap-servers: 192.168.1.201:9092
-      key-serializer: org.apache.kafka.common.serialization.StringSerializer
-      value-serializer: org.apache.kafka.common.serialization.StringSerializer
+#  kafka:
+#    consumer:
+#      bootstrap-servers: 192.168.1.201:9092
+#      group-id: group_id
+#      auto-offset-reset: earliest
+#      key-deserializer: org.apache.kafka.common.serialization.StringDeserializer
+#      value-deserializer: org.apache.kafka.common.serialization.StringDeserializer
+#    producer:
+#      bootstrap-servers: 192.168.1.201:9092
+#      key-serializer: org.apache.kafka.common.serialization.StringSerializer
+#      value-serializer: org.apache.kafka.common.serialization.StringSerializer