合并部分代码

Author: ExplodingDragon

build.gradle.kts

@@ -1,13 +1,9 @@
-group = "com.github.OpenEDGN.GradleKotlinTemplate"
-// 你可以修改此为自己的组织地址
-version = "last"
-// 你可以指定此为项目 版本号
+group = "com.github.OpenEDGN.Security4K"
 
 buildscript {
-    repositories{
+    repositories {
         mavenLocal()
         maven { url = project.uri("https://maven.aliyun.com/repository/public/") }
-        jcenter()
         mavenCentral()
         maven { url = project.uri("https://jitpack.io") }
     }
@@ -17,13 +13,13 @@ buildscript {
 }
 
 allprojects {
-    repositories{
+    repositories {
         mavenLocal()
         maven { url = project.uri("https://maven.aliyun.com/repository/public/") }
-        jcenter()
         mavenCentral()
         maven { url = project.uri("https://jitpack.io") }
-    }}
+    }
+}
 
 tasks.register("clean", Delete::class) {
     delete(rootProject.buildDir)

core/build.gradle.kts

@@ -19,8 +19,8 @@ dependencies {
     implementation(kotlin("stdlib"))
     testImplementation("com.github.OpenEdgn.Logger4K:core:1.3.1")
     testImplementation("com.github.OpenEdgn.Logger4K:logger-console:1.3.1")
-    testImplementation("org.junit.jupiter:junit-jupiter:5.6.2")
-    testImplementation("org.junit.platform:junit-platform-launcher:1.6.2")
+    testImplementation("org.junit.jupiter:junit-jupiter:5.7.2")
+    testImplementation("org.junit.platform:junit-platform-launcher:1.7.2")
 }
 
 tasks.test {
@@ -51,6 +51,3 @@ publishing {
         mavenLocal()
     }
 }
-
-
-

core/src/main/kotlin/com/github/open_edgn/security4k/asymmetric/rsa/RSA.kt

@@ -1,8 +1,8 @@
 package com.github.open_edgn.security4k.asymmetric.rsa
 
-import com.github.open_edgn.security4k.asymmetric.universal.Decoder
-import com.github.open_edgn.security4k.asymmetric.universal.Encoder
 import com.github.open_edgn.security4k.base64.Base64Utils
+import com.github.open_edgn.security4k.universal.Decoder
+import com.github.open_edgn.security4k.universal.Encoder
 import com.github.open_edgn.security4k.utils.foreach
 import java.io.ByteArrayOutputStream
 import java.io.InputStream
@@ -36,7 +36,6 @@ abstract class RSA(
     private val encryptedBlockSize by lazy { newInitCipher(Cipher.ENCRYPT_MODE).getOutputSize(1) }
     private val maxBlockSize: Int by lazy { encryptedBlockSize - 11 }
 
-
     protected val transformation: String = "RSA"
 
     /**
@@ -57,7 +56,6 @@ abstract class RSA(
         return cipher
     }
 
-
     private fun doFinal(input: InputStream, output: OutputStream, mode: Int, bufferSize: Int) {
         val cipher = newInitCipher(mode)
         val blockOutput = ByteArray(bufferSize * 4)
@@ -87,4 +85,4 @@ abstract class RSA(
         encode(plainText.toByteArray(charset).inputStream(), stream)
         return Base64Utils.encodeBytes(stream.toByteArray(), true)
     }
-}
+}

core/src/main/kotlin/com/github/open_edgn/security4k/asymmetric/rsa/RsaKeyGenerator.kt

@@ -17,8 +17,7 @@ import java.security.interfaces.RSAPublicKey
  * @param random SecureRandom 随机数生成器
  * @constructor
  */
-class RsaKeyGenerator
-    (
+class RsaKeyGenerator(
     keySize: Int = 2048,
     random: SecureRandom = SecureRandom.getInstanceStrong()
 ) : KeyGenerator {
@@ -40,5 +39,4 @@ class RsaKeyGenerator
     override val privateKeyText: String by lazy {
         Base64Utils.encodeBytes(privateKey.encoded, true)
     }
-
-}
+}

core/src/main/kotlin/com/github/open_edgn/security4k/asymmetric/rsa/RsaPrivate.kt

@@ -47,4 +47,4 @@ class RsaPrivate(
         signature.initSign(privateK)
         return signature
     }
-}
+}

core/src/main/kotlin/com/github/open_edgn/security4k/asymmetric/rsa/RsaPublic.kt

@@ -46,4 +46,4 @@ class RsaPublic(
         signature.initVerify(publicK)
         return signature
     }
-}
+}

core/src/main/kotlin/com/github/open_edgn/security4k/asymmetric/universal/IPrivateKey.kt

@@ -1,8 +1,8 @@
 package com.github.open_edgn.security4k.asymmetric.universal
 
+import com.github.open_edgn.security4k.universal.Encrypt
+
 /**
  * 非对称加、解密中私钥的接口
  */
-interface IPrivateKey : Encoder, Decoder, Sign {
-
-}
+interface IPrivateKey : Encrypt, Sign

core/src/main/kotlin/com/github/open_edgn/security4k/asymmetric/universal/IPublicKey.kt

@@ -1,7 +1,8 @@
 package com.github.open_edgn.security4k.asymmetric.universal
 
+import com.github.open_edgn.security4k.universal.Encrypt
+
 /**
  * 非对称加解密中公钥接口
  */
-interface IPublicKey : Decoder, Encoder, Verify {
-}
+interface IPublicKey : Encrypt, Verify

core/src/main/kotlin/com/github/open_edgn/security4k/asymmetric/universal/KeyGenerator.kt

@@ -13,4 +13,4 @@ interface KeyGenerator {
      * 私钥文本
      */
     val privateKeyText: String
-}
+}

core/src/main/kotlin/com/github/open_edgn/security4k/asymmetric/universal/Sign.kt

@@ -43,6 +43,4 @@ interface Sign {
      * @return String 签名
      */
     fun signText(data: String, charset: Charset = Charsets.UTF_8): String
-
-
-}
+}