diff --git a/src/main/java/net/irext/decoder/businesslogic/DecodeLogic.java b/src/main/java/net/irext/decoder/businesslogic/DecodeLogic.java index 7918e1b..396d1b7 100644 --- a/src/main/java/net/irext/decoder/businesslogic/DecodeLogic.java +++ b/src/main/java/net/irext/decoder/businesslogic/DecodeLogic.java @@ -4,7 +4,7 @@ import net.irext.decoder.alioss.OSSHelper; import net.irext.decoder.model.IRBinary; import net.irext.decoder.model.RemoteIndex; import net.irext.decoder.redisrepo.IIRBinaryRepository; -import net.irext.decoder.utils.FileUtils; +import net.irext.decoder.utils.FileUtil; import net.irext.decoder.utils.MD5Util; import org.apache.commons.io.IOUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -13,10 +13,8 @@ import org.springframework.stereotype.Controller; import javax.servlet.ServletContext; import java.io.File; import java.io.FileInputStream; -import java.io.IOException; import java.io.InputStream; import java.security.MessageDigest; -import java.security.NoSuchAlgorithmException; /** * Filename: CollectCodeLogic @@ -117,8 +115,8 @@ public class DecodeLogic { String ossChecksum = MD5Util.byteArrayToHexString(MessageDigest.getInstance("MD5").digest(binaries)).toUpperCase(); if (ossChecksum.equals(checksum)) { - FileUtils.createDirs(downloadPath); - if (FileUtils.write(binFile, binaries)) { + FileUtil.createDirs(downloadPath); + if (FileUtil.write(binFile, binaries)) { return new FileInputStream(binFile); } else { System.out.println("fatal : write file to local path failed"); diff --git a/src/main/java/net/irext/decoder/service/IRDecodeService.java b/src/main/java/net/irext/decoder/service/IRDecodeService.java index d98a29e..b82dc0c 100644 --- a/src/main/java/net/irext/decoder/service/IRDecodeService.java +++ b/src/main/java/net/irext/decoder/service/IRDecodeService.java @@ -13,6 +13,7 @@ import net.irext.decoder.response.DecodeResponse; import net.irext.decoder.response.ServiceResponse; import net.irext.decoder.response.Status; import net.irext.decoder.service.base.AbstractBaseService; +import net.irext.decoder.utils.LoggerUtil; import net.irext.decodesdk.bean.ACStatus; import net.irext.decodesdk.utils.Constants; import org.apache.logging.log4j.LogManager; @@ -34,7 +35,7 @@ import org.springframework.web.bind.annotation.*; @RequestMapping("/irext") public class IRDecodeService extends AbstractBaseService { - Logger logger = LogManager.getLogger(IRDecodeService.class); + private static final String TAG = IRDecodeService.class.getSimpleName(); private RemoteIndexMapper remoteIndexMapper; @@ -53,7 +54,7 @@ public class IRDecodeService extends AbstractBaseService { try { int remoteIndexId = openRequest.getRemoteIndexId(); - logger.trace("irOpen API called : " + remoteIndexId); + LoggerUtil.getInstance().trace(TAG,"irOpen API called : " + remoteIndexId); ServiceResponse response = new ServiceResponse(); RemoteIndex remoteIndex = IndexLogic.getInstance(remoteIndexMapper).getRemoteIndex(remoteIndexId); diff --git a/src/main/java/net/irext/decoder/utils/FileUtils.java b/src/main/java/net/irext/decoder/utils/FileUtil.java similarity index 98% rename from src/main/java/net/irext/decoder/utils/FileUtils.java rename to src/main/java/net/irext/decoder/utils/FileUtil.java index e0e792e..1629b00 100644 --- a/src/main/java/net/irext/decoder/utils/FileUtils.java +++ b/src/main/java/net/irext/decoder/utils/FileUtil.java @@ -3,7 +3,7 @@ package net.irext.decoder.utils; import java.io.*; /** - * Filename: FileUtils.java + * Filename: FileUtil.java * Revised: Date: 2017-04-14 * Revision: Revision: 1.0 *

@@ -12,7 +12,7 @@ import java.io.*; * Revision log: * 2017-04-14: created by strawmanbobi */ -public class FileUtils { +public class FileUtil { public static boolean write(File file, byte[] binaries) { if (null == file) { diff --git a/src/main/java/net/irext/decoder/utils/LoggerUtil.java b/src/main/java/net/irext/decoder/utils/LoggerUtil.java new file mode 100644 index 0000000..03ab5e7 --- /dev/null +++ b/src/main/java/net/irext/decoder/utils/LoggerUtil.java @@ -0,0 +1,40 @@ +package net.irext.decoder.utils; + +import net.irext.decoder.service.IRDecodeService; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +/** + * Filename: LoggerUtil.java + * Revised: Date: 2019-01-01 + * Revision: Revision: 1.0 + *

+ * Description: Logging util + *

+ * Revision log: + * 2019-01-01: created by strawmanbobi + */ +public class LoggerUtil { + private static LoggerUtil loggerUtil; + private Logger logger; + private static final int MODE = 0; + + LoggerUtil() { + this.logger = LogManager.getLogger(LoggerUtil.class.getSimpleName()); + } + + public static LoggerUtil getInstance() { + if (null == loggerUtil) { + loggerUtil = new LoggerUtil(); + } + return loggerUtil; + } + + public void trace(String tag, String log) { + if (0 == MODE) { + System.out.println("[" + tag + "] " + log); + } else { + this.logger.trace("[" + tag + "] " + log); + } + } +}