From 2e6de7a7c479603c7bb18790fafec26952574aa4 Mon Sep 17 00:00:00 2001 From: cheney Date: Thu, 1 Sep 2022 16:18:33 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20sonar?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 11 ++++++++++- sonar.cmd | 4 ++++ .../java/com/sunyard/sge/database/SydApiSM4.java | 5 ++++- src/test/java/test/LengthTest.java | 2 +- src/test/java/test/{test.java => Test.java} | 14 +++++++++++++- 5 files changed, 32 insertions(+), 4 deletions(-) create mode 100644 sonar.cmd rename src/test/java/test/{test.java => Test.java} (94%) diff --git a/pom.xml b/pom.xml index 812474f..dec088c 100644 --- a/pom.xml +++ b/pom.xml @@ -45,7 +45,15 @@ - + + + + org.sonarsource.scanner.maven + sonar-maven-plugin + 3.3.0.603 + + + org.apache.maven.plugins @@ -57,4 +65,5 @@ + diff --git a/sonar.cmd b/sonar.cmd new file mode 100644 index 0000000..f96af49 --- /dev/null +++ b/sonar.cmd @@ -0,0 +1,4 @@ +mvn sonar:sonar ^ + -Dsonar.projectKey=sydapi-sge-datebase ^ + -Dsonar.host.url=http://172.16.17.236:9000 ^ + -Dsonar.login=3f3a85127ef9636cf37a39d8fbfe823b7e952481 diff --git a/src/main/java/com/sunyard/sge/database/SydApiSM4.java b/src/main/java/com/sunyard/sge/database/SydApiSM4.java index 82e468b..36db984 100644 --- a/src/main/java/com/sunyard/sge/database/SydApiSM4.java +++ b/src/main/java/com/sunyard/sge/database/SydApiSM4.java @@ -126,7 +126,10 @@ public class SydApiSM4 { return api.SYD_SM4_LongData(iKeyIndex, pcdataResult, iPkgNum, iFlag); } else { - if (16 > pcData.length + sourceWrap.array().length||(pcData.length + sourceWrap.array().length)/16<2) { + if (16 > pcData.length + sourceWrap.array().length + || + (pcData.length + sourceWrap.array().length)/16<2 + ) { ByteBuffer bufferResult = ByteBuffer.allocate(sourceWrap.array().length + plength); bufferResult.put(sourceWrap.array()); bufferResult.put(pcData); diff --git a/src/test/java/test/LengthTest.java b/src/test/java/test/LengthTest.java index e53c614..8a78348 100644 --- a/src/test/java/test/LengthTest.java +++ b/src/test/java/test/LengthTest.java @@ -21,7 +21,7 @@ public class LengthTest @Before public void init(){ SydApiBuilder builder = new SydApiBuilder( - new String[]{ "192.168.0.200" }, + new String[]{ "192.168.1.128" }, new int[]{ 8889 }, 10, 15 diff --git a/src/test/java/test/test.java b/src/test/java/test/Test.java similarity index 94% rename from src/test/java/test/test.java rename to src/test/java/test/Test.java index a198758..e060ed2 100644 --- a/src/test/java/test/test.java +++ b/src/test/java/test/Test.java @@ -1,4 +1,4 @@ -//package test; +package test; // //import com.sunyard.sge.database.*; //import org.junit.Test; @@ -90,3 +90,15 @@ //// } // } //} + + +public class Test { + public static void main(String[] args) { + if (16 > 1799 + 16 + || + (1799 + 16)/16<2 + ) { + System.out.println("1"); + } + } +} From be8a23eefc4d0c4be8aa9a586242df1688205b5c Mon Sep 17 00:00:00 2001 From: cheney Date: Thu, 1 Sep 2022 17:02:27 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BE=9D=E8=B5=96=E6=A3=80=E6=B5=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 22 ++++++++++++++++++++++ sonar.cmd | 1 + 2 files changed, 23 insertions(+) diff --git a/pom.xml b/pom.xml index dec088c..fcede36 100644 --- a/pom.xml +++ b/pom.xml @@ -42,6 +42,11 @@ ${log.version} + + org.owasp + dependency-check-maven + 6.1.5 + @@ -63,6 +68,23 @@ 8 + + org.owasp + dependency-check-maven + 6.1.5 + + + + check + + + + + ALL + false + true + + diff --git a/sonar.cmd b/sonar.cmd index f96af49..3a7233f 100644 --- a/sonar.cmd +++ b/sonar.cmd @@ -1,3 +1,4 @@ +mvn clean compile dependency-check:check mvn sonar:sonar ^ -Dsonar.projectKey=sydapi-sge-datebase ^ -Dsonar.host.url=http://172.16.17.236:9000 ^ From 62ae9cd7334c9173c13b0eea6fdb07312703ba69 Mon Sep 17 00:00:00 2001 From: cheney Date: Thu, 1 Sep 2022 18:33:43 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BE=9D=E8=B5=96?= =?UTF-8?q?=E6=89=AB=E6=8F=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sonar.cmd | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/sonar.cmd b/sonar.cmd index 3a7233f..181f970 100644 --- a/sonar.cmd +++ b/sonar.cmd @@ -1,5 +1,9 @@ -mvn clean compile dependency-check:check -mvn sonar:sonar ^ +call mvn clean compile dependency-check:check +call mvn sonar:sonar ^ -Dsonar.projectKey=sydapi-sge-datebase ^ -Dsonar.host.url=http://172.16.17.236:9000 ^ - -Dsonar.login=3f3a85127ef9636cf37a39d8fbfe823b7e952481 + -Dsonar.login=3f3a85127ef9636cf37a39d8fbfe823b7e952481 ^ + -Dsonar.pdf.username=admin -Dsonar.pdf.password=admin ^ + -Dsonar.dependencyCheck.jsonReportPath=target/dependency-check-report.json ^ + -Dsonar.dependencyCheck.xmlReportPath=target/dependency-check-report.xml ^ + -Dsonar.dependencyCheck.htmlReportPath=target/dependency-check-report.html