update configuration properties

Author: weasley

mybatis-encrypt-spring-boot-starter/src/main/java/io/github/weasleyj/mybatis/encrypt/config/MybatisEncryptProperties.java

@@ -47,7 +47,7 @@ public static class AesProperties {
         /**
          * The secret key for AES encrypt, the length must be 16.
          */
-        private String secretKey;
+        private String key;
         /**
          * The offset for secretKey, the length must be 16.
          */
@@ -60,11 +60,11 @@ public String getKeyIv() {
             return keyIv;
         }
 
-        public String getSecretKey() {
-            if (secretKey.length() != 16) {
-                throw new IllegalArgumentException("secret-key length must be 16: " + secretKey);
+        public String getKey() {
+            if (key.length() != 16) {
+                throw new IllegalArgumentException("secret-key length must be 16: " + key);
             }
-            return secretKey;
+            return key;
         }
     }
 

mybatis-encrypt-spring-boot-starter/src/main/java/io/github/weasleyj/mybatis/encrypt/core/DefaultAesEncryptStrategyImpl.java

@@ -42,7 +42,7 @@ public DefaultAesEncryptStrategyImpl(AesProperties aesProperties) {
     public String encrypt(Object plaintext) {
         Assert.notNull(plaintext, "Plaintext cannot be null");
         try {
-            SecretKey secretKey = new SecretKeySpec(aesProperties.getSecretKey().getBytes(StandardCharsets.UTF_8), KEY_ALGORITHM);
+            SecretKey secretKey = new SecretKeySpec(aesProperties.getKey().getBytes(StandardCharsets.UTF_8), KEY_ALGORITHM);
             Cipher cipher = Cipher.getInstance(CIPHER_ALGORITHM);
             @SuppressWarnings({"all"}) IvParameterSpec ivSpec = new IvParameterSpec(aesProperties.getKeyIv().getBytes(StandardCharsets.UTF_8));
             int blockSize = cipher.getBlockSize();
@@ -71,7 +71,7 @@ public String decrypt(Object ciphertext) {
         try {
             byte[] decodeFromBase64 = Base64.getDecoder().decode(String.valueOf(ciphertext));
             Cipher cipher = Cipher.getInstance(CIPHER_ALGORITHM);
-            SecretKey secretKey = new SecretKeySpec(aesProperties.getSecretKey().getBytes(StandardCharsets.UTF_8), KEY_ALGORITHM);
+            SecretKey secretKey = new SecretKeySpec(aesProperties.getKey().getBytes(StandardCharsets.UTF_8), KEY_ALGORITHM);
             @SuppressWarnings({"all"}) IvParameterSpec ivSpec = new IvParameterSpec(aesProperties.getKeyIv().getBytes(StandardCharsets.UTF_8));
             cipher.init(Cipher.DECRYPT_MODE, secretKey, ivSpec);
             byte[] originalBytes = cipher.doFinal(decodeFromBase64);

mybatis-encrypt-spring-boot-starter/src/test/java/io/github/weasleyj/mybatis/encrypt/core/DefaultAesEncryptStrategyImplTest.java

@@ -7,7 +7,7 @@ class DefaultAesEncryptStrategyImplTest {
 
     static EncryptStrategy encryptStrategy = new DefaultAesEncryptStrategyImpl(
             new MybatisEncryptProperties.AesProperties()
-                    .setSecretKey("Jidkdp1mWL1tRyK=")
+                    .setKey("Jidkdp1mWL1tRyK=")
                     .setKeyIv("Jidkdp1mWL1jijK=")
     );
 

mybatis-encrypt-spring-boot-tests/src/main/resources/application.yml

@@ -29,9 +29,10 @@ mybatis:
     enable: on
     encrypt-type: aes
     aes:
-      secret-key: Jidkdp1mWL1tRyK=
+      key: Jidkdp1mWL1tRyK=
       key-iv: Poikdp1mWL1jijK=
-    encrypt-strategy:
+    diy:
+      encrypt-strategy:
 
 # PageHelper分页插件
 pagehelper: