Merge pull request apache#27 from SphereEx/5.5.2-pingan-bank-dev-hc

strongduanmu · web-flow · commit 917290e2c4b6 · 2025-03-12T17:32:22.000+08:00
Add EncryptColumnItemType to EncryptContextBuilder for enhanced encry…
diff --git a/features/encrypt/api/src/main/java/com/sphereex/dbplusengine/encrypt/context/EncryptContext.java b/features/encrypt/api/src/main/java/com/sphereex/dbplusengine/encrypt/context/EncryptContext.java
@@ -17,6 +17,8 @@
 
 package com.sphereex.dbplusengine.encrypt.context;
 
+import com.sphereex.dbplusengine.SphereEx;
+import com.sphereex.dbplusengine.infra.hint.EncryptColumnItemType;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.Setter;
@@ -33,9 +35,15 @@ public final class EncryptContext {
     
     private final DatabaseType databaseType;
     
+    @SphereEx
     @Setter
     private String aolianColumn;
     
+    @SphereEx
     @Setter
     private String dbid;
+    
+    @SphereEx
+    @Setter
+    private EncryptColumnItemType encryptColumnItemType;
 }
diff --git a/features/encrypt/core/src/main/java/com/sphereex/dbplusengine/encrypt/context/EncryptContextBuilder.java b/features/encrypt/core/src/main/java/com/sphereex/dbplusengine/encrypt/context/EncryptContextBuilder.java
@@ -18,6 +18,7 @@
 package com.sphereex.dbplusengine.encrypt.context;
 
 import com.sphereex.dbplusengine.SphereEx;
+import com.sphereex.dbplusengine.infra.hint.EncryptColumnItemType;
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
 import org.apache.shardingsphere.encrypt.rule.column.EncryptColumn;
@@ -34,12 +35,16 @@ public final class EncryptContextBuilder {
      *
      * @param column encrypt column
      * @param databaseType database type
+     * @param encryptColumnItemType encrypt column item type
      * @return encrypt context
      */
-    public static EncryptContext build(final EncryptColumn column, @SphereEx final DatabaseType databaseType) {
+    public static EncryptContext build(final EncryptColumn column, @SphereEx final DatabaseType databaseType, @SphereEx final EncryptColumnItemType encryptColumnItemType) {
         EncryptContext result = new EncryptContext(EncryptColumnDataTypeContextBuilder.build(column), databaseType);
+        // SPEX ADDED: BEGIN
         column.getAolianColumn().ifPresent(result::setAolianColumn);
         column.getDbid().ifPresent(result::setDbid);
+        result.setEncryptColumnItemType(encryptColumnItemType);
+        // SPEX ADDED: END
         return result;
     }
 }
diff --git a/features/encrypt/core/src/main/java/com/sphereex/dbplusengine/encrypt/rule/column/item/OrderQueryColumnItem.java b/features/encrypt/core/src/main/java/com/sphereex/dbplusengine/encrypt/rule/column/item/OrderQueryColumnItem.java
@@ -19,6 +19,7 @@
 
 import com.sphereex.dbplusengine.encrypt.context.EncryptContext;
 import com.sphereex.dbplusengine.encrypt.context.EncryptContextBuilder;
+import com.sphereex.dbplusengine.infra.hint.EncryptColumnItemType;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.Setter;
@@ -69,7 +70,7 @@ public Object encrypt(final String databaseName, final String schemaName, final
             return null;
         }
         return encryptor.encrypt(originalValue, new AlgorithmSQLContext(databaseName, schemaName, tableName, logicColumnName),
-                EncryptContextBuilder.build(encryptColumn, databaseType));
+                EncryptContextBuilder.build(encryptColumn, databaseType, EncryptColumnItemType.ORDER_QUERY));
     }
     
     /**
@@ -84,7 +85,7 @@ public Object encrypt(final String databaseName, final String schemaName, final
      */
     public List<Object> encrypt(final String databaseName, final String schemaName, final String tableName, final String logicColumnName, final List<Object> originalValues) {
         AlgorithmSQLContext algorithmSQLContext = new AlgorithmSQLContext(databaseName, schemaName, tableName, logicColumnName);
-        EncryptContext encryptContext = EncryptContextBuilder.build(encryptColumn, databaseType);
+        EncryptContext encryptContext = EncryptContextBuilder.build(encryptColumn, databaseType, EncryptColumnItemType.ORDER_QUERY);
         List<Object> result = new LinkedList<>();
         for (Object each : originalValues) {
             result.add(null == each ? null : encryptor.encrypt(each, algorithmSQLContext, encryptContext));
diff --git a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rule/column/item/AssistedQueryColumnItem.java b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rule/column/item/AssistedQueryColumnItem.java
@@ -20,6 +20,7 @@
 import com.sphereex.dbplusengine.SphereEx;
 import com.sphereex.dbplusengine.encrypt.context.EncryptContext;
 import com.sphereex.dbplusengine.encrypt.context.EncryptContextBuilder;
+import com.sphereex.dbplusengine.infra.hint.EncryptColumnItemType;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.Setter;
@@ -81,7 +82,7 @@ public Object encrypt(final String databaseName, final String schemaName, final
         }
         return encryptor.encrypt(originalValue, new AlgorithmSQLContext(databaseName, schemaName, tableName, logicColumnName),
                 // SPEX CHANGED: BEGIN
-                EncryptContextBuilder.build(encryptColumn, databaseType));
+                EncryptContextBuilder.build(encryptColumn, databaseType, EncryptColumnItemType.ASSISTED_QUERY));
         // SPEX CHANGED: END
     }
     
