版本号修改为 2.0.0-snapshot

2024-02-20 16:42:19 +08:00 · 2024-02-20 16:42:19 +08:00 · eb3060a379
parent 4140f63867
commit eb3060a379
14 changed files with 85 additions and 47 deletions
--- a/pom.xml
+++ b/pom.xml
@ -101,6 +101,39 @@
                <artifactId>sonar-maven-plugin</artifactId>
                <version>3.10.0.2594</version>
            </plugin>
+<!--            <plugin>-->
+<!--                <groupId>org.jacoco</groupId>-->
+<!--                <artifactId>jacoco-maven-plugin</artifactId>-->
+<!--                <version>0.8.11</version>-->
+<!--                <configuration>-->
+<!--                    <destFile>${project.build.directory}/jacoco.exec</destFile>-->
+<!--                    <dataFile>${project.build.directory}/jacoco.exec</dataFile>-->
+<!--                </configuration>-->
+<!--                <executions>-->
+<!--                    <execution>-->
+<!--                        <goals>-->
+<!--                            <goal>prepare-agent</goal>-->
+<!--                        </goals>-->
+<!--                    </execution>-->
+<!--                    <execution>-->
+<!--                        <id>report</id>-->
+<!--                        <phase>prepare-package</phase>-->
+<!--                        <goals>-->
+<!--                            <goal>report</goal>-->
+<!--                        </goals>-->
+<!--                    </execution>-->
+<!--                    <execution>-->
+<!--                        <id>post-unit-test</id>-->
+<!--                        <phase>test</phase>-->
+<!--                        <goals>-->
+<!--                            <goal>report</goal>-->
+<!--                        </goals>-->
+<!--                        <configuration>-->
+<!--                            <dataFile>target/jacoco.exec</dataFile>-->
+<!--                        </configuration>-->
+<!--                    </execution>-->
+<!--                </executions>-->
+<!--            </plugin>-->
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-jar-plugin</artifactId>
--- a/scanner.sh
+++ b/scanner.sh
@ -1,5 +1,5 @@
 sh mvn clean package verify sonar:sonar  \
  -Dsonar.projectKey=scfs-api-sdk \
  -Dsonar.projectName=scfs-api-sdk \
