ThbTech/gis-bi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改了其中的bug。

Browse Source
This commit is contained in:
root 2025-03-12 09:15:30 +08:00
parent c84df1d80c
commit f2c841e50b
18 changed files with 31 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/core-backend/src/main/java/io/gisbi/datasource/manage/EngineManage.java
View File

@ -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;

4
core/core-backend/src/main/java/io/gisbi/datasource/provider/CalciteProvider.java
View File

@ -55,9 +55,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("${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";

4
core/core-backend/src/main/java/io/gisbi/datasource/provider/ExcelUtils.java
View File

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

2
core/core-backend/src/main/java/io/gisbi/datasource/server/DatasourceDriverServer.java
View File

@ -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

2
core/core-backend/src/main/java/io/gisbi/exportCenter/manage/ExportCenterManage.java
View File

@ -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;

2
core/core-backend/src/main/java/io/gisbi/font/manage/FontManage.java
View File

@ -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

2
core/core-backend/src/main/java/io/gisbi/visualization/server/StaticResourceServer.java
View File

@ -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

4
core/core-backend/src/main/java/io/gisbi/visualization/utils/VisualizationExcelUtils.java
View File

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

4
core/core-backend/src/main/resources/application.yml
View File

@ -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:

2
core/core-backend/src/main/resources/logback-spring.xml
View File

@ -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/gisbi1.0/logs/core"/>
<springProperty scope="context" name="logPath" source="logging.file.path" defaultValue="/opt/gisbi/logs/core"/>
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<immediateFlush>true</immediateFlush>

1
core/core-backend/src/main/resources/substitule.json Normal file
View File

@ -0,0 +1 @@
{"pwd": "Gisbi@123456"}

4
core/core-frontend/config/dev.ts
View File

@ -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

4
core/core-frontend/src/locales/en.ts
View File

@ -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',

4
core/core-frontend/src/locales/tw.ts
View File

@ -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: '資料庫名稱',

4
core/core-frontend/src/locales/zh-CN.ts
View File

@ -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: '数据库名称',

7
sdk/common/src/main/java/io/gisbi/auth/config/SubstituleLoginConfig.java
View File

@ -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<String, Object> map=objectMapper.readValue(jsonFile, Map.class);
return map;
}
public static String getPwd() {

4
sdk/common/src/main/java/io/gisbi/constant/StaticResourceConstants.java
View File

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

2
sdk/common/src/main/java/io/gisbi/result/ResultResponseBodyAdvice.java
View File

@ -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<Object> {
@Override