Merge branch 'style' into jmh

src/main/java/com/style24/core/biz/thirdparty/FingerPushSender.java

@@ -1,14 +1,9 @@
 package com.style24.core.biz.thirdparty;
 
-import com.gagaframework.web.parameter.GagaMap;
-import com.gagaframework.web.util.GagaStringUtil;
-import com.style24.core.biz.dao.FingerPushDao;
-import com.style24.core.biz.dao.TscAnswerPhaseDao;
-import com.style24.core.support.env.TscConstants;
-import com.style24.persistence.domain.AnswerPhase;
-import com.style24.persistence.domain.FingerPush;
+import java.util.ArrayList;
+import java.util.List;
 
-import lombok.extern.slf4j.Slf4j;
+import javax.annotation.PostConstruct;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.annotation.Cacheable;
@@ -16,10 +11,15 @@ import org.springframework.core.env.Environment;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.annotation.PostConstruct;
-import java.util.ArrayList;
+import com.gagaframework.web.parameter.GagaMap;
+import com.gagaframework.web.util.GagaStringUtil;
+import com.style24.core.biz.dao.FingerPushDao;
+import com.style24.core.biz.dao.TscAnswerPhaseDao;
+import com.style24.core.support.env.TscConstants;
+import com.style24.persistence.domain.AnswerPhase;
+import com.style24.persistence.domain.FingerPush;
 
-import java.util.List;
+import lombok.extern.slf4j.Slf4j;
 
 @Component
 @Slf4j
@@ -89,7 +89,7 @@ public class FingerPushSender {
 		fingerPush.setPmode("STOS");
 
 		// 앱푸시(핑거푸시) 발송
-		if ("run".equals(active) || "style".equals(active) || "locp".equals(active)) {
+		if ("style".equals(active) || "locp".equals(active) || "stage".equals(active) || "brdg".equals(active)) {
 			fingerPushDao.createAgpushQueue(fingerPush);
 		} else {
 			fingerPushDao.createAgpushQueueDev(fingerPush);

src/main/java/com/style24/core/biz/thirdparty/NetpathyMailSender.java

@@ -11,6 +11,8 @@ import org.springframework.core.env.Environment;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 
+import com.gagaframework.web.parameter.GagaMap;
+import com.gagaframework.web.util.GagaStringUtil;
 import com.style24.core.biz.dao.NetpathyMailDao;
 import com.style24.core.biz.service.TscMailTemplateService;
 import com.style24.core.support.env.TscConstants;
@@ -19,9 +21,6 @@ import com.style24.persistence.domain.Netpathy;
 
 import lombok.extern.slf4j.Slf4j;
 
-import com.gagaframework.web.parameter.GagaMap;
-import com.gagaframework.web.util.GagaStringUtil;
-
 /**
  * 넷퍼시를 이용한 메일 발송
  * 
@@ -136,7 +135,7 @@ public class NetpathyMailSender {
 		netpathy.setContent(contentBuilder.toString());
 
 		// 메일 생성
-		if ("run".equals(active) || "style".equals(active) || "locp".equals(active)) {
+		if ("style".equals(active) || "locp".equals(active) || "stage".equals(active) || "brdg".equals(active)) {
 			netpathyDao.createMail(netpathy);
 		} else {
 			netpathyDao.createMailDev(netpathy);

src/main/java/com/style24/core/biz/thirdparty/SsgKakaoSender.java

@@ -218,7 +218,7 @@ public class SsgKakaoSender {
 		}
 
 		// 카카오 알림톡 발송
-		if ("run".equals(active) || "style".equals(active) || "locp".equals(active)) {
+		if ("style".equals(active) || "locp".equals(active) || "stage".equals(active) || "brdg".equals(active)) {
 			dmDao.createKakao(dm);
 		} else {
 			dmDao.createKakaoDev(dm);
@@ -240,7 +240,7 @@ public class SsgKakaoSender {
 		AnswerPhase ansPhase = this.getAnswerPhase(ansSq, replaceInfo);
 		dm.setFmessage(ansPhase.getAnsContent());
 		dm.setFcallback(callbackTelNo);
-		if ("run".equals(active) || "style".equals(active)) {
+		if ("style".equals(active) || "locp".equals(active) || "stage".equals(active) || "brdg".equals(active)) {
 			dmDao.createSms(dm);
 		} else {
 			dmDao.createSmsDev(dm);
@@ -262,7 +262,7 @@ public class SsgKakaoSender {
 		dm.setFsubject(ansPhase.getAnsTitle());
 		dm.setFmessage(ansPhase.getAnsContent());
 		dm.setFcallback(callbackTelNo);
-		if ("run".equals(active) || "style".equals(active)) {
+		if ("style".equals(active) || "locp".equals(active) || "stage".equals(active) || "brdg".equals(active)) {
 			dmDao.createLms(dm);
 		} else {
 			dmDao.createLmsDev(dm);
@@ -284,7 +284,7 @@ public class SsgKakaoSender {
 		dm.setFsubject(ansPhase.getAnsTitle());
 		dm.setFmessage(ansPhase.getAnsContent());
 		dm.setFcallback(replaceInfo.getString("callcenterTelNo"));
-		if ("run".equals(active) || "style".equals(active)) {
+		if ("style".equals(active) || "locp".equals(active) || "stage".equals(active) || "brdg".equals(active)) {
 			dmDao.createLms(dm);
 		} else {
 			dmDao.createLmsDev(dm);

src/main/java/com/style24/core/support/config/TscRedisCacheConfig.java

@@ -53,7 +53,7 @@ public class TscRedisCacheConfig {
 	public RedisConnectionFactory redisConnectionFactory() {
 		String active = env.getProperty("spring.profiles.active");
 		// 레디스 클러스터 기능 추가
-		if ("run".equals(active) || "style".equals(active) || "brdg".equals(active) || "stage".equals(active)) {
+		if ("style".equals(active) || "brdg".equals(active) || "stage".equals(active)) {
 			String clusterNodes = env.getProperty("spring.redis.cluster.nodes");
 			RedisClusterConfiguration redisClusterConfiguration = new RedisClusterConfiguration();
 			List<String> clusterList = Arrays.asList(clusterNodes.split(" "));