-  -Dsonar.host.url=http://10.133.128.95:9000 \
-  -Dsonar.token=sqa_58ffad8c89ccb18f2f475e5f8f2a7f23c25b3b32
+  -Dsonar.host.url=http://10.129.135.192:7100 \
+  -Dsonar.login=sqp_90e5fb014f985e2c458e46b9239926cfbbd4fffe
--- a/scfs-api-core/src/main/java/com/czcb/scfs/api/core/AbstractProfile.java
+++ b/scfs-api-core/src/main/java/com/czcb/scfs/api/core/AbstractProfile.java
@ -17,7 +17,7 @@ public abstract class AbstractProfile implements Profile {
    // http 客户端配置
    private final HttpProfile httpProfile;

-    public AbstractProfile(Privacy privacy, Signature signature, Channel channel, HttpProfile httpProfile) {
+    protected AbstractProfile(Privacy privacy, Signature signature, Channel channel, HttpProfile httpProfile) {
        this.privacy = privacy;
        this.signature = signature;
        this.channel = channel;
--- a/scfs-api-core/src/main/java/com/czcb/scfs/api/core/util/Strings.java
+++ b/scfs-api-core/src/main/java/com/czcb/scfs/api/core/util/Strings.java
@ -5,8 +5,9 @@ import com.czcb.scfs.api.core.exception.EncodingException;

 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
+import java.security.SecureRandom;
 import java.util.Objects;
-import java.util.concurrent.ThreadLocalRandom;
+import java.util.Random;

 /**
 * @author wangwei
@ -14,6 +15,8 @@ import java.util.concurrent.ThreadLocalRandom;
 */
 public class Strings {

+    private static final SecureRandom random = new SecureRandom();
+
    private Strings() {
    }

@ -59,8 +62,8 @@ public class Strings {
        return getRandom().nextInt(limit);
    }

-    private static ThreadLocalRandom getRandom() {
-        return ThreadLocalRandom.current();
+    private static Random getRandom() {
+        return random;
    }

    /**
--- a/scfs-api-core/src/test/java/com/czcb/scfs/api/core/cipher/DefaultCredentialTest.java
+++ b/scfs-api-core/src/test/java/com/czcb/scfs/api/core/cipher/DefaultCredentialTest.java
@ -1,14 +1,12 @@
 package com.czcb.scfs.api.core.cipher;

-import org.junit.jupiter.api.Test;
-
 class DefaultCredentialTest {

-    @Test
-    void buildRequestAuthorization() {
-    }
-
-    @Test
-    void buildResponseSignature() {
-    }
+//    @Test
+//    void buildRequestAuthorization() {
+//    }
+//
+//    @Test
+//    void buildResponseSignature() {
+//    }
 }
--- a/scfs-api-core/src/test/java/com/czcb/scfs/api/core/cipher/DefaultValidatorTest.java
+++ b/scfs-api-core/src/test/java/com/czcb/scfs/api/core/cipher/DefaultValidatorTest.java
@ -1,10 +1,8 @@
 package com.czcb.scfs.api.core.cipher;

-import org.junit.jupiter.api.Test;
-
 class DefaultValidatorTest {
-
-    @Test
-    void validate() {
-    }
+//
+//    @Test
+//    void validate() {
+//    }
 }
--- a/scfs-api-core/src/test/java/com/czcb/scfs/api/core/exception/EncodingExceptionTest.java
+++ b/scfs-api-core/src/test/java/com/czcb/scfs/api/core/exception/EncodingExceptionTest.java
@ -6,7 +6,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows;

 class EncodingExceptionTest {
    @Test
-    public void test() {
+    void test() {
        assertThrows(EncodingException.class, () -> {
            throw new EncodingException();
        });
--- a/scfs-api-core/src/test/java/com/czcb/scfs/api/core/exception/EncryptExceptionTest.java
+++ b/scfs-api-core/src/test/java/com/czcb/scfs/api/core/exception/EncryptExceptionTest.java
@ -7,7 +7,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
 class EncryptExceptionTest {

    @Test
-    public void test() {
+    void test() {
        assertThrows(EncryptException.class, () -> {
            throw new EncryptException();
        });
--- a/scfs-api-core/src/test/java/com/czcb/scfs/api/core/exception/ValidationExceptionTest.java
+++ b/scfs-api-core/src/test/java/com/czcb/scfs/api/core/exception/ValidationExceptionTest.java
@ -6,7 +6,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows;

 class ValidationExceptionTest {
    @Test
-    public void test() {
+    void test() {
        assertThrows(ValidationException.class, () -> {
            throw new ValidationException();
        });
--- a/scfs-api-core/src/test/java/com/czcb/scfs/api/core/http/DefaultApiClientBuilderTest.java
+++ b/scfs-api-core/src/test/java/com/czcb/scfs/api/core/http/DefaultApiClientBuilderTest.java
@ -1,22 +1,20 @@
 package com.czcb.scfs.api.core.http;

-import org.junit.jupiter.api.Test;
-
 class DefaultApiClientBuilderTest {

-    @Test
-    void newInstance() {
-    }
-
-    @Test
-    void profile() {
-    }
-
-    @Test
-    void httpClient() {
-    }
-
-    @Test
-    void build() {
-    }
+//    @Test
+//    void newInstance() {
+//    }
+//
+//    @Test
+//    void profile() {
+//    }
+//
+//    @Test
+//    void httpClient() {
+//    }
+//
+//    @Test
+//    void build() {
+//    }
 }
--- a/scfs-api-core/src/test/java/com/czcb/scfs/api/core/http/HttpRequestTest.java
+++ b/scfs-api-core/src/test/java/com/czcb/scfs/api/core/http/HttpRequestTest.java
@ -14,7 +14,7 @@ class HttpRequestTest {
                .url("/aa")
                .build();

-        Assertions.assertEquals(httpRequest.getHttpMethod(), HttpMethod.GET);
+        Assertions.assertEquals(HttpMethod.GET, httpRequest.getHttpMethod());
    }

    @Test
--- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/file/FileDownloadService.java
+++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/file/FileDownloadService.java
@ -1,9 +1,19 @@
 package com.czcb.scfs.api.service.file;

+import com.czcb.scfs.api.core.ApiClient;
+
 /**
 * 文件下载
 *
 * @since 2.0.0
 */
 public class FileDownloadService {
+    private final ApiClient apiClient;
+
+    public FileDownloadService(ApiClient apiClient) {
+        this.apiClient = apiClient;
+    }
+
+    public void download() {
+    }
 }
--- a/scfs-api-service/src/test/java/com/czcb/scfs/api/service/sms/SmsServiceTest.java
+++ b/scfs-api-service/src/test/java/com/czcb/scfs/api/service/sms/SmsServiceTest.java
@ -1,10 +1,5 @@
 package com.czcb.scfs.api.service.sms;

-import org.junit.jupiter.api.Test;
-
 class SmsServiceTest {

-    @Test
-    void send() {
-    }
 }
--- a/scfs-api-test/src/main/java/com/czcb/scfs/api/test/SMKeyText.java
+++ b/scfs-api-test/src/main/java/com/czcb/scfs/api/test/SMKeyText.java
@ -12,6 +12,9 @@ import java.security.cert.X509Certificate;
 * @date 2024/2/20
 */
 public final class SMKeyText {
+    private SMKeyText() {
+    }
+
    static {
        Security.addProvider(new KonaProvider());
    }