feat: jpa 改造

2026-06-17 04:51:43 +08:00 · 2025-08-18 23:34:17 +08:00
parent 7eac584c91
commit e7bd2d3a91
14 changed files with 22 additions and 20 deletions
--- 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;

--- 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
--- 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<Long, ExtendedJdbcClassLoader> 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";

--- 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/";
        }
    }

--- 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;
--- 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
--- 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<Confi
        String property = applicationContext.getEnvironment().getProperty("dataease.login_timeout", String.class, "480");
        System.setProperty("dataease.login_timeout", property);

-        String ehcache = ConfigUtils.getConfig("dataease.path.ehcache", "/opt/dataease2.0/cache");
+        String ehcache = ConfigUtils.getConfig("dataease.path.ehcache", "/opt/dataease3.0/cache");
        System.setProperty("dataease.path.ehcache", ehcache);
    }
 }
--- a/core/core-backend/src/main/java/io/dataease/visualization/utils/VisualizationExcelUtils.java
+++ b/core/core-backend/src/main/java/io/dataease/visualization/utils/VisualizationExcelUtils.java
@@ -26,9 +26,9 @@ public class VisualizationExcelUtils {

    public static String getBaseRoot() {
        if (ModelUtils.isDesktop()) {
-            return ConfigUtils.getConfig("dataease.path.report", "/opt/dataease2.0/data/report/");
+            return ConfigUtils.getConfig("dataease.path.report", "/opt/dataease3.0/data/report/");
        } else {
-            return "/opt/dataease2.0/data/report/";
+            return "/opt/dataease3.0/data/report/";
        }
    }

--- a/core/core-backend/src/main/resources/application-desktop.yml
+++ b/core/core-backend/src/main/resources/application-desktop.yml
@@ -2,7 +2,7 @@ spring:

  datasource:
    driver-class-name: org.h2.Driver
-    url: jdbc:h2:/opt/dataease2.0/desktop;AUTO_SERVER=TRUE;AUTO_RECONNECT=TRUE;MODE=MySQL;CASE_INSENSITIVE_IDENTIFIERS=TRUE;DATABASE_TO_UPPER=FALSE
+    url: jdbc:h2:/opt/dataease3.0/desktop;AUTO_SERVER=TRUE;AUTO_RECONNECT=TRUE;MODE=MySQL;CASE_INSENSITIVE_IDENTIFIERS=TRUE;DATABASE_TO_UPPER=FALSE
    username: sa
    password: 123456

--- a/core/core-backend/src/main/resources/application.yml
+++ b/core/core-backend/src/main/resources/application.yml
@@ -34,7 +34,7 @@ mybatis:
    map-underscore-to-camel-case: true
 logging:
  file:
-    path: /opt/dataease2.0/logs/dataease
+    path: /opt/dataease3.0/logs/dataease
 # sql日志生产环境注释掉
 #mybatis-plus:
 #  configuration:
--- a/core/core-backend/src/main/resources/logback-spring.xml
+++ b/core/core-backend/src/main/resources/logback-spring.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration debug="true">
-    <springProperty scope="context" name="logPath" source="logging.file.path" defaultValue="/opt/dataease2.0/logs/core"/>
+    <springProperty scope="context" name="logPath" source="logging.file.path" defaultValue="/opt/dataease3.0/logs/core"/>

    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
        <immediateFlush>true</immediateFlush>
@@ -56,4 +56,4 @@
        <appender-ref ref="error_log" />
    </root>

-</configuration>
+</configuration>
--- 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',
--- 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: '資料庫名稱',
--- 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: '数据库名称',