update configuration properties

Author: weasley

.gitignore

@@ -31,3 +31,4 @@ build/
 
 ### VS Code ###
 .vscode/
+assets/

README.md

@@ -1,2 +1,14 @@
 # mybatis-encrypt-spring-boot-parent
+
 A spring-boot starter to encrypt and decrypt some column of database
+
+Tips: For run test application I recommend you to set the correct path that you can get a cleanning project directory.
+
+![image-20221220113810243](https://alphahub-test-bucket.oss-cn-shanghai.aliyuncs.com/image/image-20221220113810243.png)
+
+## 1 Add dependences  for your project pom.xml
+
+
+
+
+

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

@@ -24,6 +24,7 @@
 import java.util.concurrent.ConcurrentHashMap;
 
 import static io.github.weasleyj.mybatis.encrypt.config.MybatisEncryptProperties.AesProperties;
+import static io.github.weasleyj.mybatis.encrypt.config.MybatisEncryptProperties.DiyProperties;
 import static io.github.weasleyj.mybatis.encrypt.constant.EncryptType.AES;
 import static io.github.weasleyj.mybatis.encrypt.constant.EncryptType.BASE64;
 import static io.github.weasleyj.mybatis.encrypt.constant.EncryptType.DIY;
@@ -39,32 +40,30 @@
 @Lazy(value = false)
 @ConditionalOnClass({SqlSessionFactory.class})
 @ConditionalOnBean(annotation = {EnableMybatisEncryption.class})
-@EnableConfigurationProperties({MybatisEncryptProperties.class, AesProperties.class})
 @ConfigurationPropertiesScan(basePackages = {"io.github.weasleyj.mybatis.encrypt.config"})
+@EnableConfigurationProperties({MybatisEncryptProperties.class, AesProperties.class, DiyProperties.class})
 public class MybatisEncryptConfiguration implements InitializingBean {
     /**
      * The clients of encrypt strategies
      */
     public static final Map<EncryptType, EncryptStrategy> STRATEGIES_CLIENTS = new ConcurrentHashMap<>(6);
     private final Logger logger = LoggerFactory.getLogger(this.getClass());
+    private final DiyProperties diyProperties;
     private final AesProperties aesProperties;
     /**
      * The list of 'SqlSessionFactory'
      */
     private final List<SqlSessionFactory> sqlSessionFactories;
-    private final MybatisEncryptProperties mybatisEncryptProperties;
     private final DefaultMybatisEncryptInterceptor defaultMybatisEncryptInterceptor;
 
-    public MybatisEncryptConfiguration(AesProperties aesProperties,
-                                       List<SqlSessionFactory> sqlSessionFactories,
-                                       MybatisEncryptProperties mybatisEncryptProperties,
-                                       DefaultMybatisEncryptInterceptor defaultMybatisEncryptInterceptor) {
+    public MybatisEncryptConfiguration(DiyProperties diyProperties, AesProperties aesProperties, List<SqlSessionFactory> sqlSessionFactories, DefaultMybatisEncryptInterceptor defaultMybatisEncryptInterceptor) {
+        this.diyProperties = diyProperties;
         this.aesProperties = aesProperties;
         this.sqlSessionFactories = sqlSessionFactories;
-        this.mybatisEncryptProperties = mybatisEncryptProperties;
         this.defaultMybatisEncryptInterceptor = defaultMybatisEncryptInterceptor;
     }
 
+
     @Override
     public void afterPropertiesSet() throws Exception {
         sqlSessionFactories.forEach(sqlSessionFactory -> {
@@ -73,8 +72,8 @@ public void afterPropertiesSet() throws Exception {
                 configuration.addInterceptor(defaultMybatisEncryptInterceptor);
             }
         });
-        if (null != mybatisEncryptProperties.getEncryptStrategy()) {
-            STRATEGIES_CLIENTS.put(DIY, ClassUtils.newInstance(mybatisEncryptProperties.getEncryptStrategy()));
+        if (null != diyProperties.getEncryptStrategy()) {
+            STRATEGIES_CLIENTS.put(DIY, ClassUtils.newInstance(diyProperties.getEncryptStrategy()));
         }
         STRATEGIES_CLIENTS.put(BASE64, new DefaultBase64EncryptStrategyImpl());
         STRATEGIES_CLIENTS.put(AES, new DefaultAesEncryptStrategyImpl(aesProperties));

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

@@ -34,10 +34,6 @@ public class MybatisEncryptProperties {
      * @see EncryptType
      */
     private EncryptType encryptType = BASE64;
-    /**
-     * Developer-defined encryption and decryption policies
-     */
-    private Class<? extends EncryptStrategy> encryptStrategy = null;
 
     /**
      * The configuration properties of AES
@@ -72,4 +68,18 @@ public String getSecretKey() {
         }
     }
 
+    /**
+     * The configuration properties of user DIY encrypt strategy
+     */
+    @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
+    @Accessors(chain = true)
+    @ConfigurationProperties(prefix = PREFIX + ".diy")
+    public static class DiyProperties {
+        /**
+         * Developer defines encryption and decryption policies
+         */
+        private Class<? extends EncryptStrategy> encryptStrategy = null;
+    }
 }

mybatis-encrypt-spring-boot-starter/src/main/java/io/github/weasleyj/mybatis/encrypt/constant/EncryptType.java

@@ -1,5 +1,6 @@
 package io.github.weasleyj.mybatis.encrypt.constant;
 
+import io.github.weasleyj.mybatis.encrypt.config.MybatisEncryptProperties;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
@@ -14,6 +15,8 @@
 public enum EncryptType implements EncryptConstant {
     /**
      * Use AES for encryption and decryption
+     *
+     * @see MybatisEncryptProperties.AesProperties
      */
     AES,
     /**
@@ -22,6 +25,8 @@ public enum EncryptType implements EncryptConstant {
     BASE64,
     /**
      * User defined encrypt strategy
+     *
+     * @see MybatisEncryptProperties.DiyProperties
      */
     DIY
 }