Browse Source

调整所有日志打印的地方

menglu 4 years ago
parent
commit
08615af478

+ 8 - 8
ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/service/DaemonThread.java

@@ -6,19 +6,19 @@ import java.util.Date;
 
 import javax.annotation.PostConstruct;
 
-import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
 import com.persagy.ibms.data.sdk.util.ComputeUtil;
 import com.persagy.ibms.data.sdk.util.Constant;
 import com.persagy.ibms.data.sdk.util.DeamonUtil;
-import com.persagy.ibms.data.sdk.util.LogUtil;
 import com.persagy.ibms.data.sdk.util.RWDDownloadUtil;
 import com.persagy.ibms.data.sdk.util.Repository;
 import com.persagy.ibms.data.sdk.util.RepositoryBase;
 import com.persagy.ibms.data.sdk.websocket.AlarmWebSocketClient;
 import com.persagy.ibms.data.sdk.websocket.IOTWebSocketClient;
 
+import lombok.extern.slf4j.Slf4j;
+
 @Slf4j
 @Component
 public class DaemonThread extends Thread {
@@ -49,8 +49,8 @@ public class DaemonThread extends Thread {
 					String tmpPath = Constant.physical_world + Constant.getSeperator() + sdf.format(currTime);
 					RWDDownloadUtil.LoadPhysicalWorld(tmpPath);
 				}
-			} catch (Exception e2) {
-				e2.printStackTrace();
+			} catch (Exception e) {
+				log.error(e.getMessage(), e);
 			}
 			try {
 				String validPath = Constant.getLatestPath(Constant.config, false);
@@ -58,8 +58,8 @@ public class DaemonThread extends Thread {
 					String tmpPath = Constant.config + Constant.getSeperator() + sdf.format(currTime) + ".json";
 					RWDDownloadUtil.LoadConfig(tmpPath);
 				}
-			} catch (Exception e2) {
-				e2.printStackTrace();
+			} catch (Exception e) {
+				log.error(e.getMessage(), e);
 			}
 		}
 
@@ -108,8 +108,8 @@ public class DaemonThread extends Thread {
 					e.printStackTrace();
 				}
 			}
-		} catch (Exception e1) {
-			LogUtil.error(e1);
+		} catch (Exception e) {
+			log.error(e.getMessage(), e);
 		}
 	}
 }

+ 2 - 1
ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/service/rest/RestUtil.java

