From e7bd2d3a91c45acabd5b944a181724c9c652d9fb Mon Sep 17 00:00:00 2001 From: taojinlong Date: Mon, 18 Aug 2025 23:34:17 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20jpa=20=E6=94=B9=E9=80=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/io/dataease/ai/service/AiBaseService.java | 2 ++ .../main/java/io/dataease/datasource/manage/EngineManage.java | 2 +- .../java/io/dataease/datasource/provider/CalciteProvider.java | 4 ++-- .../main/java/io/dataease/datasource/provider/ExcelUtils.java | 4 ++-- .../io/dataease/exportCenter/manage/ExportCenterManage.java | 2 +- .../src/main/java/io/dataease/font/manage/FontManage.java | 2 +- .../main/java/io/dataease/listener/EhCacheStartListener.java | 2 +- .../dataease/visualization/utils/VisualizationExcelUtils.java | 4 ++-- core/core-backend/src/main/resources/application-desktop.yml | 2 +- core/core-backend/src/main/resources/application.yml | 2 +- core/core-backend/src/main/resources/logback-spring.xml | 4 ++-- core/core-frontend/src/locales/en.ts | 4 ++-- core/core-frontend/src/locales/tw.ts | 4 ++-- core/core-frontend/src/locales/zh-CN.ts | 4 ++-- 14 files changed, 22 insertions(+), 20 deletions(-) diff --git a/core/core-backend/src/main/java/io/dataease/ai/service/AiBaseService.java b/core/core-backend/src/main/java/io/dataease/ai/service/AiBaseService.java index 44ab5344ba..75f269e6d3 100644 --- a/core/core-backend/src/main/java/io/dataease/ai/service/AiBaseService.java +++ b/core/core-backend/src/main/java/io/dataease/ai/service/AiBaseService.java @@ -8,6 +8,8 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; + + import java.util.HashMap; import java.util.Map; diff --git a/core/core-backend/src/main/java/io/dataease/datasource/manage/EngineManage.java b/core/core-backend/src/main/java/io/dataease/datasource/manage/EngineManage.java index 7b3e1f996e..43b36d76fc 100644 --- a/core/core-backend/src/main/java/io/dataease/datasource/manage/EngineManage.java +++ b/core/core-backend/src/main/java/io/dataease/datasource/manage/EngineManage.java @@ -46,7 +46,7 @@ public class EngineManage { private DataSourceManage dataSourceManage; @Resource private DatasourceServer datasourceServer; - @Value("${dataease.path.engine:jdbc:h2:/opt/dataease2.0/desktop_data;AUTO_SERVER=TRUE;AUTO_RECONNECT=TRUE;MODE=MySQL;CASE_INSENSITIVE_IDENTIFIERS=TRUE;DATABASE_TO_UPPER=FALSE}") + @Value("${dataease.path.engine:jdbc:h2:/opt/dataease3.0/desktop_data;AUTO_SERVER=TRUE;AUTO_RECONNECT=TRUE;MODE=MySQL;CASE_INSENSITIVE_IDENTIFIERS=TRUE;DATABASE_TO_UPPER=FALSE}") private String engineUrl; @Resource diff --git a/core/core-backend/src/main/java/io/dataease/datasource/provider/CalciteProvider.java b/core/core-backend/src/main/java/io/dataease/datasource/provider/CalciteProvider.java index f91c13d3a8..c78f1d681a 100644 --- a/core/core-backend/src/main/java/io/dataease/datasource/provider/CalciteProvider.java +++ b/core/core-backend/src/main/java/io/dataease/datasource/provider/CalciteProvider.java @@ -57,9 +57,9 @@ public class CalciteProvider extends Provider { private EngineManage engineManage; protected ExtendedJdbcClassLoader extendedJdbcClassLoader; private Map customJdbcClassLoaders = new HashMap<>(); - @Value("${dataease.path.driver:/opt/dataease2.0/drivers}") + @Value("${dataease.path.driver:/opt/dataease3.0/drivers}") private String FILE_PATH; - @Value("${dataease.path.custom-drivers:/opt/dataease2.0/custom-drivers/}") + @Value("${dataease.path.custom-drivers:/opt/dataease3.0/custom-drivers/}") private String CUSTOM_PATH; private static String split = "DE"; diff --git a/core/core-backend/src/main/java/io/dataease/datasource/provider/ExcelUtils.java b/core/core-backend/src/main/java/io/dataease/datasource/provider/ExcelUtils.java index bddaeecd99..5ebe5a89bd 100644 --- a/core/core-backend/src/main/java/io/dataease/datasource/provider/ExcelUtils.java +++ b/core/core-backend/src/main/java/io/dataease/datasource/provider/ExcelUtils.java @@ -45,9 +45,9 @@ public class ExcelUtils { public static String getExcelPath() { if (ModelUtils.isDesktop()) { - return ConfigUtils.getConfig("dataease.path.excel", "/opt/dataease2.0/data/excel/"); + return ConfigUtils.getConfig("dataease.path.excel", "/opt/dataease3.0/data/excel/"); } else { - return "/opt/dataease2.0/data/excel/"; + return "/opt/dataease3.0/data/excel/"; } } diff --git a/core/core-backend/src/main/java/io/dataease/exportCenter/manage/ExportCenterManage.java b/core/core-backend/src/main/java/io/dataease/exportCenter/manage/ExportCenterManage.java index a3f96d4b96..3bf743fd4e 100644 --- a/core/core-backend/src/main/java/io/dataease/exportCenter/manage/ExportCenterManage.java +++ b/core/core-backend/src/main/java/io/dataease/exportCenter/manage/ExportCenterManage.java @@ -114,7 +114,7 @@ public class ExportCenterManage implements BaseExportApi { private final static String DATA_URL_TITLE = "data:image/jpeg;base64,"; - @Value("${dataease.path.exportData:/opt/dataease2.0/data/exportData/}") + @Value("${dataease.path.exportData:/opt/dataease3.0/data/exportData/}") private String exportData_path; @Resource private VisualizationWatermarkRepository visualizationWatermarkRepository; diff --git a/core/core-backend/src/main/java/io/dataease/font/manage/FontManage.java b/core/core-backend/src/main/java/io/dataease/font/manage/FontManage.java index fec4223774..6fcdfe311b 100644 --- a/core/core-backend/src/main/java/io/dataease/font/manage/FontManage.java +++ b/core/core-backend/src/main/java/io/dataease/font/manage/FontManage.java @@ -26,7 +26,7 @@ import java.util.UUID; @Component public class FontManage { - @Value("${dataease.path.font:/opt/dataease2.0/data/font/}") + @Value("${dataease.path.font:/opt/dataease3.0/data/font/}") private String path; @Resource diff --git a/core/core-backend/src/main/java/io/dataease/listener/EhCacheStartListener.java b/core/core-backend/src/main/java/io/dataease/listener/EhCacheStartListener.java index 71df58fc65..a1f69ada74 100644 --- a/core/core-backend/src/main/java/io/dataease/listener/EhCacheStartListener.java +++ b/core/core-backend/src/main/java/io/dataease/listener/EhCacheStartListener.java @@ -11,7 +11,7 @@ public class EhCacheStartListener implements ApplicationContextInitializer - + true @@ -56,4 +56,4 @@ - \ No newline at end of file + diff --git a/core/core-frontend/src/locales/en.ts b/core/core-frontend/src/locales/en.ts index f6614408e2..f16bfbd18b 100644 --- a/core/core-frontend/src/locales/en.ts +++ b/core/core-frontend/src/locales/en.ts @@ -975,7 +975,7 @@ export default { auth_method: 'Authentication Method', passwd: 'Username and Password', kerbers_info: - 'Please make sure krb5.Conf, Keytab Key, have been added to the path: /opt/dataease2.0/conf', + 'Please make sure krb5.Conf, Keytab Key, have been added to the path: /opt/dataease3.0/conf', client_principal: 'Client Principal', keytab_Key_path: 'Keytab Key Path', please_select_left: 'Please select from the left', @@ -3859,7 +3859,7 @@ export default { auth_method: 'Authentication method', passwd: 'Username and password', kerbers_info: - 'Please make sure krb5.Conf and Keytab Key have been added to the path: /opt/dataease2.0/conf', + 'Please make sure krb5.Conf and Keytab Key have been added to the path: /opt/dataease3.0/conf', client_principal: 'Client Principal', keytab_Key_path: 'Keytab Key Path', data_base: 'Database name', diff --git a/core/core-frontend/src/locales/tw.ts b/core/core-frontend/src/locales/tw.ts index 7d655b2256..8673f76db8 100644 --- a/core/core-frontend/src/locales/tw.ts +++ b/core/core-frontend/src/locales/tw.ts @@ -941,7 +941,7 @@ export default { data_source_table: '資料來源表', auth_method: '認證方式', passwd: '使用者名稱密碼', - kerbers_info: '請確保krb5.Conf、Keytab Key，已新增至路徑：/opt/dataease2.0/conf', + kerbers_info: '請確保krb5.Conf、Keytab Key，已新增至路徑：/opt/dataease3.0/conf', client_principal: 'Client Principal', keytab_Key_path: 'Keytab Key Path', please_select_left: '請從左邊選擇', @@ -3747,7 +3747,7 @@ export default { data_source_table: '資料來源表', auth_method: '認證方式', passwd: '使用者名稱密碼', - kerbers_info: '請確保krb5.Conf、Keytab Key，已新增至路徑：/opt/dataease2.0/conf', + kerbers_info: '請確保krb5.Conf、Keytab Key，已新增至路徑：/opt/dataease3.0/conf', client_principal: 'Client Principal', keytab_Key_path: 'Keytab Key Path', data_base: '資料庫名稱', diff --git a/core/core-frontend/src/locales/zh-CN.ts b/core/core-frontend/src/locales/zh-CN.ts index c469ae8966..adb85dda5a 100644 --- a/core/core-frontend/src/locales/zh-CN.ts +++ b/core/core-frontend/src/locales/zh-CN.ts @@ -943,7 +943,7 @@ export default { data_source_table: '数据源表', auth_method: '认证方式', passwd: '用户名密码', - kerbers_info: '请确保 krb5.Conf、Keytab Key，已经添加到路径：/opt/dataease2.0/conf', + kerbers_info: '请确保 krb5.Conf、Keytab Key，已经添加到路径：/opt/dataease3.0/conf', client_principal: 'Client Principal', keytab_Key_path: 'Keytab Key Path', please_select_left: '请从左侧选择', @@ -3753,7 +3753,7 @@ export default { data_source_table: '数据源表', auth_method: '认证方式', passwd: '用户名密码', - kerbers_info: '请确保 krb5.Conf、Keytab Key，已经添加到路径：/opt/dataease2.0/conf', + kerbers_info: '请确保 krb5.Conf、Keytab Key，已经添加到路径：/opt/dataease3.0/conf', client_principal: 'Client Principal', keytab_Key_path: 'Keytab Key Path', data_base: '数据库名称',