diff --git a/assembly.xml b/assembly.xml new file mode 100644 index 0000000..139b587 --- /dev/null +++ b/assembly.xml @@ -0,0 +1,30 @@ + + assembled-test-jar + + jar + + false + + + + ${project.build.outputDirectory} + / + + + + ${project.build.testOutputDirectory} + / + + + + + + / + true + runtime + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index 8e7a580..7d45eda 100644 --- a/pom.xml +++ b/pom.xml @@ -182,22 +182,6 @@ - - - - org.apache.maven.plugins - maven-jar-plugin - - - - true - lib/ - com.xxx.uploadFile - - - - - org.apache.maven.plugins maven-dependency-plugin @@ -224,9 +208,12 @@ maven-assembly-plugin + + assembly.xml + - com.Sample.TestDemo + sample.TestDemo diff --git a/src/test/java/cmbpoc/FunctionTest.java b/src/test/java/cmbpoc/FunctionTest.java index 6e1ede9..c1d6491 100644 --- a/src/test/java/cmbpoc/FunctionTest.java +++ b/src/test/java/cmbpoc/FunctionTest.java @@ -20,7 +20,7 @@ public class FunctionTest { System.setProperty("com.sunyard.sydapi4j.debug", "true"); // 建立链接（单台） - this.api = (SydApi4j) new SydApi4j().connect("192.168.21.166", 8889, null, 1000); + this.api = (SydApi4j) new SydApi4j().connect("192.168.21.166", 8889, null, 5000); } diff --git a/src/test/java/cmbpoc/JmeterTest.java b/src/test/java/cmbpoc/JmeterTest.java index 8a677c8..eed2fca 100644 --- a/src/test/java/cmbpoc/JmeterTest.java +++ b/src/test/java/cmbpoc/JmeterTest.java @@ -6,8 +6,6 @@ import org.apache.jmeter.protocol.java.sampler.AbstractJavaSamplerClient; import org.apache.jmeter.protocol.java.sampler.JavaSamplerContext; import org.apache.jmeter.samplers.SampleResult; -import java.nio.charset.StandardCharsets; -import java.util.Base64; public class JmeterTest extends AbstractJavaSamplerClient { @@ -18,19 +16,13 @@ public class JmeterTest extends AbstractJavaSamplerClient { @Override public Arguments getDefaultParameters() { Arguments params = new Arguments(); - params.addArgument("publicKeyBase64", "MFkwEwYHKoZIzj0CAQYIKoEcz1UBgi0DQgAE..."); - params.addArgument("plainText", "Hello JMeter"); + params.addArgument("function", "sleep"); + params.addArgument("sleep", "1"); return params; } @Override public void setupTest(JavaSamplerContext context) { - // 初始化：将 Base64 参数转为字节数组，避免每个循环都转换 - String pubBase64 = context.getParameter("publicKeyBase64"); - String plainText = context.getParameter("plainText"); - publicKey = Base64.getDecoder().decode(pubBase64); - plainData = plainText.getBytes(StandardCharsets.UTF_8); - // 校准测试 sleep = context.getIntParameter("sleep", 1); @@ -57,7 +49,7 @@ public class JmeterTest extends AbstractJavaSamplerClient { case "SYD_SM2_Sign": break; case "sleep": - Thread.sleep(1); + Thread.sleep( this.sleep ); break; default: break; diff --git a/src/test/java/cmbpoc/SignatureVerifyTest.java b/src/test/java/cmbpoc/SignatureVerifyTest.java index 8bf43cd..1f02358 100644 --- a/src/test/java/cmbpoc/SignatureVerifyTest.java +++ b/src/test/java/cmbpoc/SignatureVerifyTest.java @@ -18,7 +18,7 @@ public class SignatureVerifyTest { @Before public void setUp() { System.setProperty("com.sunyard.sydapi4j.debug", "true"); - this.api = (SydApi4j) new SydApi4j().connect("192.168.0.100", 8889, null, 1000); + this.api = (SydApi4j) new SydApi4j().connect("192.168.21.166", 8889, null, 2000); this.orgData = "Hello, World! 测试数据".getBytes(); this.SM2dn = "C=CN,ST=北京,L=北京,O=信雅达,CN=172.1.40.188"; } diff --git a/src/main/java/com/Sample/SydUtils.java b/src/test/java/sample/SydUtils.java similarity index 97% rename from src/main/java/com/Sample/SydUtils.java rename to src/test/java/sample/SydUtils.java index cfd989a..73f3680 100644 --- a/src/main/java/com/Sample/SydUtils.java +++ b/src/test/java/sample/SydUtils.java @@ -1,4 +1,4 @@ -package com.Sample; +package sample; import racal.sunyard.main.SydApi4j; diff --git a/src/main/java/com/sample/Test.java b/src/test/java/sample/Test.java similarity index 99% rename from src/main/java/com/sample/Test.java rename to src/test/java/sample/Test.java index 639d317..14ae94f 100644 --- a/src/main/java/com/sample/Test.java +++ b/src/test/java/sample/Test.java @@ -1,4 +1,4 @@ -package com.sample; +package sample; import cn.hutool.core.io.FileUtil; import cn.hutool.json.JSONObject; diff --git a/src/test/java/sample/Test4NongxinCW.java b/src/test/java/sample/Test4NongxinCW.java index 3c649d5..9b6da4b 100644 --- a/src/test/java/sample/Test4NongxinCW.java +++ b/src/test/java/sample/Test4NongxinCW.java @@ -1,10 +1,7 @@ package sample; import cn.hutool.core.date.StopWatch; -import com.Sample.SydUtils; import com.google.gson.Gson; -import com.sunyard.RetWrap; -import com.sunyard.SydApi; import com.sunyard.SydApiException; import com.sunyard.entity.ImportResult; import com.sunyard.proto.Util; diff --git a/src/main/java/com/Sample/TestDemo.java b/src/test/java/sample/TestDemo.java similarity index 99% rename from src/main/java/com/Sample/TestDemo.java rename to src/test/java/sample/TestDemo.java index 1185bf1..4b2fef1 100644 --- a/src/main/java/com/Sample/TestDemo.java +++ b/src/test/java/sample/TestDemo.java @@ -1,4 +1,4 @@ -package com.Sample; +package sample; import com.sunyard.RetWrap; import com.sunyard.proto.Util; diff --git a/src/main/java/com/jmeter/test/Test4Jemter.java b/src/test/java/test/Test4Jemter.java similarity index 99% rename from src/main/java/com/jmeter/test/Test4Jemter.java rename to src/test/java/test/Test4Jemter.java index 7e2a61c..c6bd9f7 100644 --- a/src/main/java/com/jmeter/test/Test4Jemter.java +++ b/src/test/java/test/Test4Jemter.java @@ -1,6 +1,6 @@ -package com.jmeter.test; +package test; -import com.Sample.SydUtils; +import sample.SydUtils; import com.google.gson.Gson; import com.sunyard.SydApiException; import com.sunyard.entity.ImportResult;