From f2c841e50b9490e94ca3fddf02066ebb0558cf13 Mon Sep 17 00:00:00 2001 From: root <13910913995@163.com> Date: Wed, 12 Mar 2025 09:15:30 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E5=85=B6=E4=B8=AD?= =?UTF-8?q?=E7=9A=84bug=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/io/gisbi/datasource/manage/EngineManage.java | 2 +- .../java/io/gisbi/datasource/provider/CalciteProvider.java | 4 ++-- .../main/java/io/gisbi/datasource/provider/ExcelUtils.java | 4 ++-- .../io/gisbi/datasource/server/DatasourceDriverServer.java | 2 +- .../io/gisbi/exportCenter/manage/ExportCenterManage.java | 2 +- .../src/main/java/io/gisbi/font/manage/FontManage.java | 2 +- .../gisbi/visualization/server/StaticResourceServer.java | 2 +- .../gisbi/visualization/utils/VisualizationExcelUtils.java | 4 ++-- core/core-backend/src/main/resources/application.yml | 4 +++- core/core-backend/src/main/resources/logback-spring.xml | 2 +- core/core-backend/src/main/resources/substitule.json | 1 + core/core-frontend/config/dev.ts | 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 ++-- .../java/io/gisbi/auth/config/SubstituleLoginConfig.java | 7 ++++--- .../java/io/gisbi/constant/StaticResourceConstants.java | 4 ++-- .../java/io/gisbi/result/ResultResponseBodyAdvice.java | 2 +- 18 files changed, 31 insertions(+), 27 deletions(-) create mode 100644 core/core-backend/src/main/resources/substitule.json diff --git a/core/core-backend/src/main/java/io/gisbi/datasource/manage/EngineManage.java b/core/core-backend/src/main/java/io/gisbi/datasource/manage/EngineManage.java index 8e99a66..ec4e2a4 100644 --- a/core/core-backend/src/main/java/io/gisbi/datasource/manage/EngineManage.java +++ b/core/core-backend/src/main/java/io/gisbi/datasource/manage/EngineManage.java @@ -40,7 +40,7 @@ public class EngineManage { @Resource private CoreDatasourceMapper datasourceMapper; - @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("${gisbi.path.engine:jdbc:h2:/opt/gisbi/desktop_data;AUTO_SERVER=TRUE;AUTO_RECONNECT=TRUE;MODE=MySQL;CASE_INSENSITIVE_IDENTIFIERS=TRUE;DATABASE_TO_UPPER=FALSE}") private String engineUrl; diff --git a/core/core-backend/src/main/java/io/gisbi/datasource/provider/CalciteProvider.java b/core/core-backend/src/main/java/io/gisbi/datasource/provider/CalciteProvider.java index aacb77d..a20b026 100644 --- a/core/core-backend/src/main/java/io/gisbi/datasource/provider/CalciteProvider.java +++ b/core/core-backend/src/main/java/io/gisbi/datasource/provider/CalciteProvider.java @@ -55,9 +55,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("${gisbi.path.driver:/opt/gisbi/drivers}") private String FILE_PATH; - @Value("${dataease.path.custom-drivers:/opt/dataease2.0/custom-drivers/}") + @Value("${gisbi.path.custom-drivers:/opt/gisbi/custom-drivers/}") private String CUSTOM_PATH; private static String split = "DE"; diff --git a/core/core-backend/src/main/java/io/gisbi/datasource/provider/ExcelUtils.java b/core/core-backend/src/main/java/io/gisbi/datasource/provider/ExcelUtils.java index c6edc0e..9d80147 100644 --- a/core/core-backend/src/main/java/io/gisbi/datasource/provider/ExcelUtils.java +++ b/core/core-backend/src/main/java/io/gisbi/datasource/provider/ExcelUtils.java @@ -40,9 +40,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("gisbi.path.excel", "/opt/gisbi/data/excel/"); } else { - return "/opt/dataease2.0/data/excel/"; + return "/opt/gisbi/data/excel/"; } } diff --git a/core/core-backend/src/main/java/io/gisbi/datasource/server/DatasourceDriverServer.java b/core/core-backend/src/main/java/io/gisbi/datasource/server/DatasourceDriverServer.java index 8800938..05f6c54 100644 --- a/core/core-backend/src/main/java/io/gisbi/datasource/server/DatasourceDriverServer.java +++ b/core/core-backend/src/main/java/io/gisbi/datasource/server/DatasourceDriverServer.java @@ -33,7 +33,7 @@ import java.util.Map; @RequestMapping("/datasourceDriver") public class DatasourceDriverServer implements DatasourceDriverApi { - @Value("${dataease.path.custom-drivers:/opt/dataease2.0/custom-drivers/}") + @Value("${gisbi.path.custom-drivers:/opt/gisbi/custom-drivers/}") private String DRIVER_PATH; @Resource diff --git a/core/core-backend/src/main/java/io/gisbi/exportCenter/manage/ExportCenterManage.java b/core/core-backend/src/main/java/io/gisbi/exportCenter/manage/ExportCenterManage.java index bcd2971..7d2b0a4 100644 --- a/core/core-backend/src/main/java/io/gisbi/exportCenter/manage/ExportCenterManage.java +++ b/core/core-backend/src/main/java/io/gisbi/exportCenter/manage/ExportCenterManage.java @@ -102,7 +102,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("${gisbi.path.exportData:/opt/gisbi/data/exportData/}") private String exportData_path; @Resource private VisualizationWatermarkMapper watermarkMapper; diff --git a/core/core-backend/src/main/java/io/gisbi/font/manage/FontManage.java b/core/core-backend/src/main/java/io/gisbi/font/manage/FontManage.java index f485d34..157ec49 100644 --- a/core/core-backend/src/main/java/io/gisbi/font/manage/FontManage.java +++ b/core/core-backend/src/main/java/io/gisbi/font/manage/FontManage.java @@ -32,7 +32,7 @@ import java.util.UUID; @Component public class FontManage { - @Value("${dataease.path.font:/opt/dataease2.0/data/font/}") + @Value("${gisbi.path.font:/opt/gisbi/data/font/}") private String path; @Resource diff --git a/core/core-backend/src/main/java/io/gisbi/visualization/server/StaticResourceServer.java b/core/core-backend/src/main/java/io/gisbi/visualization/server/StaticResourceServer.java index 3d4b0fc..09de74f 100644 --- a/core/core-backend/src/main/java/io/gisbi/visualization/server/StaticResourceServer.java +++ b/core/core-backend/src/main/java/io/gisbi/visualization/server/StaticResourceServer.java @@ -34,7 +34,7 @@ import java.util.Map; @RequestMapping("/staticResource") public class StaticResourceServer implements StaticResourceApi { - @Value("${dataease.path.static-resource:/opt/dataease2.0/data/static-resource/}") + @Value("${gisbi.path.static-resource:/opt/gisbi/data/static-resource/}") private String staticDir; @Override diff --git a/core/core-backend/src/main/java/io/gisbi/visualization/utils/VisualizationExcelUtils.java b/core/core-backend/src/main/java/io/gisbi/visualization/utils/VisualizationExcelUtils.java index 8eb73b4..a90ab34 100644 --- a/core/core-backend/src/main/java/io/gisbi/visualization/utils/VisualizationExcelUtils.java +++ b/core/core-backend/src/main/java/io/gisbi/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("gisbi.path.report", "/opt/gisbi/data/report/"); } else { - return "/opt/dataease2.0/data/report/"; + return "/opt/gisbi/data/report/"; } } diff --git a/core/core-backend/src/main/resources/application.yml b/core/core-backend/src/main/resources/application.yml index 1d46ca7..2ab31b4 100644 --- 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/gisbi1.0/logs/gisbi + path: /opt/gisbi/logs # sql日志生产环境注释掉 #mybatis-plus: # configuration: @@ -52,6 +52,8 @@ gisbi: apisix-api: domain: http://127.0.0.1:9180 key: edd1c9f034335f136f87ad84b625c8f1 + path: + substitule: /opt/gisbi/substitule.json # springdoc-openapi项目配置 springdoc: diff --git a/core/core-backend/src/main/resources/logback-spring.xml b/core/core-backend/src/main/resources/logback-spring.xml index 9a5af79..2766a91 100644 --- a/core/core-backend/src/main/resources/logback-spring.xml +++ b/core/core-backend/src/main/resources/logback-spring.xml @@ -1,6 +1,6 @@ - + true diff --git a/core/core-backend/src/main/resources/substitule.json b/core/core-backend/src/main/resources/substitule.json new file mode 100644 index 0000000..b792576 --- /dev/null +++ b/core/core-backend/src/main/resources/substitule.json @@ -0,0 +1 @@ +{"pwd": "Gisbi@123456"} \ No newline at end of file diff --git a/core/core-frontend/config/dev.ts b/core/core-frontend/config/dev.ts index ca7bea3..6300308 100644 --- a/core/core-frontend/config/dev.ts +++ b/core/core-frontend/config/dev.ts @@ -8,9 +8,9 @@ export default { }, // 使用 proxy 实例 '/api': { - target: 'http://localhost:8100', + target: 'http://localhost:8105', changeOrigin: true, - rewrite: path => path.replace(/^\/api/, 'de2api') + rewrite: path => path.replace(/^\/api/, '') } }, port: 8080 diff --git a/core/core-frontend/src/locales/en.ts b/core/core-frontend/src/locales/en.ts index f93be7c..251210e 100644 --- a/core/core-frontend/src/locales/en.ts +++ b/core/core-frontend/src/locales/en.ts @@ -958,7 +958,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/gisbi/conf', client_principal: 'Client Principal', keytab_Key_path: 'Keytab Key Path', please_select_left: 'Please select from the left', @@ -3755,7 +3755,7 @@ Scatter chart (bubble) chart: {a} (series name), {b} (data name), {c} (value arr 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/gisbi/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 56c4adf..e8497d4 100644 --- a/core/core-frontend/src/locales/tw.ts +++ b/core/core-frontend/src/locales/tw.ts @@ -927,7 +927,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/gisbi/conf', client_principal: 'Client Principal', keytab_Key_path: 'Keytab Key Path', please_select_left: '請從左邊選擇', @@ -3649,7 +3649,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/gisbi/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 1f8765d..a72be7c 100644 --- a/core/core-frontend/src/locales/zh-CN.ts +++ b/core/core-frontend/src/locales/zh-CN.ts @@ -929,7 +929,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/gisbi/conf', client_principal: 'Client Principal', keytab_Key_path: 'Keytab Key Path', please_select_left: '请从左侧选择', @@ -3656,7 +3656,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/gisbi/conf', client_principal: 'Client Principal', keytab_Key_path: 'Keytab Key Path', data_base: '数据库名称', diff --git a/sdk/common/src/main/java/io/gisbi/auth/config/SubstituleLoginConfig.java b/sdk/common/src/main/java/io/gisbi/auth/config/SubstituleLoginConfig.java index 1a58ae8..9d51ffa 100644 --- a/sdk/common/src/main/java/io/gisbi/auth/config/SubstituleLoginConfig.java +++ b/sdk/common/src/main/java/io/gisbi/auth/config/SubstituleLoginConfig.java @@ -21,7 +21,7 @@ import java.util.Map; @Configuration public class SubstituleLoginConfig { - @Value("${dataease.path.substitule:classpath:substitule.json}") + @Value("${gisbi.path.substitule:classpath:substitule.json}") private String jsonFilePath; private static String pwd; @@ -35,10 +35,11 @@ public class SubstituleLoginConfig { ObjectMapper objectMapper = new ObjectMapper(); File jsonFile = new File(jsonFilePath); if (!jsonFile.exists()) { - pwd = CommonBeanFactory.getBean(Environment.class).getProperty("dataease.default-pwd", "DataEase@123456"); + pwd = CommonBeanFactory.getBean(Environment.class).getProperty("gisbi.default-pwd", "Gisbi@123456"); modifyPwd(pwd); } - return objectMapper.readValue(jsonFile, Map.class); + Map map=objectMapper.readValue(jsonFile, Map.class); + return map; } public static String getPwd() { diff --git a/sdk/common/src/main/java/io/gisbi/constant/StaticResourceConstants.java b/sdk/common/src/main/java/io/gisbi/constant/StaticResourceConstants.java index ab5078f..932cd92 100644 --- a/sdk/common/src/main/java/io/gisbi/constant/StaticResourceConstants.java +++ b/sdk/common/src/main/java/io/gisbi/constant/StaticResourceConstants.java @@ -41,9 +41,9 @@ public class StaticResourceConstants { public static String getHomeData() { if (ModelUtils.isDesktop()) { - return ConfigUtils.getConfig("dataease.path.data", "/opt/dataease2.0/data"); + return ConfigUtils.getConfig("gisbi.path.data", "/opt/gisbi/data"); } else { - return "/opt/dataease2.0/data"; + return "/opt/gisbi/data"; } } } diff --git a/sdk/common/src/main/java/io/gisbi/result/ResultResponseBodyAdvice.java b/sdk/common/src/main/java/io/gisbi/result/ResultResponseBodyAdvice.java index 5a1e4e3..c1082cc 100644 --- a/sdk/common/src/main/java/io/gisbi/result/ResultResponseBodyAdvice.java +++ b/sdk/common/src/main/java/io/gisbi/result/ResultResponseBodyAdvice.java @@ -13,7 +13,7 @@ import org.springframework.http.server.ServerHttpResponse; import org.springframework.web.bind.annotation.RestControllerAdvice; import org.springframework.web.servlet.mvc.method.annotation.ResponseBodyAdvice; -@RestControllerAdvice(value = {"io.dataease"}) +@RestControllerAdvice(value = {"io.gisbi"}) public class ResultResponseBodyAdvice implements ResponseBodyAdvice { @Override