From 2a2bcb33e510719ff13fbd1dc66b71aca065ac20 Mon Sep 17 00:00:00 2001 From: "junj2.liang" Date: Tue, 13 Sep 2022 12:41:24 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/sunyard/sge/database/SydApi4Database.java | 4 ---- .../java/com/sunyard/sge/database/SydApiBaseFunction.java | 6 +----- src/main/java/com/sunyard/sge/database/SydApiBuilder.java | 3 --- .../java/com/sunyard/sge/database/pool/SydApiPool.java | 5 ----- src/main/java/com/sunyard/sge/log/LogFactory.java | 5 ++++- .../java/com/sunyard/sge/pool/ThreadBasedConnectPool.java | 3 --- src/test/java/sample/Sample.java | 7 +++++-- 7 files changed, 10 insertions(+), 23 deletions(-) diff --git a/src/main/java/com/sunyard/sge/database/SydApi4Database.java b/src/main/java/com/sunyard/sge/database/SydApi4Database.java index 1181b4b..1d399c9 100644 --- a/src/main/java/com/sunyard/sge/database/SydApi4Database.java +++ b/src/main/java/com/sunyard/sge/database/SydApi4Database.java @@ -24,10 +24,6 @@ public class SydApi4Database extends SydApiBaseFunction { public SydApi4Database(SydApi4j[] hsms, HsmLinkInfo[] linkInfos) { super(hsms, linkInfos); } - static { - LogFactory.createLogger("./logs", 0); - } - @Override public List SYD_SM4_BatchData(int[] iKeyIndex, List pcData, int iFlag) { // 将数据进行分组，防止超长。 diff --git a/src/main/java/com/sunyard/sge/database/SydApiBaseFunction.java b/src/main/java/com/sunyard/sge/database/SydApiBaseFunction.java index 05e58e8..a88459a 100644 --- a/src/main/java/com/sunyard/sge/database/SydApiBaseFunction.java +++ b/src/main/java/com/sunyard/sge/database/SydApiBaseFunction.java @@ -16,13 +16,10 @@ import java.util.List; * 上海黄金交易所 - 数据库加密方案 */ public class SydApiBaseFunction implements SydApi { - static { - LogFactory.createLogger("./logs", 0); - } private SydApi4j[] hsms = null; private HsmLinkInfo[] linkInfos = null; private ObjectInPool oip = null; - + Logger log = LogFactory.getLogger(); private boolean isShortLinkMode = false; public SydApiBaseFunction() { @@ -120,7 +117,6 @@ public class SydApiBaseFunction implements SydApi { @Override public String SYD_SM3_Hash_ShortData(byte[] pcData) { - Logger log = LogFactory.getLogger(); if (LogFactory.iLogLevel == 3) { log.debug("SYD_SM3_Hash_ShortData方法接收参数：pcData：{}", Arrays.toString(pcData)); } diff --git a/src/main/java/com/sunyard/sge/database/SydApiBuilder.java b/src/main/java/com/sunyard/sge/database/SydApiBuilder.java index 78df6e4..c036133 100644 --- a/src/main/java/com/sunyard/sge/database/SydApiBuilder.java +++ b/src/main/java/com/sunyard/sge/database/SydApiBuilder.java @@ -10,9 +10,6 @@ import org.apache.logging.log4j.Logger; import java.util.Arrays; public class SydApiBuilder { - static { - SydApi.SYD_SetLogConfig("./logs/", 0); - } private SydApiPool pool; private CommWorker longLinkWorks; diff --git a/src/main/java/com/sunyard/sge/database/pool/SydApiPool.java b/src/main/java/com/sunyard/sge/database/pool/SydApiPool.java index de19a10..5b57ace 100644 --- a/src/main/java/com/sunyard/sge/database/pool/SydApiPool.java +++ b/src/main/java/com/sunyard/sge/database/pool/SydApiPool.java @@ -12,11 +12,6 @@ import racal.sunyard.main.SydApi4j; public class SydApiPool extends ThreadBasedConnectPool { private HsmLinkInfo[] linkInfos; - static { - LogFactory.createLogger("./logs", 0); - } - - public SydApiPool(HsmLinkInfo[] linkInfos) { super(); this.linkInfos = linkInfos; diff --git a/src/main/java/com/sunyard/sge/log/LogFactory.java b/src/main/java/com/sunyard/sge/log/LogFactory.java index 4f2db66..72172fa 100644 --- a/src/main/java/com/sunyard/sge/log/LogFactory.java +++ b/src/main/java/com/sunyard/sge/log/LogFactory.java @@ -27,7 +27,7 @@ public class LogFactory { public static final String logName = "sge-hsm-sydapi-log"; // 日志级别 - public static int iLogLevel = Consts.LogLevelOFF; + public static int iLogLevel = Consts.LogLevelOFF; // Levels private static final Level[] levels = new Level[]{ Level.OFF, Level.ERROR, Level.INFO, Level.DEBUG }; @@ -87,6 +87,9 @@ public class LogFactory { ctx.updateLoggers(); } + public static int getiLogLevel() { + return iLogLevel; + } /** * 创建 Logger diff --git a/src/main/java/com/sunyard/sge/pool/ThreadBasedConnectPool.java b/src/main/java/com/sunyard/sge/pool/ThreadBasedConnectPool.java index f323819..c556f63 100644 --- a/src/main/java/com/sunyard/sge/pool/ThreadBasedConnectPool.java +++ b/src/main/java/com/sunyard/sge/pool/ThreadBasedConnectPool.java @@ -23,9 +23,6 @@ public class ThreadBasedConnectPool { // 配置 private PoolConfig config; - static { - LogFactory.createLogger("./logs", 0); - } public ThreadBasedConnectPool(PoolConfig config) { this.config = config; diff --git a/src/test/java/sample/Sample.java b/src/test/java/sample/Sample.java index 111b4dd..bd641a5 100644 --- a/src/test/java/sample/Sample.java +++ b/src/test/java/sample/Sample.java @@ -3,6 +3,7 @@ package sample; import com.sunyard.proto.Util; import com.sunyard.sge.database.*; import com.sunyard.sge.database.Consts; +import com.sunyard.sge.log.LogFactory; import org.apache.logging.log4j.Logger; import org.junit.Assert; @@ -15,7 +16,8 @@ public class Sample public static void main(String[] args) { // 路径要以 / 或 \\ 结尾表示目录 - + SydApi.SYD_SetLogConfig("./logs/",3); + LogFactory.getiLogLevel(); // 通常单例就够了 SydApiBuilder builder = new SydApiBuilder( new String[]{ "192.168.1.129","172.16.18.59" }, @@ -60,10 +62,11 @@ public class Sample // 长数据 SM3 longSM3( api ); - } finally { if ( null != api ) { + LogFactory.getLogger().debug("END"); api.SYD_Disconnect_Ex(); + } } }