修改了其中的bug。
This commit is contained in:
parent
c84df1d80c
commit
f2c841e50b
@ -40,7 +40,7 @@ public class EngineManage {
|
|||||||
@Resource
|
@Resource
|
||||||
private CoreDatasourceMapper datasourceMapper;
|
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;
|
private String engineUrl;
|
||||||
|
|
||||||
|
|
||||||
|
@ -55,9 +55,9 @@ public class CalciteProvider extends Provider {
|
|||||||
private EngineManage engineManage;
|
private EngineManage engineManage;
|
||||||
protected ExtendedJdbcClassLoader extendedJdbcClassLoader;
|
protected ExtendedJdbcClassLoader extendedJdbcClassLoader;
|
||||||
private Map<Long, ExtendedJdbcClassLoader> customJdbcClassLoaders = new HashMap<>();
|
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;
|
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 String CUSTOM_PATH;
|
||||||
private static String split = "DE";
|
private static String split = "DE";
|
||||||
|
|
||||||
|
@ -40,9 +40,9 @@ public class ExcelUtils {
|
|||||||
|
|
||||||
public static String getExcelPath() {
|
public static String getExcelPath() {
|
||||||
if (ModelUtils.isDesktop()) {
|
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 {
|
} else {
|
||||||
return "/opt/dataease2.0/data/excel/";
|
return "/opt/gisbi/data/excel/";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -33,7 +33,7 @@ import java.util.Map;
|
|||||||
@RequestMapping("/datasourceDriver")
|
@RequestMapping("/datasourceDriver")
|
||||||
public class DatasourceDriverServer implements DatasourceDriverApi {
|
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;
|
private String DRIVER_PATH;
|
||||||
|
|
||||||
@Resource
|
@Resource
|
||||||
|
@ -102,7 +102,7 @@ public class ExportCenterManage implements BaseExportApi {
|
|||||||
|
|
||||||
|
|
||||||
private final static String DATA_URL_TITLE = "data:image/jpeg;base64,";
|
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;
|
private String exportData_path;
|
||||||
@Resource
|
@Resource
|
||||||
private VisualizationWatermarkMapper watermarkMapper;
|
private VisualizationWatermarkMapper watermarkMapper;
|
||||||
|
@ -32,7 +32,7 @@ import java.util.UUID;
|
|||||||
@Component
|
@Component
|
||||||
public class FontManage {
|
public class FontManage {
|
||||||
|
|
||||||
@Value("${dataease.path.font:/opt/dataease2.0/data/font/}")
|
@Value("${gisbi.path.font:/opt/gisbi/data/font/}")
|
||||||
private String path;
|
private String path;
|
||||||
|
|
||||||
@Resource
|
@Resource
|
||||||
|
@ -34,7 +34,7 @@ import java.util.Map;
|
|||||||
@RequestMapping("/staticResource")
|
@RequestMapping("/staticResource")
|
||||||
public class StaticResourceServer implements StaticResourceApi {
|
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;
|
private String staticDir;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -26,9 +26,9 @@ public class VisualizationExcelUtils {
|
|||||||
|
|
||||||
public static String getBaseRoot() {
|
public static String getBaseRoot() {
|
||||||
if (ModelUtils.isDesktop()) {
|
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 {
|
} else {
|
||||||
return "/opt/dataease2.0/data/report/";
|
return "/opt/gisbi/data/report/";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -34,7 +34,7 @@ mybatis:
|
|||||||
map-underscore-to-camel-case: true
|
map-underscore-to-camel-case: true
|
||||||
logging:
|
logging:
|
||||||
file:
|
file:
|
||||||
path: /opt/gisbi1.0/logs/gisbi
|
path: /opt/gisbi/logs
|
||||||
# sql日志生产环境注释掉
|
# sql日志生产环境注释掉
|
||||||
#mybatis-plus:
|
#mybatis-plus:
|
||||||
# configuration:
|
# configuration:
|
||||||
@ -52,6 +52,8 @@ gisbi:
|
|||||||
apisix-api:
|
apisix-api:
|
||||||
domain: http://127.0.0.1:9180
|
domain: http://127.0.0.1:9180
|
||||||
key: edd1c9f034335f136f87ad84b625c8f1
|
key: edd1c9f034335f136f87ad84b625c8f1
|
||||||
|
path:
|
||||||
|
substitule: /opt/gisbi/substitule.json
|
||||||
|
|
||||||
# springdoc-openapi项目配置
|
# springdoc-openapi项目配置
|
||||||
springdoc:
|
springdoc:
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<configuration debug="true">
|
<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">
|
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
|
||||||
<immediateFlush>true</immediateFlush>
|
<immediateFlush>true</immediateFlush>
|
||||||
|
1
core/core-backend/src/main/resources/substitule.json
Normal file
1
core/core-backend/src/main/resources/substitule.json
Normal file
@ -0,0 +1 @@
|
|||||||
|
{"pwd": "Gisbi@123456"}
|
@ -8,9 +8,9 @@ export default {
|
|||||||
},
|
},
|
||||||
// 使用 proxy 实例
|
// 使用 proxy 实例
|
||||||
'/api': {
|
'/api': {
|
||||||
target: 'http://localhost:8100',
|
target: 'http://localhost:8105',
|
||||||
changeOrigin: true,
|
changeOrigin: true,
|
||||||
rewrite: path => path.replace(/^\/api/, 'de2api')
|
rewrite: path => path.replace(/^\/api/, '')
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
port: 8080
|
port: 8080
|
||||||
|
@ -958,7 +958,7 @@ export default {
|
|||||||
auth_method: 'Authentication Method',
|
auth_method: 'Authentication Method',
|
||||||
passwd: 'Username and Password',
|
passwd: 'Username and Password',
|
||||||
kerbers_info:
|
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',
|
client_principal: 'Client Principal',
|
||||||
keytab_Key_path: 'Keytab Key Path',
|
keytab_Key_path: 'Keytab Key Path',
|
||||||
please_select_left: 'Please select from the left',
|
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',
|
auth_method: 'Authentication method',
|
||||||
passwd: 'Username and password',
|
passwd: 'Username and password',
|
||||||
kerbers_info:
|
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',
|
client_principal: 'Client Principal',
|
||||||
keytab_Key_path: 'Keytab Key Path',
|
keytab_Key_path: 'Keytab Key Path',
|
||||||
data_base: 'Database name',
|
data_base: 'Database name',
|
||||||
|
@ -927,7 +927,7 @@ export default {
|
|||||||
data_source_table: '資料來源表',
|
data_source_table: '資料來源表',
|
||||||
auth_method: '認證方式',
|
auth_method: '認證方式',
|
||||||
passwd: '使用者名稱密碼',
|
passwd: '使用者名稱密碼',
|
||||||
kerbers_info: '請確保krb5.Conf、Keytab Key,已新增至路徑:/opt/dataease2.0/conf',
|
kerbers_info: '請確保krb5.Conf、Keytab Key,已新增至路徑:/opt/gisbi/conf',
|
||||||
client_principal: 'Client Principal',
|
client_principal: 'Client Principal',
|
||||||
keytab_Key_path: 'Keytab Key Path',
|
keytab_Key_path: 'Keytab Key Path',
|
||||||
please_select_left: '請從左邊選擇',
|
please_select_left: '請從左邊選擇',
|
||||||
@ -3649,7 +3649,7 @@ export default {
|
|||||||
data_source_table: '資料來源表',
|
data_source_table: '資料來源表',
|
||||||
auth_method: '認證方式',
|
auth_method: '認證方式',
|
||||||
passwd: '使用者名稱密碼',
|
passwd: '使用者名稱密碼',
|
||||||
kerbers_info: '請確保krb5.Conf、Keytab Key,已新增至路徑:/opt/dataease2.0/conf',
|
kerbers_info: '請確保krb5.Conf、Keytab Key,已新增至路徑:/opt/gisbi/conf',
|
||||||
client_principal: 'Client Principal',
|
client_principal: 'Client Principal',
|
||||||
keytab_Key_path: 'Keytab Key Path',
|
keytab_Key_path: 'Keytab Key Path',
|
||||||
data_base: '資料庫名稱',
|
data_base: '資料庫名稱',
|
||||||
|
@ -929,7 +929,7 @@ export default {
|
|||||||
data_source_table: '数据源表',
|
data_source_table: '数据源表',
|
||||||
auth_method: '认证方式',
|
auth_method: '认证方式',
|
||||||
passwd: '用户名密码',
|
passwd: '用户名密码',
|
||||||
kerbers_info: '请确保 krb5.Conf、Keytab Key,已经添加到路径:/opt/dataease2.0/conf',
|
kerbers_info: '请确保 krb5.Conf、Keytab Key,已经添加到路径:/opt/gisbi/conf',
|
||||||
client_principal: 'Client Principal',
|
client_principal: 'Client Principal',
|
||||||
keytab_Key_path: 'Keytab Key Path',
|
keytab_Key_path: 'Keytab Key Path',
|
||||||
please_select_left: '请从左侧选择',
|
please_select_left: '请从左侧选择',
|
||||||
@ -3656,7 +3656,7 @@ export default {
|
|||||||
data_source_table: '数据源表',
|
data_source_table: '数据源表',
|
||||||
auth_method: '认证方式',
|
auth_method: '认证方式',
|
||||||
passwd: '用户名密码',
|
passwd: '用户名密码',
|
||||||
kerbers_info: '请确保 krb5.Conf、Keytab Key,已经添加到路径:/opt/dataease2.0/conf',
|
kerbers_info: '请确保 krb5.Conf、Keytab Key,已经添加到路径:/opt/gisbi/conf',
|
||||||
client_principal: 'Client Principal',
|
client_principal: 'Client Principal',
|
||||||
keytab_Key_path: 'Keytab Key Path',
|
keytab_Key_path: 'Keytab Key Path',
|
||||||
data_base: '数据库名称',
|
data_base: '数据库名称',
|
||||||
|
@ -21,7 +21,7 @@ import java.util.Map;
|
|||||||
@Configuration
|
@Configuration
|
||||||
public class SubstituleLoginConfig {
|
public class SubstituleLoginConfig {
|
||||||
|
|
||||||
@Value("${dataease.path.substitule:classpath:substitule.json}")
|
@Value("${gisbi.path.substitule:classpath:substitule.json}")
|
||||||
private String jsonFilePath;
|
private String jsonFilePath;
|
||||||
|
|
||||||
private static String pwd;
|
private static String pwd;
|
||||||
@ -35,10 +35,11 @@ public class SubstituleLoginConfig {
|
|||||||
ObjectMapper objectMapper = new ObjectMapper();
|
ObjectMapper objectMapper = new ObjectMapper();
|
||||||
File jsonFile = new File(jsonFilePath);
|
File jsonFile = new File(jsonFilePath);
|
||||||
if (!jsonFile.exists()) {
|
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);
|
modifyPwd(pwd);
|
||||||
}
|
}
|
||||||
return objectMapper.readValue(jsonFile, Map.class);
|
Map<String, Object> map=objectMapper.readValue(jsonFile, Map.class);
|
||||||
|
return map;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static String getPwd() {
|
public static String getPwd() {
|
||||||
|
@ -41,9 +41,9 @@ public class StaticResourceConstants {
|
|||||||
|
|
||||||
public static String getHomeData() {
|
public static String getHomeData() {
|
||||||
if (ModelUtils.isDesktop()) {
|
if (ModelUtils.isDesktop()) {
|
||||||
return ConfigUtils.getConfig("dataease.path.data", "/opt/dataease2.0/data");
|
return ConfigUtils.getConfig("gisbi.path.data", "/opt/gisbi/data");
|
||||||
} else {
|
} else {
|
||||||
return "/opt/dataease2.0/data";
|
return "/opt/gisbi/data";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -13,7 +13,7 @@ import org.springframework.http.server.ServerHttpResponse;
|
|||||||
import org.springframework.web.bind.annotation.RestControllerAdvice;
|
import org.springframework.web.bind.annotation.RestControllerAdvice;
|
||||||
import org.springframework.web.servlet.mvc.method.annotation.ResponseBodyAdvice;
|
import org.springframework.web.servlet.mvc.method.annotation.ResponseBodyAdvice;
|
||||||
|
|
||||||
@RestControllerAdvice(value = {"io.dataease"})
|
@RestControllerAdvice(value = {"io.gisbi"})
|
||||||
public class ResultResponseBodyAdvice implements ResponseBodyAdvice<Object> {
|
public class ResultResponseBodyAdvice implements ResponseBodyAdvice<Object> {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
Loading…
Reference in New Issue
Block a user