From 9fc439adf8afbfc4c7637c7eaaa01ae1a39340e2 Mon Sep 17 00:00:00 2001
From: Yvan <Yvan@fanruan.com>
Date: Thu, 2 Jun 2022 16:22:27 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-72900=20=E5=8E=BB=E9=99=A4RPC-=E4=B8=AD?=
 =?UTF-8?q?=E5=8F=B0=E5=9F=BA=E7=A1=80=E6=A8=A1=E5=9D=97=20=E3=80=90?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E5=8E=9F=E5=9B=A0=E3=80=91rt=20=E3=80=90?=
 =?UTF-8?q?=E6=94=B9=E5=8A=A8=E6=80=9D=E8=B7=AF=E3=80=91=E8=AF=A6=E8=A7=81?=
 =?UTF-8?q?=E5=BC=80=E5=8F=91=E6=96=87=E6=A1=A3=E2=80=94=E2=80=94https://k?=
 =?UTF-8?q?ms.fineres.com/pages/viewpage.action=3FpageId=3D416066483=20?=
 =?UTF-8?q?=E3=80=90review=E5=BB=BA=E8=AE=AE=E3=80=91=E5=A4=A7=E9=83=A8?=
 =?UTF-8?q?=E5=88=86=E7=9A=84=E7=B1=BB=E4=BF=AE=E6=94=B9=E6=98=AF=E5=9B=A0?=
 =?UTF-8?q?=E4=B8=BA=E6=94=B9=E4=BA=86=E7=B1=BB=E5=90=8D=E5=92=8C=E5=8C=85?=
 =?UTF-8?q?=E5=90=8D=EF=BC=8Creview=E7=9A=84=E8=AF=9D=E5=8F=AF=E4=BB=A5?=
 =?UTF-8?q?=E4=B8=BB=E8=A6=81=E7=9C=8B=E4=B8=8Bcom.fr.data.impl.escapesql?=
 =?UTF-8?q?=E4=B8=8B=E9=9D=A2=E7=9A=84=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../preview/sql/PreviewPerformedSqlPane.java       | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/preview/sql/PreviewPerformedSqlPane.java b/designer-base/src/main/java/com/fr/design/data/datapane/preview/sql/PreviewPerformedSqlPane.java
index c0239c8fad..ee9ee2ec06 100644
--- a/designer-base/src/main/java/com/fr/design/data/datapane/preview/sql/PreviewPerformedSqlPane.java
+++ b/designer-base/src/main/java/com/fr/design/data/datapane/preview/sql/PreviewPerformedSqlPane.java
@@ -4,7 +4,7 @@ import com.fr.base.Parameter;
 import com.fr.base.ParameterHelper;
 import com.fr.base.ParameterMapNameSpace;
 import com.fr.data.impl.DBTableData;
-import com.fr.data.impl.EscapeSqlHelper;
+import com.fr.data.impl.escapesql.EscapeSqlHelperManager;
 import com.fr.data.operator.DataOperator;
 import com.fr.decision.webservice.v10.config.ConfigService;
 import com.fr.design.dialog.DialogActionAdapter;
@@ -189,7 +189,7 @@ public class PreviewPerformedSqlPane extends JDialog implements ActionListener {
         Parameter[] paras = processParameters(tableData, calculator);
         // 所有被转义参数的集合
         refreshEscapeSqlHelper();
-        Set<String> specialCharParam = EscapeSqlHelper.getInstance().getSpecialCharParam(paras);
+        Set<String> specialCharParam = EscapeSqlHelperManager.getInstance().getSpecialCharParam(paras);
         // 将参数转义等
         Set<TableDataProvider> tableDataProviders = getTableDataProviders();
         for (TableDataProvider provider : tableDataProviders) {
@@ -228,10 +228,10 @@ public class PreviewPerformedSqlPane extends JDialog implements ActionListener {
     }
 
     private static void refreshEscapeSqlHelper() {
-        EscapeSqlHelper.getInstance().setUseForbidWord(ConfigService.getInstance().getPSIConfig().isUseForbidWord());
-        EscapeSqlHelper.getInstance().setSelectedForbidWord(ConfigService.getInstance().getPSIConfig().getSelectedForbidWord());
-        EscapeSqlHelper.getInstance().setUseEscapeSpecialChar(ConfigService.getInstance().getPSIConfig().isUseEscapeSpecialChar());
-        EscapeSqlHelper.getInstance().setSelectedSpecialChar(ConfigService.getInstance().getPSIConfig().getSelectedSpecialChar());
+        EscapeSqlHelperManager.getInstance().setUseForbidWord(ConfigService.getInstance().getPSIConfig().isUseForbidWord());
+        EscapeSqlHelperManager.getInstance().setSelectedForbidWord(ConfigService.getInstance().getPSIConfig().getSelectedForbidWord());
+        EscapeSqlHelperManager.getInstance().setUseEscapeSpecialChar(ConfigService.getInstance().getPSIConfig().isUseEscapeSpecialChar());
+        EscapeSqlHelperManager.getInstance().setSelectedSpecialChar(ConfigService.getInstance().getPSIConfig().getSelectedSpecialChar());
     }
 
     private static boolean isShowSpecialCharSqlPane(List<int[]> specialCharParamIndex) {
@@ -284,7 +284,7 @@ public class PreviewPerformedSqlPane extends JDialog implements ActionListener {
         if (classManagerProvider == null) {
             return new HashSet<>();
         }
-        return classManagerProvider.getArray(TableDataProvider.XML_TAG, EscapeSqlHelper.getInstance());
+        return classManagerProvider.getArray(TableDataProvider.XML_TAG, EscapeSqlHelperManager.getInstance());
     }
 
     @Override