@@ -232,7 +232,8 @@ public class RestUtil {
 		Repository Repository = RepositoryBase.instance;
 		try {
 			if (valuePath[valuePath.length - 1].equals("工单")) {
-				JSONObject work_order = FastJsonReaderUtil.Instance().ReadJSONObject(new File(Constant.GetPath() + "/work_order_sample.json"));
+				JSONObject work_order = FastJsonReaderUtil.Instance()
+						.ReadJSONObject(new File(Constant.GetPath() + Constant.getSeperator() + "work_order_sample.json"));
 				JSONArray work_orders = new JSONArray();
 				work_orders.add(work_order);
 				return FastJsonUtil.toString(work_orders);

+ 2 - 2
ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/util/ComputeUtil.java

@@ -55,7 +55,7 @@ public class ComputeUtil {
 		try {
 			DeamonUtil.Process(Repository);
 		} catch (Exception e) {
-			e.printStackTrace();
+			log.error(e.getMessage(), e);
 		}
 	}
 
@@ -320,7 +320,7 @@ public class ComputeUtil {
 						}
 						sb.append(ss.propertyName);
 					}
-					LogUtil.info("computeOnce:" + sb.toString());
+					log.info("computeOnce:" + sb.toString());
 					// if (sb.toString().equals("基础对象-设备-设备类型-清单-所属楼栋id")) {
 					// System.out.println();
 					// }

+ 4 - 1
ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/util/FileUtil.java

@@ -7,6 +7,9 @@ import java.io.OutputStreamWriter;
 import java.util.HashMap;
 import java.util.Map;
 
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
 public class FileUtil {
 	public static void Save(String filename, String content) throws Exception {
 		BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(filename), "UTF-8"));
@@ -67,7 +70,7 @@ public class FileUtil {
 
 			return true;
 		} else if (file1.isFile() && file2.isFile()) {
-			LogUtil.info(LogUtil.refreshLoggerName, "Compare " + file1.getPath() + " " + file2.getPath());
+			log.info(LogUtil.refreshLoggerName, "Compare " + file1.getPath() + " " + file2.getPath());
 			Object json1 = FastJsonReaderUtil.Instance().Read(file1);
 			Object json2 = FastJsonReaderUtil.Instance().Read(file2);
 			return FastJsonCompareUtil.Instance().CompareObject(json1, json2);

+ 173 - 182
ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/util/LogUtil.java

@@ -1,190 +1,181 @@
 package com.persagy.ibms.data.sdk.util;
 
-import java.io.File;
-import java.net.URL;
-import java.net.URLDecoder;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.log4j.Logger;
-import org.apache.log4j.PropertyConfigurator;
-
 public class LogUtil {
-	private static Logger logger;
-	private static Map<String, Logger> loggerMap = new HashMap<String, Logger>();
+	// private static Logger logger;
+	// private static Map<String, Logger> loggerMap = new HashMap<String, Logger>();
 	public static String refreshLoggerName = "refreshLogger";
 
-	static {
-		try {
-			String resource = "/log4j.properties";
-			URL resourceUrl = LogUtil.class.getResource(resource);
-			String resourcePath = null;
-			if (resourceUrl == null) {
-				resourcePath = System.getProperty("user.dir") + resource;
-			} else {
-				resourcePath = resourceUrl.getPath();
-			}
-			String GetPath = resourcePath.substring(0, resourcePath.length() - resource.length());
-			String filepathLog4j = GetPath + "/log4j.properties";
-			File fileLog4j = new File(filepathLog4j);
-			if (fileLog4j.exists()) {
-				PropertyConfigurator.configure(URLDecoder.decode(filepathLog4j, "UTF-8"));
-				logger = Logger.getRootLogger();
-				Logger loggerInner = Logger.getLogger(refreshLoggerName);
-				loggerMap.put(refreshLoggerName, loggerInner);
-			} else {
-				PropertyConfigurator.configure(LogUtil.class.getResourceAsStream("/log4j.properties"));
-				logger = Logger.getRootLogger();
-				Logger loggerInner = Logger.getLogger(refreshLoggerName);
-				loggerMap.put(refreshLoggerName, loggerInner);
-			}
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-
-	public static void debug(String message) {
-		debug(null, message);
-	}
-
-	public static void info(String message) {
-		info(null, message);
-	}
-
-	public static void warn(String message) {
-		warn(null, message);
-	}
-
-	public static void error(String message) {
-		error(null, message);
-	}
-
-	public static void fatal(String message) {
-		fatal(null, message);
-	}
-
-	public static void debug(Exception e) {
-		debug(null, e);
-	}
-
-	public static void info(Exception e) {
-		info(null, e);
-	}
-
-	public static void warn(Exception e) {
-		warn(null, e);
-	}
-
-	public static void error(Exception e) {
-		error(null, e);
-	}
-
-	public static void fatal(Exception e) {
-		fatal(null, e);
-	}
-
-	public static void debug(String name, String message) {
-		Logger loggerInner = getLogger(name);
-		if (loggerInner != null) {
-			loggerInner.debug(message);
-		} else {
-			System.out.println("debug " + message);
-		}
-	}
-
-	public static void info(String name, String message) {
-		Logger loggerInner = getLogger(name);
-		if (loggerInner != null) {
-			loggerInner.info(message);
-		} else {
-			System.out.println("info " + message);
-		}
-	}
-
-	public static void warn(String name, String message) {
-		Logger loggerInner = getLogger(name);
-		if (loggerInner != null) {
-			loggerInner.warn(message);
-		} else {
-			System.out.println("warn " + message);
-		}
-	}
-
-	public static void error(String name, String message) {
-		Logger loggerInner = getLogger(name);
-		if (loggerInner != null) {
-			loggerInner.error(message);
-		} else {
-			System.out.println("error " + message);
-		}
-	}
-
-	public static void fatal(String name, String message) {
-		Logger loggerInner = getLogger(name);
-		if (loggerInner != null) {
-			loggerInner.fatal(message);
-		} else {
-			System.out.println("fatal " + message);
-		}
-	}
-
-	public static void debug(String name, Exception e) {
-		Logger loggerInner = getLogger(name);
-		String message = GetExceptionStackTrace(e);
-		if (loggerInner != null) {
-			loggerInner.debug(message);
-		} else {
-			System.out.println("debug " + message);
-		}
-	}
-
-	public static void info(String name, Exception e) {
-		Logger loggerInner = getLogger(name);
-		String message = GetExceptionStackTrace(e);
-		if (loggerInner != null) {
-			loggerInner.info(message);
-		} else {
-			System.out.println("info " + message);
-		}
-	}
-
-	public static void warn(String name, Exception e) {
-		Logger loggerInner = getLogger(name);
-		String message = GetExceptionStackTrace(e);
-		if (loggerInner != null) {
-			loggerInner.warn(message);
-		} else {
-			System.out.println("warn " + message);
-		}
-	}
-
-	public static void error(String name, Exception e) {
-		Logger loggerInner = getLogger(name);
-		String message = GetExceptionStackTrace(e);
-		if (loggerInner != null) {
-			loggerInner.error(message);
-		} else {
-			System.out.println("error " + message);
-		}
-	}
-
-	public static void fatal(String name, Exception e) {
-		Logger loggerInner = getLogger(name);
-		String message = GetExceptionStackTrace(e);
-		if (loggerInner != null) {
-			loggerInner.fatal(message);
-		} else {
-			System.out.println("fatal " + message);
-		}
-	}
-
-	private static Logger getLogger(String name) {
-		if (name == null) {
-			return logger;
-		} else {
-			return loggerMap.get(name);
-		}
-	}
+	// static {
+	// try {
+	// String resource = "/log4j.properties";
+	// URL resourceUrl = LogUtil.class.getResource(resource);
+	// String resourcePath = null;
+	// if (resourceUrl == null) {
+	// resourcePath = System.getProperty("user.dir") + resource;
+	// } else {
+	// resourcePath = resourceUrl.getPath();
+	// }
+	// String GetPath = resourcePath.substring(0, resourcePath.length() - resource.length());
+	// String filepathLog4j = GetPath + "/log4j.properties";
+	// File fileLog4j = new File(filepathLog4j);
+	// if (fileLog4j.exists()) {
+	// PropertyConfigurator.configure(URLDecoder.decode(filepathLog4j, "UTF-8"));
+	// logger = Logger.getRootLogger();
+	// Logger loggerInner = Logger.getLogger(refreshLoggerName);
+	// loggerMap.put(refreshLoggerName, loggerInner);
+	// } else {
+	// PropertyConfigurator.configure(LogUtil.class.getResourceAsStream("/log4j.properties"));
+	// logger = Logger.getRootLogger();
+	// Logger loggerInner = Logger.getLogger(refreshLoggerName);
+	// loggerMap.put(refreshLoggerName, loggerInner);
+	// }
+	// } catch (Exception e) {
+	// e.printStackTrace();
+	// }
+	// }
+	//
+	// public static void debug(String message) {
+	// debug(null, message);
+	// }
+	//
+	// public static void info(String message) {
+	// info(null, message);
+	// }
+	//
+	// public static void warn(String message) {
+	// warn(null, message);
+	// }
+	//
+	// public static void error(String message) {
+	// error(null, message);
+	// }
+	//
+	// public static void fatal(String message) {
+	// fatal(null, message);
+	// }
+	//
+	// public static void debug(Exception e) {
+	// debug(null, e);
+	// }
+	//
+	// public static void info(Exception e) {
+	// info(null, e);
+	// }
+	//
+	// public static void warn(Exception e) {
+	// warn(null, e);
+	// }
+	//
+	// public static void error(Exception e) {
+	// error(null, e);
+	// }
+	//
+	// public static void fatal(Exception e) {
+	// fatal(null, e);
+	// }
+
+	// public static void debug(String name, String message) {
+	// Logger loggerInner = getLogger(name);
+	// if (loggerInner != null) {
+	// loggerInner.debug(message);
+	// } else {
+	// System.out.println("debug " + message);
+	// }
+	// }
+	//
+	// public static void info(String name, String message) {
+	// Logger loggerInner = getLogger(name);
+	// if (loggerInner != null) {
+	// loggerInner.info(message);
+	// } else {
+	// System.out.println("info " + message);
+	// }
+	// }
+	//
+	// public static void warn(String name, String message) {
+	// Logger loggerInner = getLogger(name);
+	// if (loggerInner != null) {
+	// loggerInner.warn(message);
+	// } else {
+	// System.out.println("warn " + message);
+	// }
+	// }
+	//
+	// public static void error(String name, String message) {
+	// Logger loggerInner = getLogger(name);
+	// if (loggerInner != null) {
+	// loggerInner.error(message);
+	// } else {
+	// System.out.println("error " + message);
+	// }
+	// }
+	//
+	// public static void fatal(String name, String message) {
+	// Logger loggerInner = getLogger(name);
+	// if (loggerInner != null) {
+	// loggerInner.fatal(message);
+	// } else {
+	// System.out.println("fatal " + message);
+	// }
+	// }
+	//
+	// public static void debug(String name, Exception e) {
+	// Logger loggerInner = getLogger(name);
+	// String message = GetExceptionStackTrace(e);
+	// if (loggerInner != null) {
+	// loggerInner.debug(message);
+	// } else {
+	// System.out.println("debug " + message);
+	// }
+	// }
+	//
+	// public static void info(String name, Exception e) {
+	// Logger loggerInner = getLogger(name);
+	// String message = GetExceptionStackTrace(e);
+	// if (loggerInner != null) {
+	// loggerInner.info(message);
+	// } else {
+	// System.out.println("info " + message);
+	// }
+	// }
+	//
+	// public static void warn(String name, Exception e) {
+	// Logger loggerInner = getLogger(name);
+	// String message = GetExceptionStackTrace(e);
+	// if (loggerInner != null) {
+	// loggerInner.warn(message);
+	// } else {
+	// System.out.println("warn " + message);
+	// }
+	// }
+	//
+	// public static void error(String name, Exception e) {
+	// Logger loggerInner = getLogger(name);
+	// String message = GetExceptionStackTrace(e);
+	// if (loggerInner != null) {
+	// loggerInner.error(message);
+	// } else {
+	// System.out.println("error " + message);
+	// }
+	// }
+	//
+	// public static void fatal(String name, Exception e) {
+	// Logger loggerInner = getLogger(name);
+	// String message = GetExceptionStackTrace(e);
+	// if (loggerInner != null) {
+	// loggerInner.fatal(message);
+	// } else {
+	// System.out.println("fatal " + message);
+	// }
+	// }
+	//
+	// private static Logger getLogger(String name) {
+	// if (name == null) {
+	// return logger;
+	// } else {
+	// return loggerMap.get(name);
+	// }
+	// }
 
 	public static String GetExceptionStackTrace(Exception e) {
 		StringBuffer sb = new StringBuffer();

+ 5 - 5
ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/util/RWDDownloadUtil.java

@@ -94,13 +94,13 @@ public class RWDDownloadUtil {
 				criteria.put("classCode", code);
 				criteria.put("valid", 1);
 				param.put("criteria", criteria);
-				LogUtil.info(LogUtil.refreshLoggerName, "Download info " + code);
+				log.info(LogUtil.refreshLoggerName, "Download info " + code);
 				String post_result = HttpClientUtil.post(Constant.rwd_url + "rwd/def/funcid", param.toJSONString());
 				JSONObject resultJSON = JSON.parseObject(post_result);
 				infoArray = resultJSON.getJSONArray("data");
 			}
 			infoArray = infoArray == null ? new JSONArray() : infoArray;
-			FileUtil.Save(path + Constant.getSeperator() + "info" + Constant.getSeperator() + code + ".json", FastJsonUtil.toFormatString(infoArray));
+			FileUtil.Save(Constant.GetPath() + Constant.getSeperator() + "info" + Constant.getSeperator() + code + ".json", FastJsonUtil.toFormatString(infoArray));
 		}
 		for (int i = 0; i < classArray.size(); i++) {
 			JSONObject item = (JSONObject) classArray.get(i);
@@ -114,7 +114,7 @@ public class RWDDownloadUtil {
 				criteria.put("classCode", code);
 				criteria.put("valid", 1);
 				param.put("criteria", criteria);
-				LogUtil.info(LogUtil.refreshLoggerName, "Download object " + code);
+				log.info(LogUtil.refreshLoggerName, "Download object " + code);
 				String post_result = HttpClientUtil.post(Constant.rwd_url + "rwd/instance/object/query?projectId=" + RepositoryBase.projectId
 						+ "&groupCode=" + RepositoryBase.groupCode, param.toJSONString());
 				JSONObject resultJSON = JSON.parseObject(post_result);
@@ -125,7 +125,7 @@ public class RWDDownloadUtil {
 					FastJsonUtil.toFormatString(infoArray));
 		}
 		Map<String, Map<String, Integer>> relDic = new HashMap<String, Map<String, Integer>>();
-		ExcelRelationUtil.ReadRel("2.6-relation.xlsx", relDic);
+		ExcelRelationUtil.ReadRel(path + Constant.getSeperator() + "2.6-relation.xlsx", relDic);
 		for (String graphCode : relDic.keySet().toArray(new String[0])) {
 			File graph = new File(path + Constant.getSeperator() + "relation" + Constant.getSeperator() + graphCode);
 			if (!graph.exists()) {
@@ -140,7 +140,7 @@ public class RWDDownloadUtil {
 					criteria.put("graphCode", graphCode);
 					criteria.put("relCode", relCode);
 					param.put("criteria", criteria);
-					LogUtil.info(LogUtil.refreshLoggerName, "Download relation " + graphCode + " " + relCode);
+					log.info(LogUtil.refreshLoggerName, "Download relation " + graphCode + " " + relCode);
 					String post_result = HttpClientUtil.post(Constant.rwd_url + "rwd/instance/relation/query?projectId=" + RepositoryBase.projectId
 							+ "&groupCode=" + RepositoryBase.groupCode, param.toJSONString());
 					JSONObject resultJSON = JSON.parseObject(post_result);

+ 5 - 6
ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/util/RWDLoadUtil.java

@@ -31,7 +31,6 @@ public class RWDLoadUtil {
 			Integer.parseInt(funcid);
 			return true;
 		} catch (NumberFormatException e) {
-			// e.printStackTrace();
 			return false;
 		}
 	}
@@ -68,7 +67,7 @@ public class RWDLoadUtil {
 			for (File file : files) {
 				int index_ = file.getName().indexOf('.');
 				String code = file.getName().substring(0, index_);
-				LogUtil.info(infoPath + Constant.getSeperator() + "" + file.getName());
+				log.info(infoPath + Constant.getSeperator() + "" + file.getName());
 				try {
 					JSONArray array = FastJsonReaderUtil.Instance().ReadJSONArray(new File(infoPath + Constant.getSeperator() + "" + file.getName()));
 					if (code.equals("OTSECB")) {
@@ -88,7 +87,6 @@ public class RWDLoadUtil {
 					infoArrayDic.put(code, RWDUtil.array2SDVList(array));
 				} catch (Exception e) {
 					log.warn(e.getMessage(), e);
-					e.printStackTrace();
 				}
 			}
 			Repository.infoArrayDic = infoArrayDic;
@@ -102,7 +100,7 @@ public class RWDLoadUtil {
 			for (File file : files) {
 				int index_ = file.getName().indexOf('.');
 				String code = file.getName().substring(0, index_);
-				LogUtil.info(objectPath + Constant.getSeperator() + "" + file.getName());
+				log.info(objectPath + Constant.getSeperator() + "" + file.getName());
 				JSONArray array = FastJsonReaderUtil.Instance().ReadJSONArray(new File(objectPath + Constant.getSeperator() + "" + file.getName()));
 				if (code.equals("OTSECB")) {
 					for (int ii = 0; ii < array.size(); ii++) {
@@ -179,7 +177,7 @@ public class RWDLoadUtil {
 				for (File file : files) {
 					int index_ = file.getName().indexOf('.');
 					String code = file.getName().substring(0, index_);
-					LogUtil.info(relationPath + Constant.getSeperator() + "" + dir.getName() + Constant.getSeperator() + file.getName());
+					log.info(relationPath + Constant.getSeperator() + "" + dir.getName() + Constant.getSeperator() + file.getName());
 					JSONArray array = FastJsonReaderUtil.Instance().ReadJSONArray(
 							new File(relationPath + Constant.getSeperator() + "" + dir.getName() + Constant.getSeperator() + file.getName()));
 					oneDic.put(code, RWDUtil.array2SDVList(array));
@@ -328,7 +326,8 @@ public class RWDLoadUtil {
 				objectItem.put("报警数量", alarmCount);
 				if (use_sample) {
 					if (BKDRHash.getHashCode(objId) % 3 == 0) {
-						JSONObject alarm = FastJsonReaderUtil.Instance().ReadJSONObject(new File(Constant.GetPath() + "/alarm_sample.json"));
+						JSONObject alarm = FastJsonReaderUtil.Instance()
+								.ReadJSONObject(new File(Constant.GetPath() + Constant.getSeperator() + "alarm_sample.json"));
 						alarm.put("objId", objId);
 						RWDAlarmUtil.ProcessAlarm(alarm);
 					}

+ 10 - 12
ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/websocket/AlarmWebSocketClient.java

@@ -2,15 +2,15 @@ package com.persagy.ibms.data.sdk.websocket;
 
 import java.net.URI;
 
-import lombok.extern.slf4j.Slf4j;
 import org.java_websocket.client.WebSocketClient;
 import org.java_websocket.handshake.ServerHandshake;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.persagy.ibms.data.sdk.util.LogUtil;
 import com.persagy.ibms.data.sdk.util.RWDAlarmUtil;
 
+import lombok.extern.slf4j.Slf4j;
+
 @Slf4j
 public class AlarmWebSocketClient extends WebSocketClient {
 	public static AlarmWebSocketClient client;
@@ -25,27 +25,26 @@ public class AlarmWebSocketClient extends WebSocketClient {
 
 	@Override
 	public void onOpen(ServerHandshake arg0) {
-		LogUtil.error("onOpen: " + serverUri.toString());
+		log.error("onOpen: " + serverUri.toString());
 		try {
-			LogUtil.error("onOpen refresh begin");
+			log.error("onOpen refresh begin");
 			int alarm_size = RWDAlarmUtil.refresh();
-			LogUtil.error("onOpen refresh finish alarm count: " + alarm_size);
+			log.error("onOpen refresh finish alarm count: " + alarm_size);
 		} catch (Exception e) {
-			LogUtil.error("onOpen refresh error");
-			LogUtil.error(e);
-			e.printStackTrace();
+			log.error("onOpen refresh error");
+			log.error(e.getMessage(), e);
 		}
 	}
 
 	@Override
 	public void onClose(int arg0, String arg1, boolean arg2) {
-		LogUtil.error("onClose: " + serverUri.toString());
+		log.error("onClose: " + serverUri.toString());
 		// this.close_connect();
 	}
 
 	@Override
 	public void onError(Exception arg0) {
-		LogUtil.error("onError: " + serverUri.toString());
+		log.error("onError: " + serverUri.toString());
 		// this.close_connect();
 	}
 
@@ -58,8 +57,7 @@ public class AlarmWebSocketClient extends WebSocketClient {
 			JSONObject alarm = (JSONObject) JSON.parse(message);
 			RWDAlarmUtil.ProcessAlarm(alarm);
 		} catch (Exception e) {
-			LogUtil.error(e);
-			e.printStackTrace();
+			log.error(e.getMessage(), e);
 		}
 	}
 }

+ 6 - 8
ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/websocket/IOTWebSocketClient.java

@@ -2,7 +2,6 @@ package com.persagy.ibms.data.sdk.websocket;
 
 import java.net.URI;
 
-import lombok.extern.slf4j.Slf4j;
 import org.java_websocket.client.WebSocketClient;
 import org.java_websocket.handshake.ServerHandshake;
 
@@ -10,9 +9,10 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.persagy.ibms.data.sdk.data.SceneDataValue;
 import com.persagy.ibms.data.sdk.util.DataUtil;
-import com.persagy.ibms.data.sdk.util.LogUtil;
 import com.persagy.ibms.data.sdk.util.RepositoryBase;
 
+import lombok.extern.slf4j.Slf4j;
+
 @Slf4j
 public class IOTWebSocketClient extends WebSocketClient {
 	public static IOTWebSocketClient client;
@@ -27,19 +27,19 @@ public class IOTWebSocketClient extends WebSocketClient {
 
 	@Override
 	public void onOpen(ServerHandshake arg0) {
-		LogUtil.error("onOpen: " + serverUri.toString());
+		log.error("onOpen: " + serverUri.toString());
 		// IOTWebSocketClient.client.send(RepositoryBase.projectId.substring(2));
 	}
 
 	@Override
 	public void onClose(int arg0, String arg1, boolean arg2) {
-		LogUtil.error("onClose: " + serverUri.toString());
+		log.error("onClose: " + serverUri.toString());
 		// this.close_connect();
 	}
 
 	@Override
 	public void onError(Exception arg0) {
-		LogUtil.error("onError: " + serverUri.toString());
+		log.error("onError: " + serverUri.toString());
 		// this.close_connect();
 	}
 
@@ -72,7 +72,6 @@ public class IOTWebSocketClient extends WebSocketClient {
 						}
 					} catch (Exception e) {
 						log.info("onMessage" + "\t" + meter + "-" + funcid + "\t" + value);
-						e.printStackTrace();
 					}
 				}
 			} else if (type.equals("pointset")) {
@@ -97,13 +96,12 @@ public class IOTWebSocketClient extends WebSocketClient {
 						}
 					} catch (Exception e) {
 						log.info("onMessage" + "\t" + meter + "-" + funcid + "\t" + value);
-						e.printStackTrace();
 					}
 				}
 
 			}
 		} catch (Exception e) {
-			e.printStackTrace();
+			log.error(e.getMessage(), e);
 		}
 	}
 }

ibms-data-sdk/2.6-relation.xlsx → ibms-data-sdk/src/main/resources/2.6-relation.xlsx