@@ -98,7 +99,7 @@ public Object encrypt(final String databaseName, final String schemaName, final
     public List<Object> encrypt(final String databaseName, final String schemaName, final String tableName, final String logicColumnName, final List<Object> originalValues) {
         AlgorithmSQLContext algorithmSQLContext = new AlgorithmSQLContext(databaseName, schemaName, tableName, logicColumnName);
         // SPEX ADDED: BEGIN
-        EncryptContext encryptContext = EncryptContextBuilder.build(encryptColumn, databaseType);
+        EncryptContext encryptContext = EncryptContextBuilder.build(encryptColumn, databaseType, EncryptColumnItemType.ASSISTED_QUERY);
         // SPEX ADDED: END
         List<Object> result = new LinkedList<>();
         for (Object each : originalValues) {
diff --git a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rule/column/item/CipherColumnItem.java b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rule/column/item/CipherColumnItem.java
@@ -23,6 +23,7 @@
 import com.sphereex.dbplusengine.encrypt.context.EncryptContext;
 import com.sphereex.dbplusengine.encrypt.context.EncryptContextBuilder;
 import com.sphereex.dbplusengine.infra.database.core.metadata.database.datatype.DataValueConverter;
+import com.sphereex.dbplusengine.infra.hint.EncryptColumnItemType;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.Setter;
@@ -77,7 +78,7 @@ public Object encrypt(final String databaseName, final String schemaName, final
         }
         return encryptor.encrypt(originalValue, new AlgorithmSQLContext(databaseName, schemaName, tableName, logicColumnName),
                 // SPEX CHANGED: BEGIN
-                EncryptContextBuilder.build(encryptColumn, databaseType));
+                EncryptContextBuilder.build(encryptColumn, databaseType, EncryptColumnItemType.CIPHER));
         // SPEX CHANGED: END
     }
     
@@ -94,7 +95,7 @@ public Object encrypt(final String databaseName, final String schemaName, final
     public List<Object> encrypt(final String databaseName, final String schemaName, final String tableName, final String logicColumnName, final List<Object> originalValues) {
         AlgorithmSQLContext algorithmSQLContext = new AlgorithmSQLContext(databaseName, schemaName, tableName, logicColumnName);
         @SphereEx(Type.MODIFY)
-        EncryptContext encryptContext = EncryptContextBuilder.build(encryptColumn, databaseType);
+        EncryptContext encryptContext = EncryptContextBuilder.build(encryptColumn, databaseType, EncryptColumnItemType.CIPHER);
         List<Object> result = new LinkedList<>();
         for (Object each : originalValues) {
             result.add(null == each ? null : encryptor.encrypt(each, algorithmSQLContext, encryptContext));
@@ -119,7 +120,7 @@ public Object decrypt(final String databaseName, final String schemaName, final
             return null;
         }
         // SPEX CHANGED: BEGIN
-        EncryptContext encryptContext = EncryptContextBuilder.build(encryptColumn, databaseType);
+        EncryptContext encryptContext = EncryptContextBuilder.build(encryptColumn, databaseType, EncryptColumnItemType.CIPHER);
         // TODO if some algorithm need to handle original Clob, this should be changed
         Object convertedCipherValue = convertClobValueToString(cipherValue);
         return convertToOriginTypeIfNecessary(
diff --git a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rule/column/item/LikeQueryColumnItem.java b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rule/column/item/LikeQueryColumnItem.java
@@ -20,6 +20,7 @@
 import com.sphereex.dbplusengine.SphereEx;
 import com.sphereex.dbplusengine.encrypt.context.EncryptContext;
 import com.sphereex.dbplusengine.encrypt.context.EncryptContextBuilder;
+import com.sphereex.dbplusengine.infra.hint.EncryptColumnItemType;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.Setter;
@@ -74,7 +75,7 @@ public Object encrypt(final String databaseName, final String schemaName, final
         }
         return encryptor.encrypt(originalValue, new AlgorithmSQLContext(databaseName, schemaName, tableName, logicColumnName),
                 // SPEX CHANGED: BEGIN
-                EncryptContextBuilder.build(encryptColumn, databaseType));
+                EncryptContextBuilder.build(encryptColumn, databaseType, EncryptColumnItemType.LIKE_QUERY));
         // SPEX CHANGED: END
     }
     
@@ -91,7 +92,7 @@ public Object encrypt(final String databaseName, final String schemaName, final
     public List<Object> encrypt(final String databaseName, final String schemaName, final String tableName, final String logicColumnName, final List<Object> originalValues) {
         AlgorithmSQLContext algorithmSQLContext = new AlgorithmSQLContext(databaseName, schemaName, tableName, logicColumnName);
         // SPEX ADDED: BEGIN
-        EncryptContext encryptContext = EncryptContextBuilder.build(encryptColumn, databaseType);
+        EncryptContext encryptContext = EncryptContextBuilder.build(encryptColumn, databaseType, EncryptColumnItemType.LIKE_QUERY);
         // SPEX ADDED: END
         List<Object> result = new LinkedList<>();
         for (Object each : originalValues) {
