|
@@ -25,6 +25,7 @@ import com.google.gson.Gson;
|
|
import com.google.gson.JsonArray;
|
|
import com.google.gson.JsonArray;
|
|
import com.google.gson.JsonElement;
|
|
import com.google.gson.JsonElement;
|
|
import com.google.gson.JsonObject;
|
|
import com.google.gson.JsonObject;
|
|
|
|
+import com.icontrols.bridge.common.COMMON_INFO;
|
|
import com.icontrols.bridge.common.CommonUtil;
|
|
import com.icontrols.bridge.common.CommonUtil;
|
|
import com.icontrols.bridge.dto.ServiceDetail;
|
|
import com.icontrols.bridge.dto.ServiceDetail;
|
|
|
|
|
|
@@ -144,12 +145,9 @@ public class MsgServerHandler extends Thread {
|
|
final String bottomStr = isContainCompany?rcvMsgStr.substring(rcvMsgStr.indexOf("</req_company>")):"";
|
|
final String bottomStr = isContainCompany?rcvMsgStr.substring(rcvMsgStr.indexOf("</req_company>")):"";
|
|
|
|
|
|
// ¼ºñ½º ¸ñ·Ï °¡Á®¿À±â
|
|
// ¼ºñ½º ¸ñ·Ï °¡Á®¿À±â
|
|
- String str = CommonUtil.readFile(CommonUtil.getPropFileDir());
|
|
|
|
- JsonObject object = CommonUtil.getJsonObject(str);
|
|
|
|
- JsonArray list = (JsonArray)object.get("services");
|
|
|
|
-
|
|
|
|
- for(JsonElement jsonObj : list) {
|
|
|
|
- ServiceDetail service = new Gson().fromJson(jsonObj.toString(), ServiceDetail.class);
|
|
|
|
|
|
+ for(ServiceDetail service : COMMON_INFO.serviceDtailList) {
|
|
|
|
+// for(JsonElement jsonObj : COMMON_INFO.propList) {
|
|
|
|
+// ServiceDetail service = new Gson().fromJson(jsonObj.toString(), ServiceDetail.class);
|
|
|
|
|
|
if(!Arrays.asList(service.getEvents()).contains(eventName)) continue;
|
|
if(!Arrays.asList(service.getEvents()).contains(eventName)) continue;
|
|
|
|
|
|
@@ -180,9 +178,7 @@ public class MsgServerHandler extends Thread {
|
|
|
|
|
|
StringBuffer logSB = new StringBuffer();
|
|
StringBuffer logSB = new StringBuffer();
|
|
|
|
|
|
- logSB.append("\n***************************************************\n")
|
|
|
|
- .append(" S E N D T O " + service.getPort() + " C O M P L I T E ! ! ! ! \n")
|
|
|
|
- .append("***************************************************");
|
|
|
|
|
|
+ logSB.append(" S E N D T O " + service.getPort() + " C O M P L I T E ! ! ! ! \n");
|
|
|
|
|
|
logger.info(logSB.toString());
|
|
logger.info(logSB.toString());
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|